|
@@ -15,14 +15,17 @@ ifeq ($(BR2_DBUS_EXPAT),y)
|
|
DBUS_XML:=expat
|
|
DBUS_XML:=expat
|
|
# depend on the exact library file instead of expat so dbus isn't always
|
|
# depend on the exact library file instead of expat so dbus isn't always
|
|
# considered out-of-date
|
|
# considered out-of-date
|
|
-DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
|
|
|
|
|
|
+DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
|
|
else
|
|
else
|
|
DBUS_XML:=libxml
|
|
DBUS_XML:=libxml
|
|
# Makefile.autotools.in unfortunately has broken dependency handling,
|
|
# Makefile.autotools.in unfortunately has broken dependency handling,
|
|
# so we cannot do the same for libxml2
|
|
# so we cannot do the same for libxml2
|
|
-DBUS_XML_DEP:=libxml2-install-staging
|
|
|
|
|
|
+DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
|
|
|
|
+#libxml2-install-staging
|
|
endif
|
|
endif
|
|
|
|
|
|
|
|
+DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
|
|
|
|
+
|
|
$(DL_DIR)/$(DBUS_SOURCE):
|
|
$(DL_DIR)/$(DBUS_SOURCE):
|
|
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
|
|
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
|
|
|
|
|
|
@@ -64,9 +67,12 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
|
|
|
|
|
|
$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
|
|
$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
|
|
$(MAKE) -C $(DBUS_DIR) all
|
|
$(MAKE) -C $(DBUS_DIR) all
|
|
|
|
+ touch $@
|
|
|
|
|
|
$(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
|
|
$(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
|
|
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
|
|
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
|
|
|
|
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdbus-1.la
|
|
|
|
+ touch $@
|
|
|
|
|
|
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
|
|
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
|
|
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
|
|
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
|