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

changes in makefile to make a separate receiver

Browse Source
This commit is contained in:
Maliakal Dhanya
2014-05-20 17:17:20 +02:00
parent 9c5e2aa5b7
commit ea1878f848
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorGui/Makefile
View File

@ -8,14 +8,15 @@ DESTDIR ?= ../bin
LIBDIR ?= $(DESTDIR) LIBDIR ?= $(DESTDIR)
DOCDIR ?= docs DOCDIR ?= docs
LIBRARYDIR ?= ../slsDetectorSoftware LIBRARYDIR ?= ../slsDetectorSoftware
INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions LIBRARYRXRDIR ?= ../slsReceiverSoftware
INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYRXRDIR)/includes
ifeq ( $(EIGERSLS), yes) #ifeq ( $(EIGERSLS), yes)
LDFLAG += $(EIGERFLAGS) # LDFLAG += $(EIGERFLAGS)
else ifeq ( $(ROOTSLS), yes) #else ifeq ( $(ROOTSLS), yes)
LDFLAG += $(ROOTFLAGS) # LDFLAG += $(ROOTFLAGS)
endif #endif
.PHONY: all lib clean mm doc htmldoc guiclient .PHONY: all lib clean mm doc htmldoc guiclient
@ -34,7 +35,7 @@ clean:
Makefile.gui: mm Makefile.gui: mm
mm: mm:
qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)' qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAGDET)'
doc: doc:
cd manual && make DESTDIR=$(DOCDIR) cd manual && make DESTDIR=$(DOCDIR)
@ -43,7 +44,7 @@ htmldoc:
cd manual && make html DESTDIR=$(DOCDIR) cd manual && make html DESTDIR=$(DOCDIR)
$(PROG): Makefile.gui $(DIR) $(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='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
guiclient: guiclient:
echo $(WD) echo $(WD)

8
slsDetectorGui/client/Makefile
View File

@ -3,8 +3,9 @@ CLAGS += -DVERBOSE #VERYBOSE
LDLIBS += -lm -lstdc++ -lpthread LDLIBS += -lm -lstdc++ -lpthread
LDIR = ../../slsDetectorSoftware LDIR = ../../slsDetectorSoftware
INCLUDES = -I ../../slsDetectorSoftware/commonFiles -I ../../slsDetectorSoftware/MySocketTCP -I ../../slsDetectorSoftware/slsDetector -I ../include RDIR = ../../slsReceiverSoftware
SRC_CLNT = qClient.cpp ../../slsDetectorSoftware/MySocketTCP/MySocketTCP.cpp INCLUDES = -I $(LDIR)/commonFiles -I $(RDIR)/MySocketTCP -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/includes
SRC_CLNT = qClient.cpp $(RDIR)/MySocketTCP/MySocketTCP.cpp
PROGS = gui_client PROGS = gui_client
DESTDIR ?= bin DESTDIR ?= bin
@ -26,8 +27,7 @@ $(PROGS):
mv $(PROGS) $(FINALDIR) mv $(PROGS) $(FINALDIR)
clean: clean:
rm -rf $(DESTDIR)/$(PROGS) *.o rm -rf $(DESTDIR)/$(PROGS) *.o $(FINALDIR)/$(PROGS)
rm -rf $(FINALDIR)/$(PROGS)

4
slsDetectorGui/slsDetectorGui.pro
View File

@ -16,11 +16,11 @@ QMAKE_LIBS = -L$(QTDIR)/lib
#epics #epics
#DEFINES += EPICS VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE #DEFINES += EPICS VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE
#LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom #LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom
#default #default
DEFINES += VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE CHECKINFERROR DEFINES += VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE CHECKINFERROR
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib