Merge remote-tracking branch 'origin/gsi-1.0.x' into gsi-1.0.x_centOS7

Conflicts:
	silecs-communication-cpp/Makefile
	silecs-diagnostic-cpp/Makefile

silecs-communication-cpp/Makefile

@@ -18,7 +18,9 @@ PRODUCT = communication
 VERSION = 1.0.4
 
 SKIP_MANIFEST = TRUE
+#local
 #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
+#global
 COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
 
 # product configuration

silecs-diagnostic-cpp/Makefile

@@ -18,7 +18,9 @@ PRODUCT = diagnostic
 VERSION = 1.0.2
 
 SKIP_MANIFEST = TRUE
+#local
 #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
+#global
 COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
 
 # product configuration

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