X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flambdakey-v1.0%2FMakefile;h=bffe7d4f3128ff33793b9afc3d205ccd7b6a47f3;hp=a4d78736beff544e3e1ce4f43d036bda2ef43018;hb=09ea349f5b37e257e8ca23ead493ba1694395530;hpb=5161f6d78647591cc7ab8774a04edbc68a09f689

diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile
index a4d78736..bffe7d4f 100644
--- a/src/lambdakey-v1.0/Makefile
+++ b/src/lambdakey-v1.0/Makefile
@@ -5,6 +5,12 @@
 
 include ../stmf0/Makefile.defs
 
+include ../scheme/Makefile-inc
+
+NEWLIB_FULL=-lm -lc -lgcc
+
+LIBS=$(NEWLIB_FULL)
+
 INC = \
 	ao.h \
 	ao_arch.h \
@@ -13,9 +19,8 @@ INC = \
 	ao_pins.h \
 	ao_product.h \
 	ao_task.h \
-	ao_lisp.h \
-	ao_lisp_const.h \
-	ao_lisp_os.h \
+	$(SCHEME_HDRS) \
+	ao_scheme_const.h \
 	stm32f0.h \
 	Makefile
 
@@ -23,34 +28,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_notask.c \
 	ao_led.c \
-	ao_dma_stm.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 \
-	ao_lisp_lex.c \
-	ao_lisp_mem.c \
-	ao_lisp_cons.c \
-	ao_lisp_eval.c \
-	ao_lisp_string.c \
-	ao_lisp_atom.c \
-	ao_lisp_int.c \
-	ao_lisp_poly.c \
-	ao_lisp_builtin.c \
-	ao_lisp_read.c \
-	ao_lisp_rep.c \
-	ao_lisp_frame.c \
-	ao_lisp_error.c \
-	ao_lisp_lambda.c \
-	ao_lisp_save.c \
-	ao_lisp_os_save.c
+	ao_romconfig.c \
+	$(SCHEME_SRCS)
 
 PRODUCT=LambdaKey-v1.0
 PRODUCT_DEF=-DLAMBDAKEY
@@ -60,6 +47,12 @@ CFLAGS = $(PRODUCT_DEF) -I. $(STMF0_CFLAGS) -Os -g
 
 LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tlambda.ld
 
+MAP=$(PROG).map
+NEWLIB=/local/newlib-mini
+MAPFILE=-Wl,-M=$(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
+
 PROGNAME=lambdakey-v1.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
@@ -69,7 +62,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)
@@ -77,13 +70,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: ../scheme/make-const/ao_scheme_make_const ao_lambdakey_const.scheme
+	../scheme/make-const/ao_scheme_make_const -d FLOAT,VECTOR,QUASI,BIGINT -o $@ ao_lambdakey_const.scheme
+
 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: