makefile compiles also the GUI

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@16 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
This commit is contained in:
l_msdetect 2012-09-21 08:45:43 +00:00
parent 7a916df311
commit 0100eb1d0c

View File

@ -5,7 +5,7 @@ WD=$(shell pwd)
LIBRARYDIR=$(WD)/slsDetectorSoftware
TLIBRARYDIR=$(WD)/TMythenDetector
CLIENTDIR=$(WD)/slsDetectorClient
GUIDIR=$(WD)/mythenGUI
GUIDIR=$(WD)/slsDetectorGuiOriginal
LIBDOCDIR=$(WD)/slsDetectorSoftware
@ -15,8 +15,7 @@ LIBDOCDIR=$(WD)/slsDetectorSoftware
all: lib slsDetectorClient
all: lib slsDetectorClient slsDetectorGUI
lib:
cd $(LIBRARYDIR) && $(MAKE) lib FLAGS=$(FLAGS)
@ -26,6 +25,10 @@ slsDetectorClient: lib
$(shell test -d bin || mkdir -p bin)
mv $(CLIENTDIR)/bin/* bin/
slsDetectorGUI: lib
cd $(GUIDIR) && $(MAKE) FLAGS=$(FLAGS)
$(shell test -d bin || mkdir -p bin)
mv $(GUIDIR)/bin/* bin/
clean:
rm -rf bin/sls_detector_*
@ -55,7 +58,6 @@ install_doc: install_libdoc install_clientdoc
install: conf install_lib install_client install_doc
conf: