From 4eb233cdf0d493f49bbb18909e29e64b29ef1c98 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 25 Mar 2014 16:05:31 +0000
Subject: [PATCH] reverted Makefile

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@806 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsReceiver/Makefile        | 10 ++--------
 slsDetectorSoftware/slsReceiver/eigerReceiver.h |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/slsDetectorSoftware/slsReceiver/Makefile b/slsDetectorSoftware/slsReceiver/Makefile
index 741464258..8e5a824ce 100644
--- a/slsDetectorSoftware/slsReceiver/Makefile
+++ b/slsDetectorSoftware/slsReceiver/Makefile
@@ -3,14 +3,11 @@ 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-64bit
-JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_6.4-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  -I ../../../slsDetectorCalibration -I . 
 SRC_CLNT	= 	slsReceiver.cpp 
 #../MySocketTCP/MySocketTCP.cpp  slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp slsReceiverUsers.cpp 
 
@@ -43,10 +40,7 @@ $(DESTDIR)/slsReceiver: lib
 	mkdir -p $(DESTDIR) 
 	$(CXX)   -o $@  $(SRC_CLNT)  $(FLAGS)  $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAG) 	
 
-eigerReceiver:
-	$(CXX) $(FLAGS) $(CFLAGS) $(EIGERFLAGS) -c -o eigerReceiverTest.o eigerReceiverTest.cpp -lPocoNet -lPocoFoundation -lJsonBox
-	$(CXX) $(FLAGS) $(CFLAGS) $(EIGERFLAGS) -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) 
diff --git a/slsDetectorSoftware/slsReceiver/eigerReceiver.h b/slsDetectorSoftware/slsReceiver/eigerReceiver.h
index cf38c21dd..bfdda2b18 100644
--- a/slsDetectorSoftware/slsReceiver/eigerReceiver.h
+++ b/slsDetectorSoftware/slsReceiver/eigerReceiver.h
@@ -171,7 +171,7 @@ public:
 	 * @param i file write enable
 	 /returns file write enable
 	 */
-	virtual int setEnableFileWrite(const int i) =  0;
+	virtual int setEnableFileWrite(const int i) = 0;
 
 	/**
 	 * Set enable file overwrite