libextractor

commit b058a6839623b32fb5fbadb0aec586887bd12237
parent 1bb323cecd7d54a6912a6d952a874ed0e177c40b
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 15 Dec 2009 15:51:49 +0000

exiv2

Diffstat:
M
configure.ac
 | 
1
-
M
src/plugins/Makefile.am
 | 
6
+++---
D
src/plugins/exiv2/Makefile.am
 | 
41
-----------------------------------------

3 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -574,7 +574,6 @@ src/plugins/printable/Makefile
 src/plugins/hash/Makefile
 src/plugins/thumbnail/Makefile
 src/plugins/thumbnailffmpeg/Makefile
-src/plugins/exiv2/Makefile
 src/test/Makefile
 ])
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
@@ -44,7 +44,7 @@ endif
 
 if HAVE_CXX
 if HAVE_EXIV2
- exiv2dir=exiv2
+ exiv2=libextractor_exiv2.la
 endif
 endif
 
@@ -61,7 +61,7 @@ endif
 
 # toggle for development
 SUBDIRS = . 
-# SUBDIRS = . $(thumbgtk) $(thumbffmpeg) $(oodir) $(printdir) hash $(oledir) $(xpdfdir) $(exiv2dir) 
+# SUBDIRS = . $(thumbgtk) $(thumbffmpeg) $(oodir) $(printdir) hash $(oledir) $(xpdfdir)
 
 
 if HAVE_VORBISFILE
@@ -91,7 +91,7 @@ plugin_LTLIBRARIES = \
   libextractor_deb.la \
   libextractor_dvi.la \
   libextractor_elf.la \
-  libextractor_exiv2.la \
+  $(exiv2) \
   libextractor_html.la \
   libextractor_it.la \
   libextractor_mime.la \
diff --git a/src/plugins/exiv2/Makefile.am b/src/plugins/exiv2/Makefile.am
@@ -1,41 +0,0 @@
-include ../Makefile-plugins.am
-
-SUBDIRS = .
-
-plugin_LTLIBRARIES = \
- libextractor_exiv2.la
-
-libextractor_exiv2_la_LDFLAGS = \
-  $(XTRA_CPPLIBS) -lpthread \
-  $(PLUGINFLAGS) $(retaincommand)
-libextractor_exiv2_la_LIBADD = \
-  $(top_builddir)/src/main/libextractor.la -lpthread -lexiv2
-
-libextractor_exiv2_la_SOURCES = \
-  exiv2extractor.cc 
-
-#exv_conf.h exv_msvc.h \
-#basicio.cpp basicio.hpp \
-#canonmn.cpp canonmn.hpp \
-#datasets.cpp datasets.hpp \
-#error.cpp error.hpp \
-#exif.cpp exif.hpp \
-#fujimn.cpp fujimn.hpp \
-#futils.cpp futils.hpp \
-#ifd.cpp ifd.hpp \
-#image.cpp image.hpp \
-#iptc.cpp iptc.hpp \
-#jpgimage.cpp jpgimage.hpp \
-#makernote.cpp makernote.hpp \
-#metadatum.cpp metadatum.hpp \
-#mn.hpp \
-#nikonmn.cpp nikonmn.hpp \
-#olympusmn.cpp olympusmn.hpp \
-#panasonicmn.cpp panasonicmn.hpp \
-#rcsid.hpp \
-#sigmamn.cpp sigmamn.hpp \
-#sonymn.cpp sonymn.hpp \
-#tags.cpp tags.hpp \
-#types.cpp types.hpp \
-#value.cpp value.hpp 
-