PR: binaries generation : remove duplicate rules

diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in
index 66d7c404c941866ccab26d6cbec602c3fd2f81dd..1ed861ed014cb06824dccabd9b1f2570993797c3 100644 (file)
--- a/src/Container/Makefile.in
+++ b/src/Container/Makefile.in
@@ -60,6 +60,6 @@ LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSA
 
 LIBS += @LDEXPDYNFLAGS@ $(PYTHON_LIBS) $(MPI_LIBS)
 
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
-LIBSFORBIN+= $(LIBS)
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
+LIBSFORBIN= $(LIBS)
 @CONCLUDE@

diff --git a/src/DataTypeCatalog/Makefile.in b/src/DataTypeCatalog/Makefile.in
index b9c606aec872f7a30b223675ec540cdab41534e0..7ba1a085f17d6cb7bd6f98add0a20812a3f3762f 100644 (file)
--- a/src/DataTypeCatalog/Makefile.in
+++ b/src/DataTypeCatalog/Makefile.in
@@ -55,6 +55,6 @@ BIN_SERVER_IDL = SALOME_DataTypeCatalog.idl
 CPPFLAGS+= $(QT_MT_INCLUDES) 
 CXXFLAGS+= 
 LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 
 @CONCLUDE@

diff --git a/src/LifeCycleCORBA/Makefile.in b/src/LifeCycleCORBA/Makefile.in
index 9ff8006da829d73b6f191f468af8cf82da6b8e25..64daf70e88ce3d675a31478afc25be604fda4df9 100644 (file)
--- a/src/LifeCycleCORBA/Makefile.in
+++ b/src/LifeCycleCORBA/Makefile.in
@@ -54,7 +54,7 @@ BIN_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \
 CPPFLAGS += $(QT_MT_INCLUDES)
 
 LDFLAGS += -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSalomeContainer -lSalomeResourcesManager
-LDFLAGSFORBIN+= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMETraceCollector
 
 @CONCLUDE@
 

diff --git a/src/Loader/Makefile.in b/src/Loader/Makefile.in
index a3e6b4cada96729e37510a0dc734ea9f522dd25c..7660e9882a495e18426b14c3fb94c03b348a147d 100644 (file)
--- a/src/Loader/Makefile.in
+++ b/src/Loader/Makefile.in
@@ -32,7 +32,7 @@ BIN_CLIENT_IDL = SALOME_Session.idl \
 CPPFLAGS+=$(QT_MT_INCLUDES)
 CXXFLAGS+=$(OCC_CXXFLAGS)
 LDFLAGS+=$(QT_MT_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace 
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 
 
 @CONCLUDE@

diff --git a/src/MEDWrapper/Factory/Makefile.in b/src/MEDWrapper/Factory/Makefile.in
index f554a6ff483615d3531625c0f898d2ead4e0392a..2b1b97d4fb18607110221c044adb48714d695248 100644 (file)
--- a/src/MEDWrapper/Factory/Makefile.in
+++ b/src/MEDWrapper/Factory/Makefile.in
@@ -51,6 +51,6 @@ CPPFLAGS+= $(BOOST_CPPFLAGS) $(MED2_INCLUDES)
 
 LDFLAGS+= -lMEDWrapper_V2_2 -lMEDWrapper_V2_1
 
-LDFLAGSFORBIN+=$(LDFLAGS) -lMEDWrapperBase
+LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapperBase
 
 @CONCLUDE@

diff --git a/src/MEDWrapper/V2_1/Makefile.in b/src/MEDWrapper/V2_1/Makefile.in
index 9bcd49c6eafe9220c2700bcc13d486554dbfdd37..1cadac2ba71075d0efb69d0389c23e6ecf428499 100644 (file)
--- a/src/MEDWrapper/V2_1/Makefile.in
+++ b/src/MEDWrapper/V2_1/Makefile.in
@@ -163,6 +163,6 @@ CPPFLAGS+= $(BOOST_CPPFLAGS) $(HDF5_INCLUDES) -DPCLINUX
 
 LDFLAGS+= $(HDF5_LIBS) -lMEDWrapperBase
 
-LDFLAGSFORBIN+=$(LDFLAGS)
+LDFLAGSFORBIN=$(LDFLAGS)
 
 @CONCLUDE@

diff --git a/src/MSG2QM/Makefile.in b/src/MSG2QM/Makefile.in
index c8d9bb37988411123c5911ee5ae5dbf413f5879d..a77f47893ca5f5e97e679ebe12db4b5fa85de7c8 100644 (file)
--- a/src/MSG2QM/Makefile.in
+++ b/src/MSG2QM/Makefile.in
@@ -38,6 +38,6 @@ BIN_SRC       =
 CPPFLAGS+=$(QT_INCLUDES) $(OGL_INCLUDES)
 LDFLAGS+=$(QT_MT_LIBS) $(OGL_LIBS)
 
-LDFLAGSFORBIN+=$(LDFLAGS)
+LDFLAGSFORBIN=$(LDFLAGS)
 
 @CONCLUDE@

diff --git a/src/ModuleCatalog/Makefile.in b/src/ModuleCatalog/Makefile.in
index 04cfd5d2d4f828ee25b90882d06c238204b00714..bc4a90babbd56572ef06cd1d21c4e3238c402e61 100644 (file)
--- a/src/ModuleCatalog/Makefile.in
+++ b/src/ModuleCatalog/Makefile.in
@@ -64,5 +64,5 @@ BIN_SERVER_IDL = SALOME_ModuleCatalog.idl
 CPPFLAGS+= $(QT_MT_INCLUDES) 
 LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace
 
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 @CONCLUDE@

diff --git a/src/Registry/Makefile.in b/src/Registry/Makefile.in
index d7605ad1236c294156b0e218e44c71aef0345ed4..8b5eb524ccd1a30abd3cd04532ef7b187e82c670 100644 (file)
--- a/src/Registry/Makefile.in
+++ b/src/Registry/Makefile.in
@@ -55,6 +55,6 @@ BIN_SERVER_IDL = SALOME_Registry.idl
 
 LDFLAGS+= -lSalomeNS -lOpUtil -lSALOMELocalTrace
 
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 
 @CONCLUDE@

diff --git a/src/RessourcesCatalog/Makefile.in b/src/RessourcesCatalog/Makefile.in
index 58d98114f3c364aec98a5eec44f2d7b087c2fbda..17f8c42afca68b0536a36db6e284d9065442e3d3 100644 (file)
--- a/src/RessourcesCatalog/Makefile.in
+++ b/src/RessourcesCatalog/Makefile.in
@@ -55,7 +55,7 @@ BIN_SERVER_IDL = SALOME_RessourcesCatalog.idl
 CPPFLAGS+= $(QT_MT_INCLUDES) 
 CXXFLAGS+= 
 LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 
 @CONCLUDE@
 

diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in
index 7c9ef89149d65654bff48466209d54ba41e86be9..5a4adbf4e62687107bfe9d9da9e834b4685e4963 100644 (file)
--- a/src/SALOMEDS/Makefile.in
+++ b/src/SALOMEDS/Makefile.in
@@ -129,7 +129,7 @@ LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOME
 #
 LDXMUFLAGS= -L/usr/X11R6/lib -lXmu
 LDFLAGS+=$(LDXMUFLAGS)
-LDFLAGSFORBIN+= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMETraceCollector
 
 @CONCLUDE@
 

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index 78522c1954f31142a668719ef04bf8b502dc279d..499b7705f0cbfdbebdb7c38a8e51d16556a53612 100644 (file)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -54,7 +54,7 @@ BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOM
 CPPFLAGS+=$(QT_MT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES)
 CXXFLAGS+=$(OCC_CXXFLAGS)
 LDFLAGS+=$(QT_MT_LIBS) $(HDF5_LIBS) -lSalomeHDFPersist -lSalomeNS -lSalomeGUI -lSalomeObject -lSalomeLifeCycleCORBA -lqsplitterP -lOpUtil -lPlot2d -lSalomeVTKFilter -lSALOMELocalTrace -lSalomeContainer -lRegistry -lSalomeNotification -lSalomeDS -lTOOLSDS -lSalomeGenericObj -lSalomeCatalog -lEvent -lSalomePrs $(CAS_LDPATH) -lTKBO -lCASCatch -lSalomeResourcesManager
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 
 @CONCLUDE@
 

diff --git a/src/TestContainer/Makefile.in b/src/TestContainer/Makefile.in
index 1214fd3adc4663432dfc473609eff1965684016d..c5b22b104f1f706e98b5f5ade45b54e521f1f37a 100644 (file)
--- a/src/TestContainer/Makefile.in
+++ b/src/TestContainer/Makefile.in
@@ -46,7 +46,7 @@ BIN = TestContainer TestLogger
 BIN_SRC = 
 
 LDFLAGS+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager
-LDFLAGSFORBIN+= $(LDFLAGS) -lSALOMETraceCollector
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 
 
 @CONCLUDE@