[tracker] Use API version for all include directories and pkg-config names

[Jürg Billeter <juergbi src gnome org>]

commit 228bb79ebde9dd7ba5c83834caa4078147891b61
Author: Jürg Billeter <j bitron ch>
Date:   Fri May 8 09:15:19 2009 +0200

    Use API version for all include directories and pkg-config names
---
 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    8 ++++++--
 data/libtracker-gtk.pc.in                          |    2 +-
 ...acker-module-1.0.pc.in => tracker-module.pc.in} |    2 +-
 data/tracker.pc.in                                 |    2 +-
 src/libtracker-common/Makefile.am                  |    2 +-
 src/libtracker-gtk/Makefile.am                     |    2 +-
 src/libtracker/Makefile.am                         |    4 +++-
 src/tracker-indexer/Makefile.am                    |    2 +-
 9 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index df6225e..cbc05e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1342,7 +1342,7 @@ AC_CONFIG_FILES([
 	data/modules/Makefile
 	data/ontologies/Makefile
 	data/tracker.pc
-	data/tracker-module-1.0.pc
+	data/tracker-module.pc
 	docs/Makefile
 	docs/design/Makefile
 	docs/manpages/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 154c7ba..41c03fa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,13 +16,17 @@ autostart_DATA = trackerd.desktop
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = 			\
 	tracker-$(TRACKER_API_VERSION).pc	\
-	tracker-module-1.0.pc
+	tracker-module-$(TRACKER_API_VERSION).pc
 
 tracker-$(TRACKER_API_VERSION).pc: tracker.pc
 	cp $< $@
 
+tracker-module-$(TRACKER_API_VERSION).pc: tracker-module.pc
+	cp $< $@
+
 CLEANFILES = $(autostart_DATA) $(autostart_in_files)	\
-	tracker-$(TRACKER_API_VERSION).pc
+	tracker-$(TRACKER_API_VERSION).pc		\
+	tracker-module-$(TRACKER_API_VERSION).pc
 
 if HAVE_LIBTRACKERGTK
 pkgconfig_DATA += libtracker-gtk-$(TRACKER_API_VERSION).pc
diff --git a/data/libtracker-gtk.pc.in b/data/libtracker-gtk.pc.in
index 4f95427..571944b 100644
--- a/data/libtracker-gtk.pc.in
+++ b/data/libtracker-gtk.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Requires.private: cairo
 Requires: tracker gtk+-2.0 glib-2.0
 Libs: -L${libdir} -ltracker-gtk- TRACKER_API_VERSION@
-Cflags: -I${includedir}/libtracker-gtk
+Cflags: -I${includedir}/libtracker-gtk- TRACKER_API_VERSION@
diff --git a/data/tracker-module-1.0.pc.in b/data/tracker-module.pc.in
similarity index 83%
rename from data/tracker-module-1.0.pc.in
rename to data/tracker-module.pc.in
index 0291fea..efb5681 100644
--- a/data/tracker-module-1.0.pc.in
+++ b/data/tracker-module.pc.in
@@ -8,4 +8,4 @@ Description: A library to develop tracker indexer modules
 Version: @VERSION@
 Requires: glib-2.0 pango
 Libs: -L${libdir}/tracker- TRACKER_API_VERSION@ -ltracker-module
-Cflags: -I${includedir}/tracker-1.0
+Cflags: -I${includedir}/tracker- TRACKER_API_VERSION@
diff --git a/data/tracker.pc.in b/data/tracker.pc.in
index e63db40..b72eb3f 100644
--- a/data/tracker.pc.in
+++ b/data/tracker.pc.in
@@ -8,5 +8,5 @@ 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@
-Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}
+Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}/tracker- TRACKER_API_VERSION@
 
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index d4a9335..57820f8 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES =						\
 	$(UNAC_CFLAGS)
 
 libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-libtracker_commonincludedir=$(includedir)/tracker-1.0/libtracker-common/
+libtracker_commonincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-common/
 libtracker_common_LTLIBRARIES = libtracker-common.la
 
 if OS_WIN32
diff --git a/src/libtracker-gtk/Makefile.am b/src/libtracker-gtk/Makefile.am
index 6c4af23..2396389 100644
--- a/src/libtracker-gtk/Makefile.am
+++ b/src/libtracker-gtk/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = 							\
 	$(LIBTRACKERGTK_CFLAGS)					\
 	$(GCOV_CFLAGS)
 
-libtracker_gtkincdir = $(includedir)/libtracker-gtk
+libtracker_gtkincdir = $(includedir)/libtracker-gtk- TRACKER_API_VERSION@
 
 lib_LTLIBRARIES = libtracker-gtk- TRACKER_API_VERSION@.la
 
diff --git a/src/libtracker/Makefile.am b/src/libtracker/Makefile.am
index 2975001..2dd1606 100644
--- a/src/libtracker/Makefile.am
+++ b/src/libtracker/Makefile.am
@@ -11,6 +11,8 @@ INCLUDES = 					\
 
 lib_LTLIBRARIES = libtrackerclient- TRACKER_API_VERSION@.la
 
+libtrackerclientincdir = $(includedir)/tracker-$(TRACKER_API_VERSION)
+
 libtrackerclient_ TRACKER_API_VERSION@_la_SOURCES = tracker.c
 
 libtrackerclient_ TRACKER_API_VERSION@_la_LDFLAGS = 			\
@@ -22,7 +24,7 @@ libtrackerclient_ TRACKER_API_VERSION@_la_LIBADD = 			\
 	$(GCOV_LIBS)				\
 	$(GOBJECT_LIBS)
 
-include_HEADERS = 				\
+libtrackerclientinc_HEADERS = 				\
 	tracker.h
 
 # Generate DBus files from XML data.
diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am
index 99dd9c7..d3d08bd 100644
--- a/src/tracker-indexer/Makefile.am
+++ b/src/tracker-indexer/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES =								\
 	$(RAPTOR_CFLAGS)
 
 libtracker_moduledir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-libtracker_moduleincludedir=$(includedir)/tracker-1.0/libtracker-module/
+libtracker_moduleincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-module/
 libtracker_module_LTLIBRARIES = libtracker-module.la
 
 libtracker_module_la_SOURCES =	 					\