1 files changed, 45 insertions, 40 deletions

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 8cdd905..f32114a 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -23,7 +23,9 @@ SUBDIRS = .
 EXTRA_DIST = \
   fuzz_default.sh \
   template_extractor.c \
+  testdata/audiosig.rm \
   testdata/archive_test.tar \
+  testdata/chello-elf \
   testdata/deb_bzip2.deb \
   testdata/dvi_ora.dvi \
   testdata/exiv2_iptc.jpg \
@@ -51,6 +53,7 @@ EXTRA_DIST = \
   testdata/png_image.png \
   testdata/ps_bloomfilter.ps \
   testdata/ps_wallace.ps \
+  testdata/ra3.ra \
   testdata/riff_flame.avi \
   testdata/rpm_test.rpm \
   testdata/s3m_2nd_pm.s3m \
@@ -68,17 +71,6 @@ if HAVE_MAGIC
 PLUGIN_MIME=libextractor_mime.la
 TEST_MIME=test_mime
 
-if HAVE_FFMPEG
-# FFmpeg-thumbnailer requires MAGIC and FFMPEG
-PLUGIN_FFMPEG=libextractor_thumbnailffmpeg.la
-TEST_FFMPEG=test_thumbnailffmpeg
-endif
-
-if HAVE_FFMPEG_NEW
-PLUGIN_PREVIEWOPUS=libextractor_previewopus.la
-TEST_PREVIEWOPUS=test_previewopus
-endif
-
 if HAVE_GDK_PIXBUF
 # Gtk-thumbnailer requires MAGIC and GDK_PIXBUF
 PLUGIN_GTK=libextractor_thumbnailgtk.la
@@ -176,11 +168,13 @@ endif
 
 plugin_LTLIBRARIES = \
   libextractor_dvi.la \
+  libextractor_elf.la \
   libextractor_it.la \
   libextractor_man.la \
   libextractor_nsf.la \
   libextractor_nsfe.la \
   libextractor_ps.la \
+  libextractor_real.la \
   libextractor_riff.la \
   libextractor_s3m.la \
   libextractor_sid.la \
@@ -188,7 +182,6 @@ plugin_LTLIBRARIES = \
   libextractor_xm.la \
   $(PLUGIN_ARCHIVE) \
   $(PLUGIN_EXIV2) \
-  $(PLUGIN_FFMPEG) \
   $(PLUGIN_FLAC) \
   $(PLUGIN_GIF) \
   $(PLUGIN_GSF) \
@@ -202,7 +195,6 @@ plugin_LTLIBRARIES = \
   $(PLUGIN_MPEG) \
   $(PLUGIN_OGG) \
   $(PLUGIN_PDF) \
-  $(PLUGIN_PREVIEWOPUS) \
   $(PLUGIN_RPM) \
   $(PLUGIN_TIFF) \
   $(PLUGIN_ZLIB)
@@ -213,6 +205,7 @@ endif
 
 check_PROGRAMS = \
   test_dvi \
+  test_elf \
   test_it \
   test_man \
   test_nsf \
@@ -220,6 +213,7 @@ check_PROGRAMS = \
   test_odf \
   test_ps \
   test_png \
+  test_real \
   test_riff \
   test_s3m \
   test_sid \
@@ -228,8 +222,6 @@ check_PROGRAMS = \
   test_zip \
   $(TEST_ARCHIVE) \
   $(TEST_EXIV2) \
-  $(TEST_FFMPEG) \
-  $(TEST_PREVIEWOPUS) \
   $(TEST_FLAC) \
   $(TEST_GIF) \
   $(TEST_GSF) \
@@ -298,6 +290,19 @@ test_dvi_SOURCES = \
 test_dvi_LDADD = \
   $(top_builddir)/src/plugins/libtest.la
 
+libextractor_elf_la_SOURCES = \
+  elf_extractor.c \
+  pack.c pack.h
+libextractor_elf_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_elf_la_LIBADD = \
+ $(XLIB) $(SOCKET_LIBS)
+
+test_elf_SOURCES = \
+  test_elf.c
+test_elf_LDADD = \
+  $(top_builddir)/src/plugins/libtest.la
+
 
 libextractor_exiv2_la_SOURCES = \
   exiv2_extractor.cc
@@ -358,6 +363,8 @@ test_gstreamer_CFLAGS = \
 
 libextractor_html_la_SOURCES = \
   html_extractor.c
+libextractor_html_la_CFLAGS = \
+  $(TIDY_CFLAGS)
 libextractor_html_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_html_la_LIBADD = \
@@ -562,6 +569,20 @@ test_ps_LDADD = \
   $(top_builddir)/src/plugins/libtest.la
 
 
+libextractor_real_la_SOURCES = \
+  real_extractor.c
+libextractor_real_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_real_la_LIBADD = \
+  -lm \
+  $(XLIB) \
+  $(LE_LIBINTL)
+
+test_real_SOURCES = \
+  test_real.c
+test_real_LDADD = \
+  $(top_builddir)/src/plugins/libtest.la
+
 libextractor_riff_la_SOURCES = \
   riff_extractor.c
 libextractor_riff_la_LDFLAGS = \
@@ -615,19 +636,6 @@ test_sid_LDADD = \
   $(top_builddir)/src/plugins/libtest.la
 
 
-libextractor_thumbnailffmpeg_la_SOURCES = \
-  thumbnailffmpeg_extractor.c
-libextractor_thumbnailffmpeg_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_thumbnailffmpeg_la_LIBADD = \
-  -lavutil -lavformat -lavcodec -lswscale -lmagic $(XLIB)
-
-test_thumbnailffmpeg_SOURCES = \
-  test_thumbnailffmpeg.c
-test_thumbnailffmpeg_LDADD = \
-  $(top_builddir)/src/plugins/libtest.la
-
-
 libextractor_thumbnailgtk_la_SOURCES = \
   thumbnailgtk_extractor.c
 libextractor_thumbnailgtk_la_LDFLAGS = \
@@ -642,18 +650,6 @@ test_thumbnailgtk_SOURCES = \
 test_thumbnailgtk_LDADD = \
   $(top_builddir)/src/plugins/libtest.la
 
-libextractor_previewopus_la_SOURCES = \
-  previewopus_extractor.c
-libextractor_previewopus_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_previewopus_la_LIBADD = \
-  -lavutil -lavformat -lavcodec -lswscale -lavresample  -lmagic $(XLIB)
-
-test_previewopus_SOURCES = \
-  test_previewopus.c
-test_previewopus_LDADD = \
-  $(top_builddir)/src/plugins/libtest.la
-
 
 libextractor_tiff_la_SOURCES = \
   tiff_extractor.c
@@ -668,6 +664,15 @@ test_tiff_LDADD = \
   $(top_builddir)/src/plugins/libtest.la
 
 
+#libextractor_vlc_la_SOURCES = \
+#  vlc_extractor.c
+#libextractor_vlc_la_LDFLAGS = \
+#  $(PLUGINFLAGS)
+#libextractor_vlc_la_LIBADD = \
+# -lvlc \
+# $(XLIB)
+
+
 libextractor_wav_la_SOURCES = \
   wav_extractor.c
 libextractor_wav_la_LDFLAGS = \