cleaning the project

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 
 
 #-------------------------------------------------------------------------------

slsReceiverSoftware/MySocketTCP/Makefile

@@ -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"
-
-

slsReceiverSoftware/MySocketTCP/MySocketTCP.c

@@ -1 +0,0 @@
-MySocketTCP.cxx

slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp

@@ -1 +0,0 @@
-MySocketTCP.cxx

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)