2010-08-25 Xan Lopez <xlopez@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
        https://bugs.webkit.org/show_bug.cgi?id=44608

        Move FEATURE_DEFINES declaration here, since it's used by the
        bindings code generator. Also, fix typo in the variable holding
        the defines.

        * GNUmakefile.am:

WebCore:

2010-08-25  Xan Lopez  <xlopez@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
        https://bugs.webkit.org/show_bug.cgi?id=44608

        Move FEATURE_DEFINES declaration to the toplevel GNUmakefile.am,
        since it's used there now too.

        * GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@66021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 2508bd4770e19d44fbf0aae7545c796e9a6f5d12..1e801203d51ec6ab59e2f42e6d496e9fccae88d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-25  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
+        https://bugs.webkit.org/show_bug.cgi?id=44608
+
+        Move FEATURE_DEFINES declaration here, since it's used by the
+        bindings code generator. Also, fix typo in the variable holding
+        the defines.
+
+        * GNUmakefile.am:
+
 2010-08-25  Rafael Antognolli  <antognolli@profusion.mobi>
 
         Unreviewed build fix.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 6496c0ccf4e57dcc50a083fc8ff23f4fdef30ca4..1ca3cdf12a05760bf31936bc73b226dc400100b3 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -818,9 +818,10 @@ $(top_builddir)/DerivedSources/webkit/WebKitDOMEventTargetPrivate.h: $(WebCore)/
        $(AM_V_GEN)cp -f $< $@
 
 # Filter out SVG for now
+FEATURE_DEFINES :=
 gdom_feature_defines := $(filter-out ENABLE-SVG%, $(FEATURE_DEFINES))
 DerivedSources/webkit/WebKitDOM%.cpp DerivedSources/webkit/WebKitDOM%.h DerivedSources/webkit/WebKitDOM%Private.h:: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_features_defines)" --generator GObject $<
+       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject $<
 
 webkitgtk_cppflags += \
        -DBUILDING_WEBKIT \

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7a157e98ae181322b57f9b1b8ecec72bb4247d33..9269315de012280ccf6d14b82a0a6a11b079d421 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-25  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
+        https://bugs.webkit.org/show_bug.cgi?id=44608
+
+        Move FEATURE_DEFINES declaration to the toplevel GNUmakefile.am,
+        since it's used there now too.
+
+        * GNUmakefile.am:
+
 2010-08-25  Dawit Alemayehu  <adawit@kde.org>
 
         Reviewed by Ariya Hidayat.

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index c3d230a5fc91f4bf9eab88a5b352d941fa94c40c..8f3b7cc22011133d7481704babf5be7f19d84d62 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1,4 +1,3 @@
-FEATURE_DEFINES :=
 SVG_FEATURES :=
 HTML_FEATURES :=