From: Uwe Hermann <redacted>
Date: Sun, 22 Jul 2012 16:29:48 +0000 (+0200)
Subject: Fix 'make clean'.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~6
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d33eeacaf5129815c290146ba85b3a36c86f02fa;p=sigrok-firmware-fx2lafw.git

Fix 'make clean'.

Things like "rm -f *.{asm,ihx,lnk,lst,map,mem,rel,rst,sym,adb,cdb,lib}"
aren't really portable or work everywhere.

Also, invoke fx2lib's clean upon an fx2lafw clean.
---

diff --git a/Makefile b/Makefile
index e754b04a..22d0a691 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ clean:
 	@rm -rf hw/cwav-usbeesx/build
 	@rm -rf hw/cypress-fx2/build
 	@rm -rf hw/braintechnology-usb-lps/build
+	$(MAKE) -C fx2lib clean
 
 .PHONY: saleae-logic cwav-usbeeax cwav-usbeesx cypress-fx2 braintechnology-usb-lps
 
diff --git a/fx2lib/Makefile b/fx2lib/Makefile
index 3044678b..731b61d2 100644
--- a/fx2lib/Makefile
+++ b/fx2lib/Makefile
@@ -21,4 +21,5 @@ dist: all docs
 		fx2lib/docs/intro/intro.pdf
 	cat build/fx2-$(VER).tar | gzip > build/fx2-$(VER).tgz
 	
-
+clean:
+	$(MAKE) -C lib clean
diff --git a/fx2lib/lib/Makefile b/fx2lib/lib/Makefile
index d894a517..d497d2a0 100644
--- a/fx2lib/lib/Makefile
+++ b/fx2lib/lib/Makefile
@@ -49,6 +49,10 @@ int4av.rel: int4av.a51
 	$(SDCC) $(INCLUDES) -c $< -o $@
 
 clean:
-	rm -f *.{asm,ihx,lnk,lst,map,mem,rel,rst,sym,adb,cdb,lib}
-	rm -f interrupts/*.{asm,ihx,lnk,lst,map,mem,rel,rst,sym,adb,dcb,lib}
+	rm -f *.asm *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym
+	rm -f *.adb *.cdb *.lib
+	rm -f interrupts/*.asm interrupts/*.ihx interrupts/*.lnk
+	rm -f interrupts/*.lst interrupts/*.map interrupts/*.mem
+	rm -f interrupts/*.rel interrupts/*.rst interrupts/*.sym
+	rm -f interrupts/*.adb interrupts/*.dcb interrupts/*.lib