From 484fa8b110fb10b19808e73c49b345be638cb1db Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 20 Dec 2012 15:27:07 +0000
Subject: move common include path setup to core Makefile

---
 windows/Makefile.target | 77 +++++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

(limited to 'windows')

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