detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'eiger_receiver' into devel_leo

Browse Source 
Conflicts:
	Makefile
	include/UDPInterface.h
	slsReceiver/Makefile
	slsReceiver/eigerReceiver/eigerReceiver.cpp
	slsReceiver/eigerReceiver/eigerReceiverDummy.cpp
	slsReceiver/eigerReceiver/eigerReceiverTest.cpp
This commit is contained in:
sala
2014-09-10 10:07:33 +02:00
parent 59fc6fbaf8 68dfe6f6a6
commit ce0b32b558
6 changed files with 569 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsReceiverSoftware/Makefile
View File

@ -17,8 +17,6 @@ DFLAGS= -g -DDACS_INT -DSLS_RECEIVER_UDP_FUNCTIONS
INCLUDES?= -Iinclude -I../slsDetectorCalibration -I$(ASM)
#-I$(SRCDIR)Interface
SRC_CLNT = MySocketTCP.cpp UDPInterface.cpp UDPBaseImplementation.cpp UDPStandardImplementation.cpp slsReceiverTCPIPInterface.cpp slsReceiver.cpp slsReceiverUsers.cpp utilities.cpp
MAIN_SRC = main.cpp
@ -67,17 +65,18 @@ mysocket_test:
clean: buildclean
make testclean
rm $(DESTDIR)/libSlsReceiver.a $(DESTDIR)/libSlsReceiver.so
rm $(PROGS)
ifeq (,$(wildcard $(TESTDIR/rec)))
make testclean
endif
buildclean:
rm -rf $(OBJS)
testclean:
cd $(TESTDIR) && rm *.o rec send
if [ -f $(TESTDIR)/rec ]; then \
cd $(TESTDIR) && rm *.o rec send; \
fi
#-------------------------------------------------------------------------------