From: prascle <prascle>
Date: Mon, 24 Jan 2005 16:27:15 +0000 (+0000)
Subject: PR: modify makefiles to separate rules for libraries and binaries.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=36610c94806b9840c3045be757bb10df91034f90;p=modules%2Fyacs.git

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 77747e2b8..7e5122adb 100644
--- 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 9c35798ec..2b8f95495 100644
--- 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 cc74c34b5..66d7c404c 100644
--- 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 f5bd3bc35..b9c606aec 100644
--- 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 49e86e969..9ff8006da 100644
--- 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 99c98ab06..a3e6b4cad 100644
--- 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 1fb3531d5..f554a6ff4 100644
--- 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 32939397b..9bcd49c6e 100644
--- 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 0cf36702e..c8d9bb379 100644
--- 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 0ba61bbaa..04cfd5d2d 100644
--- 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 cbcbf3931..d7605ad12 100644
--- 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 b43546776..58d98114f 100644
--- 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 da674c956..7c9ef8914 100644
--- 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 8d2beb1d5..7894a23c0 100644
--- 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 3fb121981..78522c195 100644
--- 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 dd0848460..1214fd3ad 100644
--- 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@