altos: Define USB product ID in per-product Makefile.defs file

[fw/altos] / src / Makefile.proto

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 4f4252ad2848d5cb1043baf2db36246ea21b4a8a..eedb878a778e3f7b6875ff31ea3550d5eccc10f2 100644 (file)
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -207,14 +207,14 @@ quiet ?= $($1)
 all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile Makefile.defs ../Makefile.proto
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && mv $(PROG) ..
-       $(call quiet,CHECK_STACK) ../ao.h $(@F:.ihx=.mem)
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
+       $(call quiet,CHECK_STACK) ../ao.h $(PMEM)
 
 ../altitude.h: make-altitude
        nickle $< > $@
 
 ao_product.h: ao-make-product.5c
-       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -p $(PRODUCT) -v $(VERSION) > $@
+       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
 ao_product.rel: ao_product.c ao_product.h
        $(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<