From: Steven Luo <steven+maemo@steven676.net>
Date: Tue, 5 Jan 2010 06:16:25 +0000 (-0800)
Subject: Add support for EXTRA_CPPFLAGS/EXTRA_LDFLAGS in Makefiles
X-Git-Tag: v3.1~4
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=dd8871e0b2cce220e39fa614c36fd6ecba333d68

Add support for EXTRA_CPPFLAGS/EXTRA_LDFLAGS in Makefiles
---

diff --git a/Makefile b/Makefile
index 443a560..33a52b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CC = gcc
 CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
-CPPFLAGS = `pkg-config --cflags dbus-glib-1`
-LDFLAGS = `pkg-config --libs dbus-glib-1`
+CPPFLAGS = `pkg-config --cflags dbus-glib-1` $(EXTRA_CPPFLAGS)
+LDFLAGS = `pkg-config --libs dbus-glib-1` $(EXTRA_LDFLAGS)
 PREFIX = /usr
 
 APP = browser-switchboard
diff --git a/config-ui/Makefile b/config-ui/Makefile
index 85d71e4..42f2003 100644
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -1,11 +1,11 @@
 CC = gcc
 CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
 CFLAGS_PLUGIN = -fPIC
-CPPFLAGS = -I../ `pkg-config --cflags gtk+-2.0`
+CPPFLAGS = -I../ `pkg-config --cflags gtk+-2.0` $(EXTRA_CPPFLAGS)
 CPPFLAGS_HILDON = -DHILDON `pkg-config --cflags hildon-1`
 CPPFLAGS_PLUGIN = $(CPPFLAGS_HILDON) -DHILDON_CP_APPLET \
 	`pkg-config --cflags libosso` `pkg-config --cflags hildon-control-panel`
-LDFLAGS = `pkg-config --libs gtk+-2.0`
+LDFLAGS = `pkg-config --libs gtk+-2.0` $(EXTRA_LDFLAGS)
 LDFLAGS_HILDON = `pkg-config --libs hildon-1`
 LDFLAGS_PLUGIN = -shared $(LDFLAGS_HILDON) \
 	`pkg-config --libs libosso` `pkg-config --libs hildon-control-panel`