diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 447d35265..85aadb3f0 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -21,9 +21,10 @@ SRC_CLNT=slsDetectorAnalysis/fileIO.cpp usersFunctions/usersFunctions.cpp slsDe DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h commonFiles/sls_detector_defs.h commonFiles/sls_detector_funcs.h commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h slsDetectorAnalysis/badChannelCorrections.h slsDetectorAnalysis/detectorData.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/fileIOStatic.h slsDetectorAnalysis/movingStat.h slsDetectorAnalysis/runningStat.h slsDetectorAnalysis/single_photon_hit.h threadFiles/Global.h threadFiles/Task.h usersFunctions/angleFunction.h + $(info ) $(info #######################################) -$(info # Compiling slsDetectorSoftware #) +$(info # In slsDetectorSoftware Makefile #) $(info #######################################) $(info ) @@ -67,7 +68,6 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC) cd gotthardDetectorServer && make -f Makefile.virtual DESTDIR=$(DESTDIR) - %.o : %.cpp %.h $(DEPSINCLUDES) Makefile $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -pthread -lrt $(LIBZMQ) $(FLAGS) @@ -75,8 +75,12 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC) package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(DESTDIR)/libSlsDetector.so: $(OBJS) - ./updateGitVersion.sh + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling slsDetector Library #") + $(call colorecho,"#######################################") + $(call colorecho,`./updateGitVersion.sh`) $(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread -lrt $(LIBZMQ) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) mv libSlsDetector.so $(DESTDIR) diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile index 5c473e367..646d9ba2d 100755 --- a/slsDetectorSoftware/eigerDetectorServer/Makefile +++ b/slsDetectorSoftware/eigerDetectorServer/Makefile @@ -12,13 +12,14 @@ SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c OBJS = $(SRC_CLNT:.c=.o) -all: clean updateVersion $(PROGS) #hv9m_blackfin_server +all: clean $(PROGS) #hv9m_blackfin_server boot: $(OBJS) -$(PROGS): - echo $(OBJS) +$(PROGS): $(OBJS) +# echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` mkdir -p $(DESTDIR) $(CC) -o $@ $(SRC_CLNT) $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) @@ -32,6 +33,4 @@ hv9m_blackfin_server:9mhvserial_bf.c clean: rm -rf $(DESTDIR)/$(PROGS) *.o $(DESTDIR)/hv9m_blackfin_server -updateVersion: - ./updateGitVersion.sh diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index c9533a5d4..f363766ff 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: 94d2b8cd58bbf69d26f491b7b81e2b269aac32b9 -Revision: 292 +Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d +Revision: 293 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1427 -Last Changed Date: 2017-06-28 10:27:40 +0200 +Last Changed Rev: 1435 +Last Changed Date: 2017-06-28 18:16:55 +0200 diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 5fcb30b25..a9d805730 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer" //#define SVNREPPATH "" -#define SVNREPUUID "94d2b8cd58bbf69d26f491b7b81e2b269aac32b9" -//#define SVNREV 0x1427 +#define SVNREPUUID "d4b0bef367ef407a3267619196da01dc1636865d" +//#define SVNREV 0x1435 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1427 +#define SVNREV 0x1435 #define SVNDATE 0x20170628 // diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 8ffab6a2a..3ba4cd1bd 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: f6589f7e6e60aa6f02e3adcf526b2a1a73153364 -Revision: 1429 +Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d +Revision: 1430 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1434 -Last Changed Date: 2017-06-28 18:13:47 +0200 +Last Changed Rev: 1435 +Last Changed Date: 2017-06-28 18:16:55 +0200 diff --git a/slsDetectorSoftware/gotthardDetectorServer/Makefile b/slsDetectorSoftware/gotthardDetectorServer/Makefile index c2e92aa6f..38e779c18 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/Makefile +++ b/slsDetectorSoftware/gotthardDetectorServer/Makefile @@ -21,12 +21,13 @@ OBJS = $(SRCS:%.c=%.o) -all: clean updateVersion $(PROGS) +all: clean $(PROGS) boot: $(OBJS) $(PROGS): $(OBJS) echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) @@ -41,8 +42,6 @@ romfs: clean: rm -rf $(PROGS) *.o *.gdb -updateVersion: - ./updateGitVersion.sh diff --git a/slsDetectorSoftware/gotthardDetectorServer/Makefile.propix b/slsDetectorSoftware/gotthardDetectorServer/Makefile.propix index 6fb7a6207..c0a4bcc55 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/Makefile.propix +++ b/slsDetectorSoftware/gotthardDetectorServer/Makefile.propix @@ -27,6 +27,7 @@ boot: $(OBJS) $(PROGS): $(OBJS) echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) diff --git a/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb b/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb index 52b5bb8df..60def850f 100644 --- a/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb +++ b/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb @@ -30,15 +30,18 @@ boot: $(OBJS) jungfrauDetectorServerTest: $(OBJS) echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) jungfrauDetectorServer: $(OBJS) echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) jungfrauADCTEst: $(OBJS) echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) -DTESTADC diff --git a/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh b/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh new file mode 100755 index 000000000..57d015ca3 --- /dev/null +++ b/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh @@ -0,0 +1,37 @@ +SERVER=jctbDetectorServer +TMPFILE=gitInfoMoenchTmp.h +INCLFILE=gitInfoMoench.h + +WD=slsDetectorSoftware/$SERVER + +GITREPO1='git remote -v' +GITREPO2=" | grep \"fetch\" | cut -d' ' -f1" +BRANCH1='git branch -v' +BRANCH2=" | grep '*' | cut -d' ' -f2" +REPUID1='git log --pretty=format:"%H" -1' +AUTH1_1='git log --pretty=format:"%cn" -1' +AUTH1_2=" | cut -d' ' -f1" +AUTH2_1='git log --pretty=format:"%cn" -1' +AUTH2_2=" | cut -d' ' -f2" +FOLDERREV1='git log --oneline . ' #used for all the individual server folders +FOLDERREV2=" | wc -l" #used for all the individual server folders +REV1='git log --oneline ' +REV2=" | wc -l" +RDATE1='git log --pretty=format:"%ci" -1' + +GITREPO=`eval $GITREPO1 $GITREPO2` +BRANCH=`eval $BRANCH1 $BRANCH2` +REPUID=`eval $REPUID1` +AUTH1=`eval $AUTH1_1 $AUTH1_2` +AUTH2=`eval $AUTH2_1 $AUTH2_2` +REV=`eval $REV1 $REV2` +FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2` +RDATE=`eval $RDATE1` +echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt +cd ../../ +./genVersionHeader.sh $WD/gitInfo.txt $WD/$TMPFILE $WD/$INCLFILE +echo "Revision Updated" +cd $WD + + + diff --git a/slsDetectorSoftware/jungfrauDetectorServer/Makefile b/slsDetectorSoftware/jungfrauDetectorServer/Makefile index 6fee46b09..4637d06fd 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/Makefile +++ b/slsDetectorSoftware/jungfrauDetectorServer/Makefile @@ -10,12 +10,13 @@ INSTMODE = 0777 SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c OBJS = $(SRC_CLNT:.c=.o) -all: clean updateVersion $(PROGS) +all: clean $(PROGS) boot: $(OBJS) $(PROGS): $(OBJS) - echo $(OBJS) +# echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) @@ -24,6 +25,5 @@ $(PROGS): $(OBJS) clean: rm -rf $(DESTDIR)/$(PROGS) *.o -updateVersion: - ./updateGitVersion.sh + \ No newline at end of file diff --git a/slsDetectorSoftware/moenchDetectorServer/Makefile b/slsDetectorSoftware/moenchDetectorServer/Makefile index e16947e8d..a38c7f521 100755 --- a/slsDetectorSoftware/moenchDetectorServer/Makefile +++ b/slsDetectorSoftware/moenchDetectorServer/Makefile @@ -21,12 +21,13 @@ OBJS = $(SRCS:%.c=%.o) -all: clean updateVersion $(PROGS) +all: clean $(PROGS) boot: $(OBJS) $(PROGS): $(OBJS) echo $(OBJS) + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) @@ -41,9 +42,6 @@ romfs: clean: rm -rf $(PROGS) *.o *.gdb -updateVersion: - ./updateGitVersion.sh - diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 5f1a9a29b..8fa9ea217 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUIDLIB "f6589f7e6e60aa6f02e3adcf526b2a1a73153364" -//#define SVNREV 0x1434 +#define SVNREPUUIDLIB "d4b0bef367ef407a3267619196da01dc1636865d" +//#define SVNREV 0x1435 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1434 +#define SVNREVLIB 0x1435 #define SVNDATELIB 0x20170628 // diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 5b284e57b..8fceec06d 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -26,9 +26,9 @@ int slsDetector::initSharedMemory(detectorType type, int id) { #ifdef VERBOSE cout << "init shm"<< endl; #endif - switch(type) { + switch(type) { case MYTHEN: - nch=128; // complete mythen system + nch=128; // complete mythen system nm=24; nc=10; nd=6; // dacs+adcs diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile b/slsDetectorSoftware/slsDetectorClient/Makefile index 63a49637a..d55b1ac5a 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile +++ b/slsDetectorSoftware/slsDetectorClient/Makefile @@ -1,96 +1,98 @@ +include ../../Makefile.include + CFLAGS= -DC_ONLY #FLAGS=-DVERBOSE #ASM=$(shell echo "/lib/modules/`uname -r`/build/include") -#INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis -I../slsDetectorSoftware/slsReceiverInterface -I$(ASM) -#LDFLAG= - - - INCLUDES?= -I../commonFiles -I../slsDetector -I ../MySocketTCP -I../usersFunctions -I../multiSlsDetector -I../slsDetectorAnalysis -I../slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include") - - -LIBDIR?=../ -LIBS?= -L$(LIBDIR) -lSlsDetector - -LDFLAG= -L/usr/lib64/ -pthread - - -DESTDIR ?= bin -DOCDIR ?= $(PWD)/docs - +DESTDIR ?= ../../bin BIN=$(DESTDIR) - +LIBS?= -L$(DESTDIR) -lSlsDetector +LIBRARYDIR?=../ +LDFLAG= -L/usr/lib64/ -pthread +DOCDIR ?= $(PWD)/docs SRC_CLNT=sls_detector_client.cpp -clients: $(DESTDIR)/sls_detector_put $(DESTDIR)/sls_detector_get $(DESTDIR)/sls_detector_acquire $(DESTDIR)/sls_detector_help - echo $(LIBS) -static_clients: $(DESTDIR)/ssls_detector_put $(DESTDIR)/ssls_detector_get $(DESTDIR)/ssls_detector_acquire $(DESTDIR)/ssls_detector_help +$(info ) +$(info #######################################) +$(info # In slsDetectorclient Makefile #) +$(info #######################################) +$(info ) all: clients - echo $(LIBS) nonstatic: clients +clients: builddir lib $(DESTDIR)/sls_detector_put $(DESTDIR)/sls_detector_get $(DESTDIR)/sls_detector_acquire $(DESTDIR)/sls_detector_help +static_clients: builddir lib $(DESTDIR)/ssls_detector_put $(DESTDIR)/ssls_detector_get $(DESTDIR)/ssls_detector_acquire $(DESTDIR)/ssls_detector_help -lib: - cd ../ && $(MAKE) DESTDIR=$(LIBDIR) - - - -$(DESTDIR)/ssls_detector_put: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) +builddir: +# echo $(LIBS) +# echo $(LDFLAG) mkdir -p $(BIN) + +lib: +# echo $(LIBDIR) + cd $(LIBRARYDIR) && $(MAKE) DESTDIR=$(DESTDIR) TABSPACE='$(TABSPACE)' + @echo "" + @echo "#######################################" + @echo "# Back in slsDetectorClient Makefile #" + @echo "#######################################" + @echo "" + +$(DESTDIR)/ssls_detector_put: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling ssls_detector_put #") + $(call colorecho,"#######################################") $(CXX) -static -o $(BIN)/ssls_detector_put $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DPUT $(LIBS) $(LDFLAG) -$(DESTDIR)/ssls_detector_get: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) - mkdir -p $(BIN) +$(DESTDIR)/ssls_detector_get: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling ssls_detector_get #") + $(call colorecho,"#######################################") $(CXX) -static -o $(BIN)/ssls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG) -$(DESTDIR)/ssls_detector_acquire: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) - mkdir -p $(BIN) +$(DESTDIR)/ssls_detector_acquire: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling ssls_detector_acquire #") + $(call colorecho,"#######################################") $(CXX) -static -o $(BIN)/ssls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG) -$(DESTDIR)/ssls_detector_help: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) - mkdir -p $(BIN) +$(DESTDIR)/ssls_detector_help: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling ssls_detector_help #") + $(call colorecho,"#######################################") $(CXX) -static -o $(BIN)/ssls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG) -$(DESTDIR)/sls_detector_put: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) - mkdir -p $(BIN) +$(DESTDIR)/sls_detector_put: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling sls_detector_put #") + $(call colorecho,"#######################################") $(CXX) -o $(BIN)/sls_detector_put $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DPUT $(LIBS) $(LDFLAG) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) -$(DESTDIR)/sls_detector_get: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) - mkdir -p $(BIN) +$(DESTDIR)/sls_detector_get: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling sls_detector_get #") + $(call colorecho,"#######################################") $(CXX) -o $(BIN)/sls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) -$(DESTDIR)/sls_detector_acquire: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) - mkdir -p $(BIN) +$(DESTDIR)/sls_detector_acquire: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling sls_detector_acquire #") + $(call colorecho,"#######################################") $(CXX) -o $(BIN)/sls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) -$(DESTDIR)/sls_detector_help: $(SRC_CLNT) lib - echo $(LIBS) - echo $(LDFLAG) - mkdir -p $(BIN) +$(DESTDIR)/sls_detector_help: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling sls_detector_help #") + $(call colorecho,"#######################################") $(CXX) -o $(BIN)/sls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) @@ -107,6 +109,3 @@ clean: install: clients - - -