Преглед на файлове

- fix a few -clean targets.
- bash build is not parallel-safe

Bernhard Reutner-Fischer преди 18 години
родител
ревизия
79e2d802ae
променени са 5 файла, в които са добавени 9 реда и са изтрити 6 реда
  1. 2 1
      package/at/at.mk
  2. 3 2
      package/bash/bash.mk
  3. 2 1
      package/bison/bison.mk
  4. 1 1
      package/module-init-tools/module-init-tools.mk
  5. 1 1
      package/netsnmp/netsnmp.mk

+ 2 - 1
package/at/at.mk

@@ -57,7 +57,8 @@ $(TARGET_DIR)/$(AT_TARGET_BINARY): $(AT_DIR)/$(AT_BINARY)
 at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_BINARY)
 
 at-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall
+	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall
+	rm -f $(TARGET_DIR)/$(AT_TARGET_BINARY) $(TARGET_DIR)/etc/init.d/S99at
 	-$(MAKE) -C $(AT_DIR) clean
 
 at-dirclean:

+ 3 - 2
package/bash/bash.mk

@@ -59,7 +59,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 	touch $@
 
 $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
+	$(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
 
 $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
 	$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
@@ -79,7 +79,8 @@ bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 endif
 
 bash-clean:
-	$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+	-$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+	rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 	-$(MAKE1) -C $(BASH_DIR) clean
 
 bash-dirclean:

+ 2 - 1
package/bison/bison.mk

@@ -58,7 +58,8 @@ $(TARGET_DIR)/$(BISON_TARGET_BINARY): $(BISON_DIR)/$(BISON_BINARY)
 bison: uclibc $(TARGET_DIR)/$(BISON_TARGET_BINARY)
 
 bison-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall
+	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall
+	rm -f $(TARGET_DIR)/$(BISON_TARGET_BINARY)
 	-$(MAKE) -C $(BISON_DIR) clean
 
 bison-dirclean:

+ 1 - 1
package/module-init-tools/module-init-tools.mk

@@ -100,7 +100,7 @@ $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26: $(MODULE_INIT_TOOLS_DIR2)/$(MODU
 
 cross-depmod26: $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
 
-cross-depmod26-source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
+module-init-tools-source cross-depmod26-source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
 
 cross-depmod26-clean:
 	rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26

+ 1 - 1
package/netsnmp/netsnmp.mk

@@ -103,7 +103,7 @@ netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h
 netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE)
 
 netsnmp-clean: 
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETSNMP_DIR) uninstall
+	$(MAKE) PREFIX=$(TARGET_DIR) INSTALL_PREFIX=$(TARGET_DIR) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETSNMP_DIR) uninstall
 	$(MAKE) -C $(NETSNMP_DIR) clean
 	rm -rf $(TARGET_DIR)/etc/snmp/{snmpd{,trapd},mib2c*}.conf \
 		$(TARGET_DIR)/etc/default/snmpd \