port changes in whiterussian ([3341]) to trunk.

[openwrt.git] / package / libusb / Makefile

diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index ae7782d..e6cf4ba 100644 (file)
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBUSB,libusb,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
@@ -48,37 +48,39 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --enable-shared \
                --enable-static \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH)
+$(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_LIBUSB):
        install -m0755 -d $(IDIR_LIBUSB)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(IDIR_LIBUSB)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(IDIR_LIBUSB)/usr/lib/
        $(RSTRIP) $(IDIR_LIBUSB)
        $(IPKG_BUILD) $(IDIR_LIBUSB) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.libs/libusb.so
+$(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/
-       touch $(STAGING_DIR)/usr/lib/libusb.so
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/
+       touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libusb.so
 
 uninstall-dev:
-       rm -rf $(STAGING_DIR)/usr/include/usb.h
-       rm -rf $(STAGING_DIR)/usr/lib/libusb.{a,so*}
+       rm -rf \
+               $(STAGING_DIR)/usr/bin/libusb-config \
+               $(STAGING_DIR)/usr/include/usb.h \
+               $(STAGING_DIR)/usr/lib/libusb*.{a,so*} \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev