From 02c4a5e18e0538d80be346bfae353b57820fe214 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Mon, 7 Apr 2014 15:50:23 +0000
Subject: [PATCH] Makefile sala refined

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@268 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/Makefile | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index dd5c0c467..b9cccd7a7 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -1,15 +1,27 @@
+# LEO: Won't compile without libSlsDetector
 
-PROG= $(DESTDIR)/slsDetectorGui
-DESTDIR?=bin
-DOCDIR?=docs
+include ../Makefile.include
 
-LIBDIR?=../bin
-LIBRARYDIR?=../slsDetectorSoftware
-INCLUDES?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP  -I$(LIBRARYDIR)/slsReceiverInterface   -I$(LIBRARYDIR)/slsDetector  -I$(LIBRARYDIR)/slsDetectorAnalysis  -I$(LIBRARYDIR)/multiSlsDetector   -I$(LIBRARYDIR)/usersFunctions  
-LDFLAG?=-L$(LIBRARYDIR)/bin -lSlsDetector 
+PROG		= 	$(DESTDIR)/slsDetectorGui
+
+DESTDIR		?=	../bin
+LIBDIR		?=	$(DESTDIR)
+DOCDIR		?=	docs
+
+LIBRARYDIR	?=	../slsDetectorSoftware
+INCLUDES	?= 	$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP  -I$(LIBRARYDIR)/slsReceiverInterface   -I$(LIBRARYDIR)/slsDetector  -I$(LIBRARYDIR)/slsDetectorAnalysis  -I$(LIBRARYDIR)/multiSlsDetector   -I$(LIBRARYDIR)/usersFunctions
+
+ifeq ( $(EIGERSLS), yes)  	
+	LDFLAG += $(EIGERFLAGS)
+endif
+
+.PHONY: all lib clean mm doc htmldoc guiclient
 
 
-all: $(PROG) Makefile.gui guiclient
+all: lib $(PROG) Makefile.gui guiclient
+
+lib:
+	cd ../ && make lib
 
 clean: 
 	if test -e Makefile.gui; then make -f Makefile.gui clean; make -f Makefile.gui mocclean; 	rm Makefile.gui; else 	make Makefile.gui; 	make -f Makefile.gui clean; make -f Makefile.gui mocclean;  fi
@@ -29,10 +41,8 @@ htmldoc:
 	cd manual && make html DESTDIR=$(DOCDIR)
 
 $(PROG): Makefile.gui $(DIR)
-	echo $(LDFLAG)
 	make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
 
-
 guiclient:
 	echo $(WD)
 	cd client && $(MAKE) DESTDIR=$(DESTDIR)