From e582a7e6c8226a6aa2c3dcae30a4773dc8477bcd Mon Sep 17 00:00:00 2001 From: Michael Biebl 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-client- 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-miner- 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-miner- TRACKER_API_VERSION@.la @@ -65,7 +64,6 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = \ $(HAL_LIBS) \ $(DEVKIT_POWER_LIBS) \ $(DBUS_LIBS) \ - $(UNAC_LIBS) \ $(PANGO_LIBS) \ $(GIO_LIBS) \ $(GCOV_LIBS) \ -- 1.7.0.4