From cfff7969e35ce466baddc54103f5dad587269e04 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Wed, 28 Jun 2017 18:52:43 +0200
Subject: [PATCH] changes for Makefile dependencies

---
 slsDetectorGui/Makefile             | 12 ++++++------
 slsDetectorGui/client/Makefile      | 27 +++++++++++----------------
 slsDetectorGui/gitInfo.txt          |  8 ++++----
 slsDetectorGui/include/gitInfoGui.h |  8 ++++----
 slsDetectorGui/updateGitVersion.sh  |  6 +++---
 5 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index e1c1ebad1..01d4a0447 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -29,10 +29,11 @@ INCLUDES	?= 	$(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP  -I$(LIBRA
 .PHONY: all lib clean mm doc htmldoc guiclient
 
 
-all: lib updateVersion $(PROG) Makefile.gui guiclient
+all: lib $(PROG) Makefile.gui guiclient
+
+lib:  $(DESTDIR)/libSlsDetector.so  $(DESTDIR)/libSlsDetector.a
+	if [ ! -f $(DESTDIR)/libSlsDetector.so ]; then cd ../ && $(MAKE) lib; fi
 
-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
@@ -42,7 +43,7 @@ clean:
 
 Makefile.gui: mm
 
-mm:
+mm: 
 	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAGDET)'
 
 doc:
@@ -52,11 +53,10 @@ htmldoc:
 	cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
 
 $(PROG): Makefile.gui $(DIR)
+	./updateGitVersion.sh
 	$(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
 
 guiclient:
 	echo $(WD)
 	cd client && $(MAKE) DESTDIR=$(DESTDIR)
 	
-updateVersion:
-	./updateGitVersion.sh
diff --git a/slsDetectorGui/client/Makefile b/slsDetectorGui/client/Makefile
index c7ea67302..9a72c99d7 100644
--- a/slsDetectorGui/client/Makefile
+++ b/slsDetectorGui/client/Makefile
@@ -7,28 +7,23 @@ RDIR 		= 	../../slsReceiverSoftware
 
 INCLUDES	= 	-I $(LDIR)/commonFiles  -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include
 SRC_CLNT	= 	qClient.cpp $(RDIR)/src/MySocketTCP.cpp
-
-PROGS		= 	gui_client 
-DESTDIR		?= 	bin
-INSTMODE	= 	0777
-
-FINALDIR    = ../../bin
-
-OBJS 		= 	$(SRC_CLNT:.cpp=.o) 
+DEPSINCLUDES=   $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h  $(LDIR)/commonFiles/sls_detector_defs.h
 
 
-all: clean $(PROGS)
+all:	client
+
+client: $(OBJS) $(DESTDIR)/gui_client
+
+OBJS = $(SRC_CLNT:%.cpp=%.o) 
+
+
+$(DESTDIR)/gui_client :  $(SRC_CLNT) $(DEPSINCLUDES) Makefile
+	$(CXX) -o $@ -c $< $(INCLUDES) $(FLAGS)  $(LDLIBS) 
 
-boot: $(OBJS)
 
-$(PROGS):
-	echo $(OBJS)
-	mkdir -p $(DESTDIR) 
-	gcc $(SRC_CLNT) $(INCLUDES) $(FLAGS) $(LDLIBS) -o $@   
-	mv $(PROGS) $(FINALDIR)
 
 clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o  $(FINALDIR)/$(PROGS)
+	rm -rf $(DESTDIR)/$(PROGS)  *.o  
 
 
 
diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt
index a0c7fcac9..7d37136d5 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: 7910e5772fc18bee7e706d6a57ccdc8b9c353d18 
-Revision: 393 
+Repsitory UUID: 6ceaa18c5d55e94339999977a91fca1d8712578d 
+Revision: 395 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 393 
-Last Changed Date: 2017-06-23 17:26:33 +0200
+Last Changed Rev: 395 
+Last Changed Date: 2017-06-28 11:18:55 +0200
diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h
index 24ed1d8c6..a98f973cc 100644
--- a/slsDetectorGui/include/gitInfoGui.h
+++ b/slsDetectorGui/include/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 "7910e5772fc18bee7e706d6a57ccdc8b9c353d18"
-//#define SVNREV 0x393
+#define SVNREPUUID "6ceaa18c5d55e94339999977a91fca1d8712578d"
+//#define SVNREV 0x395
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x393
-#define SVNDATE 0x20170623
+#define SVNREV 0x395
+#define SVNDATE 0x20170628
 //
diff --git a/slsDetectorGui/updateGitVersion.sh b/slsDetectorGui/updateGitVersion.sh
index 6d8118180..dfce2b2a5 100755
--- a/slsDetectorGui/updateGitVersion.sh
+++ b/slsDetectorGui/updateGitVersion.sh
@@ -1,7 +1,7 @@
 MAINDIR=slsDetectorsPackage
 SPECDIR=slsDetectorGui
-TMPFILE=gitInfoGuiTmp.h
-INCLFILE=gitInfoGui.h
+TMPFILE=include/gitInfoGuiTmp.h
+INCLFILE=include/gitInfoGui.h
 WD=$PWD
 
 GITREPO1='git remote -v'
@@ -28,7 +28,7 @@ REV=`eval $REV1  $REV2`
 FOLDERREV=`eval $FOLDERREV1  $FOLDERREV2`
 RDATE=`eval $RDATE1`
 echo Path: ${MAINDIR}/${SPECDIR}  $'\n'URL: ${GITREPO}  $'\n'Repository Root: ${GITREPO}  $'\n'Repsitory UUID: ${REPUID}  $'\n'Revision: ${FOLDERREV}  $'\n'Branch: ${BRANCH}  $'\n'Last Changed Author: ${AUTH1}_${AUTH2}  $'\n'Last Changed Rev: ${REV}  $'\n'Last Changed Date: ${RDATE} > gitInfo.txt 
-cd $WD
+cd ..
 ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE 
 echo "Revision Updated"
 cd $WD