altos: Fix stm-bringup demo build to use installed pdclib
authorKeith Packard <keithp@keithp.com>
Thu, 10 Oct 2013 15:04:22 +0000 (08:04 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 10 Oct 2013 15:04:22 +0000 (08:04 -0700)
Signed-off-by: Keith Packard <keithp@keithp.com>
autogen.sh
src/stm-bringup/Makefile

index c838c5b..4e8b11b 100755 (executable)
@@ -9,5 +9,4 @@ cd $srcdir
 autoreconf --force -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-PKG_CONFIG_PATH=/opt/cortex/lib/pkgconfig \
-       $srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure --enable-maintainer-mode "$@"
index 1bc5aaa..33ecd71 100644 (file)
@@ -8,11 +8,9 @@ endif
 CC=arm-none-eabi-gcc
 OBJCOPY=arm-none-eabi-objcopy
 
-PDCLIB=/opt/cortex
-C_LIB=$(PDCLIB)/lib/pdclib-cortex-m3.a
-C_INC=-I$(PDCLIB)/include
+C_LIB=-lpdclib-cortex-m3
 
-DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../../src/stm $(C_INC)
+DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../stm
 
 # to run from SRAM
 LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld
@@ -28,10 +26,10 @@ all: bringup-ram.elf bringup.elf
 %.bin: %.elf
        $(OBJCOPY) -O binary $^ $@
 
-bringup.elf: $(OBJ) $(C_LIB) bringup.ld
+bringup.elf: $(OBJ) bringup.ld
        $(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJ) $(C_LIB) -lgcc
 
-bringup-ram.elf: $(OBJ) $(C_LIB) altos-ram.ld
+bringup-ram.elf: $(OBJ) altos-ram.ld
        $(CC) $(CFLAGS) $(LD_FLAGS_RAM) -o $@ $(OBJ) $(C_LIB) -lgcc
 
 clean: