From 264485c8ff97acbbd2cf753dce43826160f1509c Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 1 May 2017 09:53:37 +0200 Subject: [PATCH] changed all -lpthread to -pthread --- slsDetectorSoftware/Makefile | 4 ++-- .../slsDetectorClient/Makefile | 2 +- .../slsDetectorClient/Makefile.x04sa | 2 +- slsDetectorSoftware/threadFiles/Makefile | 20 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 36eda6c4c..73219b47c 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -69,14 +69,14 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC) %.o : %.cpp %.h Makefile - $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread -lrt $(LIBZMQ) #$(FLAGS) + $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -pthread -lrt $(LIBZMQ) #$(FLAGS) package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a $(DESTDIR)/libSlsDetector.so: $(OBJS) - $(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -lpthread -lrt $(LIBZMQ) + $(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread -lrt $(LIBZMQ) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) mv libSlsDetector.so $(DESTDIR) diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile b/slsDetectorSoftware/slsDetectorClient/Makefile index fef04074a..63a49637a 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile +++ b/slsDetectorSoftware/slsDetectorClient/Makefile @@ -13,7 +13,7 @@ INCLUDES?= -I../commonFiles -I../slsDetector -I ../MySocketTCP -I../usersFuncti LIBDIR?=../ LIBS?= -L$(LIBDIR) -lSlsDetector -LDFLAG= -L/usr/lib64/ -lpthread +LDFLAG= -L/usr/lib64/ -pthread DESTDIR ?= bin diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa b/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa index 7e2daa9bd..af02ea176 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa +++ b/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa @@ -2,7 +2,7 @@ CFLAGS= -DC_ONLY FLAGS=-DVERBOSE INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis LIBS= -L../slsDetectorSoftware/ -LDFLAG= -lSlsDetector -lpthread +LDFLAG= -lSlsDetector -pthread EPICSFLAGS=-DEPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom diff --git a/slsDetectorSoftware/threadFiles/Makefile b/slsDetectorSoftware/threadFiles/Makefile index 19b5b40e4..a1eb27d29 100644 --- a/slsDetectorSoftware/threadFiles/Makefile +++ b/slsDetectorSoftware/threadFiles/Makefile @@ -2,20 +2,20 @@ OBJPATH=bin/obj EXAMPLEPATH=bin/example all: - g++ CondVar.cpp -lpthread -c -g -o $(OBJPATH)/CondVar.o - g++ Mutex.cpp -lpthread -c -g -o $(OBJPATH)/Mutex.o - #g++ Task.cpp -lpthread -c -g -o $(OBJPATH)/Task.o - g++ ThreadPool.cpp -lpthread -c -g -o $(OBJPATH)/ThreadPool.o - g++ Multi.cpp -lpthread -c -g -o $(OBJPATH)/Multi.o - #g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/Task.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -lpthread -I . -g -o $(EXAMPLEPATH)threadpool_test - g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -lpthread -I . -g -o $(EXAMPLEPATH)threadpool_test + g++ CondVar.cpp -pthread -c -g -o $(OBJPATH)/CondVar.o + g++ Mutex.cpp -pthread -c -g -o $(OBJPATH)/Mutex.o + #g++ Task.cpp -pthread -c -g -o $(OBJPATH)/Task.o + g++ ThreadPool.cpp -pthread -c -g -o $(OBJPATH)/ThreadPool.o + g++ Multi.cpp -pthread -c -g -o $(OBJPATH)/Multi.o + #g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/Task.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -pthread -I . -g -o $(EXAMPLEPATH)threadpool_test + g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -pthread -I . -g -o $(EXAMPLEPATH)threadpool_test #all: -# g++ threadpool.cpp -lpthread -fpic -c -o bin/obj/threadpool.o -# g++ -L./bin bin/obj/threadpool.o -lpthread threadpool_test.cpp -o bin/example/threadpool_test +# g++ threadpool.cpp -pthread -fpic -c -o bin/obj/threadpool.o +# g++ -L./bin bin/obj/threadpool.o -pthread threadpool_test.cpp -o bin/example/threadpool_test #threadpool: -# g++ threadpool.cpp -lpthread -fpic -c -o bin/obj/threadpool.o +# g++ threadpool.cpp -pthread -fpic -c -o bin/obj/threadpool.o # g++ -shared -fPIC bin/obj/threadpool.o -o bin/lib/libthreadpool.so #example: # g++ -L./bin/lib -lthreadpool threadpool_test.cpp -o threadpool_test