From 8308d37e794d8dcca6014fc39a108749c52a51fb Mon Sep 17 00:00:00 2001 From: prascle Date: Tue, 25 Jan 2005 05:58:47 +0000 Subject: [PATCH] PR: binaries generation : remove duplicate rules --- src/Container/Makefile.in | 4 ++-- src/DataTypeCatalog/Makefile.in | 2 +- src/LifeCycleCORBA/Makefile.in | 2 +- src/Loader/Makefile.in | 2 +- src/MEDWrapper/Factory/Makefile.in | 2 +- src/MEDWrapper/V2_1/Makefile.in | 2 +- src/MSG2QM/Makefile.in | 2 +- src/ModuleCatalog/Makefile.in | 2 +- src/Registry/Makefile.in | 2 +- src/RessourcesCatalog/Makefile.in | 2 +- src/SALOMEDS/Makefile.in | 2 +- src/Session/Makefile.in | 2 +- src/TestContainer/Makefile.in | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in index 66d7c404c..1ed861ed0 100644 --- 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 b9c606aec..7ba1a085f 100644 --- 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 9ff8006da..64daf70e8 100644 --- 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 a3e6b4cad..7660e9882 100644 --- 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 f554a6ff4..2b1b97d4f 100644 --- 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 9bcd49c6e..1cadac2ba 100644 --- 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 c8d9bb379..a77f47893 100644 --- 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 04cfd5d2d..bc4a90bab 100644 --- 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 d7605ad12..8b5eb524c 100644 --- 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 58d98114f..17f8c42af 100644 --- 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 7c9ef8914..5a4adbf4e 100644 --- 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 78522c195..499b7705f 100644 --- 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 1214fd3ad..c5b22b104 100644 --- 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@ -- 2.39.2