From b6df30c5a3540f32e7157aafb48ccb6b24b2c8c6 Mon Sep 17 00:00:00 2001 From: Michael Biebl 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-client- 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-miner- TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-client/libtracker-client- 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-miner- TRACKER_API_VERSION@.la @@ -58,7 +57,6 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS = \ libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \ - $(HAL_LIBS) \ $(DBUS_LIBS) \ $(GIO_LIBS) \ $(GCOV_LIBS) \ -- 1.7.0.4