From 5e38f704d32bc9be5cb96555abe526637126d37a Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 7 Nov 2005 14:28:28 +0000 Subject: [PATCH 1/1] Fix compilation problem (make bin step fails) --- adm_local/unix/make_commence.in | 4 ++++ src/Supervision/Makefile.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 8ea159b..04d424a 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,9 +10,12 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ +LIBSFORBIN=@LIBS@ LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome +LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ +LDFLAGSFORBIN+= -lstdc++ CP=@CP@ @@ -171,6 +174,7 @@ CXXFLAGS+= $(CORBA_CXXFLAGS) # add corba libs when link salome application ! #LDFLAGS+= $(CORBA_LIBS) LIBS+=$(CORBA_LIBS) +LIBSFORBIN+=$(CORBA_LIBS) DOXYGEN = @DOXYGEN@ diff --git a/src/Supervision/Makefile.in b/src/Supervision/Makefile.in index 5c1c6ec..b226744 100755 --- a/src/Supervision/Makefile.in +++ b/src/Supervision/Makefile.in @@ -98,8 +98,8 @@ LDFLAGS+= -lSalomeSuperVisionEditor -lSalomeSuperVisionExecutor -lSalomeSuperVis $(QT_MT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) -LDFLAGSFORBIN= -L$(top_builddir)/lib/salome -LIBSFORBIN=$(LIBS) +LDFLAGSFORBIN += $(LDFLAGS) -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeResourcesManager -lSALOMEBasics +#LIBSFORBIN += $(LIBS) @CONCLUDE@ -- 2.39.2