Change some flags from CXX to CPP because they are defined as the pre processor flags

diff --git a/src/DSC/DSC_Basic/Makefile.am b/src/DSC/DSC_Basic/Makefile.am
index 2f9c987fb9b0dac3c4fdb97012d1ea6d3232dc78..c69bf2871011a50a17f61861dcf4173d6e2f6a6a 100644 (file)
--- a/src/DSC/DSC_Basic/Makefile.am
+++ b/src/DSC/DSC_Basic/Makefile.am
@@ -70,7 +70,7 @@ libSalomeDSCContainer_la_SOURCES  = DSC_i.cxx \
                                    DSC_interface.cxx \
                                    PortProperties_i.cxx
 
-libSalomeDSCContainer_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libSalomeDSCContainer_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomeDSCContainer_la_LIBADD   = $(COMMON_LIBS)
 

diff --git a/src/DSC/DSC_User/Basic/Makefile.am b/src/DSC/DSC_User/Basic/Makefile.am
index 97ebee20d522800bd0ce9d793d728fe66acc9f9e..8a12b253ec559bff3173a9dd11a68e0b83c7bbb7 100644 (file)
--- a/src/DSC/DSC_User/Basic/Makefile.am
+++ b/src/DSC/DSC_User/Basic/Makefile.am
@@ -69,7 +69,7 @@ libSalomeDSCSupervBasic_la_SOURCES  = basic_port_factory.cxx \
                                      data_short_port_uses.cxx \
                                      data_short_port_provides.cxx 
 
-libSalomeDSCSupervBasic_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libSalomeDSCSupervBasic_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomeDSCSupervBasic_la_LDFLAGS  = -no-undefined -version-info=0:0:0
 libSalomeDSCSupervBasic_la_LIBADD  = ../libSalomeDSCSuperv.la

diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
index 1f87b2a13a30669c3b663830cffce3cf456d1666..cd87b30e6f0ffb97d0a98114bdf49be62163e5fb 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
+++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
@@ -118,7 +118,7 @@ libSalomeCalcium_la_SOURCES  = calcium_port_factory.cxx \
                               Calcium.cxx \
                               calcium_destructors_port_uses.cxx
 
-libSalomeCalcium_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libSalomeCalcium_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomeCalcium_la_LDFLAGS  = -no-undefined -version-info=0:0:0
 
@@ -139,7 +139,7 @@ noinst_PROGRAMS              = test_DataIdContainer
 
 test_DataIdContainer_SOURCES = test_DataIdContainer.cxx 
 
-test_DataIdContainer_CXXFLAGS = $(COMMON_CPPFLAGS)
+test_DataIdContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 test_DataIdContainer_LDADD   = libSalomeCalcium.la \
                               $(top_builddir)/src/Utils/libOpUtil.la \

diff --git a/src/DSC/DSC_User/Datastream/Makefile.am b/src/DSC/DSC_User/Datastream/Makefile.am
index 8dfb985f160b9c8de6063a3a2a26f249204d11a6..93a818f1930507b89db609cbdc13f4ed893fda98 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Makefile.am
+++ b/src/DSC/DSC_User/Datastream/Makefile.am
@@ -69,7 +69,7 @@ lib_LTLIBRARIES = libSalomeDatastream.la
 
 libSalomeDatastream_la_SOURCES        = fake.cc
 
-libSalomeDatastream_la_CXXFLAGS       = $(COMMON_CPPFLAGS)
+libSalomeDatastream_la_CPPFLAGS       = $(COMMON_CPPFLAGS)
 
 libSalomeDatastream_la_LIBADD         = $(COMMON_LIBS)
 

diff --git a/src/DSC/DSC_User/Datastream/Palm/Makefile.am b/src/DSC/DSC_User/Datastream/Palm/Makefile.am
index 6017235d0a22d44768ce36229a13408aba38663b..e4a77a34cf2273ba8aa42a2841653c677d427f21 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Palm/Makefile.am
+++ b/src/DSC/DSC_User/Datastream/Palm/Makefile.am
@@ -68,7 +68,7 @@ noinst_LTLIBRARIES = libSalomePalm.la
 
 libSalomePalm_la_SOURCES  = palm_port_factory.cxx 
 
-libSalomePalm_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libSalomePalm_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomePalm_la_LDFLAGS  = -no-undefined -version-info=0:0:0
 
@@ -81,7 +81,7 @@ noinst_PROGRAMS              = test_DataIdContainer
 
 test_DataIdContainer_SOURCES = test_DataIdContainer.cxx
 
-test_DataIdContainer_CXXFLAGS = $(COMMON_CPPFLAGS)
+test_DataIdContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 test_DataIdContainer_LDFLAGS = $(COMMON_LIBS)
 

diff --git a/src/DSC/DSC_User/Makefile.am b/src/DSC/DSC_User/Makefile.am
index d2f416ec65e81bcd6cb3a1b6367a2f045f6027c4..cb72e24f5ec2bce4c5dc5f83c285a1736da594c5 100644 (file)
--- a/src/DSC/DSC_User/Makefile.am
+++ b/src/DSC/DSC_User/Makefile.am
@@ -73,7 +73,7 @@ libSalomeDSCSuperv_la_SOURCES  = base_port.cxx \
                                 provides_port.cxx \
                                 Superv_Component_i.cxx
 
-libSalomeDSCSuperv_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libSalomeDSCSuperv_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomeDSCSuperv_la_LDFLAGS  = -no-undefined -version-info=0:0:0
 libSalomeDSCSuperv_la_LIBADD  = ../DSC_Basic/libSalomeDSCContainer.la

diff --git a/src/DSC/ParallelDSC/Makefile.am b/src/DSC/ParallelDSC/Makefile.am
index 891e533d99a6b7aa8c58ec9eeb80b6e0ee8c4050..4d228e13cb7f1c7235a19dc475c9ae7e7249cccf 100644 (file)
--- a/src/DSC/ParallelDSC/Makefile.am
+++ b/src/DSC/ParallelDSC/Makefile.am
@@ -69,7 +69,7 @@ libSalomeParallelDSCContainer_la_SOURCES  = ParallelDSC_i.cxx \
                                            Param_Double_Port_provides_i.cxx \
                                            Param_Double_Port_uses_i.cxx
 
-libSalomeParallelDSCContainer_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libSalomeParallelDSCContainer_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomeParallelDSCContainer_la_LIBADD   = $(COMMON_LIBS)
 

diff --git a/src/ParallelContainer/Makefile.am b/src/ParallelContainer/Makefile.am
index a1441d4a8e286b04b43b9d46dd41f076ee5554d6..48ada2a17bf9d5c8965baf4884d286c712bdf4b3 100644 (file)
--- a/src/ParallelContainer/Makefile.am
+++ b/src/ParallelContainer/Makefile.am
@@ -87,7 +87,7 @@ libSalomeParallelContainer_la_SOURCES  = SALOME_ParallelComponent_i.cxx \
                                         Parallel_Salome_file_i.cxx \
                                         SALOME_ParallelGlobalProcessVar_i.cxx
 
-libSalomeParallelContainer_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libSalomeParallelContainer_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomeParallelContainer_la_LIBADD   = $(COMMON_LIBS) @MPI_LIBS@