From 4971e26d7b7bac2aad6d74729841abd6b27e5cec Mon Sep 17 00:00:00 2001 From: Leonardo Sala Date: Mon, 15 Sep 2014 16:51:59 +0200 Subject: [PATCH] modified Makefiles to support REST interface --- Makefile | 3 ++- Makefile.include | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 313918a66..d454c2d49 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,9 @@ CALIBDIR = $(WD)/slsDetectorCalibration INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(ASM) -INCLUDESRXR=-I. -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYRXRDIR)/include -I$(RECEIVERDIR) -I$(RECEIVERDIR)/eigerReceiver -I$(CALIBDIR) -I$(ASM) +INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM) +#LIBFLAGRXR += $(info ) $(info #######################################) diff --git a/Makefile.include b/Makefile.include index 34ff2dcc7..14928c2d7 100644 --- a/Makefile.include +++ b/Makefile.include @@ -15,7 +15,7 @@ FLAGS= -Wall -DVERBOSE # libraries ############################################################## -EIGERSLS = yes +REST = yes #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 @@ -24,10 +24,11 @@ JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_6.4-64bit #POCODIR = /home/sala/Programs/poco-ubuntu_13.10-64bit #JSONBOXDIR = /home/sala/Programs/JsonBox-ubuntu_13.10-64bit -EIGERFLAGS = -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I$(POCODIR)/include -L$(JSONBOXDIR) -Wl,-rpath=$(JSONBOXDIR)/lib -I$(JSONBOXDIR)/include -lPocoNet -lPocoFoundation -lJsonBox +RESTFLAGS = -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -L$(JSONBOXDIR) -Wl,-rpath=$(JSONBOXDIR)/lib -lPocoNet -lPocoFoundation -lJsonBox -ifeq ($(EIGERSLS),yes) - LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(EIGERFLAGS) -DEIGERSLS +ifeq ($(REST),yes) + LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(RESTFLAGS) -DREST + INCLUDESRXR = $(EIGERFLAGS) -I$(POCODIR)/include -I$(JSONBOXDIR)/include endif