nemiver r815 - in trunk: . src/common src/confmgr src/dbdimpl/sqlite src/dbgengine src/persp/dbgperspective src/uicommon src/workbench

[dodji svn gnome org]

Author: dodji
Date: Sat May 17 14:44:07 2008
New Revision: 815
URL: http://svn.gnome.org/viewvc/nemiver?rev=815&view=rev

Log:
Merge branch 'add-as-needed-link'

Conflicts:

	ChangeLog


Modified:
   trunk/ChangeLog
   trunk/src/common/Makefile.am
   trunk/src/confmgr/Makefile.am
   trunk/src/dbdimpl/sqlite/Makefile.am
   trunk/src/dbgengine/Makefile.am
   trunk/src/persp/dbgperspective/Makefile.am
   trunk/src/uicommon/Makefile.am
   trunk/src/workbench/Makefile.am

Modified: trunk/src/common/Makefile.am
==============================================================================
--- trunk/src/common/Makefile.am	(original)
+++ trunk/src/common/Makefile.am	Sat May 17 14:44:07 2008
@@ -65,7 +65,8 @@
 publicheaders_DATA=$(headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/common
 libnemivercommon_la_LDFLAGS= NEMIVERCOMMON_LIBS@ -lutil \
-		-avoid-version -rpath $(libdir)/nemiver
+		-avoid-version -rpath $(libdir)/nemiver \
+		 -Wl,--as-needed
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnemivercommon.pc

Modified: trunk/src/confmgr/Makefile.am
==============================================================================
--- trunk/src/confmgr/Makefile.am	(original)
+++ trunk/src/confmgr/Makefile.am	Sat May 17 14:44:07 2008
@@ -10,7 +10,7 @@
 publicheaders_DATA=$(headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
 
-libgconfmgrmod_la_LDFLAGS=-module -avoid-version
+libgconfmgrmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
 libgconfmgrmod_la_LIBADD= NEMIVERCOMMON_LIBS@ @GCONF_LIBS@ \
         $(top_builddir)/src/common/libnemivercommon.la
 

Modified: trunk/src/dbdimpl/sqlite/Makefile.am
==============================================================================
--- trunk/src/dbdimpl/sqlite/Makefile.am	(original)
+++ trunk/src/dbdimpl/sqlite/Makefile.am	Sat May 17 14:44:07 2008
@@ -8,7 +8,7 @@
 
 libnemiverdbdsqlite_la_SOURCES=$(sources)
 
-libnemiverdbdsqlite_la_LDFLAGS= -module -avoid-version
+libnemiverdbdsqlite_la_LDFLAGS= -module -avoid-version -Wl,--as-needed
 libnemiverdbdsqlite_la_LIBADD= \
 @SQLITE3_LIBS@ @NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la

Modified: trunk/src/dbgengine/Makefile.am
==============================================================================
--- trunk/src/dbgengine/Makefile.am	(original)
+++ trunk/src/dbgengine/Makefile.am	Sat May 17 14:44:07 2008
@@ -75,7 +75,7 @@
 publicheaders_DATA=$(dynmodheaders)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
 
-libgdbmod_la_LDFLAGS=-module -avoid-version
+libgdbmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
 libgdbmod_la_LIBADD=libdbgcommon.la libgdbmiparser.la libgdbengine.la \
 @NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/langs/libnemivercparser.la \

Modified: trunk/src/persp/dbgperspective/Makefile.am
==============================================================================
--- trunk/src/persp/dbgperspective/Makefile.am	(original)
+++ trunk/src/persp/dbgperspective/Makefile.am	Sat May 17 14:44:07 2008
@@ -90,7 +90,7 @@
 endif
 
 libdbgperspectiveplugin_la_SOURCES=$(sources) $(memoryview_sources)
-libdbgperspectiveplugin_la_LDFLAGS= -module -avoid-version
+libdbgperspectiveplugin_la_LDFLAGS= -module -avoid-version -Wl,--as-needed
 libdbgperspectiveplugin_la_LIBADD= \
 @NEMIVERDBGPERSP_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \

Modified: trunk/src/uicommon/Makefile.am
==============================================================================
--- trunk/src/uicommon/Makefile.am	(original)
+++ trunk/src/uicommon/Makefile.am	Sat May 17 14:44:07 2008
@@ -21,10 +21,10 @@
 
 if BUILD_MEMORYVIEW
 memoryview_sources = \
-					 nmv-hex-editor.h \
-					 nmv-hex-editor.cc \
-					 nmv-hex-document.h \
-					 nmv-hex-document.cc
+nmv-hex-editor.h \
+nmv-hex-editor.cc \
+nmv-hex-document.h \
+nmv-hex-document.cc
 else
 memoryview_sources =
 endif

Modified: trunk/src/workbench/Makefile.am
==============================================================================
--- trunk/src/workbench/Makefile.am	(original)
+++ trunk/src/workbench/Makefile.am	Sat May 17 14:44:07 2008
@@ -25,7 +25,7 @@
 publicheaders_DATA=$(headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
 
-libworkbenchmod_la_LDFLAGS=-module -avoid-version
+libworkbenchmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
 libworkbenchmod_la_LIBADD= NEMIVERWORKBENCH_LIBS@ \
         $(top_builddir)/src/common/libnemivercommon.la \
         $(top_builddir)/src/uicommon/libnemiveruicommon.la