From 771a17e52dd0146cd0e1af376e0e25e4eb054fa7 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Mon, 7 May 2007 04:00:11 +0000 Subject: Major clean-up. --- package/libusb/libusb.mk | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'package/libusb') diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 8ae81a1dd..18120c001 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -8,8 +8,7 @@ LIBUSB_SOURCE:=libusb-$(LIBUSB_VER).tar.gz LIBUSB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libusb/ LIBUSB_DIR:=$(BUILD_DIR)/libusb-$(LIBUSB_VER) LIBUSB_CAT:=$(ZCAT) -LIBUSB_BINARY:=libusb.la -LIBUSB_TARGET_BINARY:=usr/lib/libusb.so +LIBUSB_BINARY:=usr/lib/libusb.so ifeq ($(BR2_ENDIAN),"BIG") LIBUSB_BE:=yes @@ -38,23 +37,29 @@ $(LIBUSB_DIR)/.configured: $(LIBUSB_DIR)/.unpacked --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ + --prefix=/ \ --disable-debug \ --disable-build-docs \ ); touch $(LIBUSB_DIR)/.configured -$(LIBUSB_DIR)/$(LIBUSB_BINARY): $(LIBUSB_DIR)/.configured +$(STAGING_DIR)/$(LIBUSB_BINARY): $(LIBUSB_DIR)/.configured $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBUSB_DIR) + $(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install -$(TARGET_DIR)/$(LIBUSB_TARGET_BINARY): $(LIBUSB_DIR)/$(LIBUSB_BINARY) - $(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(TARGET_DIR) install - rm -f $(TARGET_DIR)/usr/lib/libusb*.a $(TARGET_DIR)/usr/lib/libusb*.la +$(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/$(LIBUSB_BINARY) + -mkdir -p $(TARGET_DIR)/usr/lib + cp -a $(STAGING_DIR)/lib/libusb* $(TARGET_DIR)/usr/lib + rm -f $(TARGET_DIR)/usr/lib/*.a $(TARGET_DIR)/usr/lib/*.la -libusb: uclibc $(TARGET_DIR)/$(LIBUSB_TARGET_BINARY) +libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY) libusb-clean: - rm -f $(TARGET_DIR)/$(LIBUSB_TARGET_BINARY) + rm -f $(STAGING_DIR)/bin/libusb-config + rm -f $(STAGING_DIR)/includes/usb*.h + rm -f $(STAGING_DIR)/lib/libusb* + rm -rf $(STAGING_DIR)/lib/pkgconfig + rm -f $(TARGET_DIR)/usr/lib/libusb* -$(MAKE) -C $(LIBUSB_DIR) clean libusb-dirclean: -- cgit v1.2.3