From: Peter Korsgaard Date: Tue, 1 Apr 2008 07:03:07 +0000 (-0000) Subject: buildroot: additional -clean target fixes X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34274164d9be605924bb8466fb7639bace5dee2b;p=buildroot.git buildroot: additional -clean target fixes Patch by Hebbar. --- diff --git a/package/file/file.mk b/package/file/file.mk index f4205718cd..0498d24d21 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -105,7 +105,7 @@ endif file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY) file-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FILE_DIR2) uninstall + -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FILE_DIR2) uninstall -$(MAKE) -C $(FILE_DIR2) clean file-dirclean: diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 802da2fb78..7acd92eba8 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -125,7 +125,7 @@ gettext: uclibc pkgconfig $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) gettext-unpacked: $(GETTEXT_DIR)/.unpacked gettext-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GETTEXT_DIR) uninstall + -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GETTEXT_DIR) uninstall -$(MAKE) -C $(GETTEXT_DIR) clean gettext-dirclean: diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index fb7fc061bb..24cd667442 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -64,7 +64,7 @@ $(TARGET_DIR)/usr/lib/libdrm.so: $(STAGING_DIR)/usr/lib/libdrm.so libdrm: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libdrm.so libdrm-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIBDRM_DIR) uninstall + -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIBDRM_DIR) uninstall -$(MAKE) -C $(LIBDRM_DIR) clean libdrm-dirclean: diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index ed47900c37..a394e6835b 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -54,7 +54,7 @@ $(STAGING_DIR)/usr/lib/liblzo.a: $(LZO_DIR)/src/liblzo.la lzo: uclibc $(STAGING_DIR)/usr/lib/liblzo.a lzo-clean: - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZO_DIR) uninstall + -$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZO_DIR) uninstall -$(MAKE) -C $(LZO_DIR) clean lzo-dirclean: diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index 91c5210789..456ad24063 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -55,7 +55,7 @@ $(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY): $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY) pkgconfig: uclibc $(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY) pkgconfig-clean: - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKGCONFIG_DIR) uninstall + -$(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKGCONFIG_DIR) uninstall -$(MAKE) -C $(PKGCONFIG_DIR) clean pkgconfig-dirclean: diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 97fcf10c37..8e309d9c6c 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -91,9 +91,8 @@ tslib-build: uclibc $(TSLIB_DIR)/.configured touch $(TSLIB_DIR)/.compiled tslib-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(TSLIB_DIR) uninstall - rm -f $(STAGING_DIR)/lib/libts.* - rm -f $(STAGING_DIR)/usr/lib/libts.* + -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(TSLIB_DIR) uninstall + rm -f $(STAGING_DIR)/lib/libts.* $(STAGING_DIR)/usr/lib/libts.* -$(MAKE) -C $(TSLIB_DIR) clean tslib-dirclean: diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index ec09be62be..5dc0ce9655 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -58,8 +58,8 @@ $(XDATA_XCURSOR_THEMES_DIR)/.installed: $(XDATA_XCURSOR_THEMES_DIR)/.built touch $@ xdata_xcursor-themes-clean: - $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall + -$(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall + -$(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall -$(MAKE) -C $(XDATA_XCURSOR_THEMES_DIR) clean -rm $(XDATA_XCURSOR_THEMES_DIR)/.installed -rm $(XDATA_XCURSOR_THEMES_DIR)/.built diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in index 8ae084bdff..fc47454301 100644 --- a/target/u-boot/Makefile.in +++ b/target/u-boot/Makefile.in @@ -25,7 +25,7 @@ define insert_define @echo "#endif" >> $(U_BOOT_INC_CONF_FILE) @echo "#define $(strip $(1)) $(2)" >> $(U_BOOT_INC_CONF_FILE) endef - + $(DL_DIR)/$(U_BOOT_SOURCE): $(WGET) -P $(DL_DIR) $(U_BOOT_SITE)/$(U_BOOT_SOURCE) @@ -113,7 +113,7 @@ $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN) u-boot: gcc $(BINARIES_DIR)/$(U_BOOT_BIN) u-boot-clean: - $(MAKE) -C $(U_BOOT_DIR) clean + -$(MAKE) -C $(U_BOOT_DIR) clean u-boot-dirclean: rm -rf $(U_BOOT_DIR)