X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flambdakey-v1.0%2FMakefile;h=9d30c52149b07f9f2a752ecc70c3bf1f78f0c8b4;hb=f8a967959b2f5ca3486ab3422f30fe4ad4ba17a8;hp=4eb045b6ff8d9a10df326e383ae273aa8929e437;hpb=8ebecd364fd328e9c649c11729bddf58731aaafb;p=fw%2Faltos

diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile
index 4eb045b6..9d30c521 100644
--- a/src/lambdakey-v1.0/Makefile
+++ b/src/lambdakey-v1.0/Makefile
@@ -7,6 +7,9 @@ include ../stmf0/Makefile.defs
 
 include ../scheme/Makefile-inc
 
+vpath %.scheme ../scheme
+vpath ao_scheme_make_const ../scheme/make-const
+
 NEWLIB_FULL=-lm -lc -lgcc
 
 LIBS=$(NEWLIB_FULL)
@@ -20,6 +23,7 @@ INC = \
 	ao_product.h \
 	ao_task.h \
 	$(SCHEME_HDRS) \
+	ao_scheme_const.h \
 	stm32f0.h \
 	Makefile
 
@@ -27,20 +31,16 @@ ALTOS_SRC = \
 	ao_boot_chain.c \
 	ao_interrupt.c \
 	ao_product.c \
-	ao_romconfig.c \
 	ao_cmd.c \
-	ao_config.c \
-	ao_task.c \
 	ao_led.c \
-	ao_dma_stm.c \
+	ao_notask.c \
 	ao_stdio.c \
-	ao_mutex.c \
+	ao_stdio_newlib.c \
 	ao_panic.c \
 	ao_timer.c \
 	ao_usb_stm.c \
-	ao_flash_stm.c \
-	$(SCHEME_SRCS) \
-	ao_scheme_os_save.c
+	ao_romconfig.c \
+	$(SCHEME_SRCS)
 
 PRODUCT=LambdaKey-v1.0
 PRODUCT_DEF=-DLAMBDAKEY
@@ -52,7 +52,7 @@ LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tlambda.ld
 
 MAP=$(PROG).map
 NEWLIB=/local/newlib-mini
-MAPFILE=-Wl,-M=$(MAP)
+MAPFILE=-Wl,-Map=$(MAP)
 LDFLAGS=-L../stmf0 -L$(NEWLIB)/arm-none-eabi/lib/thumb/v6-m/ -Wl,-Tlambda.ld $(MAPFILE) -nostartfiles
 AO_CFLAGS=-I. -I../stmf0 -I../kernel -I../drivers -I.. -I../scheme -isystem $(NEWLIB)/arm-none-eabi/include -DNEWLIB
 
@@ -65,7 +65,7 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG) $(HEX)
 
-$(PROG): Makefile $(OBJ) lambda.ld altos.ld
+$(PROG): Makefile $(OBJ) lambda.ld
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)
@@ -73,13 +73,16 @@ $(OBJ): $(INC)
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
+ao_scheme_const.h: ao_scheme_make_const ao_scheme_basic_syntax.scheme
+	$^ -o $@ -d FLOAT,VECTOR,QUASI,BIGINT,POSIX,PORT,SAVE,UNDEF
+
 load: $(PROG)
 	stm-load $(PROG)
 
 distclean:	clean
 
 clean:
-	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
+	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx ao_scheme_const.h
 	rm -f ao_product.h
 
 install: