diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-20 21:32:43 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-20 21:32:43 +0000 |
| commit | ad862e2ffb6613b3eeba7221c82dfd34be0002b3 (patch) | |
| tree | d387f4a209ba78f58ed7e493e099f3c8982dabee | |
| parent | 31647bd0c61851177b54771e0f14e19a15c7cc15 (diff) | |
Libraries for dbus-glib are in /usr/lib, depend on expat
| -rw-r--r-- | package/dbus-glib/Config.in | 1 | ||||
| -rw-r--r-- | package/dbus-glib/dbus-glib.mk | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in index 9779da7e8..8b3340434 100644 --- a/package/dbus-glib/Config.in +++ b/package/dbus-glib/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DBUS_GLIB depends on BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PKGCONFIG + select BR2_PACKAGE_EXPAT help GLib bindings for D-Bus. diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 5b80906b6..5e9b0d9cf 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -31,7 +31,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \ DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \ DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \ - DBUS_GLIB_LIBS="$(STAGING_DIR)/lib/libglib-2.0.so $(STAGING_DIR)/lib/libgobject-2.0.so $(STAGING_DIR)/lib/libgmodule-2.0.so $(STAGING_DIR)/lib/libgthread-2.0.so" \ + DBUS_GLIB_LIBS="$(STAGING_DIR)/usr/lib/libglib-2.0.so $(STAGING_DIR)/usr/lib/libgobject-2.0.so $(STAGING_DIR)/usr/lib/libgmodule-2.0.so $(STAGING_DIR)/usr/lib/libgthread-2.0.so" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -47,7 +47,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked touch $(DBUS_GLIB_DIR)/.configured $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY): $(DBUS_GLIB_DIR)/.configured - $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/lib/libexpat.so" -C $(DBUS_GLIB_DIR) all + $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so" -C $(DBUS_GLIB_DIR) all $(STAGING_DIR)/usr/lib/libdbus-glib-1.so.2.0.0: $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY) cp -a $(DBUS_GLIB_DIR)/dbus/.libs/libdbus-glib-1.so* $(STAGING_DIR)/usr/lib @@ -58,7 +58,7 @@ $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-glib-1. cp -a $(DBUS_GLIB_DIR)/dbus/.libs/dbus-binding-tool $(TARGET_DIR)/usr/bin -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2.0.0 -dbus-glib: uclibc pkgconfig dbus libglib2 $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY) +dbus-glib: uclibc pkgconfig dbus expat libglib2 $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY) dbus-glib-clean: rm -f $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2* |