diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile index 64b94fa51..8fe6bc361 100644 --- a/slsReceiverSoftware/Makefile +++ b/slsReceiverSoftware/Makefile @@ -1,7 +1,6 @@ include ../Makefile.include DESTDIR ?= ../bin -LIBDIR ?= $(DESTDIR) DOCDIR ?= docs SRCDIR = src INCDIR = include @@ -45,7 +44,7 @@ OBJS=$(SRC_CLNT:%.cpp=$(BUILDDIR)/%.o) $(info ) $(info #######################################) -$(info # Compiling slsReceiverSoftware #) +$(info # In slsReceiverSoftware Makefile #) $(info #######################################) $(info ) @@ -74,7 +73,10 @@ receiver: $(DESTDIR)/slsReceiver $(DESTDIR)/libSlsReceiver.so: $(OBJS) - ./updateGitVersion.sh + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling slsReceiver Library #") + $(call colorecho,"#######################################") + $(call colorecho,`./updateGitVersion.sh`) $(CXX) -shared -Wl,-soname,libSlsReceiver.so -o libSlsReceiver.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread $(LIBZMQ) -lrt $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) mv libSlsReceiver.so $(DESTDIR) @@ -85,11 +87,17 @@ $(DESTDIR)/libSlsReceiver.a: $(OBJS) $(DESTDIR)/slsReceiver: $(SRCDIR)/$(MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling slsReceiver #") + $(call colorecho,"#######################################") $(CXX) -o $@ $(SRCDIR)/$(MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt #$(EIGERFLAGS) $(DESTDIR)/dummyReceiver: $(SRCDIR)/$(DUMMY_MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a + $(call colorecho,"#######################################") + $(call colorecho,"# Compiling Dummy slsReceiver #") + $(call colorecho,"#######################################") $(CXX) -o $@ $(SRCDIR)/$(DUMMY_MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt #$(EIGERFLAGS) @@ -108,7 +116,8 @@ clean: buildclean if test -e $(PROGS); then rm $(PROGS);fi builddir: - if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi + mkdir -p $(BUILDDIR) +# if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi buildclean: rm -rf $(OBJS) diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index d9f993439..0cb5b10ab 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git -Repsitory UUID: 36fc5833daba78a6e4daf7c3fca3199a4eb75e1c -Revision: 595 +Repsitory UUID: 7d45ac53d7d92a4817002e7aed7297d5ddfd0f73 +Revision: 596 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 600 -Last Changed Date: 2017-06-28 16:53:01 +0200 +Last Changed Rev: 601 +Last Changed Date: 2017-06-28 18:18:30 +0200 diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index d08327ba0..699b3cd33 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "36fc5833daba78a6e4daf7c3fca3199a4eb75e1c" -//#define SVNREV 0x600 +#define SVNREPUUID "7d45ac53d7d92a4817002e7aed7297d5ddfd0f73" +//#define SVNREV 0x601 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x600 +#define SVNREV 0x601 #define SVNDATE 0x20170628 //