X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flambdakey-v1.0%2FMakefile;h=b94c3873a210bc9f4a31e8f3b1243f0d075c743f;hp=33c68cf5d977148160bdf56f18df8f30e807d28b;hb=7c04888cf9809e0c73f0813c74e8dd972facde3a;hpb=56629222711ba3ef7853405c9b07ad614fb29b95 diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile index 33c68cf5..b94c3873 100644 --- a/src/lambdakey-v1.0/Makefile +++ b/src/lambdakey-v1.0/Makefile @@ -9,10 +9,6 @@ aoschemelib=$(shell pkg-config --variable=aoschemelib ao-scheme) include $(aoschemelib)/Makefile-scheme -NEWLIB_FULL=-lm -lc -lgcc - -LIBS=$(NEWLIB_FULL) - INC = \ ao.h \ ao_arch.h \ @@ -34,7 +30,6 @@ ALTOS_SRC = \ ao_led.c \ ao_notask.c \ ao_stdio.c \ - ao_stdio_newlib.c \ ao_panic.c \ ao_timer.c \ ao_usb_stm.c \ @@ -45,15 +40,7 @@ PRODUCT=LambdaKey-v1.0 PRODUCT_DEF=-DLAMBDAKEY IDPRODUCT=0x000a -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,-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$(aoschemelib) -isystem $(NEWLIB)/arm-none-eabi/include -DNEWLIB +CFLAGS = $(PRODUCT_DEF) -I. -I$(aoschemelib) $(STMF0_CFLAGS) -Os -g PROGNAME=lambdakey-v1.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -67,7 +54,7 @@ bletch: all: $(PROG) $(HEX) -$(PROG): Makefile $(OBJ) lambda.ld +$(PROG): Makefile $(OBJ) $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC)