working logger!

This commit is contained in:
2014-09-09 18:13:31 +02:00
parent 811bac16ec
commit dc04efbbb1
7 changed files with 180 additions and 94 deletions

View File

@ -12,17 +12,25 @@ CFLAGS= -g -DC_ONLY -fPIC
DFLAGS= -g -DDACS_INT -DSLS_RECEIVER_UDP_FUNCTIONS
INCLUDES?= -I. -Iincludes -IMySocketTCP -IslsReceiver -IslsDetectorCalibration -I$(ASM)
#-IslsReceiverInterface
SRC_CLNT= MySocketTCP/MySocketTCP.cpp slsReceiver/UDPInterface.cpp slsReceiver/UDPBaseImplementation.cpp slsReceiver/UDPStandardImplementation.cpp slsReceiver/UDPRESTImplementation.cpp slsReceiver/slsReceiverTCPIPInterface.cpp slsReceiver/slsReceiver.cpp slsReceiver/slsReceiverUsers.cpp includes/utilities.h
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
OBJS = $(SRC_CLNT:.cpp=.o)
OBJS += includes/utilities.h
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)
@ -30,19 +38,23 @@ all: package $(SRC_CLNT)
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
#slsReceiver/logger.o:
# $(CXX) -o $@ -c includes/logger.h $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread #$(FLAGS)
#eigerReceiver:
# echo "src client:" $(SRC_CLNT)
# cd slsReceiver && make eigerReceiver
@ -57,6 +69,7 @@ $(DESTDIR)/libSlsReceiver.a: $(OBJS)
mv libSlsReceiver.a $(DESTDIR)
clean:
echo rm -rf $(OBJS)
rm -rf $(OBJS)
cd slsReceiver && make clean
cd