From 40cee2a9fc1ffef65a39519554e4579a180c4530 Mon Sep 17 00:00:00 2001
From: Hamish Moffatt <hamish@cloud.net.au>
Date: Fri, 13 Jun 2008 10:01:03 +0000
Subject: Publish $(LIBTOOL) variable and use it in the libusb dependencies, so
 that libusb isn't rebuilt every time.

---
 package/libtool/libtool.mk | 5 +++--
 package/libusb/libusb.mk   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index fc97a3136..20b300a8d 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -12,6 +12,7 @@ LIBTOOL_DIR:=$(BUILD_DIR)/libtool-$(LIBTOOL_VERSION)
 LIBTOOL_HOST_DIR:=$(TOOL_BUILD_DIR)/libtool-$(LIBTOOL_VERSION)-host
 LIBTOOL_BINARY:=libtool
 LIBTOOL_TARGET_BINARY:=usr/bin/libtool
+LIBTOOL:=$(STAGING_DIR)/usr/bin/libtool
 
 $(DL_DIR)/$(LIBTOOL_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(LIBTOOL_SITE)/$(LIBTOOL_SOURCE)
@@ -122,7 +123,7 @@ $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY): $(LIBTOOL_HOST_DIR)/.configured
 	$(MAKE) -C $(LIBTOOL_HOST_DIR)
 	touch -c $@
 
-$(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY)
+$(LIBTOOL): $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY)
 	$(MAKE) -C $(LIBTOOL_HOST_DIR) install
 	rm -rf $(STAGING_DIR)/share/locale
 	rm -rf $(STAGING_DIR)/usr/share/doc
@@ -134,7 +135,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y)
 endif
 	touch -c $@
 
-host-libtool: $(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY)
+host-libtool: $(LIBTOOL)
 
 host-libtool-clean:
 	$(MAKE) -C $(LIBTOOL_HOST_DIR) uninstall
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index c707b0a0c..adb8b9232 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -24,7 +24,7 @@ $(DL_DIR)/$(LIBUSB_SOURCE): $(LIBUSB_PATCH)
 libusb-source: $(DL_DIR)/$(LIBUSB_SOURCE) $(LIBUSB_PATCH)
 
 libusb-unpacked: $(LIBUSB_DIR)/.unpacked
-$(LIBUSB_DIR)/.unpacked: $(AUTOCONF) $(AUTOMAKE) $(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY) $(DL_DIR)/$(LIBUSB_SOURCE)
+$(LIBUSB_DIR)/.unpacked: $(AUTOCONF) $(AUTOMAKE) $(LIBTOOL) $(DL_DIR)/$(LIBUSB_SOURCE)
 	$(LIBUSB_CAT) $(DL_DIR)/$(LIBUSB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 ifneq ($(LIBUSB_PATCH_FILE),)
 	(cd $(LIBUSB_DIR) && $(LIBUSB_CAT) $(LIBUSB_PATCH) | patch -p1)
-- 
cgit v1.2.3