diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2012-12-13 17:23:47 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-12-13 17:23:47 +0000 |
| commit | 16d67095a6731f329bad971985e8983cdc054efe (patch) | |
| tree | cde78d6c8ca1cf6035fcf29e4bc0a4b684fcee45 /gtk/Makefile.target | |
| parent | 45906b9dc2c87181f359289abc034f84b44947c4 (diff) | |
| download | netsurf-16d67095a6731f329bad971985e8983cdc054efe.tar.gz netsurf-16d67095a6731f329bad971985e8983cdc054efe.tar.bz2 | |
add pkg-config macro for libraries which are not controled by configuration
Diffstat (limited to 'gtk/Makefile.target')
| -rw-r--r-- | gtk/Makefile.target | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 3da4346a1..f9b5436af 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -7,9 +7,6 @@ # GTK flag setup (using pkg-config) # ---------------------------------------------------------------------------- -LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom libcss) -LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) - # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG @@ -24,7 +21,7 @@ NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO # add a line similar to below for each optional lib here # note: webp lacks pkg-config file -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) +$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) $(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,RSVG,librsvg-2.0,SVG)) @@ -54,16 +51,22 @@ GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ -D_POSIX_C_SOURCE=200112L \ -D_NETBSD_SOURCE \ -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \ - $(WARNFLAGS) -I. -g \ - $(shell $(PKG_CONFIG) --cflags gtk+-$(NETSURF_GTK_MAJOR).0) \ - $(shell $(PKG_CONFIG) --cflags libhubbub libcurl) \ - $(shell $(PKG_CONFIG) --cflags openssl) \ - $(shell xml2-config --cflags) + $(WARNFLAGS) -I. -g + +# non optional pkg-configed libs +$(eval $(call pkg_config_find_and_add,libcss,CSS)) +$(eval $(call pkg_config_find_and_add,libdom,DOM)) +$(eval $(call pkg_config_find_and_add,libhubbub,Hubbub)) +$(eval $(call pkg_config_find_and_add,openssl,OpenSSL)) +$(eval $(call pkg_config_find_and_add,libcurl,Curl )) +$(eval $(call pkg_config_find_and_add,gtk+-$(NETSURF_GTK_MAJOR).0,GTK-$(NETSURF_GTK_MAJOR))) +$(eval $(call pkg_config_find_and_add,gthread-2.0,GThread2)) +$(eval $(call pkg_config_find_and_add,gmodule-2.0,GModule2)) +$(eval $(call pkg_config_find_and_add,lcms,lcms)) -GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs gtk+-$(NETSURF_GTK_MAJOR).0 gthread-2.0 gmodule-2.0 lcms) CFLAGS += $(GTKCFLAGS) -LDFLAGS += -lm $(GTKLDFLAGS) +LDFLAGS += -lm # --------------------------------------------------------------------------- # Windows flag setup |