docu updates, improvements to build system

1 files changed, 15 insertions, 13 deletions

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 3bfca47..d55b720 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -110,9 +110,11 @@ TEST_JPEG=test_jpeg
 endif
 
 if HAVE_MP4
+if HAVE_EXPERIMENTAL
 PLUGIN_MP4=libextractor_mp4.la
 TEST_MP4=test_mp4
 endif
+endif
 
 if HAVE_MPEG2
 PLUGIN_MPEG=libextractor_mpeg.la
@@ -230,6 +232,19 @@ libtest_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la
 
 
+libextractor_archive_la_SOURCES = \
+  archive_extractor.c
+libextractor_archive_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_archive_la_LIBADD = \
+  -larchive
+
+test_archive_SOURCES = \
+  test_archive.c
+test_archive_LDADD = \
+  $(top_builddir)/src/plugins/libtest.la
+
+
 libextractor_deb_la_SOURCES = \
   deb_extractor.c
 libextractor_deb_la_LDFLAGS = \
@@ -542,19 +557,6 @@ test_sid_LDADD = \
   $(top_builddir)/src/plugins/libtest.la
 
 
-libextractor_archive_la_SOURCES = \
-  archive_extractor.c
-libextractor_archive_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_archive_la_LIBADD = \
-  -larchive
-
-test_archive_SOURCES = \
-  test_archive.c
-test_archive_LDADD = \
-  $(top_builddir)/src/plugins/libtest.la
-
-
 libextractor_thumbnailffmpeg_la_SOURCES = \
   thumbnailffmpeg_extractor.c
 libextractor_thumbnailffmpeg_la_LDFLAGS = \