From 2465fc4e6b8476fff1e081536e6145e4ce811ee5 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 17 Apr 2015 22:48:55 +0100 Subject: move the mandantory library config for libcss and libdom to core makefile --- Makefile | 4 +++- amiga/Makefile.target | 4 ++-- atari/Makefile.target | 3 +-- cocoa/Makefile.target | 5 +---- framebuffer/Makefile.target | 7 +++---- gtk/Makefile.target | 3 --- monkey/Makefile.target | 4 ++-- riscos/Makefile.target | 1 - windows/Makefile.target | 7 +------ 9 files changed, 13 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 077d1944c..107e61cf8 100644 --- a/Makefile +++ b/Makefile @@ -498,8 +498,10 @@ $(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf $(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv)) # Common libraries with pkgconfig -$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) +$(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,libnsutils,nsutils)) +$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) # Common libraries without pkg-config support LDFLAGS += -lz diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 9c7b8f57f..10e759b16 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -46,10 +46,10 @@ else CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl openssl) - CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libdom libcss) + CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libdom libcss) + LDFLAGS += $(shell $(PKG_CONFIG) --libs tre) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib ifeq ($(SUBTARGET),os3) diff --git a/atari/Makefile.target b/atari/Makefile.target index a09681b16..2b488e5c2 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -63,11 +63,10 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall -Dnsatari \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ -D_POSIX_C_SOURCE=200112L \ - $(shell $(PKG_CONFIG) --cflags libhubbub libcss openssl ) \ + $(shell $(PKG_CONFIG) --cflags openssl ) \ $(shell $(PKG_CONFIG) --cflags libcurl ) LDFLAGS += -lcflib -lcurl -LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub LDFLAGS += -lssl -lcrypto LDFLAGS += -lz -lcares -lHermes -lgem -lm LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index 815243c61..144219988 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -5,15 +5,12 @@ POSTEXES += NetSurf.app LDFLAGS += -L/usr/lib -LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss libdom) LDFLAGS += -L/usr/X11/lib LDFLAGS += -lm -lcurl LDFLAGS += -lssl -lcrypto CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os -CFLAGS += $(shell $(PKG_CONFIG) --cflags libhubbub libcss libdom) - # shut up zconf.h and zlib.h #CFLAGS += -D_LARGEFILE64_SOURCE=1 @@ -36,7 +33,7 @@ CFLAGS += -include cocoa/Prefix.pch # VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c) # TODO: this needs fixing properly everywhere -VERSION_FULL := "3.0 (Dev)" +VERSION_FULL := "3.4 (Dev)" VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index edc059118..d652c8a44 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -47,7 +47,7 @@ CFLAGS += -std=c99 -g -Dsmall \ -D_DEFAULT_SOURCE \ -D_XOPEN_SOURCE=600 \ -D_POSIX_C_SOURCE=200112L \ - $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) + $(shell $(PKG_CONFIG) --cflags libnsfb openssl) LDFLAGS += -lm -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive @@ -56,14 +56,13 @@ ifeq ($(HOST),mint) CFLAGS += $(shell curl-config --cflags) LDFLAGS += $(shell curl-config --libs) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub openssl libcss) + LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) LDFLAGS += -L/usr/lib/ -lz -liconv LDFLAGS += -lm else CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom openssl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libcss) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl openssl) endif diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 904c4d58a..d03f4f94d 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -61,9 +61,6 @@ GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \ -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" # 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))) diff --git a/monkey/Makefile.target b/monkey/Makefile.target index 751746343..e07af903d 100644 --- a/monkey/Makefile.target +++ b/monkey/Makefile.target @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------------- -LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom libcss) +LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl) LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here @@ -43,7 +43,7 @@ CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \ -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 libcurl) \ $(shell $(PKG_CONFIG) --cflags openssl) LDFLAGS += -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0) diff --git a/riscos/Makefile.target b/riscos/Makefile.target index de848cf0b..b2eb8927b 100644 --- a/riscos/Makefile.target +++ b/riscos/Makefile.target @@ -12,7 +12,6 @@ ifeq ($(HOST),riscos) LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet else LDFLAGS += $(shell $(PKG_CONFIG) --libs libcares libcurl openssl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libdom libcss) endif $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) diff --git a/windows/Makefile.target b/windows/Makefile.target index 4d6fa074e..a8c3282ec 100644 --- a/windows/Makefile.target +++ b/windows/Makefile.target @@ -21,13 +21,8 @@ ifneq ($(PKG_CONFIG),) $(eval $(call pkg_config_find_and_add,zlib,ZLib)) $(eval $(call pkg_config_find_and_add,libcurl,Curl)) $(eval $(call pkg_config_find_and_add,libcares,Cares)) - $(eval $(call pkg_config_find_and_add,libwapcaplet,Wapcaplet)) - $(eval $(call pkg_config_find_and_add,libparserutils,Parserutils)) - $(eval $(call pkg_config_find_and_add,libhubbub,Hubbub)) - $(eval $(call pkg_config_find_and_add,libdom,DOM)) - $(eval $(call pkg_config_find_and_add,libcss,CSS)) else - LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lcurl -lz + LDFLAGS += -lcurl -lz endif LDFLAGS += -lssl -lcrypto -lregex -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows -- cgit v1.2.3