mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-17 08:09:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

move the mandantory library config for libcss and libdom to core makefile

Browse Source
This commit is contained in:
Vincent Sanders 2015-04-17 22:48:55 +01:00
parent 89a3f250d2
commit 2465fc4e6b
9 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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

4
amiga/Makefile.target
View File

@ -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)

3
atari/Makefile.target
View File

@ -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

5
cocoa/Makefile.target
View File

@ -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)

7
framebuffer/Makefile.target
View File

@ -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

3
gtk/Makefile.target
View File

@ -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)))

4
monkey/Makefile.target
View File

@ -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)

1
riscos/Makefile.target
View File

@ -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)))

7
windows/Makefile.target
View File

@ -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