From b17c61938ed9ddcd24294aa978da8db1b6155596 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sun, 21 Jan 2007 21:32:49 +0000 Subject: - remove some hardcoded occurances of "make" and use the proper variable instead --- package/ipsec-tools/ipsec-tools.mk | 4 ++-- package/libevent/libevent.mk | 4 ++-- package/libfloat/libfloat.mk | 10 +++++----- package/libusb/libusb.mk | 2 +- package/microperl/microperl.mk | 2 +- package/python/python.mk | 4 ++-- package/usbutils/usbutils.mk | 2 +- target/powerpc/yaboot/yaboot.mk | 4 ++-- target/x86/syslinux/syslinux.mk | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index f80a67b3d..85968c767 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -137,8 +137,8 @@ ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) ipsec-tools-uninstall: ipsec-tools-clean: - make -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall - make -C $(IPSEC_TOOLS_DIR) clean + $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall + $(MAKE) -C $(IPSEC_TOOLS_DIR) clean ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_LIBS)), y) -rm -f $(STAGING_DIR)/lib/libipsec.a -rm -f $(STAGING_DIR)/lib/libipsec.la diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index c0d506aa2..1f8c3f9ac 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -40,10 +40,10 @@ $(LIBEVENT_DIR)/$(LIBEVENT_BINARY): $(LIBEVENT_DIR)/.configured $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBEVENT_DIR) $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY): $(LIBEVENT_DIR)/$(LIBEVENT_BINARY) - make -C $(LIBEVENT_DIR) DESTDIR=$(STAGING_DIR) install + $(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(STAGING_DIR) install $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY): $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY) - make -C $(LIBEVENT_DIR) DESTDIR=$(TARGET_DIR) install + $(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(TARGET_DIR) install rm -f $(TARGET_DIR)/usr/lib/libevent*.la $(TARGET_DIR)/usr/include/ev* rm -f $(TARGET_DIR)/usr/man/man3/ev*.3 rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/man/man3 diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk index 2f9723c34..b0c15100d 100644 --- a/package/libfloat/libfloat.mk +++ b/package/libfloat/libfloat.mk @@ -29,7 +29,7 @@ libfloat-source: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH) $(LIBFLOAT_DIR)/.unpacked: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH) $(LIBFLOAT_CAT) $(DL_DIR)/$(LIBFLOAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # Remove the binary files distributed with the the package. - make -C $(LIBFLOAT_DIR) clean + $(MAKE) -C $(LIBFLOAT_DIR) clean toolchain/patch-kernel.sh $(LIBFLOAT_DIR) $(DL_DIR) $(LIBFLOAT_PATCH) toolchain/patch-kernel.sh $(LIBFLOAT_DIR) package/libfloat/ libfloat\*.patch touch $(LIBFLOAT_DIR)/.unpacked @@ -38,11 +38,11 @@ $(LIBFLOAT_DIR)/libfloat.so.1: $(LIBFLOAT_DIR)/.unpacked $(TARGET_CC) $(MAKE) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld -C $(LIBFLOAT_DIR) $(STAGING_DIR)/lib/libfloat.so: $(LIBFLOAT_DIR)/libfloat.so.1 - cp -a $(LIBFLOAT_DIR)/libfloat.a $(STAGING_DIR)/lib/libfloat.a - cp -a $(LIBFLOAT_DIR)/libfloat.so.1 $(STAGING_DIR)/lib/libfloat.so.1 + cp -dpf $(LIBFLOAT_DIR)/libfloat.a $(STAGING_DIR)/lib/libfloat.a + cp -dpf $(LIBFLOAT_DIR)/libfloat.so.1 $(STAGING_DIR)/lib/libfloat.so.1 (cd $(STAGING_DIR)/lib ; ln -snf libfloat.so.1 libfloat.so) - cp -a $(LIBFLOAT_DIR)/libfloat.a $(TARGET_DIR)/usr/lib/libfloat.a - cp -a $(LIBFLOAT_DIR)/libfloat.so.1 $(TARGET_DIR)/lib/libfloat.so.1 + cp -dpf $(LIBFLOAT_DIR)/libfloat.a $(TARGET_DIR)/usr/lib/libfloat.a + cp -dpf $(LIBFLOAT_DIR)/libfloat.so.1 $(TARGET_DIR)/lib/libfloat.so.1 $(STRIP) $(TARGET_DIR)/lib/libfloat.so.1 > /dev/null 2>&1 (cd $(TARGET_DIR)/lib ; ln -snf libfloat.so.1 libfloat.so) (cd $(TARGET_DIR)/usr/lib ; ln -snf /lib/libfloat.so libfloat.so) diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index cafabcb05..f00de94eb 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -47,7 +47,7 @@ $(LIBUSB_DIR)/$(LIBUSB_BINARY): $(LIBUSB_DIR)/.configured $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBUSB_DIR) $(TARGET_DIR)/$(LIBUSB_TARGET_BINARY): $(LIBUSB_DIR)/$(LIBUSB_BINARY) - make -C $(LIBUSB_DIR) DESTDIR=$(TARGET_DIR) install + $(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(TARGET_DIR) install rm -f $(TARGET_DIR)/usr/lib/libusb*.a $(TARGET_DIR)/usr/lib/libusb*.la libusb: uclibc $(TARGET_DIR)/$(LIBUSB_TARGET_BINARY) diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index 7b468d225..08c8356b3 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -23,7 +23,7 @@ $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE) $(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.source (cd $(MICROPERL_DIR) ; chmod u+w uconfig.h ; . ./uconfig.sh ; \ - make -f Makefile.micro regen_uconfig ; \ + $(MAKE) -f Makefile.micro regen_uconfig ; \ $(SED) 's,PRIVLIB ".*,PRIVLIB "/$(MICROPERL_MODS_DIR)",' \ -e 's,PRIVLIB_EXP ".*,PRIVLIB_EXP "$(MICROPERL_MODS_DIR)",' \ -e 's,BIN ".*,BIN "/usr/bin",' \ diff --git a/package/python/python.mk b/package/python/python.mk index c51ada482..33646d9b9 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -30,10 +30,10 @@ $(PYTHON_DIR)/.hostpython: $(PYTHON_DIR)/.patched ./configure \ --with-cxx=no \ $(DISABLE_NLS); \ - make python Parser/pygen; \ + $(MAKE) python Parser/pygen; \ mv python hostpython; \ mv Parser/pgen Parser/hostpgen; \ - make distclean \ + $(MAKE) distclean \ ); touch $(PYTHON_DIR)/.hostpython diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 392c232b0..797e6b720 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -39,7 +39,7 @@ $(USBUTILS_DIR)/$(USBUTILS_BINARY): $(USBUTILS_DIR)/.configured $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(USBUTILS_DIR) $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY): $(USBUTILS_DIR)/$(USBUTILS_BINARY) - make -C $(USBUTILS_DIR) DESTDIR=$(TARGET_DIR) install + $(MAKE) -C $(USBUTILS_DIR) DESTDIR=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/man usbutils: uclibc libusb $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY) diff --git a/target/powerpc/yaboot/yaboot.mk b/target/powerpc/yaboot/yaboot.mk index 87bc6df56..efb6381ff 100644 --- a/target/powerpc/yaboot/yaboot.mk +++ b/target/powerpc/yaboot/yaboot.mk @@ -20,13 +20,13 @@ $(YABOOT_DIR)/Makefile: $(DL_DIR)/$(YABOOT_SOURCE) touch -c $(YABOOT_DIR)/Makefile $(YABOOT_DIR)/second/yaboot: $(YABOOT_DIR)/Makefile - make -C $(YABOOT_DIR) CROSS=$(TARGET_CROSS) + $(MAKE) -C $(YABOOT_DIR) CROSS=$(TARGET_CROSS) touch -c $(YABOOT_DIR)/second/yaboot yaboot: $(YABOOT_DIR)/second/yaboot yaboot-clean: - make -C $(YABOOT_DIR) clean + $(MAKE) -C $(YABOOT_DIR) clean yaboot-dirclean: rm -rf $(YABOOT_DIR) diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk index 91809213b..8d6d1e168 100644 --- a/target/x86/syslinux/syslinux.mk +++ b/target/x86/syslinux/syslinux.mk @@ -46,7 +46,7 @@ $(SYSLINUX_DIR)/isolinux.bin: $(SYSLINUX_DIR)/Makefile syslinux: $(SYSLINUX_DIR)/isolinux.bin syslinux-clean: - -make -C $(SYSLINUX_DIR) clean + -$(MAKE) -C $(SYSLINUX_DIR) clean syslinux-dirclean: rm -rf $(SYSLINUX_DIR) -- cgit v1.2.3