X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftidongle%2FMakefile;h=b2ba537bfc36336e6fa82f18e489c4882fc95340;hp=fc8df1f4cebd88e771cb99d0d726a85145635139;hb=5c4b3658a96f1a64ccebf7bddda06b15b4ac4a6f;hpb=9513be7f9d3d0b0ec29f6487fa9dc8f1ac24d0de

diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index fc8df1f4..b2ba537b 100644
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -26,7 +26,8 @@ CORE_SRC = \
 	ao_rssi.c \
 	ao_state.c \
 	ao_stdio.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_dbg.c \
@@ -36,6 +37,7 @@ CC1111_SRC = \
 	ao_packet_master.c \
 	ao_radio.c \
 	ao_romconfig.c \
+	ao_string.c \
 	ao_timer.c \
 	ao_usb.c \
 	_bp.c
@@ -51,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
@@ -69,22 +72,18 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: ../$(PROG)
+all: $(PROG)
 
-../$(PROG): $(REL) Makefile
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../core/ao.h $(PMEM)
+$(PROG): $(REL) Makefile
+	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(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: