From d56b2b480b4f234a9962a19d5da66383b3ec204b Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Thu, 4 Apr 2013 07:23:19 +0000
Subject: [PATCH] edited the gui makefile to be able to compile withot errors
 from this directory

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@170 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/Makefile           | 6 ++++--
 slsDetectorGui/slsDetectorGui.pro | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index 5088393d4..475caa294 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -1,10 +1,12 @@
 
 PROG= $(DESTDIR)/slsDetectorGui
-#DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/ forms/*)
 DESTDIR?=bin
 DOCDIR?=docs
-LIBDIR?=../slsDetectorSoftware
 
+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 
 
 all: $(PROG) Makefile.gui guiclient
 
diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro
index 465f7e448..d0c3ca3f1 100644
--- a/slsDetectorGui/slsDetectorGui.pro
+++ b/slsDetectorGui/slsDetectorGui.pro
@@ -46,14 +46,14 @@ DEPENDPATH  		+=		\
 INCLUDEPATH 		= 	\	 
 							$(QWTDIR)/include\
 							$(QWTDIR) \
-                              $(QWTDIR)/src\
-                              $(QWT3D)/include\
+                            $(QWTDIR)/src\
+                            $(QWT3D)/include\
 							slsDetectorPlotting/include\
 							include\
 							forms/include\
-                                                        $(INCLUDES)
+                            $(INCLUDES)
 
-#                                                        $(shell echo "/lib/modules/`uname -r`/build/include") \
+#                           $(shell echo "/lib/modules/`uname -r`/build/include") \
 #							../slsDetectorSoftware/commonFiles\
 #							../slsDetectorSoftware/MySocketTCP\
 #							../slsDetectorSoftware/slsReceiverInterface\