From 219fafd3516e92f681387d1ee704094296d52d3b Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 25 Jan 2005 14:12:49 +0000 Subject: [PATCH] Apply patch from Paul Rascle (correction of make procedure) --- adm_local/unix/make_commence.in | 3 --- configure.in.base | 2 +- src/GraphBase/Makefile.in | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index bb2834d..dc5c94d 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,12 +10,9 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ -LIBSFORBIN=@LIBS@ LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(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@ diff --git a/configure.in.base b/configure.in.base index 16b6906..32846d9 100644 --- a/configure.in.base +++ b/configure.in.base @@ -335,7 +335,7 @@ do case "$local_bin" in *.in | *~) ;; ./bin/CVS | ./bin/salome) ;; - *) /usr/bin/install -C $i .; echo $local_bin ;; + *) /usr/bin/install $i .; echo $local_bin ;; esac done cd $ROOT_BUILDDIR diff --git a/src/GraphBase/Makefile.in b/src/GraphBase/Makefile.in index 1b1c8a6..a119495 100644 --- a/src/GraphBase/Makefile.in +++ b/src/GraphBase/Makefile.in @@ -105,6 +105,7 @@ CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \ LDFLAGS= -L../../lib/salome $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \ -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS) \ -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGSFORBIN=$(LDFLAGS) -lSalomeContainer -lSalomeResourcesManager -lRegistry -lSalomeNotification -lSALOMETraceCollector //LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) @CONCLUDE@ -- 2.39.2