GNOME.org
 

[tracker/libtracker-extract] libtracker-extract: Initial move of files into separate lib

commit f21e0311b3919d12cf0d0073103d5d9efd004a6b
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Jan 19 12:07:27 2010 +0000

    libtracker-extract: Initial move of files into separate lib

 configure.ac                                       |    1 +
 src/Makefile.am                                    |    1 +
 .../tracker-exif.c                                 |    3 +-
 .../tracker-exif.h                                 |    0
 .../tracker-iptc.c                                 |    1 -
 .../tracker-iptc.h                                 |    0
 .../tracker-xmp.c                                  |    5 +-
 .../tracker-xmp.h                                  |    2 +
 src/tracker-extract/Makefile.am                    |  154 ++++++++++++--------
 src/tracker-extract/tracker-extract-jpeg.c         |    7 +-
 src/tracker-extract/tracker-extract-pdf.c          |    3 +-
 src/tracker-extract/tracker-extract-png.c          |    3 +-
 src/tracker-extract/tracker-extract-tiff.c         |    7 +-
 src/tracker-extract/tracker-extract-xmp.c          |    3 +-
 14 files changed, 116 insertions(+), 74 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9b7c949..eff80e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1659,6 +1659,7 @@ AC_CONFIG_FILES([
 	src/libtracker-data/Makefile
 	src/libtracker-db/Makefile
 	src/libtracker-fts/Makefile
+	src/libtracker-extract/Makefile
 	src/libtracker-gtk/Makefile
 	src/libtracker-client/Makefile
         src/libtracker-miner/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index f7d2409..d29f1f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = 					\
 	libtracker-fts				\
 	libtracker-db				\
 	libtracker-data				\
+	libtracker-extract			\
 	libtracker-client			\
 	libtracker-miner			\
 	plugins					\
diff --git a/src/tracker-extract/tracker-exif.c b/src/libtracker-extract/tracker-exif.c
similarity index 99%
rename from src/tracker-extract/tracker-exif.c
rename to src/libtracker-extract/tracker-exif.c
index e373de6..40eff24 100644
--- a/src/tracker-extract/tracker-exif.c
+++ b/src/libtracker-extract/tracker-exif.c
@@ -29,7 +29,6 @@
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
-#include "tracker-main.h"
 #include "tracker-exif.h"
 
 #ifdef HAVE_LIBEXIF
@@ -316,7 +315,7 @@ tracker_exif_read (const unsigned char *buffer,
 
 	exif = exif_data_new ();
 
-	g_return_val_if_fail (exit != NULL, FALSE);
+	g_return_val_if_fail (exif != NULL, FALSE);
 
 	exif_data_set_option (exif, EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS);
 	exif_data_unset_option (exif, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);
diff --git a/src/tracker-extract/tracker-exif.h b/src/libtracker-extract/tracker-exif.h
similarity index 100%
rename from src/tracker-extract/tracker-exif.h
rename to src/libtracker-extract/tracker-exif.h
diff --git a/src/tracker-extract/tracker-iptc.c b/src/libtracker-extract/tracker-iptc.c
similarity index 99%
rename from src/tracker-extract/tracker-iptc.c
rename to src/libtracker-extract/tracker-iptc.c
index 4ad1675..f0f03d5 100644
--- a/src/tracker-extract/tracker-iptc.c
+++ b/src/libtracker-extract/tracker-iptc.c
@@ -26,7 +26,6 @@
 #include <libtracker-common/tracker-type-utils.h>
 
 #include "tracker-iptc.h"
-#include "tracker-main.h"
 
 #ifdef HAVE_LIBIPTCDATA
 
diff --git a/src/tracker-extract/tracker-iptc.h b/src/libtracker-extract/tracker-iptc.h
similarity index 100%
rename from src/tracker-extract/tracker-iptc.h
rename to src/libtracker-extract/tracker-iptc.h
diff --git a/src/tracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
similarity index 99%
rename from src/tracker-extract/tracker-xmp.c
rename to src/libtracker-extract/tracker-xmp.c
index 14aa628..a36cdab 100644
--- a/src/tracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -24,13 +24,12 @@
 
 #include <glib.h>
 
-#include "tracker-main.h"
-#include "tracker-xmp.h"
-
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-ontology.h>
 
+#include "tracker-xmp.h"
+
 #ifdef HAVE_EXEMPI
 
 #include <exempi/xmp.h>
diff --git a/src/tracker-extract/tracker-xmp.h b/src/libtracker-extract/tracker-xmp.h
similarity index 97%
rename from src/tracker-extract/tracker-xmp.h
rename to src/libtracker-extract/tracker-xmp.h
index 09cd6b1..8c726a6 100644
--- a/src/tracker-extract/tracker-xmp.h
+++ b/src/libtracker-extract/tracker-xmp.h
@@ -23,6 +23,8 @@
 
 #include <glib.h>
 
+#include <libtracker-common/tracker-statement-list.h>
+
 G_BEGIN_DECLS
 
 typedef struct {
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index c5d2316..d74ebd8 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -15,11 +15,8 @@ INCLUDES = 								\
 	$(GDKPIXBUF_CFLAGS)						\
 	$(GMODULE_CFLAGS) 						\
 	$(DBUS_CFLAGS)							\
-	$(EXEMPI_CFLAGS) 						\
 	$(LIBJPEG_CFLAGS) 						\
 	$(LIBTIFF_CFLAGS) 						\
-	$(LIBEXIF_CFLAGS) 						\
-	$(LIBIPTCDATA_CFLAGS)						\
 	$(LIBGSF_CFLAGS) 						\
 	$(LIBWV2_CFLAGS) 						\
 	$(LIBXML2_CFLAGS) 						\
@@ -99,32 +96,21 @@ if HAVE_MOCKUP
 modules_LTLIBRARIES += libextract-mockup.la
 endif
 
-# Common XMP Sources
-xmp_sources = 								\
-	tracker-xmp.c							\
-	tracker-xmp.h
-
-# Common exif Sources
-exif_sources =								\
-	tracker-exif.c							\
-	tracker-exif.h
-
-# Common iptc Sources
-iptc_sources =								\
-	tracker-iptc.c							\
-	tracker-iptc.h
-
 # ABW
 libextract_abw_la_SOURCES = tracker-extract-abw.c
 libextract_abw_la_LDFLAGS = $(module_flags)
-libextract_abw_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_abw_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 # MP3
 libextract_mp3_la_SOURCES = tracker-extract-mp3.c
 libextract_mp3_la_LDFLAGS = $(module_flags)
-libextract_mp3_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_mp3_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 if HAVE_ENCA
 libextract_mp3_la_LIBADD += $(ENCA_LIBS)
@@ -134,25 +120,35 @@ endif
 # Vorbis (OGG)
 libextract_vorbis_la_SOURCES = tracker-extract-vorbis.c $(escape_sources)
 libextract_vorbis_la_LDFLAGS = $(module_flags)
-libextract_vorbis_la_LIBADD = $(GLIB2_LIBS) $(LIBVORBIS_LIBS) $(GCOV_LIBS)
+libextract_vorbis_la_LIBADD = 						\
+	$(LIBVORBIS_LIBS)						\
+	$(GLIB2_LIBS)							\
+	$(GCOV_LIBS)
 
 # MPlayer
 libextract_mplayer_la_SOURCES = tracker-extract-mplayer.c
 libextract_mplayer_la_LDFLAGS = $(module_flags)
-libextract_mplayer_la_LIBADD = $(GLIB2_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_mplayer_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(GLIB2_LIBS)
 
 # Oasis
 libextract_oasis_la_SOURCES = tracker-extract-oasis.c
 libextract_oasis_la_LDFLAGS = $(module_flags)
-libextract_oasis_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_oasis_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 # PNG
-libextract_png_la_SOURCES = tracker-extract-png.c $(xmp_sources)
+libextract_png_la_SOURCES = tracker-extract-png.c
 libextract_png_la_LDFLAGS = $(module_flags)
-libextract_png_la_LIBADD = $(GLIB2_LIBS) $(LIBPNG_LIBS) $(EXEMPI_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_png_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
+	$(GLIB2_LIBS) 							\
+	$(LIBPNG_LIBS) 							\
+	$(GCOV_LIBS)
 
 # PS
 libextract_ps_la_SOURCES = tracker-extract-ps.c
@@ -165,26 +161,37 @@ libextract_ps_la_LIBADD = 						\
 # Totem
 libextract_totem_la_SOURCES = tracker-extract-totem.c
 libextract_totem_la_LDFLAGS = $(module_flags)
-libextract_totem_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_totem_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 # XMP
-libextract_xmp_la_SOURCES = tracker-extract-xmp.c $(xmp_sources)
+libextract_xmp_la_SOURCES = tracker-extract-xmp.c
 libextract_xmp_la_LDFLAGS = $(module_flags)
-libextract_xmp_la_LIBADD = $(GLIB2_LIBS) $(EXEMPI_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_xmp_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 # HTML
 libextract_html_la_SOURCES = tracker-extract-html.c
 libextract_html_la_LDFLAGS = $(module_flags)
-libextract_html_la_LIBADD = $(GLIB2_LIBS) $(LIBXML2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_html_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GLIB2_LIBS) 							\
+	$(LIBXML2_LIBS) 						\
+	$(GCOV_LIBS)
 
 # MS Office
 libextract_msoffice_la_SOURCES = tracker-extract-msoffice.c
 libextract_msoffice_la_LDFLAGS = $(module_flags)
-libextract_msoffice_la_LIBADD = $(GLIB2_LIBS) $(LIBGSF_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_msoffice_la_LIBADD = 					\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(LIBGSF_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(GCOV_LIBS)
 
 if HAVE_LIBWV2
 libextract_msoffice_la_SOURCES += tracker-msword.cpp tracker-msword.h
@@ -192,60 +199,89 @@ libextract_msoffice_la_LIBADD += $(LIBWV2_LIBS)
 endif
 
 # PDF
-libextract_pdf_la_SOURCES = tracker-extract-pdf.c $(xmp_sources)
+libextract_pdf_la_SOURCES = tracker-extract-pdf.c
 libextract_pdf_la_LDFLAGS = $(module_flags)
-libextract_pdf_la_LIBADD = $(GLIB2_LIBS) $(POPPLER_GLIB_LIBS) $(EXEMPI_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_pdf_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
+	$(POPPLER_GLIB_LIBS)						\
+	$(GLIB2_LIBS)							\
+	$(GCOV_LIBS)
 
 # GStreamer
 libextract_gstreamer_la_SOURCES = tracker-extract-gstreamer.c
 libextract_gstreamer_la_LDFLAGS = $(module_flags)
-libextract_gstreamer_la_LIBADD = $(GSTREAMER_LIBS) $(GLIB2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_gstreamer_la_LIBADD = 					\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GSTREAMER_LIBS)						\
+	$(GLIB2_LIBS)							\
+	$(GCOV_LIBS)
 
 # GStreamer helix
 libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c
 libextract_gstreamer_helix_la_LDFLAGS = $(module_flags) $(albumart_flags)
-libextract_gstreamer_helix_la_LIBADD = $(GSTREAMER_LIBS) $(GLIB2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_gstreamer_helix_la_LIBADD = 					\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GSTREAMER_LIBS) 						\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 # Xine
 libextract_xine_la_SOURCES = tracker-extract-libxine.c
 libextract_xine_la_LDFLAGS = $(module_flags)
-libextract_xine_la_LIBADD = $(GLIB2_LIBS) $(XINE_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_xine_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(XINE_LIBS)							\
+	$(GLIB2_LIBS)  							\
+	$(GCOV_LIBS)
 
 # JPEG
-libextract_jpeg_la_SOURCES = tracker-extract-jpeg.c $(xmp_sources) $(iptc_sources) $(exif_sources)
+libextract_jpeg_la_SOURCES = tracker-extract-jpeg.c
 libextract_jpeg_la_LDFLAGS = $(module_flags)
-libextract_jpeg_la_LIBADD = $(GLIB2_LIBS) $(LIBJPEG_LIBS) $(LIBEXIF_LIBS) $(LIBIPTCDATA_LIBS) $(EXEMPI_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_jpeg_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
+	$(LIBJPEG_LIBS) 						\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 # TIFF
 libextract_tiff_la_SOURCES = tracker-extract-tiff.c $(xmp_sources) $(iptc_sources)
 libextract_tiff_la_LDFLAGS = $(module_flags)
-libextract_tiff_la_LIBADD = $(GLIB2_LIBS) $(LIBTIFF_LIBS) $(LIBIPTCDATA_LIBS) $(EXEMPI_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_tiff_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
+	$(LIBTIFF_LIBS) 						\
+	$(GLIB2_LIBS) 							\
+	$(GCOV_LIBS)
 
 # MOCKUP
 if HAVE_MOCKUP
 libextract_mockup_la_SOURCES = tracker-extract-mockup.c
 libextract_mockup_la_LDFLAGS = $(module_flags)
-libextract_mockup_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_mockup_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GLIB2_LIBS)  							\
+	$(GCOV_LIBS)
 endif
 
 # Playlists using totem-pl-parser
 libextract_playlist_la_SOURCES = tracker-extract-playlist.c
 libextract_playlist_la_LDFLAGS = $(module_flags)
-libextract_playlist_la_LIBADD = $(GLIB2_LIBS) $(TOTEM_PL_PARSER_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_playlist_la_LIBADD = 					\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(TOTEM_PL_PARSER_LIBS) 					\
+	$(GLIB2_LIBS)  							\
+	$(GCOV_LIBS)
 
 # TIFF
 libextract_text_la_SOURCES = tracker-extract-text.c
 libextract_text_la_LDFLAGS = $(module_flags)
-libextract_text_la_LIBADD = $(GLIB2_LIBS) $(GIO_LIBS) $(GCOV_LIBS) \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+libextract_text_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GIO_LIBS)							\
+	$(GLIB2_LIBS)  							\
+	$(GCOV_LIBS)
 
 #
 # Binaries
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index c8b8d8b..daca15d 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -47,10 +47,11 @@
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
+#include <libtracker-extract/tracker-xmp.h>
+#include <libtracker-extract/tracker-iptc.h>
+#include <libtracker-extract/tracker-exif.h>
+
 #include "tracker-main.h"
-#include "tracker-xmp.h"
-#include "tracker-iptc.h"
-#include "tracker-exif.h"
 
 #ifdef HAVE_LIBEXIF
 #define EXIF_NAMESPACE          "Exif"
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index de7f61c..fbc60a6 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -31,8 +31,9 @@
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-type-utils.h>
 
+#include <libtracker-extract/tracker-xmp.h>
+
 #include "tracker-main.h"
-#include "tracker-xmp.h"
 
 typedef struct {
 	gchar *title;
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index bc8820d..cde124b 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -41,8 +41,9 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
+#include <libtracker-extract/tracker-xmp.h>
+
 #include "tracker-main.h"
-#include "tracker-xmp.h"
 
 #define RFC1123_DATE_FORMAT "%d %B %Y %H:%M:%S %z"
 
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 6f96eca..12d1041 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -37,10 +37,11 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
+#include <libtracker-extract/tracker-xmp.h>
+#include <libtracker-extract/tracker-iptc.h>
+#include <libtracker-extract/tracker-exif.h>
+
 #include "tracker-main.h"
-#include "tracker-xmp.h"
-#include "tracker-iptc.h"
-#include "tracker-exif.h"
 
 #define EXIF_DATE_FORMAT        "%Y:%m:%d %H:%M:%S"
 
diff --git a/src/tracker-extract/tracker-extract-xmp.c b/src/tracker-extract/tracker-extract-xmp.c
index b8f6289..7f5740e 100644
--- a/src/tracker-extract/tracker-extract-xmp.c
+++ b/src/tracker-extract/tracker-extract-xmp.c
@@ -27,8 +27,9 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
+#include <libtracker-extract/tracker-xmp.h>
+
 #include "tracker-main.h"
-#include "tracker-xmp.h"
 
 static void extract_xmp (const gchar          *filename,
                          TrackerSparqlBuilder *metadata);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]