Skip to content
Snippets Groups Projects
Commit 4ee25d70 authored by Tomasz's avatar Tomasz
Browse files

synch commit and some include naming adjustments

parent 9fb577c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 104 additions and 109 deletions
Makefile
+ 63
− 69
View file @ 4ee25d70
......@@ -10,44 +10,74 @@ OBJDIR = $(DOOCSROOT)/target/$(DOOCSARCH)/obj/server/$(SERVER_NAME)
SRCDIR = $(DOOCSROOT)/source/server/lbsync/$(SERVER_NAME)
#CSA doocs locations applications
SRCDIR_SERVER = ./src
INCLDIR_SERVER = ./include
# to define the arch dependend things
include $(DOOCSROOT)/target/$(DOOCSARCH)/CONFIG
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Consatt LIBRARY
CPPFLAGS += $(shell Consatt-config --cppflags)
LDLIBS += $(shell Consatt-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Consatt-Doocs LIBRARY
CPPFLAGS += $(shell Consatt-doocs-config --cppflags)
LDLIBS += $(shell Consatt-doocs-config --ldflags)
LDLIBS += $(shell Consatt-doocs-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Demac LIBRARY
CPPFLAGS += $(shell Demac-config --cppflags)
LDLIBS += $(shell Demac-config --ldflags)
LDLIBS += $(shell Demac-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Consatt Applications LIBRARY
CPPFLAGS += $(shell Consatt-apps-config --cppflags)
LDLIBS += $(shell Consatt-apps-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
CPPFLAGS += $(shell mtca4u-deviceaccess-config --cppflags)
LDLIBS += $(shell mtca4u-deviceaccess-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/deviceaccess/00.23.01/bin/mtca4u-deviceaccess-config --cppflags)
#LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/deviceaccess/00.23.01/bin/mtca4u-deviceaccess-config --ldflags)
CPPFLAGS += $(shell mtca4u-MotorDriverCard-config --cppflags)
LDLIBS += $(shell mtca4u-MotorDriverCard-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/motordrivercard/00.14.00/bin/mtca4u-MotorDriverCard-config --cppflags)
#LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/motordrivercard/00.14.00/bin/mtca4u-MotorDriverCard-config --ldflags)
#needed for <experimental/filesystem>
LDLIBS += -lstdc++fs
CPPFLAGS += $(shell tec-config --cppflags)
LDLIBS += $(shell tec-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libtec/01.02.00/bin/tec-config --cppflags)
#LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libtec/01.02.00/bin/tec-config --ldflags)
#CSA applications
SRCDIR_CSA_APP = ../csaApplications/src/linklock
INCLDIR_CSA_APP = ../csaApplications/include/linklock
LDLIBS += -Wl,-rpath=./
SRCDIR_CSA_MISC = ../csaApplications/src/misc
INCLDIR_CSA_MISC = ../csaApplications/include/misc
#needed for <experimental/filesystem>
LDLIBS += -lstdc++fs
#CSA doocs locations applications
SRCDIR_CSA_DOOCS_APP = ../csaApplications/doocs_src/linklock
INCLDIR_CSA_DOOCS_APP = ../csaApplications/doocs_include/linklock
SRCDIR_CSA_DOOCS_MISC = ../csaApplications/doocs_src/misc
INCLDIR_CSA_DOOCS_MISC = ../csaApplications/doocs_include/misc
# External includes
CPPFLAGS += -I$(INCLDIR_CSA_APP) -I$(INCLDIR_CSA_MISC) -I$(INCLDIR_CSA_DOOCS_APP) -I$(INCLDIR_CSA_DOOCS_MISC)
CPPFLAGS += -I$(INCLDIR_SERVER)
CPPFLAGS += -I/usr/include/c++/4.4/
# Disable some annoying warnings
......@@ -63,29 +93,17 @@ SER_VER_STR = '"'$(SER_VER)'"'
%.o:
@if [ -f $(SRCDIR)/$(*F).cc ] ; then \
echo ---------- compiling $(SRCDIR)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -o ${OBJDIR}/$(*F).o $(SRCDIR)/$(*F).cc ; \
@if [ -f $(SRCDIR)/$(*F).cc ] && [ "$(*F)" = "LinkLockGlobals" ] ; then \
echo ---------- compiling SRCDIR with D: $(SRCDIR)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -DSERVER_VERSION=$(SER_VER_STR) -o ${OBJDIR}/$(*F).o $(SRCDIR)/$(*F).cc ; \
chmod g+w ${OBJDIR}/$(*F).o ; \
elif [ -f $(SRCDIR_CSA_MISC)/$(*F).cc ] && [ "$(*F)" = "CsaServerInfo" ] ; then \
echo ---------- compiling $(SRCDIR_CSA_MISC)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -D SERVER_VERSION=$(SER_VER_STR) -o ${OBJDIR}/$(*F).o $(SRCDIR_CSA_MISC)/$(*F).cc ; \
chmod g+w ${OBJDIR}/$(*F).o ; \
elif [ -f $(SRCDIR_CSA_MISC)/$(*F).cc ] ; then \
echo ---------- compiling $(SRCDIR_CSA_MISC)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -o ${OBJDIR}/$(*F).o $(SRCDIR_CSA_MISC)/$(*F).cc ; \
chmod g+w ${OBJDIR}/$(*F).o ; \
elif [ -f $(SRCDIR_CSA_APP)/$(*F).cc ] ; then \
echo ---------- compiling $(SRCDIR_CSA_APP)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -o ${OBJDIR}/$(*F).o $(SRCDIR_CSA_APP)/$(*F).cc ; \
chmod g+w ${OBJDIR}/$(*F).o ; \
elif [ -f $(SRCDIR_CSA_DOOCS_APP)/$(*F).cc ] ; then \
echo ---------- compiling $(SRCDIR_CSA_DOOCS_APP)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -o ${OBJDIR}/$(*F).o $(SRCDIR_CSA_DOOCS_APP)/$(*F).cc ; \
elif [ -f $(SRCDIR)/$(*F).cc ] ; then \
echo ---------- compiling SRCDIR: $(SRCDIR)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -o ${OBJDIR}/$(*F).o $(SRCDIR)/$(*F).cc ; \
chmod g+w ${OBJDIR}/$(*F).o ; \
elif [ -f $(SRCDIR_CSA_DOOCS_MISC)/$(*F).cc ] ; then \
echo ---------- compiling $(SRCDIR_CSA_DOOCS_MISC)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -o ${OBJDIR}/$(*F).o $(SRCDIR_CSA_DOOCS_MISC)/$(*F).cc ; \
elif [ -f $(SRCDIR_SERVER)/$(*F).cc ] ; then \
echo ---------- compiling SRCDIR_SERVER: $(SRCDIR_SERVER)/$(*F).cc ------------ ; \
$(CC) $(CPPFLAGS) $(CCFLAGS) -c -o ${OBJDIR}/$(*F).o $(SRCDIR_SERVER)/$(*F).cc ; \
chmod g+w ${OBJDIR}/$(*F).o ; \
else \
echo ---------- problem with rule for compiling $(SRCDIR)/$(*F) ------------ ; \
......@@ -93,31 +111,14 @@ SER_VER_STR = '"'$(SER_VER)'"'
fi
SOURCEOBJ = \
$(OBJDIR)/CsaServerInfo.o \
$(OBJDIR)/GenericUtils.o \
$(OBJDIR)/DoocsHelper.o \
$(OBJDIR)/linklock_rpc_server.o \
$(OBJDIR)/LinkLockGlobals.o \
$(OBJDIR)/CsaLinkLock.o \
$(OBJDIR)/CsaLSynchFmc20.o \
$(OBJDIR)/CsaLllDataHub.o \
$(OBJDIR)/CsaLinkLockCtrlChannel.o \
$(OBJDIR)/CsaLinkLockCtrlChannelVhdl.o \
$(OBJDIR)/CsaLinkLockCtrlChannelRapidX.o \
$(OBJDIR)/CsaLinkLockCtrlFMC25.o \
$(OBJDIR)/CsaLinkLockCtrlFMC25RapidX.o \
$(OBJDIR)/CsaLinkLockCtrlFMC25Vhdl.o \
$(OBJDIR)/EqLinkLockServer.o \
$(OBJDIR)/EqCsaLSynchFmc20.o \
$(OBJDIR)/EqLllDataHubServer.o \
$(OBJDIR)/EqLinkLockCtrlFMC25RapidXServer.o \
$(OBJDIR)/EqLinkLockCtrlFMC25VhdlServer.o \
$(OBJDIR)/ExternalStatusValidator.o \
$(OBJDIR)/LinkLockStatusValidator.o \
$(OBJDIR)/LinkLockUnlockEventDataStoreQueue.o \
$(OBJDIR)/LinkLockUnlockEventDataFileWriter.o \
$(OBJDIR)/CsaLinkLockStatusValidator.o \
$(OBJDIR)/LinkCalibrationAlgorithms.o \
$(OBJDIR)/EqLinkLockStatusServer.o
......@@ -133,17 +134,14 @@ all: $(OBJDIR)/$(SERVER_NAME)_server
$(OBJDIR)/.depend:
@if [ ! -f $(OBJDIR) ] ; then \
echo ---------- create dir $(OBJDIR) --------------; \
echo ---------- This is Makefie_rpath.make : create dir $(OBJDIR) --------------; \
mkdir -p $(OBJDIR) ; \
fi
for i in $(SRCDIR)/*.cc ;do $(CCDEP) $$i ;done > $(OBJDIR)/.depend_temp
for i in $(SRCDIR_CSA_APP)/*.cc ;do $(CCDEP) $$i ;done > $(OBJDIR)/.depend_temp
for i in $(SRCDIR_CSA_MISC)/*.cc ;do $(CCDEP) $$i ;done > $(OBJDIR)/.depend_temp
for i in $(SRCDIR_CSA_DOOCS_APP)/*.cc ;do $(CCDEP) $$i ;done > $(OBJDIR)/.depend_temp
for i in $(SRCDIR_CSA_DOOCS_MISC)/*.cc ;do $(CCDEP) $$i ;done > $(OBJDIR)/.depend_temp
for i in $(SRCDIR_SERVER)/*.cc ;do $(CCDEP) $$i ;done > $(OBJDIR)/.depend_temp
cat $(OBJDIR)/.depend_temp | sed -e "/:/s/^/\$$\(OBJDIR\)\//g" > $(OBJDIR)/.depend
chmod g+w $(OBJDIR)/.depend*
@echo "---------------- $(OBJDIR)/$(SERVER_NAME)_server dependency building done---------------\n"
@echo "---- This is Makefie_rpath.make : $(OBJDIR)/$(SERVER_NAME)_server dependency building done---------------\n"
include $(OBJDIR)/.depend
......@@ -151,18 +149,13 @@ include $(OBJDIR)/.depend
$(OBJDIR)/$(SERVER_NAME)_server: $(SOURCEOBJ)
@echo Argument is $(argument)
@if [ -z $(argument) ] ; then \
echo ---------- No Argument --------------; \
echo --This is Makefie_rpath.make : No Argument --------------; \
$(LINK.cc) -o $(OBJDIR)/$(SERVER_NAME)_server $(SOURCEOBJ) \
-lEqServer -lDOOCSapi -lDOOCSdapi $(LDLIBS) $(ControlSystemAttacher_LIB_FLAGS) $(DeviceModules_LIB_FLAGS) \
$(MtcaMappedDevice_LIB_FLAGS) $(MtcaMappedDevice_RUNPATH_FLAGS) ; \
elif [ $(argument) = "RPATH" ] ; then \
echo ---------- BUILD WITH RPATH --------------; \
g++ -DDMSG -D_REENTRANT -Wall -Wextra -O2 -g -fPIC -Wno-reorder -Wno-write-strings -Wno-unused-parameter -DLINUX -D__LINUX__ -DDMSG -I/home/tkozak/.netbeans/remote/doocsdev12.desy.de/mskpcx17625-Windows-x86/D/GIT_KRAKEN/doocs.git/source/server/lbsync/DoocsLbSynchTest -I/home/tkozak/.netbeans/remote/doocsdev12.desy.de/mskpcx17625-Windows-x86/D/GIT_KRAKEN/doocs.git/target/Ubuntu-12.04-x86_64/obj/server/DoocsLbSynchTest -I/home/tkozak/.netbeans/remote/doocsdev12.desy.de/mskpcx17625-Windows-x86/D/GIT_KRAKEN/doocs.git/Ubuntu-12.04-x86_64/lib/include -I/local/lib/include -DHOST="flashlxuser2" -DSERVER_PROGRAMMER="tkozak" -DPCIEBUS -DNINE_MHZ=9.02778 -I/home/tkozak/doocs.git/source/library/lbsync/libCsa/core/include -I/home/tkozak/doocs.git/source/library/lbsync/libCsa/backend_doocs/include -I/home/tkozak/doocs.git/source/library/lbsync/libCsa/backend_empty/include -I/home/tkozak/doocs.git/source/library/lbsync/libDevMod/core/include -I/home/tkozak/doocs.git/source/library/lbsync/libDevMod/modules/include -I/home/tkozak/doocs.git/source/library/lbsync/libDevMod/utils/include -I/home/tkozak/doocs.git/source/library/common/tec -DFUSION_MAX_MAP_SIZE=30 -DFUSION_MAX_VECTOR_SIZE=30 -std=c++0x -I/usr/include -I/usr/include -I/usr/include -I../csaApplications/DemoCsaAppSourceCode -I../csaApplications/CsaLaserLock -I../csaApplications/CsaLinkLock -I../csaApplications/CsaLSynchFmc20 -I../csaApplications/CsaLaserLockCtrlSIS8300L -I/usr/include/c++/4.4/ -Wno-reorder -Wno-write-strings -Wno-unused-parameter -std=c++0x -L/home/tkozak/.netbeans/remote/doocsdev12.desy.de/mskpcx17625-Windows-x86/D/GIT_KRAKEN/doocs.git/Ubuntu-12.04-x86_64/lib -o $(OBJDIR)/$(SERVER_NAME)_server $(SOURCEOBJ) \
$(ControlSystemAttacher_LIB_FLAGS_RPATH) $(DeviceModules_LIB_FLAGS_RPATH) $(LDLIBS) \
$(MtcaMappedDevice_LIB_FLAGS) $(MtcaMappedDevice_RUNPATH_FLAGS) -L/local/lib -lEqServer -lDOOCSapi -lDOOCSdapi; \
-lEqServer -lDOOCSapi -lDOOCSdapi $(LDLIBS) ; \
else \
echo --This is Makefie_rpath.make : else --------------; \
$(LINK.cc) -o $(OBJDIR)/$(SERVER_NAME)_server $(SOURCEOBJ) \
-lEqServer -lDOOCSapi -lDOOCSdapi $(LDLIBS) $(ControlSystemAttacher_LIB_FLAGS) $(DeviceModules_LIB_FLAGS) \
-lEqServer -lDOOCSapi -lDOOCSdapi $(LDLIBS) \
$(MtcaMappedDevice_LIB_FLAGS) $(MtcaMappedDevice_RUNPATH_FLAGS) ; \
fi
@chmod g+w $(OBJDIR)/$(SERVER_NAME)_server
......@@ -171,9 +164,10 @@ $(OBJDIR)/$(SERVER_NAME)_server: $(SOURCEOBJ)
clean:
rm -f $(SOURCEOBJ) $(OBJDIR)/$(SERVER_NAME)_server $(OBJDIR)/.depend*
rm -rf $(SOURCEOBJ) $(OBJDIR)/$(SERVER_NAME)_server $(OBJDIR)/.depend*
rm -rf $(OBJDIR)/SunWS_cache
rm -rf $(SRCDIR)/SunWS_cache
@echo "--This is Makefie_rpath.make : Clean project --------------"
update:
cvs update
......
Makefile_rpath.make
+ 33
− 32
View file @ 4ee25d70
......@@ -19,51 +19,52 @@ include $(DOOCSROOT)/target/$(DOOCSARCH)/CONFIG
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Consatt LIBRARY
#CPPFLAGS += $(shell Consatt-config --cppflags)
#LDLIBS += $(shell Consatt-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt/00.05.00/bin/Consatt-config --cppflags)
#LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt/00.05.00/bin/Consatt-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt/00.05.00/bin/Consatt-config --cppflags)
LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt/00.05.00/bin/Consatt-config --ldflags)
## DIFFERENT PATH FOR Consatt-Doocs LIBRARY
#CPPFLAGS += $(shell Consatt-doocs-config --cppflags)
#LDLIBS += $(shell Consatt-doocs-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.04.00/bin/Consatt-doocs-config --cppflags)
LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.04.00/bin/Consatt-doocs-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.04.00/bin/Consatt-doocs-config --cppflags)
#LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.04.00/bin/Consatt-doocs-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Consatt-Doocs LIBRARY
#CPPFLAGS += $(shell Consatt-doocs-config --cppflags)
#LDLIBS += $(shell Consatt-doocs-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.03.00/bin/Consatt-doocs-config --cppflags)
#LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.03.00/bin/Consatt-doocs-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.03.00/bin/Consatt-doocs-config --cppflags)
LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt-Doocs/00.03.00/bin/Consatt-doocs-config --ldflags)
## DIFFERENT PATH FOR Consatt Applications LIBRARY
#CPPFLAGS += $(shell Consatt-apps-config --cppflags)
#LDLIBS += $(shell Consatt-apps-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsattApp/00.02.00/bin/Consatt-apps-config --cppflags)
LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsattApp/00.02.00/bin/Consatt-apps-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsattApp/00.02.00/bin/Consatt-apps-config --cppflags)
#LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsattApp/00.02.00/bin/Consatt-apps-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Demac LIBRARY
#CPPFLAGS += $(shell Demac-config --cppflags)
#LDLIBS += $(shell Demac-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libDemac/00.04.00/bin/Demac-config --cppflags)
#LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libDemac/00.04.00/bin/Demac-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libDemac/00.04.00/bin/Demac-config --cppflags)
LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libDemac/00.04.00/bin/Demac-config --ldflags)
## DIFFERENT PATH FOR Consatt LIBRARY
#CPPFLAGS += $(shell Consatt-config --cppflags)
#LDLIBS += $(shell Consatt-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt/00.06.00/bin/Consatt-config --cppflags)
LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsatt/00.06.00/bin/Consatt-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt/00.06.00/bin/Consatt-config --cppflags)
#LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsatt/00.06.00/bin/Consatt-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## DIFFERENT PATH FOR Consatt Applications LIBRARY
#CPPFLAGS += $(shell ConsattApp-config --cppflags)
#LDLIBS += $(shell ConsattApp-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsattApp/00.01.00/bin/ConsattApp-config --cppflags)
#LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libConsattApp/00.01.00/bin/ConsattApp-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsattApp/00.01.00/bin/ConsattApp-config --cppflags)
LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libConsattApp/00.01.00/bin/ConsattApp-config --ldflags)
## DIFFERENT PATH FOR Demac LIBRARY
#CPPFLAGS += $(shell Demac-config --cppflags)
#LDLIBS += $(shell Demac-config --ldflags)
CPPFLAGS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libDemac/00.05.00/bin/Demac-config --cppflags)
LDLIBS += $(shell /home/tkozak/doocs.git/install/Ubuntu-16.04-x86_64/library/libDemac/00.05.00/bin/Demac-config --ldflags)
#CPPFLAGS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libDemac/00.05.00/bin/Demac-config --cppflags)
#LDLIBS += $(shell /home/tkozak/LIB_STABLE/20180330_1130/Ubuntu-16.04-x86_64/library/libDemac/00.05.00/bin/Demac-config --ldflags)
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
## !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
......@@ -106,8 +107,8 @@ CPPFLAGS += -I/usr/include/c++/4.4/
CPPFLAGS += -Wno-reorder -Wno-write-strings -Wno-unused-parameter
CCFLAGS += -Wno-reorder -Wno-write-strings -Wno-unused-parameter
#CPPFLAGS += -std=c++0x -pg
CPPFLAGS += -std=c++0x -O2
#CPPFLAGS += -pg -O2
SER_VER := $(shell cat VERSION)
......
VERSION
+ 1
− 1
View file @ 4ee25d70
01.04.00-alpha
01.05.00-alpha
include/DoocsHelper.h
+ 1
− 1
View file @ 4ee25d70
......@@ -21,7 +21,7 @@
#include "ConsattApp/LogFileWorker.h"
#include "Consatt-apps/LogFileWorker.h"
class DoocsHelper {
private:
......
include/EqCsaLSynchFmc20.h
+ 1
− 1
View file @ 4ee25d70
......@@ -13,7 +13,7 @@
#include "eq_client.h"
#include "DoocsHelper.h"
#include "ConsattApp/CsaLSynchFmc20.h"
#include "Consatt-apps/CsaLSynchFmc20.h"
#include "Consatt-doocs/Doocs_CsaAdapter.h"
......
include/EqLinkLockCtrlFMC25RapidXServer.h
+ 1
− 1
View file @ 4ee25d70
......@@ -15,7 +15,7 @@
#include "DoocsHelper.h"
#include "ConsattApp/CsaLinkLockCtrlFMC25RapidX.h"
#include "Consatt-apps/CsaLinkLockCtrlFMC25RapidX.h"
#include "Consatt-doocs/Doocs_CsaAdapter.h"
......
include/EqLinkLockServer.h
+ 1
− 1
View file @ 4ee25d70
......@@ -14,7 +14,7 @@
#include "eq_client.h"
#include "ConsattApp/CsaLinkLock.h"
#include "Consatt-apps/CsaLinkLock.h"
#include "Consatt-doocs/Doocs_CsaAdapter.h"
#include "DoocsHelper.h"
......
include/EqLinkLockStatusServer.h
+ 1
− 1
View file @ 4ee25d70
......@@ -14,7 +14,7 @@
#include "eq_client.h"
#include "ConsattApp/CsaLinkLockStatusValidator.h"
#include "Consatt-apps/CsaLinkLockStatusValidator.h"
#include "Consatt-doocs/Doocs_CsaAdapter.h"
#include "DoocsHelper.h"
......
include/EqLllDataHubServer.h
+ 1
− 1
View file @ 4ee25d70
......@@ -14,7 +14,7 @@
#include "eq_client.h"
#include "ConsattApp/CsaLllDataHub.h"
#include "Consatt-apps/CsaLllDataHub.h"
#include "Consatt-doocs/Doocs_CsaAdapter.h"
......
src/EqLinkLockCtrlFMC25VhdlServer.cc
+ 1
− 1
View file @ 4ee25d70
#include "EqLinkLockCtrlFMC25VhdlServer.h"
#include "ConsattApp/CsaLinkLockCtrlFMC25Vhdl.h"
#include "Consatt-apps/CsaLinkLockCtrlFMC25Vhdl.h"
#include <chrono>
int EqLinkLockCtrlFMC25VhdlServer::fct_code() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use