From de6836493ce1ae99ae334ea9933ed189192868a0 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Wed, 24 Oct 2012 11:56:51 +0000 Subject: [PATCH] Makefile adjusted for nonstatic git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@22 08cae9ef-cb74-4d14-b03a-d7ea46f178d7 --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f58f08a03..7bc048a9f 100644 --- a/Makefile +++ b/Makefile @@ -14,16 +14,24 @@ LIBDOCDIR=$(WD)/slsDetectorSoftware -all: lib slsDetectorClient +all: lib slsDetectorClient_static #slsDetectorGUI + +nonstatic: lib slsDetectorClient slsDetectorGUI lib: cd $(LIBRARYDIR) && $(MAKE) lib FLAGS=$(FLAGS) -slsDetectorClient: lib +slsDetectorClient_static: lib cd $(CLIENTDIR) && $(MAKE) FLAGS=$(FLAGS) $(shell test -d bin || mkdir -p bin) mv $(CLIENTDIR)/bin/* bin/ + +slsDetectorClient: lib + cd $(CLIENTDIR) && $(MAKE) nonstatic FLAGS=$(FLAGS) + $(shell test -d bin || mkdir -p bin) + mv $(CLIENTDIR)/bin/* bin/ + slsDetectorGUI: lib cd $(GUIDIR) && $(MAKE) FLAGS=$(FLAGS) $(shell test -d bin || mkdir -p bin)