From ea1878f848f524a1ba7519f5ea4a223af7cd472b Mon Sep 17 00:00:00 2001
From: Maliakal Dhanya <dhanya.maliakal@psi.ch>
Date: Tue, 20 May 2014 17:17:20 +0200
Subject: [PATCH] changes in makefile to make a separate receiver

---
 slsDetectorGui/Makefile           | 19 ++++++++++---------
 slsDetectorGui/client/Makefile    |  8 ++++----
 slsDetectorGui/slsDetectorGui.pro |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index f5ead9d49..fbbdeee59 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -8,14 +8,15 @@ DESTDIR		?=	../bin
 LIBDIR		?=	$(DESTDIR)
 DOCDIR		?=	docs
 
-LIBRARYDIR	?=	../slsDetectorSoftware
-INCLUDES	?= 	$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP  -I$(LIBRARYDIR)/slsReceiverInterface   -I$(LIBRARYDIR)/slsDetector  -I$(LIBRARYDIR)/slsDetectorAnalysis  -I$(LIBRARYDIR)/multiSlsDetector   -I$(LIBRARYDIR)/usersFunctions
+LIBRARYDIR		?=	../slsDetectorSoftware
+LIBRARYRXRDIR 	?= 	../slsReceiverSoftware
+INCLUDES	?= 	$(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP  -I$(LIBRARYDIR)/slsReceiverInterface   -I$(LIBRARYDIR)/slsDetector  -I$(LIBRARYDIR)/slsDetectorAnalysis  -I$(LIBRARYDIR)/multiSlsDetector   -I$(LIBRARYDIR)/usersFunctions  -I$(LIBRARYRXRDIR)/includes
 
-ifeq ( $(EIGERSLS), yes)  	
-	LDFLAG += $(EIGERFLAGS)
-else ifeq ( $(ROOTSLS), yes)  	
-	LDFLAG += $(ROOTFLAGS)
-endif
+#ifeq ( $(EIGERSLS), yes)  	
+#	LDFLAG += $(EIGERFLAGS)
+#else ifeq ( $(ROOTSLS), yes)  	
+#	LDFLAG += $(ROOTFLAGS)
+#endif
 
 .PHONY: all lib clean mm doc htmldoc guiclient
 
@@ -34,7 +35,7 @@ clean:
 Makefile.gui: mm
 
 mm:
-	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)'
+	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAGDET)'
 
 doc:
 	cd manual && make DESTDIR=$(DOCDIR)
@@ -43,7 +44,7 @@ htmldoc:
 	cd manual && make html DESTDIR=$(DOCDIR)
 
 $(PROG): Makefile.gui $(DIR)
-	make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
+	make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
 
 guiclient:
 	echo $(WD)
diff --git a/slsDetectorGui/client/Makefile b/slsDetectorGui/client/Makefile
index a889e74c7..ca48957a2 100644
--- a/slsDetectorGui/client/Makefile
+++ b/slsDetectorGui/client/Makefile
@@ -3,8 +3,9 @@ CLAGS		+=  -DVERBOSE #VERYBOSE
 LDLIBS		+= 	-lm  -lstdc++ -lpthread 
 
 LDIR 		=	../../slsDetectorSoftware
-INCLUDES	= 	-I ../../slsDetectorSoftware/commonFiles  -I ../../slsDetectorSoftware/MySocketTCP -I ../../slsDetectorSoftware/slsDetector -I ../include
-SRC_CLNT	= 	qClient.cpp ../../slsDetectorSoftware/MySocketTCP/MySocketTCP.cpp
+RDIR 		= 	../../slsReceiverSoftware
+INCLUDES	= 	-I $(LDIR)/commonFiles  -I $(RDIR)/MySocketTCP -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/includes
+SRC_CLNT	= 	qClient.cpp $(RDIR)/MySocketTCP/MySocketTCP.cpp
 
 PROGS		= 	gui_client 
 DESTDIR		?= 	bin
@@ -26,8 +27,7 @@ $(PROGS):
 	mv $(PROGS) $(FINALDIR)
 
 clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o 
-	rm -rf $(FINALDIR)/$(PROGS)
+	rm -rf $(DESTDIR)/$(PROGS)  *.o  $(FINALDIR)/$(PROGS)
 
 
 
diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro
index 72f89a506..ac60c2004 100644
--- a/slsDetectorGui/slsDetectorGui.pro
+++ b/slsDetectorGui/slsDetectorGui.pro
@@ -16,11 +16,11 @@ QMAKE_LIBS 			= 	-L$(QTDIR)/lib
 
 
 #epics
-#DEFINES 			+= 	 EPICS	VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE 
+#DEFINES 			+= 	 EPICS	VERBOSE DACS_INT PRINT_LOG  #VERYVERBOSE 
 #LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib  -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH)  -lca -lCom 
 
 #default
-DEFINES 			+= 	 VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE CHECKINFERROR 
+DEFINES 			+= 	 VERBOSE DACS_INT PRINT_LOG  #VERYVERBOSE CHECKINFERROR 
 LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib