mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-28 17:10:03 +02:00
makefiles and versioning update complete
This commit is contained in:
parent
1a74ceca3e
commit
b05e9c194a
@ -21,9 +21,10 @@ SRC_CLNT=slsDetectorAnalysis/fileIO.cpp usersFunctions/usersFunctions.cpp slsDe
|
|||||||
DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h commonFiles/sls_detector_defs.h commonFiles/sls_detector_funcs.h commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h slsDetectorAnalysis/badChannelCorrections.h slsDetectorAnalysis/detectorData.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/fileIOStatic.h slsDetectorAnalysis/movingStat.h slsDetectorAnalysis/runningStat.h slsDetectorAnalysis/single_photon_hit.h threadFiles/Global.h threadFiles/Task.h usersFunctions/angleFunction.h
|
DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h commonFiles/sls_detector_defs.h commonFiles/sls_detector_funcs.h commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h slsDetectorAnalysis/badChannelCorrections.h slsDetectorAnalysis/detectorData.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/fileIOStatic.h slsDetectorAnalysis/movingStat.h slsDetectorAnalysis/runningStat.h slsDetectorAnalysis/single_photon_hit.h threadFiles/Global.h threadFiles/Task.h usersFunctions/angleFunction.h
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$(info )
|
$(info )
|
||||||
$(info #######################################)
|
$(info #######################################)
|
||||||
$(info # Compiling slsDetectorSoftware #)
|
$(info # In slsDetectorSoftware Makefile #)
|
||||||
$(info #######################################)
|
$(info #######################################)
|
||||||
$(info )
|
$(info )
|
||||||
|
|
||||||
@ -67,7 +68,6 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC)
|
|||||||
cd gotthardDetectorServer && make -f Makefile.virtual DESTDIR=$(DESTDIR)
|
cd gotthardDetectorServer && make -f Makefile.virtual DESTDIR=$(DESTDIR)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%.o : %.cpp %.h $(DEPSINCLUDES) Makefile
|
%.o : %.cpp %.h $(DEPSINCLUDES) Makefile
|
||||||
$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -pthread -lrt $(LIBZMQ) $(FLAGS)
|
$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -pthread -lrt $(LIBZMQ) $(FLAGS)
|
||||||
|
|
||||||
@ -75,8 +75,12 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC)
|
|||||||
package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$(DESTDIR)/libSlsDetector.so: $(OBJS)
|
$(DESTDIR)/libSlsDetector.so: $(OBJS)
|
||||||
./updateGitVersion.sh
|
$(call colorecho,"#######################################")
|
||||||
|
$(call colorecho,"# Compiling slsDetector Library #")
|
||||||
|
$(call colorecho,"#######################################")
|
||||||
|
$(call colorecho,`./updateGitVersion.sh`)
|
||||||
$(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread -lrt $(LIBZMQ)
|
$(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread -lrt $(LIBZMQ)
|
||||||
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
||||||
mv libSlsDetector.so $(DESTDIR)
|
mv libSlsDetector.so $(DESTDIR)
|
||||||
|
@ -12,13 +12,14 @@ SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c
|
|||||||
OBJS = $(SRC_CLNT:.c=.o)
|
OBJS = $(SRC_CLNT:.c=.o)
|
||||||
|
|
||||||
|
|
||||||
all: clean updateVersion $(PROGS) #hv9m_blackfin_server
|
all: clean $(PROGS) #hv9m_blackfin_server
|
||||||
|
|
||||||
|
|
||||||
boot: $(OBJS)
|
boot: $(OBJS)
|
||||||
|
|
||||||
$(PROGS):
|
$(PROGS): $(OBJS)
|
||||||
echo $(OBJS)
|
# echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
mkdir -p $(DESTDIR)
|
mkdir -p $(DESTDIR)
|
||||||
$(CC) -o $@ $(SRC_CLNT) $(CFLAGS) $(LDLIBS)
|
$(CC) -o $@ $(SRC_CLNT) $(CFLAGS) $(LDLIBS)
|
||||||
mv $(PROGS) $(DESTDIR)
|
mv $(PROGS) $(DESTDIR)
|
||||||
@ -32,6 +33,4 @@ hv9m_blackfin_server:9mhvserial_bf.c
|
|||||||
clean:
|
clean:
|
||||||
rm -rf $(DESTDIR)/$(PROGS) *.o $(DESTDIR)/hv9m_blackfin_server
|
rm -rf $(DESTDIR)/$(PROGS) *.o $(DESTDIR)/hv9m_blackfin_server
|
||||||
|
|
||||||
updateVersion:
|
|
||||||
./updateGitVersion.sh
|
|
||||||
|
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
|
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
|
||||||
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
|
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
|
||||||
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
|
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
|
||||||
Repsitory UUID: 94d2b8cd58bbf69d26f491b7b81e2b269aac32b9
|
Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d
|
||||||
Revision: 292
|
Revision: 293
|
||||||
Branch: developer
|
Branch: developer
|
||||||
Last Changed Author: Dhanya_Maliakal
|
Last Changed Author: Dhanya_Maliakal
|
||||||
Last Changed Rev: 1427
|
Last Changed Rev: 1435
|
||||||
Last Changed Date: 2017-06-28 10:27:40 +0200
|
Last Changed Date: 2017-06-28 18:16:55 +0200
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
//#define SVNPATH ""
|
//#define SVNPATH ""
|
||||||
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
|
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
|
||||||
//#define SVNREPPATH ""
|
//#define SVNREPPATH ""
|
||||||
#define SVNREPUUID "94d2b8cd58bbf69d26f491b7b81e2b269aac32b9"
|
#define SVNREPUUID "d4b0bef367ef407a3267619196da01dc1636865d"
|
||||||
//#define SVNREV 0x1427
|
//#define SVNREV 0x1435
|
||||||
//#define SVNKIND ""
|
//#define SVNKIND ""
|
||||||
//#define SVNSCHED ""
|
//#define SVNSCHED ""
|
||||||
#define SVNAUTH "Dhanya_Maliakal"
|
#define SVNAUTH "Dhanya_Maliakal"
|
||||||
#define SVNREV 0x1427
|
#define SVNREV 0x1435
|
||||||
#define SVNDATE 0x20170628
|
#define SVNDATE 0x20170628
|
||||||
//
|
//
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
Path: slsDetectorsPackage/slsDetectorSoftware
|
Path: slsDetectorsPackage/slsDetectorSoftware
|
||||||
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
|
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
|
||||||
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
|
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
|
||||||
Repsitory UUID: f6589f7e6e60aa6f02e3adcf526b2a1a73153364
|
Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d
|
||||||
Revision: 1429
|
Revision: 1430
|
||||||
Branch: developer
|
Branch: developer
|
||||||
Last Changed Author: Dhanya_Maliakal
|
Last Changed Author: Dhanya_Maliakal
|
||||||
Last Changed Rev: 1434
|
Last Changed Rev: 1435
|
||||||
Last Changed Date: 2017-06-28 18:13:47 +0200
|
Last Changed Date: 2017-06-28 18:16:55 +0200
|
||||||
|
@ -21,12 +21,13 @@ OBJS = $(SRCS:%.c=%.o)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
all: clean updateVersion $(PROGS)
|
all: clean $(PROGS)
|
||||||
|
|
||||||
boot: $(OBJS)
|
boot: $(OBJS)
|
||||||
|
|
||||||
$(PROGS): $(OBJS)
|
$(PROGS): $(OBJS)
|
||||||
echo $(OBJS)
|
echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
||||||
|
|
||||||
|
|
||||||
@ -41,8 +42,6 @@ romfs:
|
|||||||
clean:
|
clean:
|
||||||
rm -rf $(PROGS) *.o *.gdb
|
rm -rf $(PROGS) *.o *.gdb
|
||||||
|
|
||||||
updateVersion:
|
|
||||||
./updateGitVersion.sh
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,6 +27,7 @@ boot: $(OBJS)
|
|||||||
|
|
||||||
$(PROGS): $(OBJS)
|
$(PROGS): $(OBJS)
|
||||||
echo $(OBJS)
|
echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,15 +30,18 @@ boot: $(OBJS)
|
|||||||
|
|
||||||
jungfrauDetectorServerTest: $(OBJS)
|
jungfrauDetectorServerTest: $(OBJS)
|
||||||
echo $(OBJS)
|
echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
||||||
|
|
||||||
|
|
||||||
jungfrauDetectorServer: $(OBJS)
|
jungfrauDetectorServer: $(OBJS)
|
||||||
echo $(OBJS)
|
echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
||||||
|
|
||||||
jungfrauADCTEst: $(OBJS)
|
jungfrauADCTEst: $(OBJS)
|
||||||
echo $(OBJS)
|
echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) -DTESTADC
|
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) -DTESTADC
|
||||||
|
|
||||||
|
|
||||||
|
37
slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
Executable file
37
slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
Executable file
@ -0,0 +1,37 @@
|
|||||||
|
SERVER=jctbDetectorServer
|
||||||
|
TMPFILE=gitInfoMoenchTmp.h
|
||||||
|
INCLFILE=gitInfoMoench.h
|
||||||
|
|
||||||
|
WD=slsDetectorSoftware/$SERVER
|
||||||
|
|
||||||
|
GITREPO1='git remote -v'
|
||||||
|
GITREPO2=" | grep \"fetch\" | cut -d' ' -f1"
|
||||||
|
BRANCH1='git branch -v'
|
||||||
|
BRANCH2=" | grep '*' | cut -d' ' -f2"
|
||||||
|
REPUID1='git log --pretty=format:"%H" -1'
|
||||||
|
AUTH1_1='git log --pretty=format:"%cn" -1'
|
||||||
|
AUTH1_2=" | cut -d' ' -f1"
|
||||||
|
AUTH2_1='git log --pretty=format:"%cn" -1'
|
||||||
|
AUTH2_2=" | cut -d' ' -f2"
|
||||||
|
FOLDERREV1='git log --oneline . ' #used for all the individual server folders
|
||||||
|
FOLDERREV2=" | wc -l" #used for all the individual server folders
|
||||||
|
REV1='git log --oneline '
|
||||||
|
REV2=" | wc -l"
|
||||||
|
RDATE1='git log --pretty=format:"%ci" -1'
|
||||||
|
|
||||||
|
GITREPO=`eval $GITREPO1 $GITREPO2`
|
||||||
|
BRANCH=`eval $BRANCH1 $BRANCH2`
|
||||||
|
REPUID=`eval $REPUID1`
|
||||||
|
AUTH1=`eval $AUTH1_1 $AUTH1_2`
|
||||||
|
AUTH2=`eval $AUTH2_1 $AUTH2_2`
|
||||||
|
REV=`eval $REV1 $REV2`
|
||||||
|
FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2`
|
||||||
|
RDATE=`eval $RDATE1`
|
||||||
|
echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
|
||||||
|
cd ../../
|
||||||
|
./genVersionHeader.sh $WD/gitInfo.txt $WD/$TMPFILE $WD/$INCLFILE
|
||||||
|
echo "Revision Updated"
|
||||||
|
cd $WD
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -10,12 +10,13 @@ INSTMODE = 0777
|
|||||||
SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c
|
SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c
|
||||||
OBJS = $(SRC_CLNT:.c=.o)
|
OBJS = $(SRC_CLNT:.c=.o)
|
||||||
|
|
||||||
all: clean updateVersion $(PROGS)
|
all: clean $(PROGS)
|
||||||
|
|
||||||
boot: $(OBJS)
|
boot: $(OBJS)
|
||||||
|
|
||||||
$(PROGS): $(OBJS)
|
$(PROGS): $(OBJS)
|
||||||
echo $(OBJS)
|
# echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
mkdir -p $(DESTDIR)
|
mkdir -p $(DESTDIR)
|
||||||
$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS)
|
$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS)
|
||||||
mv $(PROGS) $(DESTDIR)
|
mv $(PROGS) $(DESTDIR)
|
||||||
@ -24,6 +25,5 @@ $(PROGS): $(OBJS)
|
|||||||
clean:
|
clean:
|
||||||
rm -rf $(DESTDIR)/$(PROGS) *.o
|
rm -rf $(DESTDIR)/$(PROGS) *.o
|
||||||
|
|
||||||
updateVersion:
|
|
||||||
./updateGitVersion.sh
|
|
||||||
|
|
@ -21,12 +21,13 @@ OBJS = $(SRCS:%.c=%.o)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
all: clean updateVersion $(PROGS)
|
all: clean $(PROGS)
|
||||||
|
|
||||||
boot: $(OBJS)
|
boot: $(OBJS)
|
||||||
|
|
||||||
$(PROGS): $(OBJS)
|
$(PROGS): $(OBJS)
|
||||||
echo $(OBJS)
|
echo $(OBJS)
|
||||||
|
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
|
||||||
|
|
||||||
|
|
||||||
@ -41,9 +42,6 @@ romfs:
|
|||||||
clean:
|
clean:
|
||||||
rm -rf $(PROGS) *.o *.gdb
|
rm -rf $(PROGS) *.o *.gdb
|
||||||
|
|
||||||
updateVersion:
|
|
||||||
./updateGitVersion.sh
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
//#define SVNPATH ""
|
//#define SVNPATH ""
|
||||||
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
|
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
|
||||||
//#define SVNREPPATH ""
|
//#define SVNREPPATH ""
|
||||||
#define SVNREPUUIDLIB "f6589f7e6e60aa6f02e3adcf526b2a1a73153364"
|
#define SVNREPUUIDLIB "d4b0bef367ef407a3267619196da01dc1636865d"
|
||||||
//#define SVNREV 0x1434
|
//#define SVNREV 0x1435
|
||||||
//#define SVNKIND ""
|
//#define SVNKIND ""
|
||||||
//#define SVNSCHED ""
|
//#define SVNSCHED ""
|
||||||
#define SVNAUTHLIB "Dhanya_Maliakal"
|
#define SVNAUTHLIB "Dhanya_Maliakal"
|
||||||
#define SVNREVLIB 0x1434
|
#define SVNREVLIB 0x1435
|
||||||
#define SVNDATELIB 0x20170628
|
#define SVNDATELIB 0x20170628
|
||||||
//
|
//
|
||||||
|
@ -1,96 +1,98 @@
|
|||||||
|
include ../../Makefile.include
|
||||||
|
|
||||||
CFLAGS= -DC_ONLY
|
CFLAGS= -DC_ONLY
|
||||||
#FLAGS=-DVERBOSE
|
#FLAGS=-DVERBOSE
|
||||||
#ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
|
#ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
|
||||||
|
|
||||||
#INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis -I../slsDetectorSoftware/slsReceiverInterface -I$(ASM)
|
|
||||||
#LDFLAG=
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDES?= -I../commonFiles -I../slsDetector -I ../MySocketTCP -I../usersFunctions -I../multiSlsDetector -I../slsDetectorAnalysis -I../slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include")
|
INCLUDES?= -I../commonFiles -I../slsDetector -I ../MySocketTCP -I../usersFunctions -I../multiSlsDetector -I../slsDetectorAnalysis -I../slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include")
|
||||||
|
DESTDIR ?= ../../bin
|
||||||
|
|
||||||
LIBDIR?=../
|
|
||||||
LIBS?= -L$(LIBDIR) -lSlsDetector
|
|
||||||
|
|
||||||
LDFLAG= -L/usr/lib64/ -pthread
|
|
||||||
|
|
||||||
|
|
||||||
DESTDIR ?= bin
|
|
||||||
DOCDIR ?= $(PWD)/docs
|
|
||||||
|
|
||||||
BIN=$(DESTDIR)
|
BIN=$(DESTDIR)
|
||||||
|
LIBS?= -L$(DESTDIR) -lSlsDetector
|
||||||
|
LIBRARYDIR?=../
|
||||||
|
LDFLAG= -L/usr/lib64/ -pthread
|
||||||
|
DOCDIR ?= $(PWD)/docs
|
||||||
SRC_CLNT=sls_detector_client.cpp
|
SRC_CLNT=sls_detector_client.cpp
|
||||||
|
|
||||||
clients: $(DESTDIR)/sls_detector_put $(DESTDIR)/sls_detector_get $(DESTDIR)/sls_detector_acquire $(DESTDIR)/sls_detector_help
|
|
||||||
echo $(LIBS)
|
|
||||||
|
|
||||||
static_clients: $(DESTDIR)/ssls_detector_put $(DESTDIR)/ssls_detector_get $(DESTDIR)/ssls_detector_acquire $(DESTDIR)/ssls_detector_help
|
$(info )
|
||||||
|
$(info #######################################)
|
||||||
|
$(info # In slsDetectorclient Makefile #)
|
||||||
|
$(info #######################################)
|
||||||
|
$(info )
|
||||||
|
|
||||||
all: clients
|
all: clients
|
||||||
echo $(LIBS)
|
|
||||||
|
|
||||||
nonstatic: clients
|
nonstatic: clients
|
||||||
|
|
||||||
|
clients: builddir lib $(DESTDIR)/sls_detector_put $(DESTDIR)/sls_detector_get $(DESTDIR)/sls_detector_acquire $(DESTDIR)/sls_detector_help
|
||||||
|
|
||||||
|
static_clients: builddir lib $(DESTDIR)/ssls_detector_put $(DESTDIR)/ssls_detector_get $(DESTDIR)/ssls_detector_acquire $(DESTDIR)/ssls_detector_help
|
||||||
|
|
||||||
|
builddir:
|
||||||
|
# echo $(LIBS)
|
||||||
|
# echo $(LDFLAG)
|
||||||
|
mkdir -p $(BIN)
|
||||||
|
|
||||||
lib:
|
lib:
|
||||||
cd ../ && $(MAKE) DESTDIR=$(LIBDIR)
|
# echo $(LIBDIR)
|
||||||
|
cd $(LIBRARYDIR) && $(MAKE) DESTDIR=$(DESTDIR) TABSPACE='$(TABSPACE)'
|
||||||
|
@echo ""
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo "# Back in slsDetectorClient Makefile #"
|
||||||
|
@echo "#######################################"
|
||||||
|
@echo ""
|
||||||
|
|
||||||
|
$(DESTDIR)/ssls_detector_put: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
|
$(call colorecho,"#######################################")
|
||||||
$(DESTDIR)/ssls_detector_put: $(SRC_CLNT) lib
|
$(call colorecho,"# Compiling ssls_detector_put #")
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
|
||||||
mkdir -p $(BIN)
|
|
||||||
$(CXX) -static -o $(BIN)/ssls_detector_put $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DPUT $(LIBS) $(LDFLAG)
|
$(CXX) -static -o $(BIN)/ssls_detector_put $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DPUT $(LIBS) $(LDFLAG)
|
||||||
|
|
||||||
$(DESTDIR)/ssls_detector_get: $(SRC_CLNT) lib
|
$(DESTDIR)/ssls_detector_get: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
$(call colorecho,"# Compiling ssls_detector_get #")
|
||||||
mkdir -p $(BIN)
|
$(call colorecho,"#######################################")
|
||||||
$(CXX) -static -o $(BIN)/ssls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG)
|
$(CXX) -static -o $(BIN)/ssls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG)
|
||||||
|
|
||||||
$(DESTDIR)/ssls_detector_acquire: $(SRC_CLNT) lib
|
$(DESTDIR)/ssls_detector_acquire: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
$(call colorecho,"# Compiling ssls_detector_acquire #")
|
||||||
mkdir -p $(BIN)
|
$(call colorecho,"#######################################")
|
||||||
$(CXX) -static -o $(BIN)/ssls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG)
|
$(CXX) -static -o $(BIN)/ssls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG)
|
||||||
|
|
||||||
$(DESTDIR)/ssls_detector_help: $(SRC_CLNT) lib
|
$(DESTDIR)/ssls_detector_help: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
$(call colorecho,"# Compiling ssls_detector_help #")
|
||||||
mkdir -p $(BIN)
|
$(call colorecho,"#######################################")
|
||||||
$(CXX) -static -o $(BIN)/ssls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG)
|
$(CXX) -static -o $(BIN)/ssls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$(DESTDIR)/sls_detector_put: $(SRC_CLNT) lib
|
$(DESTDIR)/sls_detector_put: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
$(call colorecho,"# Compiling sls_detector_put #")
|
||||||
mkdir -p $(BIN)
|
$(call colorecho,"#######################################")
|
||||||
$(CXX) -o $(BIN)/sls_detector_put $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DPUT $(LIBS) $(LDFLAG)
|
$(CXX) -o $(BIN)/sls_detector_put $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DPUT $(LIBS) $(LDFLAG)
|
||||||
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
||||||
|
|
||||||
$(DESTDIR)/sls_detector_get: $(SRC_CLNT) lib
|
$(DESTDIR)/sls_detector_get: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
$(call colorecho,"# Compiling sls_detector_get #")
|
||||||
mkdir -p $(BIN)
|
$(call colorecho,"#######################################")
|
||||||
$(CXX) -o $(BIN)/sls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG)
|
$(CXX) -o $(BIN)/sls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG)
|
||||||
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
||||||
|
|
||||||
$(DESTDIR)/sls_detector_acquire: $(SRC_CLNT) lib
|
$(DESTDIR)/sls_detector_acquire: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
$(call colorecho,"# Compiling sls_detector_acquire #")
|
||||||
mkdir -p $(BIN)
|
$(call colorecho,"#######################################")
|
||||||
$(CXX) -o $(BIN)/sls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG)
|
$(CXX) -o $(BIN)/sls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG)
|
||||||
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
||||||
|
|
||||||
$(DESTDIR)/sls_detector_help: $(SRC_CLNT) lib
|
$(DESTDIR)/sls_detector_help: $(SRC_CLNT) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
|
||||||
echo $(LIBS)
|
$(call colorecho,"#######################################")
|
||||||
echo $(LDFLAG)
|
$(call colorecho,"# Compiling sls_detector_help #")
|
||||||
mkdir -p $(BIN)
|
$(call colorecho,"#######################################")
|
||||||
$(CXX) -o $(BIN)/sls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG)
|
$(CXX) -o $(BIN)/sls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG)
|
||||||
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
||||||
|
|
||||||
@ -107,6 +109,3 @@ clean:
|
|||||||
|
|
||||||
install: clients
|
install: clients
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user