From 82f672299b7258e77abe617c407983bd0962abfb Mon Sep 17 00:00:00 2001 From: bergamaschi Date: Wed, 14 Nov 2012 11:36:30 +0000 Subject: [PATCH] makefile fixed for asm includes git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@405 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsDetectorClient/Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile b/slsDetectorSoftware/slsDetectorClient/Makefile index 0362d1fa8..920bb7dcd 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile +++ b/slsDetectorSoftware/slsDetectorClient/Makefile @@ -1,9 +1,18 @@ CFLAGS= -DC_ONLY #FLAGS=-DVERBOSE -INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis -I../slsDetectorSoftware/slsReceiverInterface +ASM=$(shell echo "/lib/modules/`uname -r`/build/include") + +INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis -I../slsDetectorSoftware/slsReceiverInterface -I$(ASM) LIBS= -L../slsDetectorSoftware/ -lSlsDetector -L/usr/lib64/ -lpthread #LDFLAG= + + +INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis -I../slsDetectorSoftware/slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include") + +LIBS= -L../slsDetectorSoftware/ -lSlsDetector -lpthread + + BIN=bin SRC_CLNT=sls_detector_client.cpp @@ -28,7 +37,7 @@ static_sls_detector_put: $(SRC_CLNT) lib static_sls_detector_get: $(SRC_CLNT) lib mkdir -p $(BIN) $(CXX) -static -o $(BIN)/sls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG) - + static_sls_detector_acquire: $(SRC_CLNT) lib mkdir -p $(BIN) $(CXX) -static -o $(BIN)/sls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG) @@ -46,7 +55,7 @@ sls_detector_put: $(SRC_CLNT) lib sls_detector_get: $(SRC_CLNT) lib mkdir -p $(BIN) $(CXX) -o $(BIN)/sls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG) - + sls_detector_acquire: $(SRC_CLNT) lib mkdir -p $(BIN) $(CXX) -o $(BIN)/sls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG) @@ -56,14 +65,10 @@ sls_detector_help: $(SRC_CLNT) lib $(CXX) -o $(BIN)/sls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG) - clean: rm -rf $(BIN)/sls_detector_put sls_detector_get sls_detector_acquire sls_detector_help -install_doc: - - install: all