diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index 96742c268..5088393d4 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -6,7 +6,7 @@ DOCDIR?=docs LIBDIR?=../slsDetectorSoftware -all: $(PROG) Makefile.gui client +all: $(PROG) Makefile.gui guiclient 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 @@ -30,5 +30,6 @@ $(PROG): Makefile.gui $(DIR) make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' -client: - cd slsDetectorGui/client && $(MAKE) DESTDIR=$(DESTDIR) +guiclient: + echo $(WD) + cd client && $(MAKE) DESTDIR=$(DESTDIR) diff --git a/slsDetectorGui/client/Makefile b/slsDetectorGui/client/Makefile index 39bbc2d79..a889e74c7 100644 --- a/slsDetectorGui/client/Makefile +++ b/slsDetectorGui/client/Makefile @@ -23,7 +23,6 @@ $(PROGS): echo $(OBJS) mkdir -p $(DESTDIR) gcc $(SRC_CLNT) $(INCLUDES) $(FLAGS) $(LDLIBS) -o $@ - #mv $(PROGS) $(DESTDIR) mv $(PROGS) $(FINALDIR) clean: diff --git a/slsDetectorGui/include/svnInfoGui.h b/slsDetectorGui/include/svnInfoGui.h index 63f231c6c..8652c3c70 100644 --- a/slsDetectorGui/include/svnInfoGui.h +++ b/slsDetectorGui/include/svnInfoGui.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" //#define SVNREPPATH "" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" -//#define SVNREV 0x151 +//#define SVNREV 0x152 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x151 +#define SVNREV 0x152 #define SVNDATE 0x20130306 //