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

makefiles and versioning update complete

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-29 17:09:46 +02:00
parent b6eb4cbb61
commit c01931e5a6
5 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorGui/Makefile
View File

@ -4,16 +4,13 @@ include ../Makefile.include
$(info )
$(info ##################################)
$(info # Compiling slsDetectorGui #)
$(info # In slsDetectorGui Makefile #)
$(info ##################################)
$(info )
PROG = $(DESTDIR)/slsDetectorGui
DESTDIR ?= ../bin
LIBDIR ?= $(DESTDIR)
PROG = $(DESTDIR)/slsDetectorGui
DOCDIR ?= docs
LIBRARYDIR ?= ../slsDetectorSoftware
@ -29,10 +26,15 @@ INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRA
.PHONY: all lib clean mm doc htmldoc guiclient
all: lib $(PROG) Makefile.gui guiclient
all: lib Makefile.gui $(PROG) guiclient
lib: $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
if [ ! -f $(DESTDIR)/libSlsDetector.so ]; then cd ../ && $(MAKE) lib; fi
lib:
cd $(LIBRARYDIR) && $(MAKE) DESTDIR=$(DESTDIR)
@echo ""
@echo "#######################################"
@echo "# Back in slsDetectorGui Makefile #"
@echo "#######################################"
@echo ""
clean:
@ -44,7 +46,7 @@ clean:
Makefile.gui: mm
mm:
qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAGDET)'
qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(DESTDIR) SUBLIBS='$(LDFLAGDET)'
doc:
cd manual && $(MAKE) DESTDIR=$(DOCDIR)
@ -52,12 +54,10 @@ doc:
htmldoc:
cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
$(PROG): Makefile.gui slsDetectorGui.pro $(DIR)
echo $(DIR)
./updateGitVersion.sh
$(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
$(PROG): Makefile slsDetectorGui.pro $(DIR)
$(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
guiclient:
echo $(WD)
# echo $(WD)
cd client && $(MAKE) DESTDIR=$(DESTDIR)