|
|
@@ -1,7 +1,7 @@
|
|
|
Index: configure
|
|
|
---- configure.orig 2006-09-06 23:07:19 +0200
|
|
|
-+++ configure 2006-11-11 22:04:54 +0100
|
|
|
-@@ -35545,8 +35545,3 @@
|
|
|
+--- configure.orig 2006-11-12 05:56:28 +0100
|
|
|
++++ configure 2006-11-12 09:58:43 +0100
|
|
|
+@@ -35550,8 +35550,3 @@
|
|
|
{ (exit 1); exit 1; }; }
|
|
|
fi
|
|
|
|
|
|
@@ -11,9 +11,9 @@ Index: configure
|
|
|
-echo "$as_me: NOTICE: libmpeg2 not found" >&6;}
|
|
|
-fi
|
|
|
Index: src/main/Makefile.in
|
|
|
---- src/main/Makefile.in.orig 2006-09-06 23:07:45 +0200
|
|
|
-+++ src/main/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
-@@ -70,6 +70,7 @@
|
|
|
+--- src/main/Makefile.in.orig 2006-11-12 05:56:22 +0100
|
|
|
++++ src/main/Makefile.in 2006-11-12 09:59:41 +0100
|
|
|
+@@ -72,6 +72,7 @@
|
|
|
getopt1.$(OBJEXT)
|
|
|
extract_OBJECTS = $(am_extract_OBJECTS)
|
|
|
extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
|
|
|
@@ -21,7 +21,7 @@ Index: src/main/Makefile.in
|
|
|
am_test_binary_OBJECTS = test_binary.$(OBJEXT)
|
|
|
test_binary_OBJECTS = $(am_test_binary_OBJECTS)
|
|
|
test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
|
|
|
-@@ -284,7 +285,8 @@
|
|
|
+@@ -286,7 +287,8 @@
|
|
|
libextractor.la
|
|
|
|
|
|
extract_LDADD = \
|
|
|
@@ -31,18 +31,9 @@ Index: src/main/Makefile.in
|
|
|
|
|
|
@MINGW_FALSE@@SOMEBSD_FALSE@dlflag = -ldl
|
|
|
@HAVE_ZLIB_TRUE@zlib = -lz
|
|
|
-@@ -293,7 +295,7 @@
|
|
|
- -export-dynamic -version-info 2:0:1 $(LIBICONV)
|
|
|
-
|
|
|
- libextractor_la_LIBADD = \
|
|
|
-- $(LIBLTDL) $(dlflag) $(zlib) $(bz2lib)
|
|
|
-+ $(LIBLTDL) $(zlib) $(bz2lib)
|
|
|
-
|
|
|
- libextractor_la_DEPENDENCIES = \
|
|
|
- $(LIBLTDL)
|
|
|
Index: src/plugins/Makefile.in
|
|
|
---- src/plugins/Makefile.in.orig 2006-09-06 23:07:15 +0200
|
|
|
-+++ src/plugins/Makefile.in 2006-11-11 22:11:16 +0100
|
|
|
+--- src/plugins/Makefile.in.orig 2006-11-12 05:56:23 +0100
|
|
|
++++ src/plugins/Makefile.in 2006-11-12 10:00:14 +0100
|
|
|
@@ -111,7 +111,7 @@
|
|
|
libextractor_mp3_la_OBJECTS = $(am_libextractor_mp3_la_OBJECTS)
|
|
|
libextractor_mpeg_la_DEPENDENCIES =
|
|
|
@@ -50,17 +41,9 @@ Index: src/plugins/Makefile.in
|
|
|
-@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo
|
|
|
+@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS =
|
|
|
libextractor_mpeg_la_OBJECTS = $(am_libextractor_mpeg_la_OBJECTS)
|
|
|
- libextractor_ogg_la_LIBADD =
|
|
|
- am__libextractor_ogg_la_SOURCES_DIST = oggextractor.c
|
|
|
-@@ -186,7 +186,6 @@
|
|
|
- @AMDEP_TRUE@ ./$(DEPDIR)/manextractor.Plo \
|
|
|
- @AMDEP_TRUE@ ./$(DEPDIR)/mimeextractor.Plo \
|
|
|
- @AMDEP_TRUE@ ./$(DEPDIR)/mp3extractor.Plo \
|
|
|
--@AMDEP_TRUE@ ./$(DEPDIR)/mpegextractor.Plo \
|
|
|
- @AMDEP_TRUE@ ./$(DEPDIR)/oggextractor.Plo ./$(DEPDIR)/pack.Plo \
|
|
|
- @AMDEP_TRUE@ ./$(DEPDIR)/pdfextractor.Plo \
|
|
|
- @AMDEP_TRUE@ ./$(DEPDIR)/pngextractor.Plo \
|
|
|
-@@ -358,12 +357,12 @@
|
|
|
+ libextractor_nsf_la_DEPENDENCIES = \
|
|
|
+ $(top_builddir)/src/main/libextractor.la
|
|
|
+@@ -365,12 +365,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
LIBEXT = @LIBEXT@
|
|
|
@@ -75,38 +58,31 @@ Index: src/plugins/Makefile.in
|
|
|
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
-@@ -920,7 +919,6 @@
|
|
|
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manextractor.Plo@am__quote@
|
|
|
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mimeextractor.Plo@am__quote@
|
|
|
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp3extractor.Plo@am__quote@
|
|
|
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegextractor.Plo@am__quote@
|
|
|
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oggextractor.Plo@am__quote@
|
|
|
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pack.Plo@am__quote@
|
|
|
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdfextractor.Plo@am__quote@
|
|
|
-@@ -1260,20 +1258,6 @@
|
|
|
+@@ -1280,21 +1280,6 @@
|
|
|
|
|
|
|
|
|
install-exec-hook:
|
|
|
+- mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true
|
|
|
- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
|
|
|
- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la; \
|
|
|
- if test "$(thumbdir)" != ""; then \
|
|
|
- if test "$(thumbqt)" != ""; then \
|
|
|
-- $(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
|
|
|
+- $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
|
|
|
- $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
|
|
|
- else \
|
|
|
-- $(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
|
|
|
+- $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
|
|
|
- $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
|
|
|
- fi; \
|
|
|
- else \
|
|
|
-- $(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
|
|
|
+- $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
|
|
|
- $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
|
|
|
- fi;
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
|
.NOEXPORT:
|
|
|
Index: src/plugins/exiv2/Makefile.in
|
|
|
---- src/plugins/exiv2/Makefile.in.orig 2006-09-06 23:07:15 +0200
|
|
|
-+++ src/plugins/exiv2/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/exiv2/Makefile.in.orig 2006-11-12 05:56:23 +0100
|
|
|
++++ src/plugins/exiv2/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -191,12 +191,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
@@ -123,8 +99,8 @@ Index: src/plugins/exiv2/Makefile.in
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
Index: src/plugins/hash/Makefile.in
|
|
|
---- src/plugins/hash/Makefile.in.orig 2006-09-06 23:07:15 +0200
|
|
|
-+++ src/plugins/hash/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/hash/Makefile.in.orig 2006-11-12 05:56:23 +0100
|
|
|
++++ src/plugins/hash/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -180,12 +180,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
@@ -141,8 +117,8 @@ Index: src/plugins/hash/Makefile.in
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
Index: src/plugins/ole2/Makefile.in
|
|
|
---- src/plugins/ole2/Makefile.in.orig 2006-09-06 23:07:16 +0200
|
|
|
-+++ src/plugins/ole2/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/ole2/Makefile.in.orig 2006-11-12 05:56:23 +0100
|
|
|
++++ src/plugins/ole2/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -162,12 +162,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
@@ -159,8 +135,8 @@ Index: src/plugins/ole2/Makefile.in
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
Index: src/plugins/oo/Makefile.in
|
|
|
---- src/plugins/oo/Makefile.in.orig 2006-09-06 23:07:16 +0200
|
|
|
-+++ src/plugins/oo/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/oo/Makefile.in.orig 2006-11-12 05:56:24 +0100
|
|
|
++++ src/plugins/oo/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -166,12 +166,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
@@ -177,8 +153,8 @@ Index: src/plugins/oo/Makefile.in
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
Index: src/plugins/pdf/Makefile.in
|
|
|
---- src/plugins/pdf/Makefile.in.orig 2006-09-06 23:07:16 +0200
|
|
|
-+++ src/plugins/pdf/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/pdf/Makefile.in.orig 2006-11-12 05:56:24 +0100
|
|
|
++++ src/plugins/pdf/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -183,12 +183,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
@@ -195,8 +171,8 @@ Index: src/plugins/pdf/Makefile.in
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
Index: src/plugins/printable/Makefile.in
|
|
|
---- src/plugins/printable/Makefile.in.orig 2006-09-06 23:07:17 +0200
|
|
|
-+++ src/plugins/printable/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/printable/Makefile.in.orig 2006-11-12 05:56:25 +0100
|
|
|
++++ src/plugins/printable/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -492,12 +492,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
@@ -213,8 +189,8 @@ Index: src/plugins/printable/Makefile.in
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
Index: src/plugins/rpm/Makefile.in
|
|
|
---- src/plugins/rpm/Makefile.in.orig 2006-09-06 23:07:17 +0200
|
|
|
-+++ src/plugins/rpm/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/rpm/Makefile.in.orig 2006-11-12 05:56:25 +0100
|
|
|
++++ src/plugins/rpm/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -165,12 +165,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|
|
|
@@ -231,8 +207,8 @@ Index: src/plugins/rpm/Makefile.in
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
LN_S = @LN_S@
|
|
|
Index: src/plugins/thumbnail/Makefile.in
|
|
|
---- src/plugins/thumbnail/Makefile.in.orig 2006-09-06 23:07:17 +0200
|
|
|
-+++ src/plugins/thumbnail/Makefile.in 2006-11-11 22:04:54 +0100
|
|
|
+--- src/plugins/thumbnail/Makefile.in.orig 2006-11-12 05:56:25 +0100
|
|
|
++++ src/plugins/thumbnail/Makefile.in 2006-11-12 09:58:43 +0100
|
|
|
@@ -161,12 +161,12 @@
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
LIBADD_DL = @LIBADD_DL@
|