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

fixed new header for eiger

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-28 16:53:01 +02:00
parent 81d68bebc6
commit f4857355b6
7 changed files with 20 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/Makefile
View File

@ -39,7 +39,6 @@ DUMMY_MAIN_SRC = dummyMain.cpp
OBJS=$(SRC_CLNT:%.cpp=$(BUILDDIR)/%.o)
$(info )
$(info #######################################)
$(info # Compiling slsReceiverSoftware #)
@ -49,7 +48,7 @@ $(info )
.PHONY: all intdoc package eigerReceiver clean
all: builddir updateVersion lib receiver
all: builddir lib receiver
dummy: $(DESTDIR)/dummyReceiver
@ -68,7 +67,9 @@ lib: $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
receiver: $(DESTDIR)/slsReceiver
$(DESTDIR)/libSlsReceiver.so: $(OBJS)
$(DESTDIR)/libSlsReceiver.so: $(OBJS)
./updateGitVersion.sh
$(CXX) -shared -Wl,-soname,libSlsReceiver.so -o libSlsReceiver.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread $(LIBZMQ) -lrt
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
mv libSlsReceiver.so $(DESTDIR)
@ -78,12 +79,12 @@ $(DESTDIR)/libSlsReceiver.a: $(OBJS)
mv libSlsReceiver.a $(DESTDIR)
$(DESTDIR)/slsReceiver: lib
$(DESTDIR)/slsReceiver: $(SRCDIR)/$(MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
$(CXX) -o $@ $(SRCDIR)/$(MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt
#$(EIGERFLAGS)
$(DESTDIR)/dummyReceiver: lib
$(DESTDIR)/dummyReceiver: $(SRCDIR)/$(DUMMY_MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
$(CXX) -o $@ $(SRCDIR)/$(DUMMY_MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt
#$(EIGERFLAGS)
@ -112,8 +113,6 @@ testclean:
cd $(TESTDIR) && rm *.o rec send; \
fi
updateVersion:
./updateGitVersion.sh
#-------------------------------------------------------------------------------