detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-24 10:31:09 +02:00
Code Issues Actions Packages Releases Activity

changed slsDetectorReceiver to slsReceiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@24 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
This commit is contained in:
l_maliakal_d
2012-10-24 13:11:31 +00:00
parent 98945dce88
commit 4d47efb847
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -6,7 +6,7 @@ LIBRARYDIR=$(WD)/slsDetectorSoftware
CLIENTDIR=$(WD)/slsDetectorClient CLIENTDIR=$(WD)/slsDetectorClient
GUIDIR=$(WD)/slsDetectorGuiOriginal GUIDIR=$(WD)/slsDetectorGuiOriginal
LIBDOCDIR=$(WD)/slsDetectorSoftware LIBDOCDIR=$(WD)/slsDetectorSoftware
RECEIVERDIR=$(LIBRARYDIR)/slsDetectorReceiver RECEIVERDIR=$(LIBRARYDIR)/slsReceiver
@ -15,9 +15,9 @@ RECEIVERDIR=$(LIBRARYDIR)/slsDetectorReceiver
all: lib slsDetectorClient_static slsDetectorReceiver #slsDetectorGUI all: lib slsDetectorClient_static slsReceiver #slsDetectorGUI
nonstatic: lib slsDetectorClient slsDetectorReceiver slsDetectorGUI nonstatic: lib slsDetectorClient slsReceiver slsDetectorGUI
lib: lib:
cd $(LIBRARYDIR) && $(MAKE) lib FLAGS=$(FLAGS) cd $(LIBRARYDIR) && $(MAKE) lib FLAGS=$(FLAGS)
@ -33,7 +33,7 @@ slsDetectorClient: lib
$(shell test -d bin || mkdir -p bin) $(shell test -d bin || mkdir -p bin)
mv $(CLIENTDIR)/bin/* bin/ mv $(CLIENTDIR)/bin/* bin/
slsDetectorReceiver: lib slsReceiver: lib
cd $(RECEIVERDIR) && $(MAKE) FLAGS=$(FLAGS) cd $(RECEIVERDIR) && $(MAKE) FLAGS=$(FLAGS)
$(shell test -d bin || mkdir -p bin) $(shell test -d bin || mkdir -p bin)
mv $(RECEIVERDIR)/bin/* bin/ mv $(RECEIVERDIR)/bin/* bin/
@ -51,7 +51,7 @@ calWiz:
cp calibrationWizards/manual/*.pdf manual/ cp calibrationWizards/manual/*.pdf manual/
clean: clean:
rm -rf bin/sls_detector_* rm -rf bin/sls_detector_* bin/slsDetectorGui bin/slsReceiver
cd $(LIBRARYDIR) && $(MAKE) clean cd $(LIBRARYDIR) && $(MAKE) clean
cd $(CLIENTDIR) && $(MAKE) clean cd $(CLIENTDIR) && $(MAKE) clean
cd $(GUIDIR) && $(MAKE) clean cd $(GUIDIR) && $(MAKE) clean