[tracker] Improve PANGO linking

From: Martyn James Russell <mr src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker] Improve PANGO linking
Date: Wed, 14 Apr 2010 11:28:57 +0000 (UTC)
commit 71f1819bde4a430cf387fd56d71d996a9bfa510b
Author: Michael Biebl <biebl debian org>
Date:   Wed Apr 14 12:27:06 2010 +0100

    Improve PANGO linking

 docs/reference/libtracker-client/Makefile.am |    2 --
 docs/reference/libtracker-common/Makefile.am |    2 --
 docs/reference/libtracker-miner/Makefile.am  |    2 --
 examples/libtracker-miner/Makefile.am        |    1 -
 src/libtracker-common/Makefile.am            |    2 --
 src/libtracker-miner/Makefile.am             |    2 --
 src/miners/fs/Makefile.am                    |    2 --
 src/tracker-search-tool/Makefile.am          |    1 +
 src/tracker-status-icon/Makefile.am          |    2 ++
 src/tracker-store/Makefile.am                |    2 --
 tests/libtracker-common/Makefile.am          |    1 -
 tests/libtracker-extract/Makefile.am         |    1 -
 tests/libtracker-miner/Makefile.am           |    1 -
 tests/tracker-extract/Makefile.am            |    1 -
 tests/tracker-miner-fs/Makefile.am           |    2 --
 tests/tracker-store/Makefile.am              |    1 -
 16 files changed, 3 insertions(+), 22 deletions(-)
---
diff --git a/docs/reference/libtracker-client/Makefile.am b/docs/reference/libtracker-client/Makefile.am
index ee2beaa..e3ff49f 100644
--- a/docs/reference/libtracker-client/Makefile.am
+++ b/docs/reference/libtracker-client/Makefile.am
@@ -33,7 +33,6 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src						\
 	$(GLIB2_CFLAGS)							\
 	$(GIO_CFLAGS)							\
-	$(PANGO_CFLAGS)							\
 	$(HAL_CFLAGS)							\
 	$(DBUS_CFLAGS)
 
@@ -42,7 +41,6 @@ GTKDOC_LIBS =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(HAL_LIBS)							\
 	$(DBUS_LIBS)							\
-	$(PANGO_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GLIB2_LIBS)
 
diff --git a/docs/reference/libtracker-common/Makefile.am b/docs/reference/libtracker-common/Makefile.am
index 751309b..6c9db2f 100644
--- a/docs/reference/libtracker-common/Makefile.am
+++ b/docs/reference/libtracker-common/Makefile.am
@@ -31,7 +31,6 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src						\
 	$(GLIB2_CFLAGS)							\
 	$(GIO_CFLAGS)							\
-	$(PANGO_CFLAGS)							\
 	$(HAL_CFLAGS)							\
 	$(DBUS_CFLAGS)
 
@@ -39,7 +38,6 @@ GTKDOC_LIBS =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(HAL_LIBS)							\
 	$(DBUS_LIBS)							\
-	$(PANGO_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GLIB2_LIBS)
 
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index d8007d6..ecd7236 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -42,7 +42,6 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src						\
 	$(GLIB2_CFLAGS)							\
 	$(GIO_CFLAGS)							\
-	$(PANGO_CFLAGS)							\
 	$(HAL_CFLAGS)							\
 	$(DBUS_CFLAGS)
 
@@ -52,7 +51,6 @@ GTKDOC_LIBS =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(HAL_LIBS)							\
 	$(DBUS_LIBS)							\
-	$(PANGO_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GLIB2_LIBS)
 
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index bd13704..778d520 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -11,7 +11,6 @@ INCLUDES =							\
 	$(GCOV_CFLAGS)						\
 	$(GDKPIXBUF_CFLAGS)					\
 	$(GIO_CFLAGS)						\
-	$(PANGO_CFLAGS)						\
 	$(HAL_CFLAGS)						\
 	$(DEVKIT_POWER_CFLAGS)					\
 	$(DBUS_CFLAGS)						\
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 28e72b2..af61364 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -11,7 +11,6 @@ INCLUDES =						\
 	$(GCOV_CFLAGS)					\
 	$(GDKPIXBUF_CFLAGS)				\
 	$(GIO_CFLAGS)					\
-	$(PANGO_CFLAGS)					\
 	$(HAL_CFLAGS)					\
 	$(DEVKIT_POWER_CFLAGS)				\
 	$(DBUS_CFLAGS)
@@ -81,7 +80,6 @@ libtracker_common_la_LIBADD = 				\
 	$(HAL_LIBS)					\
 	$(DEVKIT_POWER_LIBS)				\
 	$(DBUS_LIBS)					\
-	$(PANGO_LIBS)					\
 	$(GIO_LIBS)					\
 	$(GCOV_LIBS)					\
 	$(GLIB2_LIBS)					\
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index d76318e..ae55358 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -13,7 +13,6 @@ INCLUDES =						\
 	$(GCOV_CFLAGS)					\
 	$(GDKPIXBUF_CFLAGS)				\
 	$(GIO_CFLAGS)					\
-	$(PANGO_CFLAGS)					\
 	$(HAL_CFLAGS)					\
 	$(DEVKIT_POWER_CFLAGS)				\
 	$(DBUS_CFLAGS)
@@ -64,7 +63,6 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(HAL_LIBS)					\
 	$(DEVKIT_POWER_LIBS)				\
 	$(DBUS_LIBS)					\
-	$(PANGO_LIBS)					\
 	$(GIO_LIBS)					\
 	$(GCOV_LIBS)					\
 	$(GLIB2_LIBS)					\
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index eaa3ee5..b66035d 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -11,7 +11,6 @@ INCLUDES =								\
 	-I$(top_srcdir)/src						\
 	$(WARN_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
-	$(PANGO_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(GCOV_CFLAGS)
 
@@ -37,7 +36,6 @@ tracker_miner_fs_LDADD =						\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
-	$(PANGO_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GCOV_LIBS)							\
 	$(GLIB2_LIBS)							\
diff --git a/src/tracker-search-tool/Makefile.am b/src/tracker-search-tool/Makefile.am
index 35a9225..5e4c937 100644
--- a/src/tracker-search-tool/Makefile.am
+++ b/src/tracker-search-tool/Makefile.am
@@ -25,6 +25,7 @@ tracker_search_tool_CFLAGS = \
 	-DSRCDIR=\"$(abs_srcdir)/\"				\
 	$(TRACKER_APPS_CFLAGS)					\
 	$(TRACKER_VALA_CFLAGS)					\
+	$(PANGO_CFLAGS)						\
 	$(WARN_CFLAGS)						\
 	$(GCOV_CFLAGS)						\
 	-include$(top_srcdir)/config.h  			\
diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am
index 82bc39c..f60e21f 100644
--- a/src/tracker-status-icon/Makefile.am
+++ b/src/tracker-status-icon/Makefile.am
@@ -8,6 +8,7 @@ INCLUDES =								\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	$(TRACKER_APPS_CFLAGS)						\
+	$(PANGO_CFLAGS)							\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)
 
@@ -19,6 +20,7 @@ tracker_status_icon_LDADD = 						\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(TRACKER_APPS_LIBS)						\
+	$(PANGO_LIBS)							\
 	$(GCOV_LIBS)							\
 	-lX11
 
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 3481179..9aa80d2 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -15,7 +15,6 @@ INCLUDES =								\
 	$(GIO_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
-	$(PANGO_CFLAGS)							\
 	$(FAM_CFLAGS)							\
 	$(SQLITE3_CFLAGS)
 
@@ -65,7 +64,6 @@ tracker_store_LDADD =							\
 	$(top_builddir)/src/libstemmer/libstemmer.la	 		\
 	$(SQLITE3_LIBS)							\
 	$(DBUS_LIBS)							\
-	$(PANGO_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index ca1203b..76fc1fe 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -18,7 +18,6 @@ INCLUDES = 								\
 	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
-	$(PANGO_CFLAGS)							\
 	$(DBUS_CFLAGS)
 
 tracker_dbus_SOURCES = 							\
diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am
index ef8e4df..dbe2193 100644
--- a/tests/libtracker-extract/Makefile.am
+++ b/tests/libtracker-extract/Makefile.am
@@ -16,7 +16,6 @@ INCLUDES = 								\
 	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
-	$(PANGO_CFLAGS)							\
 	$(DBUS_CFLAGS)
 
 tracker_utils_SOURCES = \
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index 5df44fa..e5b251e 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -28,7 +28,6 @@ INCLUDES =									\
 	$(GIO_CFLAGS)								\
 	$(GMODULE_CFLAGS)							\
 	$(GTHREAD_CFLAGS)							\
-	$(PANGO_CFLAGS)								\
 	$(DBUS_CFLAGS)
 
 LIBS =										\
diff --git a/tests/tracker-extract/Makefile.am b/tests/tracker-extract/Makefile.am
index e686e9e..0eb3a28 100644
--- a/tests/tracker-extract/Makefile.am
+++ b/tests/tracker-extract/Makefile.am
@@ -35,7 +35,6 @@ INCLUDES = 								\
 	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
-	$(PANGO_CFLAGS)							\
 	$(DBUS_CFLAGS)
 
 # TEST_UTILS_SOURCES = 							\
diff --git a/tests/tracker-miner-fs/Makefile.am b/tests/tracker-miner-fs/Makefile.am
index c3e559d..e407126 100644
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@ -20,7 +20,6 @@ INCLUDES = 									\
 	$(GCOV_CFLAGS)								\
 	$(GMODULE_CFLAGS)							\
 	$(GTHREAD_CFLAGS)							\
-	$(PANGO_CFLAGS)								\
 	$(DBUS_CFLAGS)
 
 tracker_metadata_utils_SOURCES = 						\
@@ -35,7 +34,6 @@ tracker_metadata_utils_LDADD =	                                        	\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/tests/common/libtracker-testcommon.la           	\
 	$(DBUS_LIBS)								\
-	$(PANGO_LIBS)								\
 	$(GMODULE_LIBS)								\
 	$(GTHREAD_LIBS)								\
 	$(GIO_LIBS)								\
diff --git a/tests/tracker-store/Makefile.am b/tests/tracker-store/Makefile.am
index 9261e17..20db3a9 100644
--- a/tests/tracker-store/Makefile.am
+++ b/tests/tracker-store/Makefile.am
@@ -19,7 +19,6 @@ INCLUDES = 									\
 	$(GCOV_CFLAGS)								\
 	$(GMODULE_CFLAGS)							\
 	$(GTHREAD_CFLAGS)							\
-	$(PANGO_CFLAGS)								\
 	$(DBUS_CFLAGS)
 
 # tracker_events_SOURCES = 							\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]