From fa369ca22f441cd8693bc1d6061ca10735a8badf Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 13 Jan 2012 09:45:08 +0000 Subject: [PATCH] commented out everything to do with out detectors including multislsdetector git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@97 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index e36f2fb8d..7d14790f7 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -1,11 +1,11 @@ CFLAGS= -DC_ONLY FLAGS=-DVERBOSE -INCLUDES= -I commonFiles -I slsDetector -I MySocketTCP -I usersFunctions -I multiSlsDetector +INCLUDES= -I commonFiles -I slsDetector -I MySocketTCP -I usersFunctions #-I multiSlsDetector #-I eigerDetector -ImythenDetector -IgotthardDetector #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom -SRC_CLNT= slsDetector/slsDetector.cpp MySocketTCP/MySocketTCP.cxx usersFunctions/usersFunctions.c multiSlsDetector/multiSlsDetector.cpp +SRC_CLNT= slsDetector/slsDetector.cpp MySocketTCP/MySocketTCP.cxx usersFunctions/usersFunctions.c #multiSlsDetector/multiSlsDetector.cpp #mythenDetector/mythenDetector.cpp eigerDetector/eigerDetector.cpp gotthardDetector/gotthardDetector.cpp SRC_MYTHEN_SVC = mythenDetectorServer/server.c mythenDetectorServer/server_funcs.c mythenDetectorServer/communication_funcs.c mythenDetectorServer/firmware_funcs.c mythenDetectorServer/mcb_funcs.c mythenDetectorServer/trimming_funcs.c #mythenDetectorServer/sharedmemory.c @@ -29,19 +29,20 @@ picassoServer: $(SRC_MYTHEN_SVC) package: $(SRC_CLNT) - $(CXX) -fPIC -g -o objs/multiSlsDetector.o -c -Wall multiSlsDetector/multiSlsDetector.cpp $(INCLUDES) $(FLAGS) +# $(CXX) -fPIC -g -o objs/multiSlsDetector.o -c -Wall multiSlsDetector/multiSlsDetector.cpp $(INCLUDES) $(FLAGS) $(CXX) -fPIC -g -o objs/slsDetector.o -c -Wall slsDetector/slsDetector.cpp $(INCLUDES) $(FLAGS) # $(CXX) -fPIC -g -o objs/eigerDetector.o -c -Wall eigerDetector/eigerDetector.cpp $(INCLUDES) $(FLAGS) # $(CXX) -fPIC -g -o objs/mythenDetector.o -c -Wall mythenDetector/mythenDetector.cpp $(INCLUDES) $(FLAGS) # $(CXX) -fPIC -g -o objs/gotthardDetector.o -c -Wall gotthardDetector/gotthardDetector.cpp $(INCLUDES) $(FLAGS) $(CXX) -fPIC -g -o objs/usersFunctions.o -c -Wall usersFunctions/usersFunctions.c $(INCLUDES) $(FLAGS) $(EPICSFLAGS) $(CXX) -fPIC -g -o objs/MySocketTCP.o -c -Wall MySocketTCP/MySocketTCP.cpp $(INCLUDES) $(FLAGS) - $(CXX) -fPIC -g -o objs/multiSDetector.o -c -Wall multiSlsDetector/multiSlsDetector.cpp $(INCLUDES) $(FLAGS) - $(CXX) -shared -Wl,-soname,libSlsDetector.so.1 -o libSlsDetector.so.1.0.1 objs/slsDetector.o objs/usersFunctions.o objs/MySocketTCP.o objs/multiSDetector.o -lc $(INCLUDES) $(FLAGS) $(EPICSFLAGS) +# $(CXX) -fPIC -g -o objs/multiSDetector.o -c -Wall multiSlsDetector/multiSlsDetector.cpp $(INCLUDES) $(FLAGS) +# $(CXX) -shared -Wl,-soname,libSlsDetector.so.1 -o libSlsDetector.so.1.0.1 objs/slsDetector.o objs/usersFunctions.o objs/MySocketTCP.o objs/multiSDetector.o -lc $(INCLUDES) $(FLAGS) $(EPICSFLAGS) + $(CXX) -shared -Wl,-soname,libSlsDetector.so.1 -o libSlsDetector.so.1.0.1 objs/slsDetector.o objs/usersFunctions.o objs/MySocketTCP.o -lc $(INCLUDES) $(FLAGS) $(EPICSFLAGS) #objs/mythenDetector.o objs/gotthardDetector.o ln -sf libSlsDetector.so.1.0.1 libSlsDetector.so ln -sf libSlsDetector.so.1 libSlsDetector.so - ar rcs libSlsDetector.a objs/slsDetector.o objs/usersFunctions.o objs/MySocketTCP.o objs/multiSlsDetector.o + ar rcs libSlsDetector.a objs/slsDetector.o objs/usersFunctions.o objs/MySocketTCP.o #objs/multiSlsDetector.o #objs/mythenDetector.o objs/gotthardDetector.o clean: @@ -59,9 +60,9 @@ install_lib: lib install_inc: $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) cp -P ../slsDetectorSoftware/MySocketTCP/MySocketTCP.h $(DESTDIR) - cp -P ../slsDetectorSoftware/eigerDetector/eigerDetector.h $(DESTDIR) - cp -P ../slsDetectorSoftware/mythenDetector/mythenDetector.h $(DESTDIR) - cp -P ../slsDetectorSoftware/gotthardDetector/gotthardDetector.h $(DESTDIR) +# cp -P ../slsDetectorSoftware/eigerDetector/eigerDetector.h $(DESTDIR) +# cp -P ../slsDetectorSoftware/mythenDetector/mythenDetector.h $(DESTDIR) +# cp -P ../slsDetectorSoftware/gotthardDetector/gotthardDetector.h $(DESTDIR) cp -P ../slsDetectorSoftware/slsDetector/slsDetector.h $(DESTDIR) cp -P ../slsDetectorSoftware/commonFiles/sls_detector_defs.h $(DESTDIR) cp -P ../slsDetectorSoftware/usersFunctions/usersFunctions.h $(DESTDIR)