libextractor

commit 5e35a18db730d6089af1a9d058141d874872deb6
parent 02a09f49353a0df6e31c7f01b98f3038936991d0
Author: Heikki Lindholm <holin@iki.fi>
Date:   Mon, 29 Dec 2008 15:38:48 +0000

less of a shotgun solution for the plugins...


Diffstat:
M
src/plugins/Makefile-plugins.am
 | 
3
---
M
src/plugins/Makefile.am
 | 
20
+++++++++++++++-----
M
src/plugins/printable/Makefile.am
 | 
2
+-

3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/plugins/Makefile-plugins.am b/src/plugins/Makefile-plugins.am
@@ -3,9 +3,6 @@ INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common
 # install plugins under:
 plugindir = $(libdir)/@RPLUGINDIR@
 
-LIBS = \
- @LE_LIBINTL@ @LIBS@
-
 if HAVE_GNU_LD
  makesymbolic=-Wl,-Bsymbolic
 endif
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
@@ -142,7 +142,8 @@ libextractor_flac_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_flac_la_LIBADD = \
   -lFLAC $(flacoggflag) \
-  $(top_builddir)/src/main/libextractor.la
+  $(top_builddir)/src/main/libextractor.la \
+  $(LE_LIBINTL)
 endif
 
 if HAVE_ZLIB
@@ -165,6 +166,8 @@ libextractor_wav_la_SOURCES = \
   wavextractor.c
 libextractor_wav_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_wav_la_LIBADD = \
+  $(LE_LIBINTL)
 
 libextractor_pdf_la_SOURCES = \
   pdfextractor.c
@@ -178,7 +181,8 @@ libextractor_mp3_la_SOURCES = \
 libextractor_mp3_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_mp3_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la
+  $(top_builddir)/src/common/libextractor_common.la \
+  $(LE_LIBINTL)
 
 libextractor_id3v2_la_SOURCES = \
   id3v2extractor.c 
@@ -251,7 +255,8 @@ libextractor_applefile_la_SOURCES = \
 libextractor_applefile_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_applefile_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la
+  $(top_builddir)/src/common/libextractor_common.la \
+  $(LE_LIBINTL)
 
 libextractor_elf_la_SOURCES = \
   elfextractor.c 
@@ -271,6 +276,8 @@ libextractor_jpeg_la_SOURCES = \
   jpegextractor.c 
 libextractor_jpeg_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_jpeg_la_LIBADD = \
+  $(LE_LIBINTL)
 
 libextractor_html_la_SOURCES = \
   htmlextractor.c 
@@ -314,7 +321,8 @@ libextractor_man_la_SOURCES = \
 libextractor_man_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_man_la_LIBADD = \
-  $(top_builddir)/src/main/libextractor.la
+  $(top_builddir)/src/main/libextractor.la \
+  $(LE_LIBINTL)
 
 if HAVE_ZLIB
 libextractor_deb_la_SOURCES = \
@@ -332,6 +340,7 @@ libextractor_riff_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_riff_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la \
+  $(LE_LIBINTL) \
   -lm 
 
 if HAVE_ZLIB
@@ -351,7 +360,8 @@ libextractor_filename_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_filename_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la \
-  $(top_builddir)/src/common/libextractor_common.la
+  $(top_builddir)/src/common/libextractor_common.la \
+  $(LE_LIBINTL)
 
 libextractor_sid_la_SOURCES = \
   sidextractor.c 
diff --git a/src/plugins/printable/Makefile.am b/src/plugins/printable/Makefile.am
@@ -65,7 +65,7 @@ pesv.c:
 dictionary_builder_SOURCES = \
  dictionary-builder.c 
 dictionary_builder_LDADD = \
- $(LIBINTL) 
+ $(LE_LIBINTL) 
 
 plugin_LTLIBRARIES = \
  libextractor_printable_da.la \