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 e754b04ab04fede9a630e2a56bc7c76e1f8206be..22d0a691cd5c9f5ee9b8016b8d29abd06e263e84 100644 (file)
--- 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 3044678bba2c6ed0f0f1d3b7f728b37383e44d63..731b61d2f310c5899899169630d86bdcd72d45b5 100644 (file)
--- 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 d894a517e4d17e9bd80b9904a38d1cf6e139000f..d497d2a03209211addeadd7610841cf36b8b88d6 100644 (file)
--- 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