From c559a43262f70a0512cd3d759285914cf06d27a1 Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@08cae9ef-cb74-4d14-b03a-d7ea46f178d7>
Date: Fri, 5 Apr 2013 10:54:36 +0000
Subject: [PATCH] static compilation now works

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@50 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
---
 Makefile | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 37e68778a..88e152ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,11 @@ INCLUDES='-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRAR
 
 
 
-all: lib  textclient slsReceiver gui 
+all: lib  textclient receiver gui 
 
-nonstatic: lib  slsDetectorClient slsReceiver slsDetectorGUI
+nonstatic: lib  textclient receiver gui 
+
+static: lib  stextclient sreceiver gui 
 
 lib:
 	cd $(LIBRARYDIR) && $(MAKE) FLAGS=$(FLAGS) DESTDIR=$(LIBDIR) INCLUDES=$(INCLUDES)
@@ -38,17 +40,21 @@ lib:
 stextclient: slsDetectorClient_static
 
 slsDetectorClient_static: lib
-	cd  $(CLIENTDIR) && $(MAKE) static_clients FLAGS=$(FLAGS) LDFLAG=$(LDFLAG) DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR) INCLUDES=$(INCLUDES)
+	cd  $(CLIENTDIR) && $(MAKE) static_clients FLAGS=$(FLAGS) LIBS=$(LDFLAG) DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR) INCLUDES=$(INCLUDES)
 
 
-textclient:
+textclient: lib
 	cd  $(CLIENTDIR) && $(MAKE) FLAGS=$(FLAGS) DESTDIR=$(BINDIR)  LIBDIR=$(LIBDIR) LIBS=$(LDFLAG) INCLUDES=$(INCLUDES)
 
-slsReceiver: lib
-	cd  $(RECEIVERDIR) && $(MAKE)  FLAGS=$(FLAGS) DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR)  LIBS=$(LDFLAG) INCLUDES=$(INCLUDES)
+slsReceiver: receiver
 
 
-receiver: slsReceiver
+receiver: lib
+	cd  $(RECEIVERDIR) && $(MAKE)  receiver FLAGS=$(FLAGS) DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR)  LIBS=$(LDFLAG) INCLUDES=$(INCLUDES)
+
+sreceiver: lib
+	cd  $(RECEIVERDIR) && $(MAKE)  static_receiver FLAGS=$(FLAGS) DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR)  LIBS=$(LDFLAG) INCLUDES=$(INCLUDES)
+
 
 slsDetectorGUI: lib
 	echo $(LDFLAG)