From a5f63b039a81cc7af32574554f1535e54ee38d04 Mon Sep 17 00:00:00 2001 From: Michael Biebl 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_extract_ 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_miner_ TRACKER_API_VERSION@_la_LIBADD = \ $(DBUS_LIBS) \ $(GIO_LIBS) \ $(GCOV_LIBS) \ - $(GLIB2_LIBS) \ - $(GDKPIXBUF_LIBS) + $(GLIB2_LIBS) if HAVE_LIBINOTIFY libtracker_miner_ 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-client- 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