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

changes for Makefile dependencies

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-28 18:52:43 +02:00
parent 3515951bb8
commit cfff7969e3
5 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorGui/Makefile
View File

@ -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