[drwright] build: Move ldflags to Makefile.am

[Christian Persch <chpe src gnome org>]

commit 07ef0c81d590438c177e891a4dfc1863e6e25d27
Author: Christian Persch <chpe gnome org>
Date:   Thu Mar 29 18:06:45 2012 +0200

    build: Move ldflags to Makefile.am

 configure.in    |    6 ------
 src/Makefile.am |   17 +++++++++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1b1691a..528c94d 100644
--- a/configure.in
+++ b/configure.in
@@ -93,9 +93,6 @@ AC_SUBST([gsd_plugindir])
 GSD_INTLTOOL_PLUGIN_RULE='%.gnome-settings-plugin:   %.gnome-settings-plugin.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 AC_SUBST([GSD_INTLTOOL_PLUGIN_RULE])
 
-GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined -export-symbols-regex '^register_gnome_settings_plugin'"
-AC_SUBST([GSD_PLUGIN_LDFLAGS])
-
 # ********************
 # Control centre panel
 # ********************
@@ -105,9 +102,6 @@ PKG_CHECK_MODULES([CCPANEL],[gio-2.0 gtk+-3.0])
 ccpanelsdir='${libdir}/control-center-1/panels'
 AC_SUBST([ccpanelsdir])
 
-CCPANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
-AC_SUBST([CCPANEL_LDFLAGS])
-
 AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
 if test "$GTK_BUILDER_CONVERT" = "false"; then
   AC_MSG_ERROR([gtk-builder-convert not found])
diff --git a/src/Makefile.am b/src/Makefile.am
index fe6da6c..6fe4f4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,9 +76,13 @@ libtyping_break_la_CFLAGS = \
 	$(GSD_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
-libtyping_break_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)	\
-	$(NULL)
+libtyping_break_la_LDFLAGS = \
+	-export-dynamic \
+	-export-symbols-regex '^register_gnome_settings_plugin' \
+	-module \
+	-avoid-version \
+	-no-undefined \
+	$(AM_LDFLAGS)
 
 libtyping_break_la_LIBADD  = 		\
 	$(GSD_PLUGIN_LIBS)	\
@@ -112,7 +116,12 @@ libdrwrightccp_la_LIBADD = \
 	$(CCPANEL_LIBS)	\
 	$(INTLLIBS)
 libdrwrightccp_la_LDFLAGS = \
-	$(CCPANEL_LDFLAGS)
+	-export-dynamic \
+	-export-symbols-regex '^g_io_module_(load|unload)' \
+	-avoid-version \
+	-module \
+	-no-undefined \
+	$(AM_LDFLAGS)
 
 builderdir = $(pkgdatadir)
 builder_in_files = drwright-panel.glade