From bcb25400e433e46888eb69aab123b6dba6185cf7 Mon Sep 17 00:00:00 2001 From: aschwinn <al.schwinn@gsi.de> Date: Thu, 15 Sep 2016 10:24:50 +0200 Subject: [PATCH] fixed makefile paths for asl744 installation --- silecs-communication-cpp/Makefile | 9 +++++++-- silecs-diagnostic-cpp/Makefile | 5 +++++ silecs-diagnostic-cpp/Makefile.dep | 8 ++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/silecs-communication-cpp/Makefile b/silecs-communication-cpp/Makefile index 186f2ec..9e64056 100644 --- a/silecs-communication-cpp/Makefile +++ b/silecs-communication-cpp/Makefile @@ -18,8 +18,13 @@ PRODUCT = communication VERSION = 1.0.4 SKIP_MANIFEST = TRUE -COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles -#COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20 + +#local +#COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles +#old cluster +COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20 +#new cluster +#COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0 # product configuration LIB_NAME = comm diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile index 14f2f7a..7a63c24 100644 --- a/silecs-diagnostic-cpp/Makefile +++ b/silecs-diagnostic-cpp/Makefile @@ -18,8 +18,13 @@ PRODUCT = diagnostic VERSION = 1.0.2 SKIP_MANIFEST = TRUE + +#local #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles +#old cluster COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20 +#new cluster +#COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0 # product configuration BIN_NAME = $(PROJECT)-$(PRODUCT) diff --git a/silecs-diagnostic-cpp/Makefile.dep b/silecs-diagnostic-cpp/Makefile.dep index 1041b87..70ecd1f 100644 --- a/silecs-diagnostic-cpp/Makefile.dep +++ b/silecs-diagnostic-cpp/Makefile.dep @@ -5,11 +5,15 @@ SILECS_COMM_VERSION = 1.0.2 BOOST_HOME ?= /acc/local/$(CPU)/3rdparty/boost/$(BOOST_VERSION) RBACK_HOME ?= /acc/local/$(CPU)/cmw/cmw-rbac/$(RBAC_VERSION) -SILECS_COMM_HOME ?= ../../git/silecs-communication-cpp/build +#for compile out of eclipse +#SILECS_COMM_HOME ?= ../../git/silecs-communication-cpp/build +SILECS_COMM_HOME ?= ../silecs-communication-cpp/build LIBXML_PATH ?= /usr/include/libxml2/ -SNAP7_BASE ?= ../../git/snap7/snap7-full +#for compile out of eclipse +#SNAP7_BASE ?= ../../git/snap7/snap7-full +SNAP7_BASE ?= ../snap7/snap7-full DEPENDENT_COMPILER_OPTIONS += -I$(RBACK_HOME)/include DEPENDENT_COMPILER_OPTIONS += -I$(SILECS_COMM_HOME)/include -- GitLab