GNOME.org
 

[tracker/libtracker-sparql-porting: 22/34] build: Fixed a myriad of build issues

commit 8fc13531ade88fd143fc4d59aa61016b473c3941
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jul 22 12:06:50 2010 +0100

    build: Fixed a myriad of build issues
    
    - Removed examples/tracker-steroids, unused now.
    - Fixed all tracker-extract/*.c includes using libtracker-client
    - Fixed TRACKER_IS_SPARQL_BUILDER for _SPARQL_IS_BUILDER
    - Fixed Makefile.am includes and linking with libtracker-client were
      not needed

 configure.ac                                       |    1 -
 .../libtracker-extract-sections.txt                |    1 +
 examples/Makefile.am                               |    3 +-
 examples/libtracker-extract/Makefile.am            |    3 +-
 .../libtracker-extract/tracker-extract-mockup.c    |    2 +-
 examples/tracker-steroids/.gitignore               |    5 -
 examples/tracker-steroids/Makefile.am              |   50 ----------
 examples/tracker-steroids/benchmark-tracker-ipc.c  |   91 ------------------
 examples/tracker-steroids/benchmark-update.c       |   92 ------------------
 examples/tracker-steroids/benchmark.c              |   91 ------------------
 examples/tracker-steroids/steroids-sparql-async.c  |   80 ----------------
 .../steroids-sparql-update-async.c                 |   98 --------------------
 examples/tracker-steroids/steroids-sparql.c        |   68 --------------
 src/libtracker-extract/Makefile.am                 |    1 +
 src/libtracker-extract/tracker-data.h              |    4 +-
 src/libtracker-extract/tracker-xmp.c               |    2 +-
 src/libtracker-extract/tracker-xmp.h               |    2 +-
 src/tracker-extract/tracker-extract-flac.c         |    4 +-
 src/tracker-extract/tracker-extract-gif.c          |    4 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |    2 -
 src/tracker-extract/tracker-extract-jpeg.c         |    4 +-
 src/tracker-extract/tracker-extract-mp3.c          |    2 -
 src/tracker-extract/tracker-extract-png.c          |    1 -
 src/tracker-extract/tracker-extract-tiff.c         |    1 -
 src/tracker-extract/tracker-extract-totem.c        |    7 +-
 src/tracker-extract/tracker-extract-vorbis.c       |    4 +-
 src/tracker-extract/tracker-extract.c              |    5 +-
 src/tracker-preferences/Makefile.am                |    1 -
 src/tracker-status-icon/Makefile.am                |    2 -
 src/tracker-utils/Makefile.am                      |    2 +-
 tests/Makefile.am                                  |    4 +-
 tests/libtracker-extract/Makefile.am               |    4 +-
 tests/libtracker-extract/tracker-xmp-test.c        |    3 +-
 tests/libtracker-miner/Makefile.am                 |    4 +-
 34 files changed, 29 insertions(+), 619 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 85cd6b2..9e21c35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1954,7 +1954,6 @@ AC_CONFIG_FILES([
 	examples/libtracker-extract/Makefile
 	examples/libtracker-miner/Makefile
 	examples/rss-reader/Makefile
-	examples/tracker-steroids/Makefile
 ])
 
 AC_OUTPUT
diff --git a/docs/reference/libtracker-extract/libtracker-extract-sections.txt b/docs/reference/libtracker-extract/libtracker-extract-sections.txt
index f28a32c..e8832c8 100644
--- a/docs/reference/libtracker-extract/libtracker-extract-sections.txt
+++ b/docs/reference/libtracker-extract/libtracker-extract-sections.txt
@@ -34,6 +34,7 @@ tracker_text_normalize
 tracker_text_validate_utf8
 tracker_date_format_to_iso8601
 tracker_date_guess
+tracker_keywords_parse
 </SECTION>
 
 <SECTION>
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1664c21..41a8a67 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,5 +3,4 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS = 			\
 	libtracker-extract	\
 	libtracker-miner	\
-	rss-reader		\
-	tracker-steroids
+	rss-reader
diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am
index 604a60f..878d44e 100644
--- a/examples/libtracker-extract/Makefile.am
+++ b/examples/libtracker-extract/Makefile.am
@@ -6,7 +6,7 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
 INCLUDES = 								\
 	-I$(top_srcdir)/src 						\
 	-I$(top_builddir)/src						\
-	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)
@@ -17,6 +17,7 @@ libextract_mockup_la_SOURCES = tracker-extract-mockup.c
 libextract_mockup_la_LDFLAGS = $(module_flags)
 libextract_mockup_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(GLIB2_LIBS)  							\
 	$(GCOV_LIBS)
 
diff --git a/examples/libtracker-extract/tracker-extract-mockup.c b/examples/libtracker-extract/tracker-extract-mockup.c
index 18d5c01..0d82f38 100644
--- a/examples/libtracker-extract/tracker-extract-mockup.c
+++ b/examples/libtracker-extract/tracker-extract-mockup.c
@@ -24,7 +24,7 @@
 #include <gio/gio.h>
 
 #include <libtracker-extract/tracker-extract.h>
-#include <libtracker-client/tracker-client.h>
+#include <libtracker-sparql/tracker-sparql.h>
 
 static void extract_mockup (const gchar          *uri,
                             TrackerSparqlBuilder *preupdate,
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index bfa9b1e..96e927e 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES =						\
 	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
 	-I$(top_builddir)/src				\
+	-I$(top_builddir)/src/libtracker-sparql		\
 	$(WARN_CFLAGS)					\
 	$(GLIB2_CFLAGS)					\
 	$(GCOV_CFLAGS)					\
diff --git a/src/libtracker-extract/tracker-data.h b/src/libtracker-extract/tracker-data.h
index ebe65c1..7b0cabf 100644
--- a/src/libtracker-extract/tracker-data.h
+++ b/src/libtracker-extract/tracker-data.h
@@ -24,9 +24,7 @@
 #error "only <libtracker-extract/tracker-extract.h> must be included directly."
 #endif
 
-#include <glib.h>
-
-#include <libtracker-client/tracker-sparql-builder.h>
+#include <libtracker-sparql/tracker-sparql.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index e146aba..872ec1d 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -662,7 +662,7 @@ tracker_xmp_apply (TrackerSparqlBuilder *metadata,
 	GPtrArray *keywords;
 	guint i;
 
-	g_return_val_if_fail (TRACKER_IS_SPARQL_BUILDER (metadata), FALSE);
+	g_return_val_if_fail (TRACKER_SPARQL_IS_BUILDER (metadata), FALSE);
 	g_return_val_if_fail (uri != NULL, FALSE);
 	g_return_val_if_fail (data != NULL, FALSE);
 
diff --git a/src/libtracker-extract/tracker-xmp.h b/src/libtracker-extract/tracker-xmp.h
index c9059c6..088abc3 100644
--- a/src/libtracker-extract/tracker-xmp.h
+++ b/src/libtracker-extract/tracker-xmp.h
@@ -25,7 +25,7 @@
 #error "only <libtracker-extract/tracker-extract.h> must be included directly."
 #endif
 
-#include <libtracker-client/tracker-sparql-builder.h>
+#include <libtracker-sparql/tracker-sparql.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-extract/tracker-extract-flac.c b/src/tracker-extract/tracker-extract-flac.c
index 5315d55..96fdd8d 100644
--- a/src/tracker-extract/tracker-extract-flac.c
+++ b/src/tracker-extract/tracker-extract-flac.c
@@ -28,9 +28,7 @@
 
 #include <FLAC/metadata.h>
 
-#include <libtracker-common/tracker-file-utils.h>
-
-#include <libtracker-client/tracker.h>
+#include <libtracker-common/tracker-common.h>
 
 #include <libtracker-extract/tracker-extract.h>
 
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
index 577608f..11d2e86 100644
--- a/src/tracker-extract/tracker-extract-gif.c
+++ b/src/tracker-extract/tracker-extract-gif.c
@@ -26,8 +26,8 @@
 
 #include <gif_lib.h>
 
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-client/tracker-client.h>
+#include <libtracker-common/tracker-common.h>
+
 #include <libtracker-extract/tracker-extract.h>
 
 #define XMP_MAGIC_TRAILER_LENGTH 256
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 7bd8321..614e0e1 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -35,8 +35,6 @@ long long int llroundl(long double x);
 #include <gst/gst.h>
 #include <gst/tag/tag.h>
 
-#include <libtracker-client/tracker.h>
-
 #include <libtracker-extract/tracker-extract.h>
 
 #include "tracker-albumart.h"
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index 5a84387..5d37fe0 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -29,8 +29,8 @@
 
 #include <jpeglib.h>
 
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-client/tracker-client.h>
+#include <libtracker-common/tracker-common.h>
+
 #include <libtracker-extract/tracker-extract.h>
 
 #include "tracker-main.h"
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 3e154f1..5e8c423 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -45,8 +45,6 @@
 
 #include <libtracker-common/tracker-common.h>
 
-#include <libtracker-client/tracker.h>
-
 #include <libtracker-extract/tracker-extract.h>
 
 #include "tracker-albumart.h"
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index d564679..25159ce 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -27,7 +27,6 @@
 #include <png.h>
 
 #include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-client/tracker-client.h>
 #include <libtracker-extract/tracker-extract.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 5b2b9c5..c7dcab5 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -24,7 +24,6 @@
 
 #include <tiffio.h>
 
-#include <libtracker-client/tracker-client.h>
 #include <libtracker-extract/tracker-extract.h>
 
 #define CM_TO_INCH          0.393700787
diff --git a/src/tracker-extract/tracker-extract-totem.c b/src/tracker-extract/tracker-extract-totem.c
index b87bb64..8c4e755 100644
--- a/src/tracker-extract/tracker-extract-totem.c
+++ b/src/tracker-extract/tracker-extract-totem.c
@@ -18,16 +18,15 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <glib.h>
 
-#include <libtracker-common/tracker-os-dependant.h>
-#include <libtracker-common/tracker-ontologies.h>
-#include <libtracker-common/tracker-utils.h>
+#include <libtracker-common/tracker-common.h>
 
 #include <libtracker-extract/tracker-extract.h>
-#include <libtracker-client/tracker.h>
 
 static void extract_totem (const gchar          *uri,
                            TrackerSparqlBuilder *preupdate,
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index cfda452..213c25d 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -28,9 +28,7 @@
 
 #include <vorbis/vorbisfile.h>
 
-#include <libtracker-common/tracker-file-utils.h>
-
-#include <libtracker-client/tracker.h>
+#include <libtracker-common/tracker-common.h>
 
 #include <libtracker-extract/tracker-extract.h>
 
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index 8817d01..dbf1b17 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -28,10 +28,7 @@
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-log.h>
-
-#include <libtracker-client/tracker-sparql-builder.h>
+#include <libtracker-common/tracker-common.h>
 
 #include <libtracker-extract/tracker-extract.h>
 
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 585b4a8..9e9e78a 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -38,7 +38,6 @@ tracker_preferences_SOURCES = 						\
 	$(tracker_preferences_VALASOURCES:.vala=.c)
 
 tracker_preferences_LDADD = 						\
-	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(TRACKER_APPS_LIBS)						\
 	$(GCOV_LIBS)
diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am
index 797cbc9..cb5c1c9 100644
--- a/src/tracker-status-icon/Makefile.am
+++ b/src/tracker-status-icon/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES =								\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
-	-I$(top_builddir)/src/libtracker-client				\
 	$(TRACKER_APPS_CFLAGS)						\
 	$(PANGO_CFLAGS)							\
 	$(WARN_CFLAGS)							\
@@ -19,7 +18,6 @@ bin_PROGRAMS = tracker-status-icon
 # Note: the -lX11 is needed for XGetModifierMapping() and other X11 calls
 tracker_status_icon_LDADD = 						\
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la 	\
-	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(TRACKER_APPS_LIBS)						\
 	$(PANGO_LIBS)							\
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 2efed32..8c07a99 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES =								\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
-	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b8a1cb6..e84748a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,10 +9,12 @@ SUBDIRS = 			\
 	libtracker-data		\
 	tracker-miner-fs	\
 	tracker-extract		\
-	tracker-steroids	\
 	tracker-store		\
 	tracker-writeback
 
+# Disabled until it works again
+#	tracker-steroids	
+
 if DIST_FUNCTIONAL_TESTS
 SUBDIRS += functional-tests
 endif
diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am
index 13ee713..e6291e4 100644
--- a/tests/libtracker-extract/Makefile.am
+++ b/tests/libtracker-extract/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
 	-I$(top_builddir)/src						\
-	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
@@ -27,7 +27,7 @@ tracker_utils_LDADD =							\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la   \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la   \
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GOBJECT_LIBS)							\
diff --git a/tests/libtracker-extract/tracker-xmp-test.c b/tests/libtracker-extract/tracker-xmp-test.c
index 3f06267..8d121d5 100644
--- a/tests/libtracker-extract/tracker-xmp-test.c
+++ b/tests/libtracker-extract/tracker-xmp-test.c
@@ -22,8 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libtracker-extract/tracker-xmp.h>
-#include <libtracker-client/tracker-sparql-builder.h>
+#include <libtracker-extract/tracker-extract.h>
 
 #define BROKEN_XMP "This is not even XML"
 #define EXAMPLE_XMP   \
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index f3d0ff8..fce4b35 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -28,6 +28,8 @@ INCLUDES =									\
 	-I$(top_builddir)/src/libtracker-client					\
 	-I$(top_srcdir)/src/libtracker-miner					\
 	-I$(top_builddir)/src/libtracker-miner					\
+	-I$(top_srcdir)/src/libtracker-sparql					\
+	-I$(top_builddir)/src/libtracker-sparql					\
 	$(WARN_CFLAGS)								\
 	$(GCOV_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
@@ -37,7 +39,7 @@ INCLUDES =									\
 	$(DBUS_CFLAGS)
 
 LIBS =										\
-	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la		\
 	$(DBUS_LIBS)                                                            \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]