diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index ba731307c..d8480b08b 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -1,18 +1,29 @@
-PROG= bin/slsDetectorGui
+
+PROG= $(DESTDIR)/slsDetectorGui
 DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/* forms/include/*)
+DESTDIR?=bin
+DOCDIR?=docs
+LIBDIR?=../slsDetectorSoftware
 
 
-all: $(PROG)
-
+all: $(PROG) Makefile.gui
 
 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
+	cd manual && make clean
 
 
 
 Makefile.gui: slsDetectorGui.pro
-	qmake -o Makefile.gui
+	qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR)
+
+doc:
+	cd manual && make DESTDIR=$(DOCDIR)
+
+htmldoc:
+	cd manual && make html DESTDIR=$(DOCDIR)
 
 $(PROG): Makefile.gui $(DIR)
-	make -f Makefile.gui
+	echo $(LDFLAG)
+	make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
 
diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro
index ac0af2ac1..f66c3aa54 100644
--- a/slsDetectorGui/slsDetectorGui.pro
+++ b/slsDetectorGui/slsDetectorGui.pro
@@ -1,8 +1,10 @@
-DESTDIR  			= 		bin
+
+
+DESTDIR  			?= 		bin
 MOC_DIR   			= 		mocs
 OBJECTS_DIR 		= 		objs
 UI_HEADERS_DIR		= 		forms/include
-
+SLSDETLIB ?=../slsDetectorSoftware               
 RESOURCES   		+=  	icons.qrc
 
 CONFIG				+=		debug 
@@ -18,12 +20,13 @@ documentation.path 	= 		/$(DOCPATH)
 documentation.files = 		docs/*
 INSTALLS			+= 		target
 INSTALLS 			+= 		documentation
-QMAKE_CLEAN 		+= 		docs/*/* \
-							$(DESTDIR)* 
+QMAKE_CLEAN 		+= 		docs/*/* 
 							
 
-LIBS				+=		-Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector  -Wl,-Bdynamic\
-							-L$(QWTDIR)/lib  -lqwt -L$(QWT3D)/lib  
+#LIBS				+=		-Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector  -Wl,-Bdynamic\
+#							-L$(QWTDIR)/lib  -lqwt -L$(QWT3D)/lib 
+ 
+LIBS				+=		-L$(QWTDIR)/lib  -lqwt -L$(QWT3D)/lib  
 
 DEPENDPATH  		+=		\
 							slsDetectorPlotting/include\
@@ -33,21 +36,23 @@ DEPENDPATH  		+=		\
 
 
 INCLUDEPATH 		+= 		\
-                            $(shell echo "/lib/modules/`uname -r`/build/include") \
 							$(QWTDIR)/include\
 							$(QWTDIR) \
-                            $(QWTDIR)/src\
-                            $(QWT3D)/include\
+                              $(QWTDIR)/src\
+                              $(QWT3D)/include\
 							slsDetectorPlotting/include\
 							include\
 							forms/include\
-							../slsDetectorSoftware/commonFiles\
-							../slsDetectorSoftware/MySocketTCP\
-							../slsDetectorSoftware/slsReceiverInterface\
-							../slsDetectorSoftware/slsDetector\
-							../slsDetectorSoftware/slsDetectorAnalysis\
-							../slsDetectorSoftware/multiSlsDetector\
-							../slsDetectorSoftware/usersFunctions  
+                                                        $(INCLUDES)
+
+#                                                        $(shell echo "/lib/modules/`uname -r`/build/include") \
+#							../slsDetectorSoftware/commonFiles\
+#							../slsDetectorSoftware/MySocketTCP\
+#							../slsDetectorSoftware/slsReceiverInterface\
+#							../slsDetectorSoftware/slsDetector\
+#							../slsDetectorSoftware/slsDetectorAnalysis\
+#							../slsDetectorSoftware/multiSlsDetector\
+#							../slsDetectorSoftware/usersFunctions  
 
 SOURCES 			= 		\
 							slsDetectorPlotting/src/SlsQt1DPlot.cxx\