diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index 5650a6cbb..cb1fe0f82 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -4,16 +4,13 @@ include ../Makefile.include
 
 $(info )
 $(info ##################################)
-$(info #    Compiling slsDetectorGui    #)
+$(info #    In slsDetectorGui Makefile  #)
 $(info ##################################)
 $(info )
 
 
-
-PROG		= 	$(DESTDIR)/slsDetectorGui
-
 DESTDIR		?=	../bin
-LIBDIR		?=	$(DESTDIR)
+PROG		= 	$(DESTDIR)/slsDetectorGui
 DOCDIR		?=	docs
 
 LIBRARYDIR		?=	../slsDetectorSoftware
@@ -29,10 +26,15 @@ INCLUDES	?= 	$(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP  -I$(LIBRA
 .PHONY: all lib clean mm doc htmldoc guiclient
 
 
-all: lib $(PROG) Makefile.gui guiclient
+all: lib Makefile.gui $(PROG) guiclient
 
-lib:  $(DESTDIR)/libSlsDetector.so  $(DESTDIR)/libSlsDetector.a
-	if [ ! -f $(DESTDIR)/libSlsDetector.so ]; then cd ../ && $(MAKE) lib; fi
+lib:  
+	cd $(LIBRARYDIR) && $(MAKE) DESTDIR=$(DESTDIR) 
+	@echo ""
+	@echo "#######################################"
+	@echo "#   Back in slsDetectorGui Makefile   #"
+	@echo "#######################################"
+	@echo ""
 
 
 clean: 
@@ -44,7 +46,7 @@ clean:
 Makefile.gui: mm
 
 mm: 
-	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAGDET)'
+	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(DESTDIR) SUBLIBS='$(LDFLAGDET)'
 
 doc:
 	cd manual && $(MAKE) DESTDIR=$(DOCDIR)
@@ -52,12 +54,10 @@ doc:
 htmldoc:
 	cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
 
-$(PROG): Makefile.gui slsDetectorGui.pro $(DIR)
-	echo $(DIR)
-	./updateGitVersion.sh
-	$(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
+$(PROG): Makefile slsDetectorGui.pro $(DIR)
+	$(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
 
 guiclient:
-	echo $(WD)
+#	echo $(WD)
 	cd client && $(MAKE) DESTDIR=$(DESTDIR)
 	
diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt
index 39d2639e7..1abff021b 100644
--- a/slsDetectorGui/gitInfo.txt
+++ b/slsDetectorGui/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorGui 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
-Repsitory UUID: d327f25aa2d79558370a3ad8ca1fbfa78479bb35 
-Revision: 397 
+Repsitory UUID: 9794596be92a600d19395eb6bf7818ae5e0a68f7 
+Revision: 398 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 397 
-Last Changed Date: 2017-06-29 09:27:26 +0200
+Last Changed Rev: 398 
+Last Changed Date: 2017-06-29 10:18:51 +0200
diff --git a/slsDetectorGui/gitInfoGui.h b/slsDetectorGui/gitInfoGui.h
index 048a10e11..0d4e7bd79 100644
--- a/slsDetectorGui/gitInfoGui.h
+++ b/slsDetectorGui/gitInfoGui.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "d327f25aa2d79558370a3ad8ca1fbfa78479bb35"
-//#define SVNREV 0x397
+#define SVNREPUUID "9794596be92a600d19395eb6bf7818ae5e0a68f7"
+//#define SVNREV 0x398
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x397
+#define SVNREV 0x398
 #define SVNDATE 0x20170629
 //
diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h
index 52a1a6b2d..f1b7d2b51 100644
--- a/slsDetectorGui/include/qDefs.h
+++ b/slsDetectorGui/include/qDefs.h
@@ -19,7 +19,7 @@
 #include <QAbstractButton>
 using namespace std;
 
-class qDefs:public QWidget {
+class qDefs:public QWidget{
 public:
 //-------------------------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro
index 080cf6c8c..d3dae9c80 100644
--- a/slsDetectorGui/slsDetectorGui.pro
+++ b/slsDetectorGui/slsDetectorGui.pro
@@ -4,6 +4,7 @@
 #When using epics, uncomment epics defines, libs and a line in INCLUDEPATH
 
 
+
 QT_INSTALL_PREFIX	=	$(QTDIR)
 QMAKE_UIC 			= 	$(QTDIR)/bin/uic
 QMAKE_MOC 			=  	$(QTDIR)/bin/moc
@@ -30,7 +31,7 @@ QMAKE_CXXFLAGS_WARN_ON = 	-w
 QMAKE_CFLAGS_WARN_ON   = 	-w
 
 
-#QMAKE_PRE_LINK		= 		updateGitVersion.sh
+
 
 DESTDIR  			?= 		bin
 MOC_DIR   			= 		mocs
@@ -51,6 +52,18 @@ QMAKE_CLEAN 		+= 		docs/*/*
 							
 
 
+extralib.target = extra
+extralib.commands = 	echo `tput setaf 6`;	\
+	echo 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';	\
+	echo 'x       Compiling slsDetectorGui      x';	\
+	echo 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';	\
+	echo `./updateGitVersion.sh; tput sgr0`
+extralib.depends = $(target)
+QMAKE_EXTRA_TARGETS += extralib
+PRE_TARGETDEPS = extra
+
+
+
 
 DEPENDPATH  		+=		\
 							slsDetectorPlotting/include\