[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
eric at webkit.org
eric at webkit.org
Tue Jan 5 23:52:35 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit e17ea36c4dd732354f09ed016c2bc37421aef39c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 17 19:59:43 2009 +0000
2009-12-17 Evan Martin <evan at chromium.org>
Reviewed by Xan Lopez.
Always use all WebCore include paths in GtkWebKit.
With this patch, I can disable all optional features and still build.
* GNUmakefile.am:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52274 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df4d374..dff36b3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-17 Evan Martin <evan at chromium.org>
+
+ Reviewed by Xan Lopez.
+
+ Always use all WebCore include paths in GtkWebKit.
+
+ With this patch, I can disable all optional features and still build.
+
+ * GNUmakefile.am:
+
2009-12-17 Yaar Schnitman <yaar at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 1e3a0e4..fcce0bc 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -26,6 +26,7 @@ webcore_cppflags += \
-I$(srcdir)/WebCore/loader/appcache \
-I$(srcdir)/WebCore/loader/archive \
-I$(srcdir)/WebCore/loader/icon \
+ -I$(srcdir)/WebCore/mathml \
-I$(srcdir)/WebCore/notifications \
-I$(srcdir)/WebCore/page \
-I$(srcdir)/WebCore/page/animation \
@@ -49,6 +50,12 @@ webcore_cppflags += \
-I$(srcdir)/WebCore/rendering \
-I$(srcdir)/WebCore/rendering/style \
-I$(srcdir)/WebCore/storage \
+ -I$(srcdir)/WebCore/svg \
+ -I$(srcdir)/WebCore/svg/animation \
+ -I$(srcdir)/WebCore/svg/graphics \
+ -I$(srcdir)/WebCore/svg/graphics/filters \
+ -I$(srcdir)/WebCore/websockets \
+ -I$(srcdir)/WebCore/wml \
-I$(srcdir)/WebCore/workers \
-I$(srcdir)/WebCore/xml \
-I$(top_builddir)/WebCore/bindings/js \
@@ -2581,8 +2588,7 @@ webcore_built_sources += \
DerivedSources/WMLNames.cpp
webcore_cppflags += \
- -DENABLE_WML=1 \
- -I$(top_srcdir)/WebCore/wml
+ -DENABLE_WML=1
webcore_sources += \
WebCore/wml/WMLAElement.cpp \
@@ -2686,7 +2692,6 @@ if ENABLE_MATHML
FEATURE_DEFINES_JAVASCRIPT += ENABLE_MATHML=1
webcore_cppflags += \
- -I$(srcdir)/WebCore/mathml \
-DENABLE_MATHML=1
webcore_sources += \
@@ -2905,11 +2910,7 @@ IDL_BINDINGS += \
WebCore/svg/SVGZoomEvent.idl
webcore_cppflags += \
- -DENABLE_SVG=1 \
- -I$(top_srcdir)/WebCore/svg \
- -I$(top_srcdir)/WebCore/svg/animation \
- -I$(top_srcdir)/WebCore/svg/graphics \
- -I$(top_srcdir)/WebCore/svg/graphics/filters
+ -DENABLE_SVG=1
webcore_sources += \
WebCore/bindings/js/JSSVGElementInstanceCustom.cpp \
@@ -3375,8 +3376,7 @@ IDL_BINDINGS += \
WebCore/websockets/WebSocket.idl
webcore_cppflags += \
- -DENABLE_WEB_SOCKETS=1 \
- -I$(srcdir)/WebCore/websockets
+ -DENABLE_WEB_SOCKETS=1
webcore_sources += \
WebCore/bindings/js/JSWebSocketConstructor.cpp \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list