changed the makefiles a bit to be included in slsDetectorsPAckage make

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@153 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-03-06 09:41:21 +00:00
parent 499cf4db56
commit 448f333b1e
3 changed files with 6 additions and 6 deletions

View File

@@ -6,7 +6,7 @@ DOCDIR?=docs
LIBDIR?=../slsDetectorSoftware
all: $(PROG) Makefile.gui client
all: $(PROG) Makefile.gui guiclient
clean:
if test -e Makefile.gui; then make -f Makefile.gui clean; make -f Makefile.gui mocclean; rm Makefile.gui; else make Makefile.gui; make -f Makefile.gui clean; make -f Makefile.gui mocclean; fi
@@ -30,5 +30,6 @@ $(PROG): Makefile.gui $(DIR)
make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
client:
cd slsDetectorGui/client && $(MAKE) DESTDIR=$(DESTDIR)
guiclient:
echo $(WD)
cd client && $(MAKE) DESTDIR=$(DESTDIR)