sala Makefile

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@814 951219d9-93cf-4727-9268-0efd64621fa3

slsDetectorSoftware/Makefile

@@ -18,14 +18,20 @@ OBJS = $(SRC_CLNT:.cpp=.o)
 
 HEADERS = $(SRC_CLNT:.cpp=.h) commonFiles/sls_detector_defs.h slsDetectorAnalysis/detectorData.h slsDetector/slsDetectorBase.h multiSlsDetector/multiSlsDetectorCommand.h   slsDetectorAnalysis/enCalLogClass.h  slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h  usersFunctions/angleFunction.h slsReceiverInterface/receiverInterface.h slsDetector/svnInfoLib.h slsReceiver/circularFifo.h        slsReceiver/slsReceiver_funcs.h        slsReceiver/svnInfoReceiverTmp.h slsReceiver/receiver_defs.h       slsReceiver/slsReceiverFunctionList.h  slsReceiver/slsReceiverUsers.h slsReceiver/svnInfoReceiver.h #../slsDetectorCalibration/singlePhotonDetector.h  ../slsDetectorCalibration/moenchCommonMode.h ../slsDetectorCalibration/moench02ModuleData.h ../slsDetectorCalibration/slsReceiverData.h
 
+#POCODIR = /afs/psi.ch/user/s/sala/public/poco-slp_6.4-32bit
+#JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_6.4-32bit
+POCODIR ?= /afs/psi.ch/user/s/sala/public/poco-slp_5.7-32bit
+JSONBOXDIR ?= /afs/psi.ch/user/s/sala/public/JsonBox-slp_5.7-32bit
+#POCODIR ?= /home/sala/Programs/poco-ubuntu_13.10-64bit
+#JSONBOXDIR ?= /home/sala/Programs/JsonBox-ubuntu_13.10-64bit
+EIGERFLAGS ?= -L $(JSONBOXDIR) -L $(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I $(POCODIR)/include -I $(JSONBOXDIR)/include 
 
-
+DESTDIR = bin
-DESTDIR ?= bin
 DOCDIR ?= docs
 
 
 all: package $(SRC_CLNT)
-	echo "compiling all"
+	echo "-----------compiling all"
 
 intdoc: $(SRC_H) $(SRC_CLNT) 
 	doxygen doxy.config
@@ -60,11 +66,16 @@ gotthardVirtualServer:  $(SRC_MYTHEN_SVC)
 
 
 %.o : %.cpp %.h Makefile
-	$(CXX) -Wall -o $@ -c $< $(INCLUDES) $(DFLAGS) $(FLAGS)  -fPIC  $(EPICSFLAGS) -L/usr/lib64/
+	echo "------------- compiling" $@
+	$(CXX) -Wall -o $@ -c $< $(INCLUDES) $(DFLAGS) $(FLAGS) $(EIGERFLAGS) -fPIC  $(EPICSFLAGS) -L/usr/lib64/
 
-package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a 
+package: eigerReceiver $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a 
+
+eigerReceiver:
+	cd slsReceiver && make eigerReceiver
 
 $(DESTDIR)/libSlsDetector.so: $(OBJS) 
+	echo "------------- Moving"
 	$(CXX)  -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so  $(OBJS)  -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS)  -L/usr/lib64/
 	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
 	mv libSlsDetector.so $(DESTDIR)
@@ -74,7 +85,7 @@ $(DESTDIR)/libSlsDetector.a: $(OBJS)
 	mv libSlsDetector.a $(DESTDIR)
 
 clean:
-	rm -rf libSlsDetector.a  libSlsDetector.so core  docs/* slsDetectorUsersDocs $(OBJS)
+	rm -rf $(DESTDIR)/libSlsDetector.a  $(DESTDIR)/libSlsDetector.so core  docs/* slsDetectorUsersDocs $(OBJS)
 
 
 #-------------------------------------------------------------------------------

slsDetectorSoftware/slsReceiver/Makefile

@@ -3,15 +3,26 @@ CFLAGS		+=  -DSLS_RECEIVER_FUNCTION_LIST -O3
 CPPFLAGS    = ${CFLAGS}   # for MAC
 LDFLAG=   -L/usr/lib64/ -lpthread -lm  -lstdc++ 
 
+#POCODIR = /afs/psi.ch/user/s/sala/public/poco-slp_6.4-32bit
+#JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_6.4-32bit
+POCODIR ?= /afs/psi.ch/user/s/sala/public/poco-slp_5.7-32bit
+JSONBOXDIR ?= /afs/psi.ch/user/s/sala/public/JsonBox-slp_5.7-32bit
+#POCODIR ?= /home/sala/Programs/poco-ubuntu_13.10-64bit
+#JSONBOXDIR ?= /home/sala/Programs/JsonBox-ubuntu_13.10-64bit
+
+EIGERFLAGS ?= -L $(JSONBOXDIR) -L $(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I$(POCODIR)/include -I$(JSONBOXDIR)/include 
 
 #LDLIBS		+= 	-lm  -lstdc++ -lpthread 
 LIBS?= -L$(LIBDIR) -lSlsDetector 
 
-INCLUDES	?= 	-I ../MySocketTCP  -I ../commonFiles -I  -I ../../../slsDetectorCalibration -I . 
+INCLUDES	?= 	-I ../MySocketTCP -I ../commonFiles -I ../../slsDetectorCalibration -I . 
 SRC_CLNT	= 	slsReceiver.cpp 
 #../MySocketTCP/MySocketTCP.cpp  slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp slsReceiverUsers.cpp 
 
 DESTDIR		?= 	bin
+#### LEO ADD
+LIBDIR 		= 	../$(DESTDIR)
+### END
 INSTMODE	= 	0777
 
 OBJS 		= 	$(SRC_CLNT:.cpp=.o) 
@@ -36,17 +47,22 @@ $(DESTDIR)/sslsReceiver: lib
 
 
 $(DESTDIR)/slsReceiver: lib
-	echo $(OBJS)
+	echo "---------------slsReceiver"
 	mkdir -p $(DESTDIR) 
-	$(CXX)   -o $@  $(SRC_CLNT)  $(FLAGS)  $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAG) 	
+	$(CXX)   -o $@  $(SRC_CLNT)  $(FLAGS)  $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAG) $(EIGERFLAGS) -L../$(LIBDIR)	-lPocoNet -lPocoFoundation -lJsonBox
 
 
+eigerReceiver: 
+	echo "---------------EigerReceiver"
+	$(CXX) $(FLAGS) $(CFLAGS) $(EIGERFLAGS) -fPIC -c -o eigerReceiverTest.o eigerReceiverTest.cpp -lPocoNet -lPocoFoundation -lJsonBox
+	$(CXX) $(FLAGS) $(CFLAGS) $(EIGERFLAGS) -fPIC -c -o eigerReceiver.o eigerReceiver.cpp -lPocoNet -lPocoFoundation -lJsonBox
+	$(CXX) $(EIGERFLAGS) eigerReceiverTest.o eigerReceiver.o   -o eigerReceiverTest -lPocoNet -lPocoFoundation -lJsonBox
 
 lib:
 	cd ../ && $(MAKE) DESTDIR=$(LIBDIR) 
 
 clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o  eigerReceiverTest
+	rm -rf $(PROGS)  *.o  eigerReceiverTest
 
 # EigerDataReceiver
 eigerReceiverTest.o: eigerReceiver.h