detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

changed the makefiles a bit to be included in slsDetectorsPAckage make

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@153 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-03-06 09:41:21 +00:00
parent 499cf4db56
commit 448f333b1e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorGui/Makefile
View File

@ -6,7 +6,7 @@ DOCDIR?=docs
LIBDIR?=../slsDetectorSoftware LIBDIR?=../slsDetectorSoftware
all: $(PROG) Makefile.gui client all: $(PROG) Makefile.gui guiclient
clean: 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
@ -30,5 +30,6 @@ $(PROG): Makefile.gui $(DIR)
make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
client: guiclient:
cd slsDetectorGui/client && $(MAKE) DESTDIR=$(DESTDIR) echo $(WD)
cd client && $(MAKE) DESTDIR=$(DESTDIR)

1
slsDetectorGui/client/Makefile
View File

@ -23,7 +23,6 @@ $(PROGS):
echo $(OBJS) echo $(OBJS)
mkdir -p $(DESTDIR) mkdir -p $(DESTDIR)
gcc $(SRC_CLNT) $(INCLUDES) $(FLAGS) $(LDLIBS) -o $@ gcc $(SRC_CLNT) $(INCLUDES) $(FLAGS) $(LDLIBS) -o $@
#mv $(PROGS) $(DESTDIR)
mv $(PROGS) $(FINALDIR) mv $(PROGS) $(FINALDIR)
clean: clean:

4
slsDetectorGui/include/svnInfoGui.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061"
//#define SVNREV 0x151 //#define SVNREV 0x152
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x151 #define SVNREV 0x152
#define SVNDATE 0x20130306 #define SVNDATE 0x20130306
// //