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

diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile
index bffe7d4f..33c68cf5 100644
--- a/src/lambdakey-v1.0/Makefile
+++ b/src/lambdakey-v1.0/Makefile
@@ -5,7 +5,9 @@
 
 include ../stmf0/Makefile.defs
 
-include ../scheme/Makefile-inc
+aoschemelib=$(shell pkg-config --variable=aoschemelib ao-scheme)
+
+include $(aoschemelib)/Makefile-scheme
 
 NEWLIB_FULL=-lm -lc -lgcc
 
@@ -29,8 +31,8 @@ ALTOS_SRC = \
 	ao_interrupt.c \
 	ao_product.c \
 	ao_cmd.c \
-	ao_notask.c \
 	ao_led.c \
+	ao_notask.c \
 	ao_stdio.c \
 	ao_stdio_newlib.c \
 	ao_panic.c \
@@ -49,9 +51,9 @@ 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
+AO_CFLAGS=-I. -I../stmf0 -I../kernel -I../drivers -I.. -I$(aoschemelib) -isystem $(NEWLIB)/arm-none-eabi/include -DNEWLIB
 
 PROGNAME=lambdakey-v1.0
 PROG=$(PROGNAME)-$(VERSION).elf
@@ -60,6 +62,9 @@ HEX=$(PROGNAME)-$(VERSION).ihx
 SRC=$(ALTOS_SRC) ao_lambdakey.c
 OBJ=$(SRC:.c=.o)
 
+bletch:
+	echo lib is $(aoschemelib)
+
 all: $(PROG) $(HEX)
 
 $(PROG): Makefile $(OBJ) lambda.ld
@@ -70,8 +75,8 @@ $(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
+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)