From daf7a52dd67e7ac2149dba337cc156c9ba308987 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 17 Apr 2009 00:54:27 +0000 Subject: Hubbub is no longer optional. Remove libxml2 parser binding. svn path=/trunk/netsurf/; revision=7115 --- Makefile | 175 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 82 insertions(+), 93 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 578aece44..85d33fcf1 100644 --- a/Makefile +++ b/Makefile @@ -248,15 +248,15 @@ CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\" CFLAGS += -DNETSURF_HOMEPAGE=\"$(NETSURF_HOMEPAGE)\" # ---------------------------------------------------------------------------- -# RISC OS host flag setup +# RISC OS target setup # ---------------------------------------------------------------------------- ifeq ($(TARGET),riscos) ifeq ($(HOST),riscos) LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lcares - LDFLAGS += -lssl -lcrypto + LDFLAGS += -lssl -lcrypto -lhubbub0 -lparserutils0 else - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub-0) endif $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG rendering)) @@ -265,102 +265,32 @@ ifeq ($(TARGET),riscos) $(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering)) $(eval $(call feature_enabled,PLUGINS,-DWITH_PLUGIN,,Plugin protocol support)) ifeq ($(HOST),riscos) - $(eval $(call feature_enabled,HUBBUB,-DWITH_HUBBUB,-lhubbub0 -lparserutils0,Hubbub HTML parser)) $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp0,NetSurf BMP decoder)) $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif0,NetSurf GIF decoder)) $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG support)) else - NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub-0,Hubbub HTML parser)) $(eval $(call pkg_config_find_and_add,BMP,libnsbmp-0,NetSurf BMP decoder)) $(eval $(call pkg_config_find_and_add,GIF,libnsgif-0,NetSurf GIF decoder)) $(eval $(call pkg_config_find_and_add,PNG,libpng,PNG support)) endif -endif - -# ---------------------------------------------------------------------------- -# BeOS flag setup -# ---------------------------------------------------------------------------- - -ifeq ($(HOST),beos) - $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG support)) - - LDFLAGS += -L/boot/home/config/lib - # for Haiku - LDFLAGS += -L/boot/common/lib - # some people do *not* have libm... - LDFLAGS += -lxml2 -lz -lcurl -liconv - LDFLAGS += -lssl -lcrypto -endif - -# ---------------------------------------------------------------------------- -# GTK flag setup (using pkg-config) -# ---------------------------------------------------------------------------- - -ifeq ($(TARGET),gtk) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl) - - # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here - NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG - NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE - NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB - NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP - NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF - NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - - # add a line similar to below for each optional pkg-configed lib here - $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering)) - $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering)) - $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub-0,Hubbub HTML parser)) - $(eval $(call pkg_config_find_and_add,BMP,libnsbmp-0,NetSurf BMP decoder)) - $(eval $(call pkg_config_find_and_add,GIF,libnsgif-0,NetSurf GIF decoder)) - $(eval $(call pkg_config_find_and_add,PNG,libpng,PNG support)) - GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ - -DGTK_DISABLE_DEPRECATED \ - -D_BSD_SOURCE \ - -D_XOPEN_SOURCE=600 \ - -D_POSIX_C_SOURCE=200112L \ - -D_NETBSD_SOURCE \ - -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \ - $(WARNFLAGS) -I. -g \ - $(shell $(PKG_CONFIG) --cflags libglade-2.0 gtk+-2.0) \ - $(shell xml2-config --cflags) - - GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms) - - CFLAGS += $(GTKCFLAGS) - LDFLAGS += $(GTKLDFLAGS) - - # ---------------------------------------------------------------------------- - # Windows flag setup - # ---------------------------------------------------------------------------- - - ifeq ($(HOST),Windows_NT) - CFLAGS += -U__STRICT_ANSI__ - endif -endif - -# ---------------------------------------------------------------------------- -# RISC OS target flag setup -# ---------------------------------------------------------------------------- - -ifeq ($(TARGET),riscos) TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \ !NetSurf/Resources/$(TPL)/Templates$(TPLEXT)) RESOURCES = $(TPD_RISCOS) - CFLAGS += -I. $(WARNFLAGS) -Driscos \ + CFLAGS += -I. $(WARNFLAGS) -Driscos \ -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \ -mpoke-function-name CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include \ -I$(GCCSDK_INSTALL_ENV)/include/libxml2 \ - -I$(GCCSDK_INSTALL_ENV)/include/libmng + -I$(GCCSDK_INSTALL_ENV)/include/libmng \ + -I$(GCCSDK_INSTALL_ENV)/include/hubbub0 \ + -I$(GCCSDK_INSTALL_ENV)/include/parserutils0 ifeq ($(HOST),riscos) CFLAGS += -I -mthrowback endif @@ -380,10 +310,19 @@ ifeq ($(TARGET),riscos) endif # ---------------------------------------------------------------------------- -# BeOS target flag setup +# BeOS target setup # ---------------------------------------------------------------------------- ifeq ($(TARGET),beos) + $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG support)) + + LDFLAGS += -L/boot/home/config/lib + # for Haiku + LDFLAGS += -L/boot/common/lib + # some people do *not* have libm... + LDFLAGS += -lxml2 -lcurl -liconv + LDFLAGS += -lssl -lcrypto -lhubbub0 -lparserutils0 + CFLAGS += -I. -O $(WARNFLAGS) -Dnsbeos \ -D_BSD_SOURCE -D_POSIX_C_SOURCE \ -Drestrict="" -Wno-multichar @@ -404,7 +343,9 @@ ifeq ($(TARGET),beos) ifeq ($(HOST),beos) CFLAGS += -I/boot/home/config/include \ -I/boot/home/config/include/libxml2 \ - -I/boot/home/config/include/libmng + -I/boot/home/config/include/libmng \ + -I/boot/home/config/include/hubbub0 \ + -I/boot/home/config/include/parserutils0 ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),) LDFLAGS += -lzeta endif @@ -412,7 +353,9 @@ ifeq ($(TARGET),beos) # Haiku CFLAGS += -I/boot/common/include \ -I/boot/common/include/libxml2 \ - -I/boot/common/include/libmng + -I/boot/common/include/libmng \ + -I/boot/common/include/hubbub0 \ + -I/boot/common/include/parserutils0 NETLDFLAGS := -lnetwork else ifneq ($(wildcard /boot/develop/lib/*/libbind.so),) @@ -430,20 +373,65 @@ ifeq ($(TARGET),beos) LDFLAGS += -lbe -ltranslation $(NETLDFLAGS) endif +# ---------------------------------------------------------------------------- +# GTK flag setup (using pkg-config) +# ---------------------------------------------------------------------------- + +ifeq ($(TARGET),gtk) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub-0) + + # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here + NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG + NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE + NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP + NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF + NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG + + # add a line similar to below for each optional pkg-configed lib here + $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering)) + $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering)) + $(eval $(call pkg_config_find_and_add,BMP,libnsbmp-0,NetSurf BMP decoder)) + $(eval $(call pkg_config_find_and_add,GIF,libnsgif-0,NetSurf GIF decoder)) + $(eval $(call pkg_config_find_and_add,PNG,libpng,PNG support)) + + GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ + -DGTK_DISABLE_DEPRECATED \ + -D_BSD_SOURCE \ + -D_XOPEN_SOURCE=600 \ + -D_POSIX_C_SOURCE=200112L \ + -D_NETBSD_SOURCE \ + -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \ + $(WARNFLAGS) -I. -g \ + $(shell $(PKG_CONFIG) --cflags libglade-2.0 gtk+-2.0) \ + $(shell $(PKG_CONFIG) --cflags libhubbub-0) \ + $(shell xml2-config --cflags) + + GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms) + + CFLAGS += $(GTKCFLAGS) + LDFLAGS += $(GTKLDFLAGS) + + # ---------------------------------------------------------------------------- + # Windows flag setup + # ---------------------------------------------------------------------------- + + ifeq ($(HOST),Windows_NT) + CFLAGS += -U__STRICT_ANSI__ + endif +endif + # ---------------------------------------------------------------------------- # Amiga target setup # ---------------------------------------------------------------------------- ifeq ($(TARGET),amiga) NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE - NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG $(eval $(call feature_enabled,ROSPRITE,-DWITH_NSSPRITE,-lrosprite,RISC OS Sprite decoder)) - $(eval $(call feature_enabled,HUBBUB,-DWITH_HUBBUB,-lhubbub0,Hubbub HTML parser)) $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp0,NetSurf BMP decoder)) $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif0,NetSurf GIF decoder)) $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG support)) @@ -451,8 +439,8 @@ ifeq ($(TARGET),amiga) $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,libmng extras)) CFLAGS += -D__USE_INLINE__ -std=c99 -I . -Dnsamiga - LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto -lparserutils0 - LDFLAGS += -lssl -lcrypto + LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto + LDFLAGS += -lssl -lcrypto -lhubbub0 -lparserutils0 ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES) CFLAGS += -DNS_AMIGA_CAIRO -I SDK:local/common/include/cairo @@ -476,7 +464,6 @@ ifeq ($(TARGET),framebuffer) # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE - NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF @@ -486,40 +473,39 @@ ifeq ($(TARGET),framebuffer) ifeq ($(NETSURF_FB_FRONTEND),linux) $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering)) $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering)) - $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub-0,Hubbub HTML parser)) $(eval $(call pkg_config_find_and_add,BMP,libnsbmp-0,NetSurf BMP decoder)) $(eval $(call pkg_config_find_and_add,GIF,libnsgif-0,NetSurf GIF decoder)) CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) \ + $(shell $(PKG_CONFIG) --cflags libhubbub-0) \ $(shell xml2-config --cflags) \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ -D_POSIX_C_SOURCE=200112L LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub-0) SUBTARGET := -linux endif ifeq ($(NETSURF_FB_FRONTEND),able) - $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif-0,NetSurf GIF decoder)) - $(eval $(call feature_enabled,HUBBUB,-DWITH_HUBBUB,-lhubbub-0,Hubbub)) + $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif0,NetSurf GIF decoder)) CC=arm-able-gcc CFLAGS += -std=c99 -I. -I/usr/lib/able/include -Dsmall $(WARNFLAGS) - LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm + LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm -lhubbub0 -lparserutils0 SUBTARGET := -able endif ifeq ($(NETSURF_FB_FRONTEND),dummy) $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering)) $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering)) - $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub-0,Hubbub HTML parser)) $(eval $(call pkg_config_find_and_add,BMP,libnsbmp-0,NetSurf BMP decoder)) $(eval $(call pkg_config_find_and_add,GIF,libnsgif-0,NetSurf GIF decoder)) CFLAGS += -std=c99 -g -I. $(WARNFLAGS) \ + $(shell $(PKG_CONFIG) --cflags libhubbub-0) \ $(shell xml2-config --cflags) \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ @@ -527,19 +513,20 @@ ifeq ($(TARGET),framebuffer) LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub-0) SUBTARGET := -dummy endif ifeq ($(NETSURF_FB_FRONTEND),sdl) $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering)) $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering)) - $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub-0,Hubbub HTML parser)) $(eval $(call pkg_config_find_and_add,BMP,libnsbmp-0,NetSurf BMP decoder)) $(eval $(call pkg_config_find_and_add,GIF,libnsgif-0,NetSurf GIF decoder)) # $(eval $(call pkg_config_find_and_add,SDL,libSDL,SDL Library)) CFLAGS += -std=c99 -g -I. $(WARNFLAGS) \ + $(shell $(PKG_CONFIG) --cflags libhubbub-0) \ $(shell xml2-config --cflags) \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ @@ -547,19 +534,20 @@ ifeq ($(TARGET),framebuffer) LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm -lSDL LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub-0) SUBTARGET := -sdl endif ifeq ($(NETSURF_FB_FRONTEND),vnc) $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering)) $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering)) - $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub-0,Hubbub HTML parser)) $(eval $(call pkg_config_find_and_add,BMP,libnsbmp-0,NetSurf BMP decoder)) $(eval $(call pkg_config_find_and_add,GIF,libnsgif-0,NetSurf GIF decoder)) # $(eval $(call pkg_config_find_and_add,VNCSERVER,libvncserver,VNC server)) CFLAGS += -std=c99 -g -I. $(WARNFLAGS) \ + $(shell $(PKG_CONFIG) --cflags libhubbub-0) \ $(shell xml2-config --cflags) \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ @@ -567,6 +555,7 @@ ifeq ($(TARGET),framebuffer) LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm -lvncserver LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub-0) SUBTARGET := -vnc endif -- cgit v1.2.3