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

makefile changed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@114 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
bergamaschi 2012-11-21 09:01:33 +00:00
parent 832287af9e
commit 29a9678d3b
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorGui/Makefile
View File

@ -1,18 +1,29 @@
PROG= bin/slsDetectorGui
PROG= $(DESTDIR)/slsDetectorGui
DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/* forms/include/*)
DESTDIR?=bin
DOCDIR?=docs
LIBDIR?=../slsDetectorSoftware
all: $(PROG)
all: $(PROG) Makefile.gui
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
cd manual && make clean
Makefile.gui: slsDetectorGui.pro
qmake -o Makefile.gui
qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR)
doc:
cd manual && make DESTDIR=$(DOCDIR)
htmldoc:
cd manual && make html DESTDIR=$(DOCDIR)
$(PROG): Makefile.gui $(DIR)
make -f Makefile.gui
echo $(LDFLAG)
make -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'

33
slsDetectorGui/slsDetectorGui.pro
View File

@ -1,8 +1,10 @@
DESTDIR = bin
DESTDIR ?= bin
MOC_DIR = mocs
OBJECTS_DIR = objs
UI_HEADERS_DIR = forms/include
SLSDETLIB ?=../slsDetectorSoftware
RESOURCES += icons.qrc
CONFIG += debug
@ -18,12 +20,13 @@ documentation.path = /$(DOCPATH)
documentation.files = docs/*
INSTALLS += target
INSTALLS += documentation
QMAKE_CLEAN += docs/*/* \
$(DESTDIR)*
QMAKE_CLEAN += docs/*/*
LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\
-L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
#LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\
# -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
LIBS += -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
DEPENDPATH += \
slsDetectorPlotting/include\
@ -33,7 +36,6 @@ DEPENDPATH += \
INCLUDEPATH += \
$(shell echo "/lib/modules/`uname -r`/build/include") \
$(QWTDIR)/include\
$(QWTDIR) \
$(QWTDIR)/src\
@ -41,13 +43,16 @@ INCLUDEPATH += \
slsDetectorPlotting/include\
include\
forms/include\
../slsDetectorSoftware/commonFiles\
../slsDetectorSoftware/MySocketTCP\
../slsDetectorSoftware/slsReceiverInterface\
../slsDetectorSoftware/slsDetector\
../slsDetectorSoftware/slsDetectorAnalysis\
../slsDetectorSoftware/multiSlsDetector\
../slsDetectorSoftware/usersFunctions
$(INCLUDES)
# $(shell echo "/lib/modules/`uname -r`/build/include") \
# ../slsDetectorSoftware/commonFiles\
# ../slsDetectorSoftware/MySocketTCP\
# ../slsDetectorSoftware/slsReceiverInterface\
# ../slsDetectorSoftware/slsDetector\
# ../slsDetectorSoftware/slsDetectorAnalysis\
# ../slsDetectorSoftware/multiSlsDetector\
# ../slsDetectorSoftware/usersFunctions
SOURCES = \
slsDetectorPlotting/src/SlsQt1DPlot.cxx\