Hi,
I noticed with amazement, that tracker-store has a dependency against
libgtk [1], also the dependencies of e.g. libtracker-client-8.0-0 are
not ideal.
I started working on that a bit, and attached is a serious of patches.
To see the effect, I prepate a before and after of a few selected
(Debian) binary packages
before
======
Package: libtracker-client-0.8-0
Depends: libc6 (>= 2.3.6-6~), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2
(>= 0.78), libdevkit-power-gobject1 (>= 1:0.9.1), libglib2.0-0 (>=
2.24.0), libgtk2.0-0 (>= 2.18.0), libpango1.0-0 (>= 1.14.0), libunac
Package: libtracker-extract-0.8-0
Depends: libc6 (>= 2.3.6-6~), libexempi3 (>= 2.1.0), libexif12,
libglib2.0-0 (>= 2.20.0), libgtk2.0-0 (>= 2.18.0), libiptcdata0,
libtracker-client-0.8-0 (>= 0.8.1)
Package: libtracker-miner-0.8-0
Depends: libc6 (>= 2.4), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>=
0.78), libdevkit-power-gobject1 (>= 1:0.9.1), libglib2.0-0 (>=
2.24.0), libgnome-keyring0 (>= 2.22.2), libgtk2.0-0 (>= 2.18.0),
libpango1.0-0 (>= 1.14.0), libtracker-client-0.8-0 (>= 0.8.1),
libunac1
Package: tracker
Depends: libc6 (>= 2.3.6-6~), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2
(>= 0.78), libdevkit-power-gobject1 (>= 1:0.9.1), libglib2.0-0 (>=
2.24.0), libgtk2.0-0 (>= 2.18.0), libpango1.0-0 (>= 1.14.0),
libsqlite3-0 (>= 3.6.23.1), libtracker-client-0.8-0 (>= 0.8.1),
libtracker-miner-0.8-0 (>= 0.8.0), libunac1, libuuid1 (>= 2.16),
zlib1g (>= 1:1.1.4), shared-mime-info, dbus
after
=====
Package: libtracker-client-0.8-0
Depends: libc6 (>= 2.3.6-6~), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2
(>= 0.78), libdevkit-power-gobject1 (>= 1:0.9.1), libglib2.0-0 (>=
2.24.0)
Package: libtracker-extract-0.8-0
Depends: libc6 (>= 2.3.6-6~), libexempi3 (>= 2.1.0), libexif12,
libglib2.0-0 (>= 2.20.0), libiptcdata0, libtracker-client-0.8-0 (>=
0.8.1)
Package: libtracker-miner-0.8-0
Depends: libc6 (>= 2.4), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>=
0.78), libglib2.0-0 (>= 2.24.0), libgnome-keyring0 (>= 2.22.2),
libtracker-client-0.8-0 (>= 0.8.1)
Package: tracker
Depends: libc6 (>= 2.3.6-6~), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2
(>= 0.78), libdevkit-power-gobject1 (>= 1:0.9.1), libglib2.0-0 (>=
2.24.0), libpango1.0-0 (>= 1.14.0), libsqlite3-0 (>= 3.6.23.1),
libtracker-client-0.8-0 (>= 0.8.1), libtracker-miner-0.8-0 (>= 0.8.0),
libunac1, libuuid1 (>= 2.16), zlib1g (>= 1:1.1.4), shared-mime-info,
dbus
For now I concentrated on unac, pango, devicekit-power, hal and
gdkpixbuf and only link those libraries/binaries against them, when
they actually use them.
I've tested with binutils-gold to not break anything, but a review is
appreciated.
If possible I'd like to see that merged into the stable branch, too.
Cheers,
Michael
[1] http://packages.debian.org/experimental/tracker
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
From e582a7e6c8226a6aa2c3dcae30a4773dc8477bcd Mon Sep 17 00:00:00 2001
From: Michael Biebl <bi...@debian.org>
Date: Tue, 13 Apr 2010 04:59:21 +0200
Subject: [PATCH 1/5] Improve UNAC linking
---
docs/reference/libtracker-client/Makefile.am | 4 +---
docs/reference/libtracker-common/Makefile.am | 4 +---
docs/reference/libtracker-miner/Makefile.am | 4 +---
examples/libtracker-miner/Makefile.am | 1 -
src/libtracker-common/Makefile.am | 4 +---
src/libtracker-fts/Makefile.am | 2 ++
src/libtracker-miner/Makefile.am | 4 +---
7 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/docs/reference/libtracker-client/Makefile.am b/docs/reference/libtracker-client/Makefile.am
index 9c2c945..ee2beaa 100644
--- a/docs/reference/libtracker-client/Makefile.am
+++ b/docs/reference/libtracker-client/Makefile.am
@@ -35,15 +35,13 @@ INCLUDES = \
$(GIO_CFLAGS) \
$(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(UNAC_CFLAGS)
+ $(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-client/libtracker-clie...@tracker_api_version@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(HAL_LIBS) \
$(DBUS_LIBS) \
- $(UNAC_LIBS) \
$(PANGO_LIBS) \
$(GIO_LIBS) \
$(GLIB2_LIBS)
diff --git a/docs/reference/libtracker-common/Makefile.am b/docs/reference/libtracker-common/Makefile.am
index e8cc890..751309b 100644
--- a/docs/reference/libtracker-common/Makefile.am
+++ b/docs/reference/libtracker-common/Makefile.am
@@ -33,14 +33,12 @@ INCLUDES = \
$(GIO_CFLAGS) \
$(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(UNAC_CFLAGS)
+ $(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(HAL_LIBS) \
$(DBUS_LIBS) \
- $(UNAC_LIBS) \
$(PANGO_LIBS) \
$(GIO_LIBS) \
$(GLIB2_LIBS)
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index 7e4dbe6..d8007d6 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -44,8 +44,7 @@ INCLUDES = \
$(GIO_CFLAGS) \
$(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(UNAC_CFLAGS)
+ $(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-miner/libtracker-min...@tracker_api_version@.la \
@@ -53,7 +52,6 @@ GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(HAL_LIBS) \
$(DBUS_LIBS) \
- $(UNAC_LIBS) \
$(PANGO_LIBS) \
$(GIO_LIBS) \
$(GLIB2_LIBS)
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index 5f753ce..bd13704 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -15,7 +15,6 @@ INCLUDES = \
$(HAL_CFLAGS) \
$(DEVKIT_POWER_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UNAC_CFLAGS)
noinst_PROGRAMS = tracker-miner-test
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index a10a2d4..28e72b2 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -14,8 +14,7 @@ INCLUDES = \
$(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
$(DEVKIT_POWER_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(UNAC_CFLAGS)
+ $(DBUS_CFLAGS)
libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
libtracker_common_LTLIBRARIES = libtracker-common.la
@@ -82,7 +81,6 @@ libtracker_common_la_LIBADD = \
$(HAL_LIBS) \
$(DEVKIT_POWER_LIBS) \
$(DBUS_LIBS) \
- $(UNAC_LIBS) \
$(PANGO_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
index efe5757..4938097 100644
--- a/src/libtracker-fts/Makefile.am
+++ b/src/libtracker-fts/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
$(GCOV_CFLAGS) \
$(PANGO_CFLAGS) \
$(DBUS_CFLAGS) \
+ $(UNAC_CFLAGS) \
$(SQLITE3_CFLAGS)
noinst_LTLIBRARIES = libtracker-fts.la
@@ -30,4 +31,5 @@ libtracker_fts_la_LIBADD = \
$(GTHREAD_LIBS) \
$(GCOV_LIBS) \
$(PANGO_LIBS) \
+ $(UNAC_LIBS) \
$(GLIB2_LIBS)
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 64cef25..d76318e 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -16,8 +16,7 @@ INCLUDES = \
$(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
$(DEVKIT_POWER_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(UNAC_CFLAGS)
+ $(DBUS_CFLAGS)
lib_LTLIBRARIES = libtracker-min...@tracker_api_version@.la
@@ -65,7 +64,6 @@ libtracker_min...@tracker_api_version@_la_LIBADD = \
$(HAL_LIBS) \
$(DEVKIT_POWER_LIBS) \
$(DBUS_LIBS) \
- $(UNAC_LIBS) \
$(PANGO_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
--
1.7.0.4
From 2b5ceb518e91fc6a988a3b8d3ef4a99192654179 Mon Sep 17 00:00:00 2001
From: Michael Biebl <bi...@debian.org>
Date: Tue, 13 Apr 2010 05:13:36 +0200
Subject: [PATCH 2/5] 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_min...@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-clie...@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-clie...@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 = \
--
1.7.0.4
From 9edbe61376b72d4cbcf1b8554a72b61a3ebaea1f Mon Sep 17 00:00:00 2001
From: Michael Biebl <bi...@debian.org>
Date: Tue, 13 Apr 2010 22:13:23 +0200
Subject: [PATCH 3/5] Improve DEVICEKIT_POWER linking
---
examples/libtracker-miner/Makefile.am | 2 --
src/libtracker-miner/Makefile.am | 3 ---
2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index 778d520..593e2ad 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES = \
-DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
@@ -12,7 +11,6 @@ INCLUDES = \
$(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(HAL_CFLAGS) \
- $(DEVKIT_POWER_CFLAGS) \
$(DBUS_CFLAGS) \
noinst_PROGRAMS = tracker-miner-test
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index ae55358..8651f6d 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -5,7 +5,6 @@ INCLUDES = \
-DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
-DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
@@ -14,7 +13,6 @@ INCLUDES = \
$(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(HAL_CFLAGS) \
- $(DEVKIT_POWER_CFLAGS) \
$(DBUS_CFLAGS)
lib_LTLIBRARIES = libtracker-min...@tracker_api_version@.la
@@ -61,7 +59,6 @@ libtracker_min...@tracker_api_version@_la_LIBADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-client/libtracker-clie...@tracker_api_version@.la \
$(HAL_LIBS) \
- $(DEVKIT_POWER_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
--
1.7.0.4
From b6df30c5a3540f32e7157aafb48ccb6b24b2c8c6 Mon Sep 17 00:00:00 2001
From: Michael Biebl <bi...@debian.org>
Date: Tue, 13 Apr 2010 22:22:27 +0200
Subject: [PATCH 4/5] Improve HAL 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 | 3 +--
src/libtracker-miner/Makefile.am | 2 --
5 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/docs/reference/libtracker-client/Makefile.am b/docs/reference/libtracker-client/Makefile.am
index e3ff49f..522a69c 100644
--- a/docs/reference/libtracker-client/Makefile.am
+++ b/docs/reference/libtracker-client/Makefile.am
@@ -33,13 +33,11 @@ INCLUDES = \
-I$(top_srcdir)/src \
$(GLIB2_CFLAGS) \
$(GIO_CFLAGS) \
- $(HAL_CFLAGS) \
$(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-client/libtracker-clie...@tracker_api_version@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(HAL_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GLIB2_LIBS)
diff --git a/docs/reference/libtracker-common/Makefile.am b/docs/reference/libtracker-common/Makefile.am
index 6c9db2f..1c77b36 100644
--- a/docs/reference/libtracker-common/Makefile.am
+++ b/docs/reference/libtracker-common/Makefile.am
@@ -31,12 +31,10 @@ INCLUDES = \
-I$(top_srcdir)/src \
$(GLIB2_CFLAGS) \
$(GIO_CFLAGS) \
- $(HAL_CFLAGS) \
$(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(HAL_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GLIB2_LIBS)
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index ecd7236..650b6f3 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -42,14 +42,12 @@ INCLUDES = \
-I$(top_srcdir)/src \
$(GLIB2_CFLAGS) \
$(GIO_CFLAGS) \
- $(HAL_CFLAGS) \
$(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-miner/libtracker-min...@tracker_api_version@.la \
$(top_builddir)/src/libtracker-client/libtracker-clie...@tracker_api_version@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(HAL_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GLIB2_LIBS)
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index 593e2ad..bc723db 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -10,8 +10,7 @@ INCLUDES = \
$(GCOV_CFLAGS) \
$(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
- $(HAL_CFLAGS) \
- $(DBUS_CFLAGS) \
+ $(DBUS_CFLAGS)
noinst_PROGRAMS = tracker-miner-test
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 8651f6d..69040ea 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -12,7 +12,6 @@ INCLUDES = \
$(GCOV_CFLAGS) \
$(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
- $(HAL_CFLAGS) \
$(DBUS_CFLAGS)
lib_LTLIBRARIES = libtracker-min...@tracker_api_version@.la
@@ -58,7 +57,6 @@ libtracker_min...@tracker_api_version@_la_LDFLAGS = \
libtracker_min...@tracker_api_version@_la_LIBADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-client/libtracker-clie...@tracker_api_version@.la \
- $(HAL_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
--
1.7.0.4
From a5f63b039a81cc7af32574554f1535e54ee38d04 Mon Sep 17 00:00:00 2001
From: Michael Biebl <bi...@debian.org>
Date: Tue, 13 Apr 2010 23:00:49 +0200
Subject: [PATCH 5/5] Improve GDKPIXBUF linking
---
examples/libtracker-miner/Makefile.am | 1 -
src/libtracker-common/Makefile.am | 4 +---
src/libtracker-extract/Makefile.am | 2 --
src/libtracker-miner/Makefile.am | 4 +---
src/tracker-search-bar/Makefile.am | 2 ++
src/tracker-search-tool/Makefile.am | 2 ++
6 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index bc723db..72300ed 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GCOV_CFLAGS) \
- $(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(DBUS_CFLAGS)
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index af61364..5a3d33e 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -9,7 +9,6 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GCOV_CFLAGS) \
- $(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(HAL_CFLAGS) \
$(DEVKIT_POWER_CFLAGS) \
@@ -82,8 +81,7 @@ libtracker_common_la_LIBADD = \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
- $(GLIB2_LIBS) \
- $(GDKPIXBUF_LIBS)
+ $(GLIB2_LIBS)
marshal_sources = \
tracker-marshal.h \
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 1cf67f7..8d02c20 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GCOV_CFLAGS) \
- $(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(LIBIPTCDATA_CFLAGS) \
$(LIBEXIF_CFLAGS) \
@@ -48,7 +47,6 @@ libtracker_extra...@tracker_api_version@_la_LIBADD = \
$(GIO_LIBS) \
$(GCOV_LIBS) \
$(GLIB2_LIBS) \
- $(GDKPIXBUF_LIBS) \
$(LIBIPTCDATA_LIBS) \
$(LIBEXIF_LIBS) \
$(EXEMPI_LIBS)
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 69040ea..a438ad6 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -10,7 +10,6 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GCOV_CFLAGS) \
- $(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(DBUS_CFLAGS)
@@ -60,8 +59,7 @@ libtracker_min...@tracker_api_version@_la_LIBADD = \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
- $(GLIB2_LIBS) \
- $(GDKPIXBUF_LIBS)
+ $(GLIB2_LIBS)
if HAVE_LIBINOTIFY
libtracker_min...@tracker_api_version@_la_LIBADD += \
diff --git a/src/tracker-search-bar/Makefile.am b/src/tracker-search-bar/Makefile.am
index fb68259..7a7fe3d 100644
--- a/src/tracker-search-bar/Makefile.am
+++ b/src/tracker-search-bar/Makefile.am
@@ -18,6 +18,7 @@ tracker_search_bar_CFLAGS = \
-I$(top_srcdir)/src \
$(TRACKER_APPS_CFLAGS) \
$(TRACKER_APPLETS_CFLAGS) \
+ $(GDKPIXBUF_CFLAGS) \
$(WARN_CFLAGS) \
$(GCOV_CFLAGS)
@@ -25,6 +26,7 @@ tracker_search_bar_LDADD = \
$(top_builddir)/src/libtracker-client/libtracker-clie...@tracker_api_version@.la \
$(TRACKER_APPS_LIBS) \
$(TRACKER_APPLETS_LIBS) \
+ $(GDKPIXBUF_LIBS) \
$(GCOV_LIBS)
uidir = $(datadir)/tracker
diff --git a/src/tracker-search-tool/Makefile.am b/src/tracker-search-tool/Makefile.am
index 5e4c937..9e9341a 100644
--- a/src/tracker-search-tool/Makefile.am
+++ b/src/tracker-search-tool/Makefile.am
@@ -26,6 +26,7 @@ tracker_search_tool_CFLAGS = \
$(TRACKER_APPS_CFLAGS) \
$(TRACKER_VALA_CFLAGS) \
$(PANGO_CFLAGS) \
+ $(GDKPIXBUF_CFLAGS) \
$(WARN_CFLAGS) \
$(GCOV_CFLAGS) \
-include$(top_srcdir)/config.h \
@@ -34,6 +35,7 @@ tracker_search_tool_CFLAGS = \
tracker_search_tool_LDADD = \
$(TRACKER_APPS_LIBS) \
$(TRACKER_VALA_LIBS) \
+ $(GDKPIXBUF_LIBS) \
$(GCOV_LIBS) \
$(NULL)
--
1.7.0.4
_______________________________________________
tracker-list mailing list
tracker-list@gnome.org
http://mail.gnome.org/mailman/listinfo/tracker-list
