From 484fa8b110fb10b19808e73c49b345be638cb1db Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 20 Dec 2012 15:27:07 +0000 Subject: move common include path setup to core Makefile --- Makefile | 7 +++- Makefile.defaults | 2 +- Makefile.sources.javascript | 2 +- amiga/Makefile.target | 2 +- atari/Makefile.target | 2 +- beos/Makefile.target | 93 ++++++++++++++++++++++----------------------- cocoa/Makefile.target | 6 +-- framebuffer/Makefile.target | 2 +- gtk/Makefile.target | 2 +- monkey/Makefile.target | 2 +- riscos/Makefile.target | 8 ++-- windows/Makefile.target | 77 +++++++++++++++++++------------------ 12 files changed, 104 insertions(+), 101 deletions(-) diff --git a/Makefile b/Makefile index baf835421..7a09e6c45 100644 --- a/Makefile +++ b/Makefile @@ -426,9 +426,14 @@ $(eval $(call feature_enabled,LIBICONV_PLUG,-DLIBICONV_PLUG,,glibc internal icon # common libraries without pkg-config support LDFLAGS += -lz +# add top level and build directory to include search path +CFLAGS += -I. -I$(OBJROOT) + +# export the user agent format CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\" -CFLAGS += -DNETSURF_HOMEPAGE=\"$(NETSURF_HOMEPAGE)\" +# set the default homepage to use +CFLAGS += -DNETSURF_HOMEPAGE=\"$(NETSURF_HOMEPAGE)\" # ---------------------------------------------------------------------------- # General make rules diff --git a/Makefile.defaults b/Makefile.defaults index 812a5a950..7650b381f 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -93,7 +93,7 @@ NETSURF_HOMEPAGE := "about:welcome" NETSURF_USE_LIBICONV_PLUG := YES # Initial CFLAGS. Optimisation level etc. tend to be target specific. -CFLAGS := +CFLAGS := # Default installation/execution prefix PREFIX ?= /usr/local diff --git a/Makefile.sources.javascript b/Makefile.sources.javascript index 76a6ff145..3092d1b2f 100644 --- a/Makefile.sources.javascript +++ b/Makefile.sources.javascript @@ -33,7 +33,7 @@ D_JSAPI_BINDING += $(patsubst %.c,%.d,$(2)) $(2): $(1) $(OBJROOT)/created $$(VQ)echo " GENBIND: $(1)" - $(Q)nsgenbind -I javascript/WebIDL -d $(patsubst %.c,%.d,$(2)) -o $(2) $(1) + $(Q)nsgenbind -I javascript/WebIDL -d $(patsubst %.c,%.d,$(2)) -h $(patsubst %.c,%.h,$(2)) -o $(2) $(1) endef diff --git a/amiga/Makefile.target b/amiga/Makefile.target index ec43fdd30..f2c429998 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -2,7 +2,7 @@ # Amiga target setup # ---------------------------------------------------------------------------- -CFLAGS += -std=c99 -I . -Dnsamiga +CFLAGS += -std=c99 -Dnsamiga ifneq ($(SUBTARGET),os3) CFLAGS += -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__ diff --git a/atari/Makefile.target b/atari/Makefile.target index 7f0573407..8e87a741d 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -58,7 +58,7 @@ endif $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -CFLAGS += -U__STRICT_ANSI__ -std=c99 -I. -Dsmall $(WARNFLAGS) -Dnsatari \ +CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall $(WARNFLAGS) -Dnsatari \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ -D_POSIX_C_SOURCE=200112L \ diff --git a/beos/Makefile.target b/beos/Makefile.target index 4edde01a1..7b473dd2f 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -3,35 +3,34 @@ # ---------------------------------------------------------------------------- - $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) - - LDFLAGS += -L/boot/home/config/lib - # for Haiku - LDFLAGS += -L/boot/common/lib - # some people do *not* have libm... - LDFLAGS += -lssl -lcrypto -lcss - $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) - LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet - LDFLAGS += -lexpat -lcurl -liconv - - CFLAGS += -I. -O $(WARNFLAGS) -Dnsbeos \ - -D_BSD_SOURCE -D_POSIX_C_SOURCE \ - -Drestrict="" -Wno-multichar - # DEBUG - CFLAGS += -g -O0 - # -DDEBUG=1 - - BEOS_BERES := beres - BEOS_RC := rc - BEOS_XRES := xres - BEOS_SETVER := setversion - BEOS_MIMESET := mimeset - VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) - 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) - RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) - RESOURCES = $(RSRC_BEOS) - ifeq ($(HOST),beos) +$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) + +LDFLAGS += -L/boot/home/config/lib +# for Haiku +LDFLAGS += -L/boot/common/lib +# some people do *not* have libm... +LDFLAGS += -lssl -lcrypto -lcss +$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) +LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet +LDFLAGS += -lexpat -lcurl -liconv + +CFLAGS += -O $(WARNFLAGS) -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE \ + -Drestrict="" -Wno-multichar +# DEBUG +CFLAGS += -g -O0 +# -DDEBUG=1 + +BEOS_BERES := beres +BEOS_RC := rc +BEOS_XRES := xres +BEOS_SETVER := setversion +BEOS_MIMESET := mimeset +VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) +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) +RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) +RESOURCES = $(RSRC_BEOS) +ifeq ($(HOST),beos) CFLAGS += -I/boot/home/config/include \ -I/boot/home/config/include/libmng \ -I/boot/home/config/include/hubbub \ @@ -66,22 +65,22 @@ LDFLAGS += -lstdc++.r4 else LDFLAGS += -lstdc++ -lsupc++ - endif +endif - ifeq ($(HOST),beos) - CFLAGS += -I$(PREFIX)/include - LDFLAGS += -L$(PREFIX)/lib - $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) - $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) - $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) - else - 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_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 )) - endif +ifeq ($(HOST),beos) + CFLAGS += -I$(PREFIX)/include + LDFLAGS += -L$(PREFIX)/lib + $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) + $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) + $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) +else + 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_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 )) +endif # ---------------------------------------------------------------------------- # Source file setup @@ -89,9 +88,9 @@ # S_BEOS are sources purely for the BeOS build S_BEOS := about.cpp bitmap.cpp download.cpp fetch_rsrc.cpp filetype.cpp \ - font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp scaffolding.cpp \ - search.cpp schedule.cpp thumbnail.cpp treeview.cpp throbber.cpp \ - window.cpp system_colour.cpp + font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp \ + scaffolding.cpp search.cpp schedule.cpp thumbnail.cpp treeview.cpp \ + throbber.cpp window.cpp system_colour.cpp S_BEOS := $(addprefix beos/,$(S_BEOS)) RDEF_BEOS := res.rdef diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index d975a0c8f..2da4c5bb4 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -10,11 +10,9 @@ LDFLAGS += -lm -lcurl -liconv LDFLAGS += -lssl -lcrypto - CFLAGS += -I. -O $(WARNFLAGS) -Dnscocoa \ + CFLAGS += -O $(WARNFLAGS) -Dnscocoa \ -D_BSD_SOURCE -D_POSIX_C_SOURCE \ - -std=c99 - - CFLAGS += -g -Os -Wno-uninitialized + -std=c99 -g -Os CFLAGS += $(shell $(PKG_CONFIG) --cflags libhubbub libcss libdom) diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index f3d91de0d..8ab8804b9 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -44,7 +44,7 @@ $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) -CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) \ +CFLAGS += -std=c99 -g -Dsmall $(WARNFLAGS) \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ -D_POSIX_C_SOURCE=200112L \ diff --git a/gtk/Makefile.target b/gtk/Makefile.target index f9b5436af..2d1eebf50 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -51,7 +51,7 @@ GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ -D_POSIX_C_SOURCE=200112L \ -D_NETBSD_SOURCE \ -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \ - $(WARNFLAGS) -I. -g + $(WARNFLAGS) -g # non optional pkg-configed libs $(eval $(call pkg_config_find_and_add,libcss,CSS)) diff --git a/monkey/Makefile.target b/monkey/Makefile.target index fa15a50f2..05a32d005 100644 --- a/monkey/Makefile.target +++ b/monkey/Makefile.target @@ -41,7 +41,7 @@ MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \ -D_POSIX_C_SOURCE=200112L \ -D_NETBSD_SOURCE \ -DMONKEY_RESPATH=\"$(NETSURF_MONKEY_RESOURCES)\" \ - $(WARNFLAGS) -I. -g \ + $(WARNFLAGS) -g \ $(shell $(PKG_CONFIG) --cflags glib-2.0) \ $(shell $(PKG_CONFIG) --cflags libdom libcurl) \ $(shell $(PKG_CONFIG) --cflags openssl) \ diff --git a/riscos/Makefile.target b/riscos/Makefile.target index e7370e7ee..faefa417f 100644 --- a/riscos/Makefile.target +++ b/riscos/Makefile.target @@ -42,12 +42,10 @@ TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \ RESOURCES = $(TPD_RISCOS) split-messages -CFLAGS += -I. $(WARNFLAGS) -Driscos \ - -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \ - -mpoke-function-name -fno-strict-aliasing +CFLAGS += $(WARNFLAGS) -Driscos -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \ + -mpoke-function-name -fno-strict-aliasing -CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include \ - -I$(GCCSDK_INSTALL_ENV)/include/libmng +CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include -I$(GCCSDK_INSTALL_ENV)/include/libmng ifeq ($(HOST),riscos) CFLAGS += -I -mthrowback endif diff --git a/windows/Makefile.target b/windows/Makefile.target index 90f97fbea..c373ff593 100644 --- a/windows/Makefile.target +++ b/windows/Makefile.target @@ -3,48 +3,51 @@ # # This file is part of NetSurf - LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib - CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/ - - NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG - NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE - NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP - NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF - NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) - $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) - $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) - $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) - $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng))) - - ifneq ($(PKG_CONFIG),) - CFLAGS += $(shell $(PKG_CONFIG) --cflags zlib libcares libcurl libhubbub \ - libparserutils libdom libwapcaplet) - LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libcurl libcares \ - libhubbub libparserutils libcss libdom libwapcaplet) - else - LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lcurl -lz - endif - - LDFLAGS += -lssl -lcrypto -lregex -liconv \ +LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib +CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/ + +NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG +NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE +NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP +NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF +NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG + +$(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) +$(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) +$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) +$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) +$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng))) + +ifneq ($(PKG_CONFIG),) + $(eval $(call pkg_config_find_and_add,zlib,ZLib)) + $(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)) + $(eval $(call pkg_config_find_and_add,libcurl,Curl)) +else + LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lcurl -lz +endif + +LDFLAGS += -lssl -lcrypto -lregex -liconv \ -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows - CFLAGS += -U__STRICT_ANSI__ -mwin32 - # only windows versions after XP are supported - CFLAGS += '-DWINVER=0x0501' - CFLAGS += '-D_WIN32_WINNT=0x0501' - CFLAGS += '-D_WIN32_WINDOWS=0x0501' - CFLAGS += '-D_WIN32_IE=0x0501' +CFLAGS += -U__STRICT_ANSI__ -mwin32 +# only windows versions after XP are supported +CFLAGS += '-DWINVER=0x0501' +CFLAGS += '-D_WIN32_WINNT=0x0501' +CFLAGS += '-D_WIN32_WINDOWS=0x0501' +CFLAGS += '-D_WIN32_IE=0x0501' - #installed resource path - CFLAGS += '-DNETSURF_WINDOWS_RESPATH="$(NETSURF_WINDOWS_RESPATH)"' +#installed resource path +CFLAGS += '-DNETSURF_WINDOWS_RESPATH="$(NETSURF_WINDOWS_RESPATH)"' +WSCFLAGS := -std=c99 $(WARNFLAGS) -DCURL_STATICLIB -DCARES_STATICLIB -g - WSCFLAGS := -std=c99 \ - $(WARNFLAGS) -I. \ - -DCURL_STATICLIB -DCARES_STATICLIB -g - CFLAGS += $(WSCFLAGS) - LDFLAGS += $(WSCFLAGS) +CFLAGS += $(WSCFLAGS) +LDFLAGS += $(WSCFLAGS) # ---------------------------------------------------------------------------- # built-in resource setup -- cgit v1.2.3