From aa169b80039728e35b0dec3be66a8483d48a3458 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 10 Oct 2013 08:04:22 -0700
Subject: [PATCH 1/1] altos: Fix stm-bringup demo build to use installed pdclib

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 autogen.sh               |  3 +--
 src/stm-bringup/Makefile | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index c838c5b3..4e8b11ba 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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 "$@"
diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
index 1bc5aaad..33ecd710 100644
--- a/src/stm-bringup/Makefile
+++ b/src/stm-bringup/Makefile
@@ -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:
-- 
2.30.2