diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile index a9f9f57dc..3b3f6c526 100644 --- a/slsReceiverSoftware/Makefile +++ b/slsReceiverSoftware/Makefile @@ -4,6 +4,8 @@ include ../Makefile.include DESTDIR ?= ../bin LIBDIR ?= $(DESTDIR) DOCDIR ?= docs +SRCDIR = src +PROGS = $(DESTDIR)/slsReceiver CFLAGS= -g -DC_ONLY -fPIC @@ -11,53 +13,34 @@ CFLAGS= -g -DC_ONLY -fPIC DFLAGS= -g -DDACS_INT -DSLS_RECEIVER_UDP_FUNCTIONS -INCLUDES?= -I. -Iincludes -IMySocketTCP -IslsReceiver -IslsDetectorCalibration -I$(ASM) +INCLUDES?= -Iinclude -IMySocketTCP -I../slsDetectorCalibration -I$(ASM) -#-IslsReceiverInterface +#-I$(SRCDIR)Interface -SRC_CLNT = MySocketTCP/MySocketTCP.cpp slsReceiver/UDPInterface.cpp slsReceiver/UDPBaseImplementation.cpp slsReceiver/UDPStandardImplementation.cpp slsReceiver/slsReceiverTCPIPInterface.cpp slsReceiver/slsReceiver.cpp slsReceiver/slsReceiverUsers.cpp slsReceiver/utilities.cpp -#slsReceiverInterface/receiverInterface.cpp -#slsReceiver/slsReceiverUDPFunctions.cpp -#slsReceiver/utilities.cpp includes/logger.h -#ifeq ($(REST),yes) -# SRC_CLNT += slsReceiver/UDPRESTImplementation.cpp -# INCLUDES += $(RESTINCLUDE) -#endif +SRC_CLNT = $(SRCDIR)/MySocketTCP.cpp $(SRCDIR)/UDPInterface.cpp $(SRCDIR)/UDPBaseImplementation.cpp $(SRCDIR)/UDPStandardImplementation.cpp $(SRCDIR)/slsReceiverTCPIPInterface.cpp $(SRCDIR)/slsReceiver.cpp $(SRCDIR)/slsReceiverUsers.cpp $(SRCDIR)/utilities.cpp +MAIN_SRC = $(SRCDIR)/main.cpp OBJS=$(SRC_CLNT:.cpp=.o) -#OBJS = $(OBJS1:.h=.o) -#OBJS += slsReceiver/logger.o -#OBJS += slsReceiver/eigerReceiver.o - .PHONY: all intdoc package eigerReceiver clean -all: package $(SRC_CLNT) +all: lib $(SRC_CLNT) receiver intdoc: $(SRC_H) $(SRC_CLNT) doxygen doxy.config %.o : %.cpp Makefile ifeq ($(ROOTSLS),yes) - echo "with root" $(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS) $(ROOTFLAGS) -fPIC $(EPICSFLAGS) -L/usr/lib64/ #$(FLAGS) else - echo "without root" - echo $(REST) - echo $(INCLUDES) $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread #$(FLAGS) endif -# LEO: not satisfied by eigerReceiver -package: $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a +lib: $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a -#slsReceiver/logger.o: -# $(CXX) -o $@ -c includes/logger.h $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread #$(FLAGS) +receiver: $(DESTDIR)/slsReceiver -#eigerReceiver: -# echo "src client:" $(SRC_CLNT) -# cd slsReceiver && make eigerReceiver $(DESTDIR)/libSlsReceiver.so: $(OBJS) $(CXX) -shared -Wl,-soname,libSlsReceiver.so -o libSlsReceiver.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -lpthread @@ -68,10 +51,23 @@ $(DESTDIR)/libSlsReceiver.a: $(OBJS) ar rcs libSlsReceiver.a $(OBJS) mv libSlsReceiver.a $(DESTDIR) + +$(DESTDIR)/slsReceiver: lib + $(CXX) -o $@ $(MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC +#$(EIGERFLAGS) + + +# Stand-alone Mysocket tests +mysocket_test: + g++ -c $(SRCDIR)/MySocketTCP.cpp -I include + g++ -o rec MySocketTCP.o $(SRCDIR)/rec.cxx -I include + g++ -o send MySocketTCP.o $(SRCDIR)/send.cxx -I include + + clean: - echo rm -rf $(OBJS) rm -rf $(OBJS) - cd slsReceiver && make clean + rm $(PROGS) + rm $(DESTDIR)/libSlsReceiver.a $(DESTDIR)/libSlsReceiver.so cd #------------------------------------------------------------------------------- diff --git a/slsReceiverSoftware/MySocketTCP/._.DS_Store b/slsReceiverSoftware/MySocketTCP/._.DS_Store deleted file mode 100644 index c9474ea62..000000000 Binary files a/slsReceiverSoftware/MySocketTCP/._.DS_Store and /dev/null differ diff --git a/slsReceiverSoftware/MySocketTCP/Makefile b/slsReceiverSoftware/MySocketTCP/Makefile deleted file mode 100644 index 69634f361..000000000 --- a/slsReceiverSoftware/MySocketTCP/Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -TOBECLEANED = MySocketTCP.o - -PROGRAMS = rec send - -all: $(PROGRAMS) - -clean: - @rm -f $(TOBECLEANED) $(PROGRAMS) - -rec: MySocketTCP.o rec.cxx - g++ -o $@ $^ - @echo "$@ done" - -send: MySocketTCP.o send.cxx - g++ -o $@ $^ - @echo "$@ done" - -MySocketTCP.o: MySocketTCP.cxx MySocketTCP.h - g++ -c $< - @echo "$@ done" - - diff --git a/slsReceiverSoftware/MySocketTCP/MySocketTCP.c b/slsReceiverSoftware/MySocketTCP/MySocketTCP.c deleted file mode 120000 index a995312db..000000000 --- a/slsReceiverSoftware/MySocketTCP/MySocketTCP.c +++ /dev/null @@ -1 +0,0 @@ -MySocketTCP.cxx \ No newline at end of file diff --git a/slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp b/slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp deleted file mode 120000 index a995312db..000000000 --- a/slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp +++ /dev/null @@ -1 +0,0 @@ -MySocketTCP.cxx \ No newline at end of file diff --git a/slsReceiverSoftware/MySocketTCP/rec b/slsReceiverSoftware/MySocketTCP/rec deleted file mode 100755 index b652bb8f4..000000000 Binary files a/slsReceiverSoftware/MySocketTCP/rec and /dev/null differ diff --git a/slsReceiverSoftware/MySocketTCP/send b/slsReceiverSoftware/MySocketTCP/send deleted file mode 100755 index 251a9eeb9..000000000 Binary files a/slsReceiverSoftware/MySocketTCP/send and /dev/null differ diff --git a/slsReceiverSoftware/MySocketTCP/MySocketTCP.h b/slsReceiverSoftware/include/MySocketTCP.h similarity index 100% rename from slsReceiverSoftware/MySocketTCP/MySocketTCP.h rename to slsReceiverSoftware/include/MySocketTCP.h diff --git a/slsReceiverSoftware/includes/circularFifo.h b/slsReceiverSoftware/include/circularFifo.h similarity index 100% rename from slsReceiverSoftware/includes/circularFifo.h rename to slsReceiverSoftware/include/circularFifo.h diff --git a/slsReceiverSoftware/MySocketTCP/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h similarity index 100% rename from slsReceiverSoftware/MySocketTCP/genericSocket.h rename to slsReceiverSoftware/include/genericSocket.h diff --git a/slsReceiverSoftware/includes/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h similarity index 100% rename from slsReceiverSoftware/includes/gitInfoReceiver.h rename to slsReceiverSoftware/include/gitInfoReceiver.h diff --git a/slsReceiverSoftware/includes/gitInfoReceiverTmp.h b/slsReceiverSoftware/include/gitInfoReceiverTmp.h similarity index 100% rename from slsReceiverSoftware/includes/gitInfoReceiverTmp.h rename to slsReceiverSoftware/include/gitInfoReceiverTmp.h diff --git a/slsReceiverSoftware/includes/logger.h b/slsReceiverSoftware/include/logger.h similarity index 100% rename from slsReceiverSoftware/includes/logger.h rename to slsReceiverSoftware/include/logger.h diff --git a/slsReceiverSoftware/includes/receiver_defs.h b/slsReceiverSoftware/include/receiver_defs.h similarity index 100% rename from slsReceiverSoftware/includes/receiver_defs.h rename to slsReceiverSoftware/include/receiver_defs.h diff --git a/slsReceiverSoftware/includes/sls_receiver_defs.h b/slsReceiverSoftware/include/sls_receiver_defs.h similarity index 100% rename from slsReceiverSoftware/includes/sls_receiver_defs.h rename to slsReceiverSoftware/include/sls_receiver_defs.h diff --git a/slsReceiverSoftware/includes/sls_receiver_funcs.h b/slsReceiverSoftware/include/sls_receiver_funcs.h similarity index 100% rename from slsReceiverSoftware/includes/sls_receiver_funcs.h rename to slsReceiverSoftware/include/sls_receiver_funcs.h diff --git a/slsReceiverSoftware/includes/utilities.h b/slsReceiverSoftware/include/utilities.h similarity index 100% rename from slsReceiverSoftware/includes/utilities.h rename to slsReceiverSoftware/include/utilities.h diff --git a/slsReceiverSoftware/slsReceiver/.cproject b/slsReceiverSoftware/src/.cproject similarity index 100% rename from slsReceiverSoftware/slsReceiver/.cproject rename to slsReceiverSoftware/src/.cproject diff --git a/slsReceiverSoftware/slsReceiver/.project b/slsReceiverSoftware/src/.project similarity index 100% rename from slsReceiverSoftware/slsReceiver/.project rename to slsReceiverSoftware/src/.project diff --git a/slsReceiverSoftware/slsReceiver/Makefile b/slsReceiverSoftware/src/Makefile similarity index 92% rename from slsReceiverSoftware/slsReceiver/Makefile rename to slsReceiverSoftware/src/Makefile index 0592e962e..88d8caf2e 100644 --- a/slsReceiverSoftware/slsReceiver/Makefile +++ b/slsReceiverSoftware/src/Makefile @@ -32,15 +32,11 @@ static_receiver: $(DESTDIR)/sslsReceiver boot: $(OBJS) $(DESTDIR)/sslsReceiver: lib - echo $(OBJS) - echo $(LDFLAGRXR) - echo $(LIBS) mkdir -p $(DESTDIR) $(CXX) -static -o $@ $(SRC_CLNT) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) $(DESTDIR)/slsReceiver: lib - echo "AAAAAAAAAAAA" $(CXX) -o $@ $(SRC_CLNT) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(CXX) -o $@ $(SRC_CLNT) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC #$(EIGERFLAGS) diff --git a/slsReceiverSoftware/MySocketTCP/MySocketTCP.cxx b/slsReceiverSoftware/src/MySocketTCP.cpp similarity index 100% rename from slsReceiverSoftware/MySocketTCP/MySocketTCP.cxx rename to slsReceiverSoftware/src/MySocketTCP.cpp diff --git a/slsReceiverSoftware/slsReceiver/RestHelper.h b/slsReceiverSoftware/src/RestHelper.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/RestHelper.h rename to slsReceiverSoftware/src/RestHelper.h diff --git a/slsReceiverSoftware/slsReceiver/UDPBaseImplementation.cpp b/slsReceiverSoftware/src/UDPBaseImplementation.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPBaseImplementation.cpp rename to slsReceiverSoftware/src/UDPBaseImplementation.cpp diff --git a/slsReceiverSoftware/slsReceiver/UDPBaseImplementation.h b/slsReceiverSoftware/src/UDPBaseImplementation.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPBaseImplementation.h rename to slsReceiverSoftware/src/UDPBaseImplementation.h diff --git a/slsReceiverSoftware/slsReceiver/UDPInterface.cpp b/slsReceiverSoftware/src/UDPInterface.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPInterface.cpp rename to slsReceiverSoftware/src/UDPInterface.cpp diff --git a/slsReceiverSoftware/slsReceiver/UDPInterface.h b/slsReceiverSoftware/src/UDPInterface.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPInterface.h rename to slsReceiverSoftware/src/UDPInterface.h diff --git a/slsReceiverSoftware/slsReceiver/UDPRESTImplementation.cpp b/slsReceiverSoftware/src/UDPRESTImplementation.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPRESTImplementation.cpp rename to slsReceiverSoftware/src/UDPRESTImplementation.cpp diff --git a/slsReceiverSoftware/slsReceiver/UDPRESTImplementation.h b/slsReceiverSoftware/src/UDPRESTImplementation.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPRESTImplementation.h rename to slsReceiverSoftware/src/UDPRESTImplementation.h diff --git a/slsReceiverSoftware/slsReceiver/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPStandardImplementation.cpp rename to slsReceiverSoftware/src/UDPStandardImplementation.cpp diff --git a/slsReceiverSoftware/slsReceiver/UDPStandardImplementation.h b/slsReceiverSoftware/src/UDPStandardImplementation.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/UDPStandardImplementation.h rename to slsReceiverSoftware/src/UDPStandardImplementation.h diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/RestHelper.h b/slsReceiverSoftware/src/eigerReceiver/RestHelper.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/eigerReceiver/RestHelper.h rename to slsReceiverSoftware/src/eigerReceiver/RestHelper.h diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.cpp b/slsReceiverSoftware/src/eigerReceiver/eigerReceiver.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.cpp rename to slsReceiverSoftware/src/eigerReceiver/eigerReceiver.cpp diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.h b/slsReceiverSoftware/src/eigerReceiver/eigerReceiver.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.h rename to slsReceiverSoftware/src/eigerReceiver/eigerReceiver.h diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverDummy.cpp b/slsReceiverSoftware/src/eigerReceiver/eigerReceiverDummy.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverDummy.cpp rename to slsReceiverSoftware/src/eigerReceiver/eigerReceiverDummy.cpp diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverTest.cpp b/slsReceiverSoftware/src/eigerReceiver/eigerReceiverTest.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverTest.cpp rename to slsReceiverSoftware/src/eigerReceiver/eigerReceiverTest.cpp diff --git a/slsReceiverSoftware/slsReceiver/main.cpp b/slsReceiverSoftware/src/main.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/main.cpp rename to slsReceiverSoftware/src/main.cpp diff --git a/slsReceiverSoftware/MySocketTCP/rec.cxx b/slsReceiverSoftware/src/rec.cxx similarity index 100% rename from slsReceiverSoftware/MySocketTCP/rec.cxx rename to slsReceiverSoftware/src/rec.cxx diff --git a/slsReceiverSoftware/MySocketTCP/send.cxx b/slsReceiverSoftware/src/send.cxx similarity index 100% rename from slsReceiverSoftware/MySocketTCP/send.cxx rename to slsReceiverSoftware/src/send.cxx diff --git a/slsReceiverSoftware/slsReceiver/slsReceiver.cpp b/slsReceiverSoftware/src/slsReceiver.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/slsReceiver.cpp rename to slsReceiverSoftware/src/slsReceiver.cpp diff --git a/slsReceiverSoftware/slsReceiver/slsReceiver.h b/slsReceiverSoftware/src/slsReceiver.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/slsReceiver.h rename to slsReceiverSoftware/src/slsReceiver.h diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp rename to slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h rename to slsReceiverSoftware/src/slsReceiverTCPIPInterface.h diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h b/slsReceiverSoftware/src/slsReceiverUDPFunctions.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h rename to slsReceiverSoftware/src/slsReceiverUDPFunctions.h diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUsers.cpp b/slsReceiverSoftware/src/slsReceiverUsers.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/slsReceiverUsers.cpp rename to slsReceiverSoftware/src/slsReceiverUsers.cpp diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUsers.h b/slsReceiverSoftware/src/slsReceiverUsers.h similarity index 100% rename from slsReceiverSoftware/slsReceiver/slsReceiverUsers.h rename to slsReceiverSoftware/src/slsReceiverUsers.h diff --git a/slsReceiverSoftware/slsReceiver/utilities.cpp b/slsReceiverSoftware/src/utilities.cpp similarity index 100% rename from slsReceiverSoftware/slsReceiver/utilities.cpp rename to slsReceiverSoftware/src/utilities.cpp