Publish $(LIBTOOL) variable and use it in the libusb dependencies, so that

libusb isn't rebuilt every time.
This commit is contained in:
Hamish Moffatt 2008-06-13 10:01:03 +00:00
parent c498d3f9f3
commit 40cee2a9fc
2 changed files with 4 additions and 3 deletions

View File

@ -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

View File

@ -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)