docu updates, improvements to build system

3 files changed, 18 insertions, 15 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 = \
diff --git a/src/plugins/test_lib.c b/src/plugins/test_lib.c
index df8771a..1dec938 100644
--- a/src/plugins/test_lib.c
+++ b/src/plugins/test_lib.c
@@ -155,10 +155,10 @@ ET_main (const char *plugin_name,
     fprintf (stderr, 
              "Failed to update my environment, plugin loading may fail: %s\n",
              strerror (errno));    
-  ret = run (plugin_name, ps, EXTRACTOR_OPTION_IN_PROCESS);
+  ret = run (plugin_name, ps, EXTRACTOR_OPTION_DEFAULT_POLICY);
   if (0 != ret)
     return ret;
-  ret = run (plugin_name, ps, EXTRACTOR_OPTION_DEFAULT_POLICY);
+  ret = run (plugin_name, ps, EXTRACTOR_OPTION_IN_PROCESS);
   if (0 != ret)
     return ret;
   return 0;
diff --git a/src/plugins/thumbnailffmpeg_extractor.c b/src/plugins/thumbnailffmpeg_extractor.c
index b742431..9c52242 100644
--- a/src/plugins/thumbnailffmpeg_extractor.c
+++ b/src/plugins/thumbnailffmpeg_extractor.c
@@ -716,6 +716,7 @@ thumbnailffmpeg_lib_init (void)
     }
 }
 
+
 /**
  * Destructor for the library, cleans up.
  */