GNOME.org
 

[tracker] Rename libtrackerclient to libtracker-client

commit 1020b164a75a72acd21b47a949758be5a8aa9f6f
Author: Jürg Billeter <j bitron ch>
Date:   Tue Sep 8 15:04:41 2009 +0200

    Rename libtrackerclient to libtracker-client
    
    Also update pkg-config name and source diretory. This eliminates
    inconsistency with other tracker libraries.

 configure.ac                                      |    4 ++--
 data/Makefile.am                                  |    6 +++---
 data/{tracker.pc.in => tracker-client.pc.in}      |    4 ++--
 src/Makefile.am                                   |    4 ++--
 src/{libtracker => libtracker-client}/COPYING.LIB |    0
 src/{libtracker => libtracker-client}/Makefile.am |   12 ++++++------
 src/{libtracker => libtracker-client}/tracker.c   |    0
 src/{libtracker => libtracker-client}/tracker.h   |    0
 src/libtracker-gtk/Makefile.am                    |    4 ++--
 src/libtracker-gtk/tracker-keyword-store.h        |    2 +-
 src/libtracker-gtk/tracker-metadata-tile.h        |    2 +-
 src/libtracker-gtk/tracker-tag-bar.h              |    2 +-
 src/libtracker-gtk/tracker-utils.h                |    2 +-
 src/libtracker-miner/Makefile.am                  |    2 +-
 src/libtracker-miner/tracker-miner.h              |    2 +-
 src/tracker-miner-fs/Makefile.am                  |    2 +-
 src/tracker-preferences/Makefile.am               |    2 +-
 src/tracker-preferences/tracker-preferences.c     |    2 +-
 src/tracker-search-tool/Makefile.am               |    3 +--
 src/tracker-search-tool/tracker-search-tool.h     |    2 +-
 src/tracker-utils/Makefile.am                     |    2 +-
 src/tracker-utils/tracker-import.c                |    2 +-
 src/tracker-utils/tracker-info.c                  |    2 +-
 src/tracker-utils/tracker-search.c                |    2 +-
 src/tracker-utils/tracker-sparql.c                |    2 +-
 src/tracker-utils/tracker-stats.c                 |    2 +-
 src/tracker-utils/tracker-status.c                |    2 +-
 src/tracker-utils/tracker-tag.c                   |    2 +-
 tests/tracker-miner-fs/Makefile.am                |    2 +-
 29 files changed, 37 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b4ee349..d2068b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1376,7 +1376,7 @@ AC_CONFIG_FILES([
 	data/libtracker-gtk.pc
 	data/Makefile
 	data/ontologies/Makefile
-	data/tracker.pc
+	data/tracker-client.pc
 	data/tracker-miner.pc
 	docs/Makefile
 	docs/design/Makefile
@@ -1398,7 +1398,7 @@ AC_CONFIG_FILES([
 	src/libtracker-data/Makefile
 	src/libtracker-db/Makefile
 	src/libtracker-gtk/Makefile
-	src/libtracker/Makefile
+	src/libtracker-client/Makefile
         src/libtracker-miner/Makefile
         src/libtracker-miner/test/Makefile
 	src/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 47278bf..0ff7e79 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -38,10 +38,10 @@ endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = 					\
-	tracker-$(TRACKER_API_VERSION).pc		\
+	tracker-client-$(TRACKER_API_VERSION).pc		\
 	tracker-miner-$(TRACKER_API_VERSION).pc
 
-tracker-$(TRACKER_API_VERSION).pc: tracker.pc
+tracker-client-$(TRACKER_API_VERSION).pc: tracker-client.pc
 	cp $< $@
 
 tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
@@ -50,7 +50,7 @@ tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
 CLEANFILES = 						\
 	$(autostart_DATA) 				\
 	$(autostart_in_files)				\
-	tracker-$(TRACKER_API_VERSION).pc		\
+	tracker-client-$(TRACKER_API_VERSION).pc		\
 	tracker-miner-$(TRACKER_API_VERSION).pc
 
 if HAVE_LIBTRACKERGTK
diff --git a/data/tracker.pc.in b/data/tracker-client.pc.in
similarity index 79%
rename from data/tracker.pc.in
rename to data/tracker-client.pc.in
index b72eb3f..d854f1a 100644
--- a/data/tracker.pc.in
+++ b/data/tracker-client.pc.in
@@ -3,10 +3,10 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: tracker
+Name: tracker-client
 Description: Tracker : Indexer, metadata harvester and metadata database
 Version: @VERSION@
 Requires: glib-2.0 dbus-1 dbus-glib-1
-Libs: -L${libdir} -ltrackerclient- TRACKER_API_VERSION@
+Libs: -L${libdir} -ltracker-client- TRACKER_API_VERSION@
 Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}/tracker- TRACKER_API_VERSION@
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 88811f4..747a022 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = 					\
 	tracker-fts				\
 	libtracker-db				\
 	libtracker-data				\
-	libtracker				\
+	libtracker-client			\
 	libtracker-miner			\
 	plugins					\
 	tracker-store				\
@@ -42,7 +42,7 @@ DIST_SUBDIRS = 					\
 	tracker-fts				\
 	libtracker-db				\
 	libtracker-data				\
-	libtracker				\
+	libtracker-client			\
 	libtracker-miner			\
 	tracker-store				\
 	tracker-utils				\
diff --git a/src/libtracker/COPYING.LIB b/src/libtracker-client/COPYING.LIB
similarity index 100%
rename from src/libtracker/COPYING.LIB
rename to src/libtracker-client/COPYING.LIB
diff --git a/src/libtracker/Makefile.am b/src/libtracker-client/Makefile.am
similarity index 65%
rename from src/libtracker/Makefile.am
rename to src/libtracker-client/Makefile.am
index 990c67f..5422b8e 100644
--- a/src/libtracker/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -9,22 +9,22 @@ INCLUDES = 					\
 	$(GCOV_CFLAGS)				\
 	$(DBUS_CFLAGS)			
 
-lib_LTLIBRARIES = libtrackerclient- TRACKER_API_VERSION@.la
+lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
 
-libtrackerclientincdir = $(includedir)/tracker-$(TRACKER_API_VERSION)
+libtracker_clientincdir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-client
 
-libtrackerclient_ TRACKER_API_VERSION@_la_SOURCES = tracker.c
+libtracker_client_ TRACKER_API_VERSION@_la_SOURCES = tracker.c
 
-libtrackerclient_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
+libtracker_client_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-libtrackerclient_ TRACKER_API_VERSION@_la_LIBADD =	\
+libtracker_client_ TRACKER_API_VERSION@_la_LIBADD =	\
 	$(GLIB2_LIBS) 					\
 	$(DBUS_LIBS)					\
 	$(GCOV_LIBS)					\
 	$(GOBJECT_LIBS)
 
-libtrackerclientinc_HEADERS = 				\
+libtracker_clientinc_HEADERS = 				\
 	tracker.h
 
 # Generate DBus files from XML data.
diff --git a/src/libtracker/tracker.c b/src/libtracker-client/tracker.c
similarity index 100%
rename from src/libtracker/tracker.c
rename to src/libtracker-client/tracker.c
diff --git a/src/libtracker/tracker.h b/src/libtracker-client/tracker.h
similarity index 100%
rename from src/libtracker/tracker.h
rename to src/libtracker-client/tracker.h
diff --git a/src/libtracker-gtk/Makefile.am b/src/libtracker-gtk/Makefile.am
index 58c4a28..0d3314e 100644
--- a/src/libtracker-gtk/Makefile.am
+++ b/src/libtracker-gtk/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES = 							\
-	-I$(top_srcdir)/src/libtracker			 	\
+	-I$(top_srcdir)/src				 	\
 	$(WARN_CFLAGS)						\
 	$(LIBTRACKERGTK_CFLAGS)					\
 	$(GCOV_CFLAGS)
@@ -26,7 +26,7 @@ libtracker_gtk_ TRACKER_API_VERSION@_la_SOURCES =					\
 	tracker-keyword-store.c
 
 libtracker_gtk_ TRACKER_API_VERSION@_la_LIBADD = 					\
-	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la 	\
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la 	\
 	$(LIBTRACKERGTK_LIBS) 					\
 	$(GCOV_LIBS)
 
diff --git a/src/libtracker-gtk/tracker-keyword-store.h b/src/libtracker-gtk/tracker-keyword-store.h
index 247b197..1238200 100644
--- a/src/libtracker-gtk/tracker-keyword-store.h
+++ b/src/libtracker-gtk/tracker-keyword-store.h
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include <tracker.h>
+#include <libtracker-client/tracker.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-gtk/tracker-metadata-tile.h b/src/libtracker-gtk/tracker-metadata-tile.h
index 53fad96..d7cb3aa 100644
--- a/src/libtracker-gtk/tracker-metadata-tile.h
+++ b/src/libtracker-gtk/tracker-metadata-tile.h
@@ -24,7 +24,7 @@
 #define TRACKER_METADATA_TILE_H
 
 #include <gtk/gtk.h>
-#include <tracker.h>
+#include <libtracker-client/tracker.h>
 
 
 #define TRACKER_TYPE_METADATA_TILE		(tracker_metadata_tile_get_type ())
diff --git a/src/libtracker-gtk/tracker-tag-bar.h b/src/libtracker-gtk/tracker-tag-bar.h
index 8452a0f..987e900 100644
--- a/src/libtracker-gtk/tracker-tag-bar.h
+++ b/src/libtracker-gtk/tracker-tag-bar.h
@@ -24,7 +24,7 @@
 #define TRACKER_TAG_BAR_H
 
 #include <gtk/gtk.h>
-#include <tracker.h>
+#include <libtracker-client/tracker.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-gtk/tracker-utils.h b/src/libtracker-gtk/tracker-utils.h
index 68ffbda..7cfbf9d 100644
--- a/src/libtracker-gtk/tracker-utils.h
+++ b/src/libtracker-gtk/tracker-utils.h
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <tracker.h>
+#include <libtracker-client/tracker.h>
 
 GList *		tracker_keyword_array_to_glist (gchar **array);
 GList *		tracker_get_all_keywords (TrackerClient *tracker_client);
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 6c93049..389e0b0 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -52,7 +52,7 @@ libtracker_miner_la_LDFLAGS = \
 libtracker_miner_la_LIBADD = 				\
 	$(top_builddir)/src/libstemmer/libstemmer.la	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libinotify/libinotify.la	\
 	$(HAL_LIBS)					\
 	$(DEVKIT_POWER_LIBS)				\
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index f2f059b..5d3b0ef 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -22,7 +22,7 @@
 #define __LIBTRACKERMINER_MINER_H__
 
 #include <glib-object.h>
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-miner-fs/Makefile.am b/src/tracker-miner-fs/Makefile.am
index 9c9069e..a5b2047 100644
--- a/src/tracker-miner-fs/Makefile.am
+++ b/src/tracker-miner-fs/Makefile.am
@@ -36,7 +36,7 @@ tracker_miner_fs_LDADD =						\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libstemmer/libstemmer.la	 		\
 	$(top_builddir)/src/libinotify/libinotify.la			\
 	$(top_builddir)/src/libtracker-miner/libtracker-miner.la	\
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 357c367..a295abb 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -32,7 +32,7 @@ tracker_preferences_SOURCES = 						\
 	tracker-preferences-utils.h
 
 tracker_preferences_LDADD = 						\
-	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la	\
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(GTK2_LIBS) 							\
 	$(DBUS_LIBS) 							\
diff --git a/src/tracker-preferences/tracker-preferences.c b/src/tracker-preferences/tracker-preferences.c
index 2a5b3b4..7628fef 100644
--- a/src/tracker-preferences/tracker-preferences.c
+++ b/src/tracker-preferences/tracker-preferences.c
@@ -28,7 +28,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
 #include "tracker-preferences.h"
diff --git a/src/tracker-search-tool/Makefile.am b/src/tracker-search-tool/Makefile.am
index b733d26..b6a9f8c 100644
--- a/src/tracker-search-tool/Makefile.am
+++ b/src/tracker-search-tool/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = 	\
 	-DTRACKER_DATADIR=\""$(datadir)"\"			\
 	-DGREP_COMMAND=\""$(GREP_COMMAND)"\"			\
 	-I$(top_srcdir)/src/					\
-	-I$(top_srcdir)/src/libtracker				\
 	$(WARN_CFLAGS)						\
 	$(GLIB2_CFLAGS)						\
 	$(GCOV_CFLAGS)						\
@@ -36,7 +35,7 @@ tracker_search_tool_LDADD =   					\
 	$(GNOMEDESKTOP_LIBS) 					\
 	$(DBUS_LIBS)						\
         $(top_builddir)/src/libtracker-gtk/libtracker-gtk- TRACKER_API_VERSION@.la 	\
-	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la 
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la 
 
 
 desktopdir = $(datadir)/applications
diff --git a/src/tracker-search-tool/tracker-search-tool.h b/src/tracker-search-tool/tracker-search-tool.h
index 465e625..0b846e3 100644
--- a/src/tracker-search-tool/tracker-search-tool.h
+++ b/src/tracker-search-tool/tracker-search-tool.h
@@ -44,7 +44,7 @@ extern "C" {
 
 #include <libgnomeui/libgnomeui.h>
 
-#include "../libtracker/tracker.h"
+#include <libtracker-client/tracker.h>
 
 #define MAX_SEARCH_RESULTS 10
 
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 8afe822..f05c676 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -16,7 +16,7 @@ libs = 									\
 	$(top_builddir)/src/libtracker-miner/libtracker-miner.la	\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(DBUS_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GTHREAD_LIBS)							\
diff --git a/src/tracker-utils/tracker-import.c b/src/tracker-utils/tracker-import.c
index f080877..cb8bf58 100644
--- a/src/tracker-utils/tracker-import.c
+++ b/src/tracker-utils/tracker-import.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
 static gchar        **filenames = NULL;
diff --git a/src/tracker-utils/tracker-info.c b/src/tracker-utils/tracker-info.c
index 6ee330d..1cc68d2 100644
--- a/src/tracker-utils/tracker-info.c
+++ b/src/tracker-utils/tracker-info.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
 static gchar        **filenames = NULL;
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index a13fd48..81b3c3f 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
 static gint	      limit = 512;
diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c
index c02b0e9..bbb8a59 100644
--- a/src/tracker-utils/tracker-sparql.c
+++ b/src/tracker-utils/tracker-sparql.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
 static gchar	*file;
diff --git a/src/tracker-utils/tracker-stats.c b/src/tracker-utils/tracker-stats.c
index 727e4ac..21bac4c 100644
--- a/src/tracker-utils/tracker-stats.c
+++ b/src/tracker-utils/tracker-stats.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 
 static void
 get_meta_table_data (gpointer value)
diff --git a/src/tracker-utils/tracker-status.c b/src/tracker-utils/tracker-status.c
index 8c63de2..ae49451 100644
--- a/src/tracker-utils/tracker-status.c
+++ b/src/tracker-utils/tracker-status.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 
 #include <libtracker-common/tracker-type-utils.h>
 
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index 5a573d6..09634d4 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -29,7 +29,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include <libtracker/tracker.h>
+#include <libtracker-client/tracker.h>
 #include <libtracker-common/tracker-common.h>
 
 #ifdef G_OS_WIN32
diff --git a/tests/tracker-miner-fs/Makefile.am b/tests/tracker-miner-fs/Makefile.am
index d0f44de..07ef3c4 100644
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@ -35,7 +35,7 @@ tracker_metadata_utils_LDADD =	                                        	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la 			\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 			\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 		\
-	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/tests/common/libtracker-testcommon.la           	\
 	$(top_builddir)/src/libinotify/libinotify.la				\
 	$(DBUS_LIBS)								\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]