X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelescience-v0.1%2FMakefile;h=10e4a2a301e01f5600fa56f3270dcd6e111b7427;hb=040a6eb119451026e1ec7c3a6a8e76b439c632d5;hp=28620242107249b0b9418495a68bf19d5ea25a7b;hpb=b2d4e49bfe88aa61ca36fb1af8f3088c5754304c;p=fw%2Faltos

diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile
index 28620242..10e4a2a3 100644
--- a/src/telescience-v0.1/Makefile
+++ b/src/telescience-v0.1/Makefile
@@ -20,9 +20,10 @@ endif
 
 INC = \
 	ao.h \
+	ao_arch.h \
 	ao_usb.h \
 	ao_pins.h \
-	altitude.h
+	ao_product.h
 
 #
 # Common AltOS sources
@@ -30,7 +31,11 @@ INC = \
 TELESCIENCE_STORAGE= \
 	ao_m25.c \
 	ao_spi_usart.c \
-	ao_storage.c \
+	ao_storage.c
+
+TELESCIENCE_LOG= \
+	ao_log_single.c \
+	ao_log_telescience.c
 
 ALTOS_SRC = \
 	ao_clock.c \
@@ -46,10 +51,10 @@ ALTOS_SRC = \
 	ao_romconfig.c \
 	ao_usb_avr.c \
 	ao_adc_avr.c \
+	ao_science_slave.c \
 	ao_spi_slave.c \
-	ao_log_single.c \
-	ao_log_telescience.c \
-	$(TELESCIENCE_STORAGE)
+	$(TELESCIENCE_STORAGE)\
+	$(TELESCIENCE_LOG)
 
 PRODUCT=TeleScience-v0.1
 MCU=atmega32u4
@@ -89,14 +94,13 @@ $(PROG).hex: $(PROG)
 load: $(PROG).hex
 	$(LOADCMD) $(LOADARG)$(PROG).hex
 
-../altitude.h: make-altitude
-	nickle $< > $@
-
 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
 
@@ -108,4 +112,4 @@ install:
 
 uninstall:
 
-$(OBJ): ao.h ao_product.h ao_usb.h
+$(OBJ): ao_product.h $(INC)