PR: modify makefiles to separate rules for libraries and binaries.

diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in
index 77747e2b817073799c45d4643c0246468f3cb02d..7e5122adbc32a661ab6f7d2d315dd0f8df839258 100644 (file)
--- a/salome_adm/unix/make_commence.in
+++ b/salome_adm/unix/make_commence.in
@@ -11,10 +11,13 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
+LIBSFORBIN=@LIBS@
 # LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
 LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= @STDLIB@
+LDFLAGSFORBIN+= @STDLIB@
 
 #CP=@CP@
 

diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in
index 9c35798ec08d2b833ad053a3bbbc225b9e4295e1..2b8f95495ffc84b81fdfa33e08ba7694f88c2a99 100644 (file)
--- a/salome_adm/unix/make_conclude.in
+++ b/salome_adm/unix/make_conclude.in
@@ -95,7 +95,7 @@ $(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/
        ln -sf $(CURDIR)/$< $@
 
 $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ)
-       $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
+       $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN)
 
 # copy python scripts in $(top_builddir)/bin/salome
 #

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

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

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

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

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

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

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

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

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

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

diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in
index da674c95623a254e7e92835b4611ed80c924f332..7c9ef89149d65654bff48466209d54ba41e86be9 100644 (file)
--- a/src/SALOMEDS/Makefile.in
+++ b/src/SALOMEDS/Makefile.in
@@ -120,7 +120,7 @@ LIB_CLIENT_IDL = SALOME_Component.idl SALOME_GenericObj.idl
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES)
 CXXFLAGS+=$(OCC_CXXFLAGS)
-LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace $(CAS_LDPATH) -lTKCAF -lTKBO -lTKStdSchema -lSalomeGenericObj -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeResourcesManager -lRegistry -lSalomeNotification -lSALOMETraceCollector
+LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace $(CAS_LDPATH) -lTKCAF -lTKBO -lTKStdSchema -lSalomeGenericObj -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeResourcesManager
 
 # _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC.
 # La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans).
@@ -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
 
 @CONCLUDE@
 

diff --git a/src/SALOMELocalTrace/Makefile.in b/src/SALOMELocalTrace/Makefile.in
index 8d2beb1d55106531213902af2129b8f1f5d5fa61..7894a23c02dcdfd1a908141e9e0ad337af6ede74 100644 (file)
--- a/src/SALOMELocalTrace/Makefile.in
+++ b/src/SALOMELocalTrace/Makefile.in
@@ -47,6 +47,8 @@ LIB = libSALOMELocalTrace.la
 LIB_SRC = LocalTraceCollector.cxx \
          LocalTraceBufferPool.cxx
 
-LDFLAGS+= 
+LIBS= @LIBS@ 
+#LDFLAGS+= 
+
 
 @CONCLUDE@

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index 3fb121981eb81621ed9e146172446a92af3e39b8..78522c1954f31142a668719ef04bf8b502dc279d 100644 (file)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -53,8 +53,8 @@ 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 -lSALOMETraceCollector -lSalomeContainer -lRegistry -lSalomeNotification -lSalomeDS -lTOOLSDS -lSalomeGenericObj -lSalomeCatalog -lEvent -lSalomePrs $(CAS_LDPATH) -lTKBO -lCASCatch -lSalomeResourcesManager
-
+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
 
 @CONCLUDE@
 

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