From 5e4c2f30b4ed9a96fff6a6df15b9727444d54f10 Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 5 Apr 2013 10:54:56 +0000
Subject: [PATCH] static compilation now works

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@503 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetectorClient/Makefile                | 15 ++++++++
 slsDetectorSoftware/slsReceiver/Makefile      | 37 +++++++++++++++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile b/slsDetectorSoftware/slsDetectorClient/Makefile
index be8a265c9..fef04074a 100644
--- a/slsDetectorSoftware/slsDetectorClient/Makefile
+++ b/slsDetectorSoftware/slsDetectorClient/Makefile
@@ -42,39 +42,54 @@ lib:
 
 $(DESTDIR)/ssls_detector_put: $(SRC_CLNT) lib
 	echo $(LIBS)
+	echo  $(LDFLAG) 
 	mkdir -p $(BIN)
 	$(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)
 	$(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)
 	$(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)
 	$(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)
 	$(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)
 	$(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)
 	$(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)
 	$(CXX) -o $(BIN)/sls_detector_help $(SRC_CLNT)   $(FLAGS)  $(INCLUDES) -DHELP  $(LIBS) $(LDFLAG)
 	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
diff --git a/slsDetectorSoftware/slsReceiver/Makefile b/slsDetectorSoftware/slsReceiver/Makefile
index 8fe4a34d5..fa3669d29 100644
--- a/slsDetectorSoftware/slsReceiver/Makefile
+++ b/slsDetectorSoftware/slsReceiver/Makefile
@@ -1,27 +1,48 @@
 CC			=	g++ 
 CLAGS		+=  -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD  #-DUHRIXCALLBACK  #-DTESTWRITE
-LDLIBS		+= 	-lm  -lstdc++ -lpthread 
+LDFLAG=   -L/usr/lib64/ -lpthread -lm  -lstdc++ 
 
-INCLUDES	= 	-I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I .
-SRC_CLNT	= 	slsReceiver.cpp ../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp slsReceiverUsers.cpp 
 
-PROGS		= 	slsReceiver 
+#LDLIBS		+= 	-lm  -lstdc++ -lpthread 
+LIBS?= -L$(LIBDIR) -lSlsDetector 
+
+INCLUDES	?= 	-I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I .
+SRC_CLNT	= 	slsReceiver.cpp 
+#../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp slsReceiverUsers.cpp 
+
 DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
 OBJS 		= 	$(SRC_CLNT:.cpp=.o) 
 
+PROGS		= 	$(DESTDIR)/slsReceiver 
+
+all: receiver
+
+receiver: $(DESTDIR)/slsReceiver
+
+static_receiver: $(DESTDIR)/sslsReceiver
 
-all: clean $(PROGS)
 
 boot: $(OBJS)
 
-$(PROGS): 
+$(DESTDIR)/sslsReceiver: lib
+	echo $(OBJS)
+	echo $(LDFLAG)
+	echo $(LIBS)
+	mkdir -p $(DESTDIR) 
+	$(CXX) -static  -o $@  $(SRC_CLNT)  $(FLAGS)  $(INCLUDES) $(CLAGS)  $(LIBS) $(LDFLAG)
+
+
+$(DESTDIR)/slsReceiver: lib
 	echo $(OBJS)
 	mkdir -p $(DESTDIR) 
-	gcc $(SRC_CLNT) $(INCLUDES) $(CLAGS) $(LDLIBS) -o $@   
-	mv $(PROGS) $(DESTDIR)
+	$(CXX)   -o $@  $(SRC_CLNT)  $(FLAGS)  $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAG) 	
 
 
+
+lib:
+	cd ../ && $(MAKE) DESTDIR=$(LIBDIR) 
+
 clean:
 	rm -rf $(DESTDIR)/$(PROGS)  *.o