diff options
| author | Joe Shaw <joeshaw@novell.com> | 2004-03-01 20:29:05 +0000 |
|---|---|---|
| committer | Joe Shaw <joeshaw@novell.com> | 2004-03-01 20:29:05 +0000 |
| commit | e7cff33e5a32d5d6a3843e3aef3144ecd45cc9ac (patch) | |
| tree | 175aec6efd55ec735f4e4332a2f303e1f142246d | |
| parent | 577592390ecb7773c79eb33c28953de66933d18b (diff) | |
Use @PACKAGE_LIBS@ and @DBUS_LIBS@ instead of referencing the libs
directly. This allows us to have dbus and/or glib in a prefix.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2004-03-01 Joe Shaw <joe@ximian.com> + + * tools/Makefile.am: Use @PACKAGE_LIBS@ and @DBUS_LIBS@ instead of + referencing the libs directly. This allows us to have dbus and/or + glib in a prefix. + 2004-03-01 David Zeuthen <david@fubar.dk> Preliminary support for waiting for sysfs information to appear - diff --git a/tools/Makefile.am b/tools/Makefile.am index 319e2544..9b2c889b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -12,14 +12,14 @@ INCLUDES = \ bin_PROGRAMS = lshal hal-get-property hal-set-property lshal_SOURCES = lshal.c -lshal_LDADD = -ldbus-1 -ldbus-glib-1 -lglib-2.0 \ +lshal_LDADD = @PACKAGE_LIBS@ \ $(top_builddir)/libhal/libhal.la hal_get_property_SOURCES = hal_get_property.c -hal_get_property_LDADD = -ldbus-1 $(top_builddir)/libhal/libhal.la +hal_get_property_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la hal_set_property_SOURCES = hal_set_property.c -hal_set_property_LDADD = -ldbus-1 $(top_builddir)/libhal/libhal.la +hal_set_property_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la clean-local : rm -f *~ |