mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-29 09:30:02 +02:00
makefiles and versioning update complete
This commit is contained in:
parent
e79827384a
commit
7afbd8f0f0
56
Makefile
56
Makefile
@ -19,6 +19,8 @@ CALWIZDIR = $(WD)/calibrationWizards
|
|||||||
MANDIR = $(WD)/manual
|
MANDIR = $(WD)/manual
|
||||||
CALIBDIR = $(WD)/slsDetectorCalibration
|
CALIBDIR = $(WD)/slsDetectorCalibration
|
||||||
|
|
||||||
|
TABSPACE := "\t"
|
||||||
|
|
||||||
|
|
||||||
INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(ASM)
|
INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(ASM)
|
||||||
|
|
||||||
@ -27,14 +29,15 @@ INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM)
|
|||||||
|
|
||||||
$(info )
|
$(info )
|
||||||
$(info #######################################)
|
$(info #######################################)
|
||||||
$(info # Compiling slsDetectorsPackage #)
|
$(info # In slsDetectorsPackage Makefile #)
|
||||||
$(info #######################################)
|
$(info #######################################)
|
||||||
$(info )
|
$(info )
|
||||||
|
|
||||||
|
|
||||||
.PHONY: all nonstatic static lib libreceiver textclient receiver gui stextclient sreceiver
|
.PHONY: all nonstatic static lib libreceiver textclient receiver gui stextclient sreceiver
|
||||||
|
|
||||||
all: lib textclient receiver gui
|
#all: lib textclient receiver gui
|
||||||
|
all: textclient receiver gui
|
||||||
|
|
||||||
nonstatic: lib libreceiver textclient receiver gui
|
nonstatic: lib libreceiver textclient receiver gui
|
||||||
|
|
||||||
@ -52,28 +55,49 @@ stextclient: slsDetectorClient_static
|
|||||||
|
|
||||||
slsDetectorClient: textclient
|
slsDetectorClient: textclient
|
||||||
|
|
||||||
slsDetectorClient_static: lib
|
slsDetectorClient_static: #lib
|
||||||
cd $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' LIBS='$(LDFLAGDET)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
|
cd $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
|
||||||
|
@echo ""
|
||||||
textclient: lib
|
@echo "#######################################"
|
||||||
cd $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
|
@echo "# Back in slsDetectorPackage Makefile #"
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo ""
|
||||||
|
|
||||||
|
textclient: #lib
|
||||||
|
cd $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
|
||||||
|
@echo ""
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo "# Back in slsDetectorPackage Makefile #"
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo ""
|
||||||
|
|
||||||
slsReceiver: receiver
|
slsReceiver: receiver
|
||||||
|
|
||||||
slsReceiver_static: receiver
|
slsReceiver_static: receiver
|
||||||
|
|
||||||
receiver: libreceiver
|
receiver: #libreceiver
|
||||||
cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
|
cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
|
||||||
|
@echo ""
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo "# Back in slsDetectorPackage Makefile #"
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo ""
|
||||||
|
|
||||||
sreceiver: libreceiver
|
sreceiver: #libreceiver
|
||||||
cd $(RECEIVERDIR) && $(MAKE) static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
|
cd $(RECEIVERDIR) && $(MAKE) static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
|
||||||
|
@echo ""
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo "# Back in slsDetectorPackage Makefile #"
|
||||||
slsDetectorGUI: lib
|
@echo "#######################################"
|
||||||
cd $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' LDFLAGDET='-L$(LIBDIR) -lSlsDetector'
|
@echo ""
|
||||||
|
|
||||||
|
slsDetectorGUI: #lib
|
||||||
|
cd $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' INCLUDES='$(INCLUDES)' LDFLAGDET='-L$(LIBDIR) -lSlsDetector'
|
||||||
|
@echo ""
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo "# Back in slsDetectorPackage Makefile #"
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo ""
|
||||||
|
|
||||||
calWiz:
|
calWiz:
|
||||||
cd $(CALWIZDIR) && $(MAKE) DESTDIR=$(BINDIR) #FLAGS=$(FLAGS) LDFLAGDET=$(LDFLAGDET) INCLUDES=$(INCLUDES)
|
cd $(CALWIZDIR) && $(MAKE) DESTDIR=$(BINDIR) #FLAGS=$(FLAGS) LDFLAGDET=$(LDFLAGDET) INCLUDES=$(INCLUDES)
|
||||||
|
@ -69,6 +69,11 @@ ifeq ($(ROOTSLS),yes)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
define colorecho
|
||||||
|
@tput setaf 6
|
||||||
|
@echo $1
|
||||||
|
@tput sgr0
|
||||||
|
endef
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user