From b50da5b1985c221e5bfa5939df9a5af43b5703de Mon Sep 17 00:00:00 2001 From: Sala Leonardo Date: Tue, 5 Aug 2014 11:05:24 +0200 Subject: [PATCH] updated makefile for eiger receiver --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1649e111d..1f2a80f09 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ INCDIR ?= $(INSTALLROOT)/include WD = $(shell pwd) LIBRARYDIR = $(WD)/slsDetectorSoftware -LIBRARYRXRDIR = $(WD)/slsReceiverSoftware +LIBRARYRXRDIR = $(WD)/slsReceiverSoftware CLIENTDIR = $(LIBRARYDIR)/slsDetectorClient GUIDIR = $(WD)/slsDetectorGui RECEIVERDIR = $(LIBRARYRXRDIR)/slsReceiver @@ -21,7 +21,8 @@ CALIBDIR = $(LIBRARYRXRDIR)/slsDetectorCalibration INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/includes -I$(ASM) -INCLUDESRXR=-I. -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYRXRDIR)/includes -I$(RECEIVERDIR) -I$(RECEIVERDIR)/eigerReceiver -I$(CALIBDIR) -I$(ASM) #-I$(LIBRARYDIR)/slsReceiverInterface + +INCLUDESRXR=-I. -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYRXRDIR)/includes -I$(RECEIVERDIR) -I$(RECEIVERDIR)/eigerReceiver -I$(CALIBDIR) -I$(ASM) -I$(LIBRARYDIR)/slsReceiverInterface -I$(WD)/slsDetectorSoftware/commonFiles .PHONY: all nonstatic static lib libreceiver textclient receiver gui stextclient sreceiver @@ -34,7 +35,7 @@ static: lib libreceiver stextclient sreceiver gui lib: cd $(LIBRARYDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' - + libreceiver: cd $(LIBRARYRXRDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDESRXR)' @@ -126,7 +127,7 @@ install_lib: make htmldoc; \ cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR); \ cd $(LIBRARYRXRDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR); - + install: make install_lib; \ make gui; \