Makefile: improve clean rule

remove on clean: --config.o --revision.o --$(OUTPUT).vhd --$(OUTPUT).mif --$(OUTPUT)_disasm.S --include/config --include/generated --tools/dump-info-host.bin arch/lm32/ram.ld is not removed Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Makefile: improve clean rule
remove on clean: --config.o --revision.o --$(OUTPUT).vhd --$(OUTPUT).mif --$(OUTPUT)_disasm.S --include/config --include/generated --tools/dump-info-host.bin arch/lm32/ram.ld is not removed Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
5d784730 · Adam Wujek · Grzegorz Daniluk · 8509a41e · 5d784730 · 5d784730
Commit 5d784730 authored Feb 14, 2017 by Adam Wujek 💬 Committed by Grzegorz Daniluk Feb 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 7 deletions

.gitignore .gitignore +0 -1

MAKEALL MAKEALL +7 -2

Makefile Makefile +5 -2

ppsi ppsi +1 -1

Makefile tools/Makefile +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 *~
 *_disasm.S
 *.vhd
 *.cmd
 *.o
 .tmp_*

--- a/MAKEALL
+++ b/MAKEALL
 #!/bin/sh
 # A trivial script to build with all known configurations
-# (please add a file in confifs/ to test your special case)
+# (please add a file in configs/*_defconfig to test your special case)
 T=$(mktemp /tmp/wrpc-config.XXXXXX)
 TW=$(mktemp /tmp/save-dotconfig-wrpc.XXXXXX)
@@ -30,7 +30,12 @@ rm -rf $size_info_file
 for c in $configs; do
    echo "##### Building with '$c'"
-    make -s clean; rm -f ppsi/.config
+    if ! make -s clean; then
+	echo "Error while cleaning (see $T)"
+	exit 1
+    fi
+    rm -f ppsi/.config
    if ! make $c 2>&1 >> $T; then
 	echo "Error in configuration (see $T)"
 	exit 1

--- a/Makefile
+++ b/Makefile
@@ -187,8 +187,11 @@ config.o: .config
 $(AUTOCONF): silentoldconfig
 clean:
-	rm -f $(OBJS) $(OUTPUT).elf $(OUTPUT).bin $(OUTPUT).bram \
+	rm -f $(OBJS) $(OUTPUT).o config.o revision.o $(OUTPUT).elf $(LDS) \
-		$(LDS)  rules-*.bin
+		$(OUTPUT).bin rules-*.bin \
+		$(OUTPUT).bram $(OUTPUT).vhd $(OUTPUT).mif $(OUTPUT)_disasm.S
+	rm -rf include/config
+	rm -rf include/generated
 	$(MAKE) -C $(PPSI) clean
 	$(MAKE) -C sdb-lib clean
 	$(MAKE) -C tools clean

--- a/ppsi @ 67efec3c
+++ b/ppsi @ 67efec3c
-Subproject commit 6be2d811aa3b6123f75fb3cbc8937e920cff5d98
+Subproject commit 67efec3c7c7f6eac4495fb6d12598e4aca179fb8
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -60,5 +60,5 @@ dump-info-host.o: ../dump-info.o
 ../dump-info.o: ../dump-info.c
 	$(MAKE) -C .. dump-info.o
 clean:
-	rm -f $(ALL) *.o *~
+	rm -f $(ALL) *.o *~ dump-info-host.bin