From db5c6864ca7765b01d904ff1179d6522198c6d70 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Mon, 27 Dec 2010 17:49:40 -0700
Subject: untangle the CFLAGS mess

---
 Makefile       | 34 ++++++++++++++++++++++------------
 tests/Makefile | 32 ++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index a0d7655..832b531 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,30 @@
 # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
 
-REQ_PKGS  = libsoup-2.4 gthread-2.0 glib-2.0
-
 # gtk2
-REQ_PKGS += gtk+-2.0 webkit-1.0
-CPPFLAGS  =
+REQ_PKGS = gtk+-2.0 webkit-1.0
+CPPFLAGS =
 
 # gtk3
-#REQ_PKGS += gtk+-3.0 webkitgtk-3.0
-#CPPFLAGS	 = -DGTK3
+#REQ_PKGS = gtk+-3.0 webkitgtk-3.0
+#CPPFLAGS	= -DGTK3
+
+REQ_PKGS += libsoup-2.4 gthread-2.0 glib-2.0
+
+ARCH:=$(shell uname -m)
+ARCH!=echo `uname -m`
+
+COMMIT_HASH:=$(shell ./misc/hash.sh)
+COMMIT_HASH!=echo `./misc/hash.sh`
+
+CPPFLAGS += -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\"
+
+PKG_CFLAGS:=$(shell pkg-config --cflags $(REQ_PKGS))
+PKG_CFLAGS!=echo pkg-config --cflags $(REQ_PKGS)
 
-CFLAGS:=-std=c99 $(shell pkg-config --cflags $(REQ_PKGS)) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-CFLAGS!=echo -std=c99 `pkg-config --cflags $(REQ_PKGS)` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
+PKG_LDFLAGS:=$(shell pkg-config --libs $(REQ_PKGS) x11)
+PKG_LDFLAGS!=echo pkg-config --libs $(REQ_PKGS) x11
 
-UZBL_LDFLAGS:=$(shell pkg-config --libs $(REQ_PKGS) x11) -pthread $(LDFLAGS)
-UZBL_LDFLAGS!=echo `pkg-config --libs $(REQ_PKGS) x11` -pthread $(LDFLAGS)
+CFLAGS = -std=c99 $(PKG_CFLAGS) -ggdb -Wall -W -lgthread-2.0 $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
 
 SRC = $(wildcard src/*.c)
 HEAD = $(wildcard src/*.h)
@@ -31,8 +41,8 @@ VPATH:=src
 ${OBJ}: ${HEAD}
 
 uzbl-core: ${OBJ}
-	@echo -e "\n${CC} -o $@ ${OBJ} ${UZBL_LDFLAGS}"
-	@${CC} -o $@ ${OBJ} ${UZBL_LDFLAGS}
+	@echo -e "\n${CC} -o $@ ${OBJ} ${PKG_LDFLAGS} -pthread ${LDFLAGS}"
+	@${CC} -o $@ ${OBJ} ${PKG_LDFLAGS} -pthread ${LDFLAGS}
 
 uzbl-cookie-manager: examples/uzbl-cookie-manager.o src/util.o
 	@echo -e "\n${CC} -o $@ uzbl-cookie-manager.o util.o ${LDFLAGS} ${shell pkg-config --libs glib-2.0 libsoup-2.4}"
diff --git a/tests/Makefile b/tests/Makefile
index c35a2f2..f87964b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,18 +1,30 @@
-REQ_PKGS  = libsoup-2.4 gthread-2.0 glib-2.0
-
 # gtk2
-REQ_PKGS += gtk+-2.0 webkit-1.0
-CPPFLAGS  =
+REQ_PKGS = gtk+-2.0 webkit-1.0
+CPPFLAGS = -DERRORCHECK_MUTEXES -I ../
 
 # gtk3
-#REQ_PKGS += gtk+-3.0 webkitgtk-3.0
-#CPPFLAGS	 = -DGTK3
+#REQ_PKGS = gtk+-3.0 webkitgtk-3.0
+#CPPFLAGS	= -DERRORCHECK_MUTEXES -DGTK3 -I ../
+
+REQ_PKGS += libsoup-2.4 gthread-2.0 glib-2.0
+
+ARCH:=$(shell uname -m)
+ARCH!=echo `uname -m`
+
+COMMIT_HASH:=$(shell cd .. && ./misc/hash.sh)
+COMMIT_HASH!=echo `cd .. && ./misc/hash.sh`
+
+CPPFLAGS += -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\"
+
+PKG_CFLAGS:=$(shell pkg-config --cflags $(REQ_PKGS))
+PKG_CFLAGS!=echo pkg-config --cflags $(REQ_PKGS)
+
+PKG_LDFLAGS:=$(shell pkg-config --libs $(REQ_PKGS) x11)
+PKG_LDFLAGS!=echo pkg-config --libs $(REQ_PKGS) x11
 
-CFLAGS:=-std=c99 -I$(shell pwd)/../ -L$(shell pwd) -luzbl-core $(shell pkg-config --cflags $(REQ_PKGS)) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS)
-CFLAGS!=echo -std=c99 `pkg-config --cflags $(REQ_PKGS)` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS)
+CFLAGS = -std=c99 $(PKG_CFLAGS) -ggdb -Wall -W -lgthread-2.0 -fPIC -W -Wall -Wextra -pedantic
 
-LDFLAGS:=$(shell pkg-config --libs $(REQ_PKGS)) -pthread $(LDFLAGS)
-LDFLAGS!=echo `pkg-config --libs $(REQ_PKGS)` -pthread $(LDFLAGS)
+LDFLAGS = $(PKG_LDFLAGS) -pthread -L . -luzbl-core
 
 GTESTER:=gtester
 GTESTER_REPORT:=gtester-report
-- 
cgit v1.2.3