From 256c7267a7d4d1fb579040f473ba9a9c686e654c Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Tue, 17 Jul 2007 15:19:18 +0000 Subject: Make dbus depend on libxml2 and link with lib --- package/dbus/Config.in | 1 + package/dbus/dbus.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/dbus/Config.in b/package/dbus/Config.in index 7d7640c79..7e668ce84 100644 --- a/package/dbus/Config.in +++ b/package/dbus/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_DBUS bool "dbus" default n select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBXML2 help The D-Bus message bus system. diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index fba734bfd..ad961b0b0 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -51,7 +51,7 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked touch $@ $(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured - $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so" -C $(DBUS_DIR) all + $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so $(STAGING_DIR)/usr/lib/libxml2.so" -C $(DBUS_DIR) all $(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install @@ -70,7 +70,7 @@ $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so -rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share rm -rf $(TARGET_DIR)/etc/rc.d -dbus: uclibc expat $(TARGET_DIR)/$(DBUS_TARGET_BINARY) +dbus: uclibc expat libxml2-headers $(TARGET_DIR)/$(DBUS_TARGET_BINARY) dbus-clean: rm -f $(TARGET_DIR)/etc/dbus-1/session.conf -- cgit v1.2.3