summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-03-24 16:31:15 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-03-24 16:31:15 +0000
commit93c202497fa12f75c393e686ed470f85faa72af2 (patch)
treedbf688f4f4bbd1ac162d5b1d03d6c5cdb62e5ee4 /Makefile
parent0d98990eace7a5054dfbb927e16e67eadaf63653 (diff)
downloadlibhubbub-93c202497fa12f75c393e686ed470f85faa72af2.tar.gz
libhubbub-93c202497fa12f75c393e686ed470f85faa72af2.tar.bz2
Fix determination of whether json is required
svn path=/trunk/hubbub/; revision=6846
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile27
1 files changed, 26 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 824c134..2308c85 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,36 @@ WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
-I$(CURDIR)/src $(WARNFLAGS)
+# Parserutils
ifneq ($(PKGCONFIG),)
CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils --cflags)
LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils --libs)
else
- LDFLAGS := -lparserutils
+ LDFLAGS := $(LDFLAGS) -lparserutils
+endif
+
+ifeq ($(MAKECMDGOALS),test)
+ NEED_JSON := yes
+else
+ ifeq ($(MAKECMDGOALS),profile)
+ NEED_JSON := yes
+ else
+ ifeq ($(MAKECMDGOALS),coverage)
+ NEED_JSON := yes
+ endif
+ endif
+endif
+
+ifeq ($(NEED_JSON),yes)
+ # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/
+ ifneq ($(PKGCONFIG),)
+ CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json)
+ LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json)
+ else
+ LDFLAGS := $(LDFLAGS) -ljson
+ endif
+
+ CFLAGS := $(CFLAGS) -Wno-unused-parameter
endif
include build/makefiles/Makefile.top