From 21d739de967fce9ccab40a3b3a97b513f8410406 Mon Sep 17 00:00:00 2001
From: Xiangfu <xiangfu@openmobilefree.net>
Date: Wed, 3 Oct 2012 15:10:57 +0800
Subject: [PATCH] add CPPFLAGS and LDFALGS, run chrpath on .so files

---
 Makefile           | 2 +-
 libs/Makefile      | 5 +++--
 mini-jtag/Makefile | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c320a02..2502d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all: new_fp fp2bit bit2fp draw_svg_tiles autotest hstrrep \
 include Makefile.common
 
 %.o:	%.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 	$(MKDEP)
 
 libs/%.so: FAKE
diff --git a/libs/Makefile b/libs/Makefile
index 83ac9cd..40a1ee6 100644
--- a/libs/Makefile
+++ b/libs/Makefile
@@ -41,11 +41,11 @@ libfpga-floorplan.so: $(LIBFPGA_FLOORPLAN_OBJS)
 libfpga-control.so: $(LIBFPGA_CONTROL_OBJS)
 
 %.so:
-	$(CC) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
 	@rm -f $@ && ln -s $@.$(LIBS_VERSION) $@
 
 %.o:	%.c
-	$(CC) $(CFLAGS) -fPIC -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
 	$(MKDEP)
 
 clean:
@@ -56,6 +56,7 @@ install: all
 	mkdir -p $(DESTDIR)/$(PREFIX)/include/
 	install -m 644 $(DYNAMIC_HEADS) $(DESTDIR)/$(PREFIX)/include/
 	for f in $(DYNAMIC_LIBS); do \
+		chrpath -d $$f.$(LIBS_VERSION) && \
 		install -m 644 $$f.$(LIBS_VERSION) $(DESTDIR)/$(PREFIX)/lib/$$f.$(LIBS_VERSION) && \
 		(cd $(DESTDIR)/$(PREFIX)/lib/ && ln -s $$f.$(LIBS_VERSION) $$f) \
 		|| exit 1; done
diff --git a/mini-jtag/Makefile b/mini-jtag/Makefile
index ca58011..24229b7 100644
--- a/mini-jtag/Makefile
+++ b/mini-jtag/Makefile
@@ -20,7 +20,7 @@ mini-jtag: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
 
 %.o:	%.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 	$(MKDEP)
 
 install: all