From: vsr <vsr@opencascade.com>
Date: Thu, 13 Aug 2009 05:38:18 +0000 (+0000)
Subject: Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined
X-Git-Tag: V5_1_main_FINAL~369
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8bf966c79dee7949487a34548c184b20b98e5308;p=tools%2Fmedcoupling.git

Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined
---

diff --git a/src/INTERP_KERNEL/Makefile.am b/src/INTERP_KERNEL/Makefile.am
index 7a348f546..0403e79f9 100644
--- a/src/INTERP_KERNEL/Makefile.am
+++ b/src/INTERP_KERNEL/Makefile.am
@@ -125,5 +125,5 @@ libinterpkernel_la_LDFLAGS=
 # the geom2D library is included in the interpkernel one
 libinterpkernel_la_LIBADD= ./Geometric2D/libInterpGeometric2DAlg.la Bases/libinterpkernelbases.la
 
-AM_CPPFLAGS= $(libinterpkernel_la_CPPFLAGS)
+AM_CPPFLAGS += $(libinterpkernel_la_CPPFLAGS)
 LDADD= $(libinterpkernel_la_LDFLAGS)
diff --git a/src/MEDCoupling/Makefile.am b/src/MEDCoupling/Makefile.am
index 4b3dd4bc5..9524a1064 100644
--- a/src/MEDCoupling/Makefile.am
+++ b/src/MEDCoupling/Makefile.am
@@ -52,7 +52,7 @@ libmedcoupling_la_CPPFLAGS=  @CXXTMPDPTHFLAGS@ \
 # the geom2D library is included in the interpkernel one
 libmedcoupling_la_LIBADD= ../INTERP_KERNEL/libinterpkernel.la
 
-AM_CPPFLAGS= $(libinterpkernel_la_CPPFLAGS)
+AM_CPPFLAGS += $(libinterpkernel_la_CPPFLAGS)
 LDADD= $(libinterpkernel_la_LDFLAGS)
 if MED_ENABLE_KERNEL
      LDADD+=-lSALOMEBasics
diff --git a/src/ParaMEDMEM/Test/Makefile.am b/src/ParaMEDMEM/Test/Makefile.am
index 1c2b5d2a5..71a2e0132 100644
--- a/src/ParaMEDMEM/Test/Makefile.am
+++ b/src/ParaMEDMEM/Test/Makefile.am
@@ -99,6 +99,6 @@ if MED_ENABLE_FVM
 	libParaMEDMEMTest_la_LDFLAGS += $(FVM_LIBS)
 endif
 
-AM_CPPFLAGS = $(libParaMEDMEMTest_la_CPPFLAGS)
+AM_CPPFLAGS += $(libParaMEDMEMTest_la_CPPFLAGS)
 
 UNIT_TEST_PROG = TestParaMEDMEM