From d3643748926ae0a7c1ca79db23d561c1cce88c04 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 1 Apr 2014 10:01:46 +0000 Subject: [PATCH] sala Makefile git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@71 08cae9ef-cb74-4d14-b03a-d7ea46f178d7 --- Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c214d2dcf..7f012a335 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,13 @@ CALWIZDIR=$(WD)/calibrationWizards MANDIR=$(WD)/manual CALIBDIR=$(WD)/slsDetectorCalibration +POCODIR = /afs/psi.ch/user/s/sala/public/poco-slp_5.7-32bit +JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_5.7-32bit +#POCODIR = /home/sala/Programs/poco-ubuntu_13.10-64bit +#JSONBOXDIR = /home/sala/Programs/JsonBox-ubuntu_13.10-64bit + +EIGERFLAGS = -L$(JSONBOXDIR) -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I$(POCODIR)/include + INSTALLROOT?=$(PWD) BINDIR?=$(INSTALLROOT)/bin DOCDIR?=$(INSTALLROOT)/docs @@ -18,7 +25,8 @@ LIBDIR?=$(INSTALLROOT)/bin INCDIR?=$(INSTALLROOT)/include -LDFLAG:='-L$(LIBDIR) -lSlsDetector' +LDFLAG = '-L$(LIBDIR) -lSlsDetector $(EIGERFLAGS) -lPocoNet -lPocoFoundation -lJsonBox' +#LDFLAG:='-L$(LIBDIR) -lSlsDetector' #FLAGS=-DVERBOSE ASM=$(shell echo "/lib/modules/`uname -r`/build/include") @@ -62,7 +70,7 @@ sreceiver: lib slsDetectorGUI: lib echo $(LDFLAG) - cd $(GUIDIR) && $(MAKE) FLAGS=$(FLAGS) LDFLAG='-L$(LIBDIR) -lSlsDetector' DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR) INCLUDES=$(INCLUDES) + cd $(GUIDIR) && $(MAKE) FLAGS=$(FLAGS) LDFLAG='-L$(LIBDIR) -lSlsDetector $(EIGERFLAGS) -lPocoNet -lJsonBox' DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR) INCLUDES=$(INCLUDES) calWiz: cd $(CALWIZDIR) && $(MAKE) FLAGS=$(FLAGS) LDFLAG=$(LDFLAG) DESTDIR=$(BINDIR) INCLUDES=$(INCLUDES) @@ -87,8 +95,8 @@ clean: cd $(LIBDIR) && rm -rf libSlsDetector.so libSlsDetector.a cd $(LIBRARYDIR) && $(MAKE) clean cd $(CLIENTDIR) && $(MAKE) clean - cd $(GUIDIR) && $(MAKE) clean cd $(RECEIVERDIR) && $(MAKE) clean + cd $(GUIDIR) && $(MAKE) clean cd $(CALWIZDIR) && $(MAKE) clean cd manual && $(MAKE) clean cd $(DOCDIR) && rm -rf *