From f011485f52c8cd61a4c541fbdc3f69babf7a70dd Mon Sep 17 00:00:00 2001 From: gdd Date: Thu, 20 Jun 2013 15:59:53 +0000 Subject: [PATCH] Change some flags from CXX to CPP because they are defined as the pre processor flags --- src/DSC/DSC_Basic/Makefile.am | 2 +- src/DSC/DSC_User/Basic/Makefile.am | 2 +- src/DSC/DSC_User/Datastream/Calcium/Makefile.am | 4 ++-- src/DSC/DSC_User/Datastream/Makefile.am | 2 +- src/DSC/DSC_User/Datastream/Palm/Makefile.am | 4 ++-- src/DSC/DSC_User/Makefile.am | 2 +- src/DSC/ParallelDSC/Makefile.am | 2 +- src/ParallelContainer/Makefile.am | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/DSC/DSC_Basic/Makefile.am b/src/DSC/DSC_Basic/Makefile.am index 2f9c987fb..c69bf2871 100644 --- 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 97ebee20d..8a12b253e 100644 --- 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 1f87b2a13..cd87b30e6 100644 --- 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 8dfb985f1..93a818f19 100644 --- 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 6017235d0..e4a77a34c 100644 --- 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 d2f416ec6..cb72e24f5 100644 --- 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 891e533d9..4d228e13c 100644 --- 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 a1441d4a8..48ada2a17 100644 --- 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@ -- 2.39.2