diff --git a/Makefile.include b/Makefile.include index d223a7ce3..7357ba2a9 100755 --- a/Makefile.include +++ b/Makefile.include @@ -5,9 +5,9 @@ CC = g++ CXX = $(CC) ASM=$(shell echo "/lib/modules/`uname -r`/build/include") -LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread -LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread -FLAGS= -Wall #-DEIGER_DEBUG2 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG +LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread +LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread +FLAGS= -Wall -DVERBOSE -DVERYVERBOSE #-DEIGER_DEBUG2 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG # -DVERBOSE # Setting up the verbose flags diff --git a/manual/manual-api/Makefile b/manual/manual-api/Makefile index 9c236d3ed..ac5451e01 100644 --- a/manual/manual-api/Makefile +++ b/manual/manual-api/Makefile @@ -2,8 +2,8 @@ INCLUDES = -I . SRC_DET = mainClient.cpp SRC_REC = mainReceiver.cpp LIBDIR = ../../bin -LDFLAG_DET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread -LDFLAG_REC = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread +LDFLAG_DET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread +LDFLAG_REC = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread DESTDIR ?= ../docs diff --git a/manual/manual-api/mainClient.cpp b/manual/manual-api/mainClient.cpp index cf2a335df..15838ba86 100644 --- a/manual/manual-api/mainClient.cpp +++ b/manual/manual-api/mainClient.cpp @@ -4,7 +4,7 @@ This file is an example of how to implement the slsDetectorUsers class You can compile it linking it to the slsDetector library -gcc mainClient.cpp -L lib -l SlsDetector -lm -lpthread +gcc mainClient.cpp -L lib -l SlsDetector -lm -pthread where lib is the location of libSlsDetector.so diff --git a/manual/manual-api/mainReceiver.cpp b/manual/manual-api/mainReceiver.cpp index 60276a969..c0727dfa5 100644 --- a/manual/manual-api/mainReceiver.cpp +++ b/manual/manual-api/mainReceiver.cpp @@ -9,7 +9,7 @@ This file is an example of how to implement the slsDetectorUsers class You can compile it linking it to the slsDetector library -gcc mainReceiver.cpp -L lib -l SlsDetector -lm -lpthread +gcc mainReceiver.cpp -L lib -l SlsDetector -lm -pthread where lib is the location of libSlsDetector.so diff --git a/users/Makefile b/users/Makefile index 892283037..3c5c83e57 100644 --- a/users/Makefile +++ b/users/Makefile @@ -2,8 +2,8 @@ WD = $(shell pwd) LIBDIR = $(WD)/../bin LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware LIBRARYDETDIR = $(WD)/../slsDetectorSoftware -LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread -LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread +LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread +LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread INCLUDESRXR = -I $(LIBRARYRXRDIR)/include INCLUDESDET = -I $(LIBRARYRXRDIR)/include -I $(LIBRARYDETDIR)/slsDetector -I $(LIBRARYDETDIR)/slsDetectorAnalysis diff --git a/users/Makefile_new b/users/Makefile_new index ddc005018..0f5bae42a 100644 --- a/users/Makefile_new +++ b/users/Makefile_new @@ -2,8 +2,8 @@ WD = $(shell pwd) LIBDIR = $(WD)/../bin LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware LIBRARYDETDIR = $(WD)/../slsDetectorSoftware -LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread -LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread +LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread +LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread INCLUDESRXR = -I $(LIBRARYRXRDIR)/include INCLUDESDET = -I $(LIBRARYDETDIR)/slsDetector -I $(LIBRARYDETDIR)/slsDetectorAnalysis diff --git a/users/mainClient.cpp b/users/mainClient.cpp index df03ad74e..e7310e1a3 100644 --- a/users/mainClient.cpp +++ b/users/mainClient.cpp @@ -4,10 +4,10 @@ This file is an example of how to implement the slsDetectorUsers class You can compile it linking it to the slsDetector library -gcc mainClient.cpp -L lib -l SlsDetector -lm -lpthread +gcc mainClient.cpp -L lib -l SlsDetector -lm -pthread where lib is the location of libSlsDetector.so -gcc mainClient.cpp -L . -l SlsDetector -lm -lpthread -o users +gcc mainClient.cpp -L . -l SlsDetector -lm -pthread -o users */ diff --git a/users/mainClient_new.cpp b/users/mainClient_new.cpp index 9208c0b97..6490888ec 100644 --- a/users/mainClient_new.cpp +++ b/users/mainClient_new.cpp @@ -5,10 +5,10 @@ This file is an example of how to implement the slsDetectorUsers class You can compile it linking it to the slsDetector library -gcc mainClient.cpp -L lib -l SlsDetector -lm -lpthread +gcc mainClient.cpp -L lib -l SlsDetector -lm -pthread where lib is the location of libSlsDetector.so -gcc mainClient.cpp -L . -l SlsDetector -lm -lpthread -o users +gcc mainClient.cpp -L . -l SlsDetector -lm -pthread -o users */