From 8a87f17811d9c281ce7bc201c350d3faea9e98da Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Wed, 6 Mar 2013 09:18:46 +0000 Subject: [PATCH] included makefile changes for gui client git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@151 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/Makefile | 6 +++++- slsDetectorGui/include/svnInfoGui.h | 11 ----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index d1ff906aa..96742c268 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -9,7 +9,8 @@ LIBDIR?=../slsDetectorSoftware all: $(PROG) Makefile.gui client 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 + 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 client && $(MAKE) clean # cd manual && make clean @@ -28,3 +29,6 @@ $(PROG): Makefile.gui $(DIR) echo $(LDFLAG) make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' + +client: + cd slsDetectorGui/client && $(MAKE) DESTDIR=$(DESTDIR) diff --git a/slsDetectorGui/include/svnInfoGui.h b/slsDetectorGui/include/svnInfoGui.h index deff612b6..e69de29bb 100644 --- a/slsDetectorGui/include/svnInfoGui.h +++ b/slsDetectorGui/include/svnInfoGui.h @@ -1,11 +0,0 @@ -//#define SVNPATH "" -#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" -//#define SVNREPPATH "" -#define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" -//#define SVNREV 0x148 -//#define SVNKIND "" -//#define SVNSCHED "" -#define SVNAUTH "l_maliakal_d" -#define SVNREV 0x148 -#define SVNDATE 0x20130226 -//