Package: salome
Version: 5.1.3-12
Severity: normal
User: [email protected]
Usertags: origin-ubuntu natty
User: [email protected]
Usertags: ld-as-needed
Fixing some failures in GUI_SRC, libraries must always be added to _LIBADD or
_LDADD, never to _LDFLAGS.
--- ./GUI_SRC_5.1.3/src/SUITApp/Makefile.am~ 2009-12-01 15:58:58.000000000
+0100
+++ ./GUI_SRC_5.1.3/src/SUITApp/Makefile.am 2010-12-20 13:59:01.048229946
+0100
@@ -52,16 +52,19 @@
MOC_FLAGS = -DENABLE_TESTRECORDER
endif
-libSUITApp_la_LDFLAGS = $(QT_MT_LIBS)
+libSUITApp_la_LDFLAGS =
+
+libSUITApp_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la
../Style/libSalomeStyle.la
+
+libSUITApp_la_LIBADD += $(QT_MT_LIBS)
if ENABLE_TESTRECORDER
- libSUITApp_la_LDFLAGS+= $(TESTRECORDER_LIBS)
+ libSUITApp_la_LIBADD+= $(TESTRECORDER_LIBS)
endif
-libSUITApp_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la
../Style/libSalomeStyle.la
-
if ENABLE_PYCONSOLE
-libSUITApp_la_LDFLAGS += -Xlinker -export-dynamic $(PYTHON_LIBS)
+libSUITApp_la_LDFLAGS += -Xlinker -export-dynamic
+libSUITApp_la_LIBADD += $(PYTHON_LIBS)
AM_CPPFLAGS+=-DSUIT_ENABLE_PYTHON
endif
@@ -82,3 +85,9 @@
if ENABLE_TESTRECORDER
SUITApp_LDADD+= $(TESTRECORDER_LIBS)
endif
+
+SUITApp_LDADD += $(QT_MT_LIBS)
+if ENABLE_PYCONSOLE
+SUITApp_LDFLAGS = -Xlinker -export-dynamic
+SUITApp_LDADD += $(PYTHON_LIBS)
+endif
--- ./GUI_SRC_5.1.3/src/Session/Makefile.am~ 2009-12-01 15:58:59.000000000
+0100
+++ ./GUI_SRC_5.1.3/src/Session/Makefile.am 2010-12-20 14:13:05.748228254
+0100
@@ -57,7 +57,7 @@
libSalomeSession_la_CPPFLAGS+= -DENABLE_TESTRECORDER $(TESTRECORDER_INCLUDES)
endif
-libSalomeSession_la_LDFLAGS = $(KERNEL_LDFLAGS) -lSalomeNS
\
+libSalomeSession_la_LIBADD = $(KERNEL_LDFLAGS) -lSalomeNS
\
-lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSalomeCatalog
\
-lSalomeDSClient $(CAS_KERNEL) -lwith_loggerTraceCollector
\
-lSalomeIDLKernel -lSalomeContainer -lTOOLSDS -lSalomeLauncher
\
@@ -66,7 +66,7 @@
../Style/libSalomeStyle.la $(QT_MT_LIBS)
if ENABLE_TESTRECORDER
- libSalomeSession_la_LDFLAGS+= $(TESTRECORDER_LIBS)
+ libSalomeSession_la_LIBADD+= $(TESTRECORDER_LIBS)
endif
# Executable
@@ -75,7 +75,7 @@
dist_SALOME_Session_Server_SOURCES = SALOME_Session_Server.cxx
SALOME_Session_Server_CPPFLAGS = $(libSalomeSession_la_CPPFLAGS)
-SALOME_Session_Server_LDADD = $(libSalomeSession_la_LDFLAGS)
\
+SALOME_Session_Server_LDADD = $(libSalomeSession_la_LIBADD)
\
-lSalomeContainer -lSalomeResourcesManager -lTOOLSDS
\
-lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry
\
-lSalomeNotification -lSALOMEBasics -lSalomeLauncher ../Qtx/libqtx.la
\
