summaryrefslogtreecommitdiff
path: root/monkey
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-09-05 16:01:44 +0100
committerVincent Sanders <vince@kyllikki.org>2014-09-05 16:01:44 +0100
commit4f530a3f8fff035006e2c9afbcfd233cd38a499a (patch)
treedb356c0ef1c02bf0476213e6927bd0e579c4a62d /monkey
parentef5b2340809ca61b4ffd87d864fec8f40ea43120 (diff)
downloadnetsurf-4f530a3f8fff035006e2c9afbcfd233cd38a499a.tar.gz
netsurf-4f530a3f8fff035006e2c9afbcfd233cd38a499a.tar.bz2
Pull warning flags out into variables that can be overriden seperately for C and C++
Diffstat (limited to 'monkey')
-rw-r--r--monkey/Makefile.target31
1 files changed, 13 insertions, 18 deletions
diff --git a/monkey/Makefile.target b/monkey/Makefile.target
index 1b0ec163d..d3c974782 100644
--- a/monkey/Makefile.target
+++ b/monkey/Makefile.target
@@ -33,24 +33,19 @@ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
# no pkg-config for this library
$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp)))
-WARNFLAGS += -Werror
-
-MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L \
- -D_NETBSD_SOURCE \
- -DMONKEY_RESPATH=\"$(NETSURF_MONKEY_RESOURCES)\" \
- $(WARNFLAGS) -g \
- $(shell $(PKG_CONFIG) --cflags glib-2.0) \
- $(shell $(PKG_CONFIG) --cflags libdom libcurl) \
- $(shell $(PKG_CONFIG) --cflags openssl)
-
-MONKEYLDFLAGS := -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0)
-
-
-CFLAGS += $(MONKEYCFLAGS)
-LDFLAGS += $(MONKEYLDFLAGS)
+CWARNFLAGS += -Werror
+
+CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \
+ -D_BSD_SOURCE \
+ -D_XOPEN_SOURCE=600 \
+ -D_POSIX_C_SOURCE=200112L \
+ -D_NETBSD_SOURCE \
+ -DMONKEY_RESPATH=\"$(NETSURF_MONKEY_RESOURCES)\" \
+ $(shell $(PKG_CONFIG) --cflags glib-2.0) \
+ $(shell $(PKG_CONFIG) --cflags libdom libcurl) \
+ $(shell $(PKG_CONFIG) --cflags openssl)
+
+LDFLAGS += -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0)
# ---------------------------------------------------------------------------
# Windows flag setup