Merge branch 'with-pdclib' of ssh://git.gag.com/scm/git/fw/altos into with-pdclib

diff --git a/src/Makefile b/src/Makefile
index 2488cbab371e0efe992bf621c62feb639548aea2..0ca101c07c526a3457fcfa9d0e0171d1eff621f2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,7 +30,6 @@ ARMM3DIRS=\
        telemetrum-v2.0 telemetrum-v2.0/flash-loader \
        megadongle-v0.1 megadongle-v0.1/flash-loader \
        telegps-v0.3 telegps-v0.3/flash-loader \
-       stm-bringup stm-demo \
        telelco-v0.2 telelco-v0.2/flash-loader \
        telescience-v0.2 telescience-v0.2/flash-loader
 

diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
index 33ecd710c4ebe99d9341d4c93d70f943a871a6d9..797df2d697b4cc3ffd05cde93717855270386ad7 100644 (file)
--- a/src/stm-bringup/Makefile
+++ b/src/stm-bringup/Makefile
@@ -4,13 +4,15 @@ vpath ao-make-product.5c ../util
 ifndef VERSION
 include ../Version
 endif
+TOPDIR=..
+include $(TOPDIR)/Makedefs
 
 CC=arm-none-eabi-gcc
 OBJCOPY=arm-none-eabi-objcopy
 
-C_LIB=-lpdclib-cortex-m3
+C_LIB=$(PDCLIB_LIBS_M3)
 
-DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../stm
+DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../stm $(PDCLIB_INCLUDES)
 
 # to run from SRAM
 LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld