diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-05-03 14:56:42 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-05-03 14:56:42 +0100 |
| commit | a14b689b7aebe990e99727bca911d488f04f69b9 (patch) | |
| tree | df07d84135ff37a8906ed0d89ed4962cce9558fd /monkey/Makefile.target | |
| parent | 408e818cbeaf32d3e5fddc6c6110b4caf06098d5 (diff) | |
| download | netsurf-a14b689b7aebe990e99727bca911d488f04f69b9.tar.gz netsurf-a14b689b7aebe990e99727bca911d488f04f69b9.tar.bz2 | |
Use standard macros for monkey frontend mandantory pkg-config based libraries
Diffstat (limited to 'monkey/Makefile.target')
| -rw-r--r-- | monkey/Makefile.target | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/monkey/Makefile.target b/monkey/Makefile.target index 62ab2ab82..281e82b98 100644 --- a/monkey/Makefile.target +++ b/monkey/Makefile.target @@ -8,9 +8,6 @@ # ---------------------------------------------------------------------------- -LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl) -LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) - # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE @@ -20,29 +17,32 @@ NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 -# add a line similar to below for each optional pkg-configed lib here -$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) -$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) -$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) CWARNFLAGS += -Werror CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \ -D_BSD_SOURCE \ -D_DEFAULT_SOURCE \ - -D_XOPEN_SOURCE=600 \ + -D_XOPEN_SOURCE=700 \ -D_POSIX_C_SOURCE=200809L \ -D_NETBSD_SOURCE \ - -DMONKEY_RESPATH=\"$(NETSURF_MONKEY_RESOURCES)\" \ - $(shell $(PKG_CONFIG) --cflags glib-2.0) \ - $(shell $(PKG_CONFIG) --cflags libcurl) \ - $(shell $(PKG_CONFIG) --cflags openssl) + -DMONKEY_RESPATH=\"$(NETSURF_MONKEY_RESOURCES)\" + +LDFLAGS += -lm -LDFLAGS += -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0) +# non optional pkg-configed libs +$(eval $(call pkg_config_find_and_add,libcurl,Curl )) +$(eval $(call pkg_config_find_and_add,openssl,OpenSSL)) +$(eval $(call pkg_config_find_and_add,glib-2.0,GLib2)) + +# optional pkg-config configured libraries +$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) +$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) +$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) +$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) +$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) +$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) +$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) # --------------------------------------------------------------------------- # Windows flag setup |