From 0db4606fc4daa63f63b30a44832cbc0b99cbd1fa Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Mon, 27 Dec 2010 19:00:35 -0700
Subject: take advantage of implicit Makefile rules

---
 Makefile       | 18 ++++++------------
 tests/Makefile | 16 ++++++++--------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index c4e6ad6..9a8454d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,10 @@ 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
+LDLIBS:=$(shell pkg-config --libs $(REQ_PKGS) x11)
+LDLIBS!=echo pkg-config --libs $(REQ_PKGS) x11
 
-CFLAGS = -std=c99 $(PKG_CFLAGS) -ggdb $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
+CFLAGS += -std=c99 $(PKG_CFLAGS) -ggdb -W -Wall -Wextra -pedantic -fPIC -pthread
 
 SRC = $(wildcard src/*.c)
 HEAD = $(wildcard src/*.h)
@@ -44,19 +44,13 @@ all: uzbl-browser uzbl-cookie-manager
 
 VPATH:=src
 
-.c.o:
-	@echo -e "${CC} -c ${CFLAGS} $<"
-	@${CC} -c ${CFLAGS} $<
-
 ${OBJ}: ${HEAD}
 
 uzbl-core: ${OBJ}
-	@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}"
-	@${CC} -o $@ uzbl-cookie-manager.o util.o ${LDFLAGS} $(shell pkg-config --libs glib-2.0 libsoup-2.4)
+uzbl-cookie-manager: examples/uzbl-cookie-manager.o util.o
+	@echo -e "\n${CC} -o $@ examples/uzbl-cookie-manager.o util.o ${shell pkg-config --libs glib-2.0 libsoup-2.4}"
+	@${CC} -o $@ examples/uzbl-cookie-manager.o util.o $(shell pkg-config --libs glib-2.0 libsoup-2.4)
 
 uzbl-browser: uzbl-core uzbl-cookie-manager
 
diff --git a/tests/Makefile b/tests/Makefile
index 0da12ba..bfe74c5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -21,21 +21,21 @@ 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
+LDLIBS:=$(shell pkg-config --libs $(REQ_PKGS) x11)
+LDLIBS!=echo pkg-config --libs $(REQ_PKGS) x11
 
-CFLAGS = -std=c99 $(PKG_CFLAGS) -ggdb -fPIC -W -Wall -Wextra -pedantic
+CFLAGS += -std=c99 $(PKG_CFLAGS) -ggdb -fPIC -W -Wall -Wextra -pedantic -pthread
 
-LDFLAGS = $(PKG_LDFLAGS) -pthread -L . -luzbl-core
+GTESTER = gtester
+GTESTER_REPORT = gtester-report
 
-GTESTER:=gtester
-GTESTER_REPORT:=gtester-report
-
-TEST_PROGS:=test-expand test-command
+TEST_PROGS = test-expand test-command
 
 all: $(TEST_PROGS)
 	LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." $(GTESTER) --verbose $(TEST_PROGS)
 
+${TEST_PROGS}: libuzbl-core.so
+
 clean:
 	rm -f $(TEST_PROGS)
 	rm -f libuzbl-core.so
-- 
cgit v1.2.3