X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelescience-v0.1%2FMakefile;h=c55c48e2a347c2d70f7cf41941934ba49c45ee23;hb=eb70e334ffc77e737bb21ab3fe777a982d80ee3b;hp=be99f10dd7076bf8b47b5f92623b14872f0fcc72;hpb=652c024ed37bfed5de17f45c772796d5cbe4599f;p=fw%2Faltos

diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile
index be99f10d..c55c48e2 100644
--- a/src/telescience-v0.1/Makefile
+++ b/src/telescience-v0.1/Makefile
@@ -2,27 +2,24 @@
 # AltOS build
 #
 #
-vpath % ..:../core:../product:../drivers:../avr
+vpath % ..:../kernel:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
+include ../avr/Makefile.defs
+
 MCU=atmega32u4
 DUDECPUTYPE=m32u4
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
 
-ifndef VERSION
-include ../Version
-endif
+#LDFLAGS=-L$(LDSCRIPTS) -Tavr5.x
 
 INC = \
 	ao.h \
 	ao_arch.h \
 	ao_usb.h \
-	ao_pins.h
+	ao_pins.h \
+	ao_product.h
 
 #
 # Common AltOS sources
@@ -59,7 +56,7 @@ PRODUCT=TeleScience-v0.1
 MCU=atmega32u4
 PRODUCT_DEF=-DTELESCIENCE
 IDPRODUCT=0x0011
-CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I..
+CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I..
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR
 
 NICKLE=nickle
@@ -96,13 +93,15 @@ load: $(PROG).hex
 ao_product.h: ao-make-product.5c ../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$@ $<
+ao_product.o: ao_product.c ao_product.h
+
+%.o : %.c $(INC)
+	$(call quiet,CC) -c $(CFLAGS) $<
 
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROG) $(PROG).hex
 	rm -f ao_product.h
 
 install: