altos: Have 'make clean' remove all programs, even old ones

This makes sure that changing version numbers doesn't leave old
compiled output lying around.

Signed-off-by: Keith Packard <keithp@keithp.com>

15 files changed, 48 insertions, 69 deletions

diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index 8de4a9b2..f7ecce33 100644
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -25,3 +25,11 @@ PAOM=$(PROG:.ihx=)
 
 %.rel : %.c $(INC)
 	$(call quiet,CC,$(PRODUCT_DEF)) $(CFLAGS) -c -o$@ $<
+
+all:
+
+clean-cc1111:
+	rm -f *.adb *.asm *.lnk *.lst *.rel *.rst *.sym
+	rm -f $(PROGNAME)-*
+	rm -f ao_product.h
+	rm -f ../$(PROGNAME)-*
diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 13e46c97..59cfb64d 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -82,7 +82,8 @@ IDPRODUCT=0x0023
 
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g
 
-PROG=megametrum-v0.1-$(VERSION).elf
+PROGNAME=megametrum-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
 
 SRC=$(ALTOS_SRC) ao_megametrum.c
 OBJ=$(SRC:.c=.o)
@@ -103,7 +104,7 @@ ao_product.h: ao-make-product.5c ../Version
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROGNAME)-*.elf
 	rm -f ao_product.h
 
 install:
diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt
index 90525d63..fd52cec4 100644
--- a/src/product/Makefile.telebt
+++ b/src/product/Makefile.telebt
@@ -60,7 +60,8 @@ SRC = \
 	$(PRODUCT_SRC) \
 	$(TELEBT_SRC)
 
-PROG = telebt-v$(TELEBT_VER)-$(VERSION).ihx
+PROGNAME = telebt-v$(TELEBT_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleBT-v$(TELEBT_VER)
 PRODUCT_DEF=-DTELEBT_V_$(TELEBT_DEF)
 IDPRODUCT=0x000e
@@ -78,9 +79,9 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: ../$(PROG)
+all: $(PROG)
 
-../$(PROG): $(REL) Makefile
+$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
 	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
@@ -89,11 +90,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
index fbf14a04..5105b567 100644
--- a/src/product/Makefile.teledongle
+++ b/src/product/Makefile.teledongle
@@ -60,7 +60,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = teledongle-v$(TD_VER)-$(VERSION).ihx
+PROGNAME = teledongle-v$(TD_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleDongle-v$(TD_VER)
 PRODUCT_DEF=-DTELEDONGLE_V_$(TD_DEF)
 IDPRODUCT=0x000c
@@ -89,11 +90,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 3753f3c9..1e55989c 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -62,7 +62,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telelaunch-v$(TELELAUNCH_VER)-$(VERSION).ihx
+PROGNAME = telelaunch-v$(TELELAUNCH_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleLaunch-v$(TELELAUNCH_VER)
 PRODUCT_DEF=-DTELELAUNCH_V_$(TELELAUNCH_DEF)
 IDPRODUCT=0x000f
@@ -92,11 +93,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index 57586c95..5e3eed7f 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -75,7 +75,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telemetrum-v$(TM_VER)-$(VERSION)$(TM_EXTRA).ihx
+PROGNAME = telemetrum-v$(TM_VER)$(TM_EXTRA)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleMetrum-v$(TM_VER)
 PRODUCT_DEF=-DTELEMETRUM_V_$(TM_DEF)
 IDPRODUCT=0x000b
@@ -104,11 +105,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 23aed1c7..ef8906ba 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -63,7 +63,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telemini-v$(TELEMINI_VER)-$(VERSION).ihx
+PROGNAME = telemini-v$(TELEMINI_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleMini-v$(TELEMINI_VER)
 PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
 IDPRODUCT=0x000a
@@ -93,11 +94,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index ca719bbf..67410ae0 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -62,7 +62,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telenano-v$(TELENANO_VER)-$(VERSION).ihx
+PROGNAME = telenano-v$(TELENANO_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleNano-v$(TELENANO_VER)
 PRODUCT_DEF=-DTELENANO_V_$(TELENANO_DEF)
 IDPRODUCT=0x000a
@@ -92,11 +93,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index dd7e6e02..055a73af 100644
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -61,7 +61,7 @@ $(OBJ): $(INC)
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROG)
 	rm -f ao_product.h
 
 install:
diff --git a/src/teleballoon-v1.1/Makefile b/src/teleballoon-v1.1/Makefile
index fb88787b..2eea996e 100644
--- a/src/teleballoon-v1.1/Makefile
+++ b/src/teleballoon-v1.1/Makefile
@@ -81,7 +81,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = teleballoon-v$(TELEBALLOON_VER)-$(VERSION).ihx
+PROGNAME = teleballoon-v$(TELEBALLOON_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleBalloon-v$(TELEBALLOON_VER)
 PRODUCT_DEF=-DTELEBALLOON_V_$(TELEBALLOON_DEF)
 IDPRODUCT=0x000b
@@ -99,9 +100,9 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: ../$(PROG)
+all: $(PROG)
 
-../$(PROG): $(REL) Makefile
+$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
 	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
@@ -110,11 +111,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile
index 10e4a2a3..d24128ef 100644
--- a/src/telescience-v0.1/Makefile
+++ b/src/telescience-v0.1/Makefile
@@ -105,7 +105,7 @@ ao_product.o: ao_product.c ao_product.h
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROG) $(PROG).hex
 	rm -f ao_product.h
 
 install:
diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile
index c1f45f37..ab2a025f 100644
--- a/src/teleshield-v0.1/Makefile
+++ b/src/teleshield-v0.1/Makefile
@@ -72,7 +72,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = teleshield-v$(TELESHIELD_VER)-$(VERSION).ihx
+PROGNAME = teleshield-v$(TELESHIELD_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleShield-v$(TELESHIELD_VER)
 PRODUCT_DEF=-DTELESHIELD_V_$(TELESHIELD_DEF)
 IDPRODUCT=0x0013
@@ -102,11 +103,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 4967d187..65db57ce 100644
--- a/src/teleterra-v0.2/Makefile
+++ b/src/teleterra-v0.2/Makefile
@@ -66,7 +66,8 @@ SRC = \
 
 TELETERRA_VER=0.2
 TELETERRA_DEF=0_2
-PROG = teleterra-v$(TELETERRA_VER)-$(VERSION).ihx
+PROGNAME = teleterra-v$(TELETERRA_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleTerra-v$(TELETERRA_VER)
 PRODUCT_DEF=-DTELETERRA_V_$(TELETERRA_DEF)
 IDPRODUCT=0x000d
@@ -95,11 +96,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/test/Makefile b/src/test/Makefile
index 963f4131..db3cc04b 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -9,7 +9,7 @@ CFLAGS=-I.. -I. -I../core -I../drivers -O3 -g -Wall
 all: $(PROGS)
 
 clean:
-	rm -f $(PROGS)
+	rm -f $(PROGS) run-out.baro run-out.full
 
 install:
 
diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index 0bb2ce32..1514c4df 100644
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -53,7 +53,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = tidongle-$(VERSION).ihx
+PROGNAME = tidongle
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TIDongle
 PRODUCT_DEF=-DTIDONGLE
 IDPRODUCT=0x000a
@@ -82,11 +83,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install: