[GNUnet-SVN] r9806 - Extractor/src/plugins

[gnunet]

Author: grothoff
Date: 2009-12-19 13:33:32 +0100 (Sat, 19 Dec 2009)
New Revision: 9806

Removed:
   Extractor/src/plugins/Makefile-plugins.am
Modified:
   Extractor/src/plugins/Makefile.am
Log:
streamline

Deleted: Extractor/src/plugins/Makefile-plugins.am
===================================================================
--- Extractor/src/plugins/Makefile-plugins.am   2009-12-19 12:32:34 UTC (rev 
9805)
+++ Extractor/src/plugins/Makefile-plugins.am   2009-12-19 12:33:32 UTC (rev 
9806)
@@ -1,12 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common
-
-# install plugins under:
-plugindir = $(libdir)/@RPLUGINDIR@
-
-if HAVE_GNU_LD
- makesymbolic=-Wl,-Bsymbolic
-endif
-
-PLUGINFLAGS = $(makesymbolic) $(LE_PLUGIN_LDFLAGS)
-
-

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2009-12-19 12:32:34 UTC (rev 9805)
+++ Extractor/src/plugins/Makefile.am   2009-12-19 12:33:32 UTC (rev 9806)
@@ -1,5 +1,14 @@
-include Makefile-plugins.am
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common
 
+# install plugins under:
+plugindir = $(libdir)/@RPLUGINDIR@
+
+if HAVE_GNU_LD
+ makesymbolic=-Wl,-Bsymbolic
+endif
+
+PLUGINFLAGS = $(makesymbolic) $(LE_PLUGIN_LDFLAGS)
+
 SUBDIRS = . 
 
 if HAVE_FFMPEG