mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-06 01:50:40 +02:00
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:
parent
7a916df311
commit
0100eb1d0c
10
Makefile
10
Makefile
@ -5,7 +5,7 @@ WD=$(shell pwd)
|
|||||||
LIBRARYDIR=$(WD)/slsDetectorSoftware
|
LIBRARYDIR=$(WD)/slsDetectorSoftware
|
||||||
TLIBRARYDIR=$(WD)/TMythenDetector
|
TLIBRARYDIR=$(WD)/TMythenDetector
|
||||||
CLIENTDIR=$(WD)/slsDetectorClient
|
CLIENTDIR=$(WD)/slsDetectorClient
|
||||||
GUIDIR=$(WD)/mythenGUI
|
GUIDIR=$(WD)/slsDetectorGuiOriginal
|
||||||
LIBDOCDIR=$(WD)/slsDetectorSoftware
|
LIBDOCDIR=$(WD)/slsDetectorSoftware
|
||||||
|
|
||||||
|
|
||||||
@ -15,8 +15,7 @@ LIBDOCDIR=$(WD)/slsDetectorSoftware
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
all: lib slsDetectorClient
|
all: lib slsDetectorClient slsDetectorGUI
|
||||||
|
|
||||||
|
|
||||||
lib:
|
lib:
|
||||||
cd $(LIBRARYDIR) && $(MAKE) lib FLAGS=$(FLAGS)
|
cd $(LIBRARYDIR) && $(MAKE) lib FLAGS=$(FLAGS)
|
||||||
@ -26,6 +25,10 @@ slsDetectorClient: lib
|
|||||||
$(shell test -d bin || mkdir -p bin)
|
$(shell test -d bin || mkdir -p bin)
|
||||||
mv $(CLIENTDIR)/bin/* bin/
|
mv $(CLIENTDIR)/bin/* bin/
|
||||||
|
|
||||||
|
slsDetectorGUI: lib
|
||||||
|
cd $(GUIDIR) && $(MAKE) FLAGS=$(FLAGS)
|
||||||
|
$(shell test -d bin || mkdir -p bin)
|
||||||
|
mv $(GUIDIR)/bin/* bin/
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf bin/sls_detector_*
|
rm -rf bin/sls_detector_*
|
||||||
@ -55,7 +58,6 @@ install_doc: install_libdoc install_clientdoc
|
|||||||
|
|
||||||
|
|
||||||
install: conf install_lib install_client install_doc
|
install: conf install_lib install_client install_doc
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
conf:
|
conf:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user