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 7a348f54646abc772adc1a275e21ab5ee968acd2..0403e79f9422e96976bea0095b1c3be9a7d97e1f 100644 (file)
--- 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 4b3dd4bc53e0cc4edaa597a164e8b929525fc41b..9524a106441899c2ad93d8a4e49f1b1bbd72b58b 100644 (file)
--- 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 1c2b5d2a5b94d72a44be271e36b330b32544c2fa..71a2e0132907f0eb8611ac12c3cc61f8fae3bc88 100644 (file)
--- 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