--- a/finch/plugins/Makefile.am Wed Apr 16 12:04:51 2014 +0530
+++ b/finch/plugins/Makefile.am Sat Apr 19 20:05:35 2014 +0530
@@ -1,9 +1,9 @@
-gntclipboard_la_LDFLAGS = -module -avoid-version
-gntgf_la_LDFLAGS = -module -avoid-version
-gnthistory_la_LDFLAGS = -module -avoid-version
-gntlastlog_la_LDFLAGS = -module -avoid-version
-gnttinyurl_la_LDFLAGS = -module -avoid-version
-grouping_la_LDFLAGS = -module -avoid-version
+gntclipboard_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+gntgf_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+gnthistory_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+gntlastlog_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+gnttinyurl_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+grouping_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
if PLUGINS
@@ -27,12 +27,12 @@
gntclipboard_la_CFLAGS = $(X11_CFLAGS)
gntgf_la_CFLAGS = $(X11_CFLAGS)
-gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
-gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
-gnthistory_la_LIBADD = $(GLIB_LIBS)
-gntlastlog_la_LIBADD = $(GLIB_LIBS)
-gnttinyurl_la_LIBADD = $(GLIB_LIBS)
-grouping_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
+gntclipboard_la_LIBADD = @FINCH_LIBS@ $(X11_LIBS)
+gntgf_la_LIBADD = @FINCH_LIBS@ $(X11_LIBS)
+gnthistory_la_LIBADD = @FINCH_LIBS@
+gntlastlog_la_LIBADD = @FINCH_LIBS@
+gnttinyurl_la_LIBADD = @FINCH_LIBS@
+grouping_la_LIBADD = @FINCH_LIBS@
endif # PLUGINS
@@ -57,7 +57,7 @@
SUFFIXES = .c .so
.c.so:
$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module @PLUGIN_LDFLAGS@ $(PLUGIN_LIBS)
@rm -f tmp$@.lo tmp$@.o libtmp$@.la
@cp .libs/libtmp$@.so.so $@
@rm -rf .libs/libtmp$@.*
