2010-05-05 Alejandro G. Castro <alex@igalia.com>
authoralex@webkit.org <alex@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 May 2010 09:44:20 +0000 (09:44 +0000)
committeralex@webkit.org <alex@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 May 2010 09:44:20 +0000 (09:44 +0000)
        Reviewed by Xan Lopez.

        Fixed the gobject introspection compilation with the new DOM
        bindings, we needed to add DOM objects.

        * GNUmakefile.am:

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

ChangeLog
GNUmakefile.am
WebCore/ChangeLog
WebCore/GNUmakefile.am

index fe50756..1bd0da4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-05  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        Fixed the gobject introspection compilation with the new DOM
+        bindings, we needed to add DOM objects.
+
+        * GNUmakefile.am:
+
 2010-05-04  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         Unreviewed, build fix for Symbian.
index 03fad07..b0ad9e9 100644 (file)
@@ -69,6 +69,13 @@ webcore_built_nosources :=
 webcore_dist :=
 webcoregtk_cppflags :=
 webcoregtk_sources :=
+IDL_BINDINGS_GDOM :=
+GDOM_AUTO_CLASSES :=
+GDOM_FIXED_CLASSES :=
+GDOM_CLASSES :=
+GDOM_HEADERS_BUILT :=
+GDOM_HEADERS_FIXED :=
+libgdom_h_api :=
 webkitgtk_h_api :=
 webkitgtk_sources :=
 webkitgtk_cppflags :=
@@ -338,7 +345,8 @@ webkitgtk_h_api += \
        $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \
        $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
        $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
-       $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
+       $(top_builddir)/WebKit/gtk/webkit/webkitversion.h \
+       $(libgdom_h_api)
 
 webkitgtk_built_sources += \
        DerivedSources/webkitenumtypes.cpp \
@@ -440,6 +448,7 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la
             --add-include-path $(top_srcdir)/WebKit/gtk \
             -I$(top_srcdir)/WebKit/gtk \
             -I$(top_builddir)/WebKit/gtk \
+            -I$(top_builddir)/DerivedSources \
             -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
             -I$(top_srcdir) \
             $(webkitgtk_h_api)
index 6608a5f..cffa692 100644 (file)
@@ -1,3 +1,12 @@
+2010-05-05  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        Fixed the gobject introspection compilation with the new DOM
+        bindings, we needed to add DOM objects.
+
+        * GNUmakefile.am:
+
 2010-05-06  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.
index 8ae788e..d8cfc3a 100644 (file)
@@ -3795,7 +3795,7 @@ $(top_builddir)/DerivedSources/webkit/WebKitDOMObject.h:
        cp -f $(WebCore)/bindings/gobject/WebKitDOMObject.h $@
 
 # Start with a subset of all the DOM bindings
-IDL_BINDINGS_GDOM := \
+IDL_BINDINGS_GDOM += \
        WebCore/css/CSSRule.idl \
        WebCore/css/CSSRuleList.idl \
        WebCore/css/CSSStyleDeclaration.idl \
@@ -3911,18 +3911,18 @@ IDL_BINDINGS_GDOM := \
        WebCore/xml/XPathResult.idl
 
 # All classes autogenerated in the GObject DOM bindings
-GDOM_AUTO_CLASSES := $(basename $(notdir $(IDL_BINDINGS_GDOM)))
+GDOM_AUTO_CLASSES += $(basename $(notdir $(IDL_BINDINGS_GDOM)))
 
 # The classes implemented manually
-GDOM_FIXED_CLASSES := Object
+GDOM_FIXED_CLASSES += Object
 
-GDOM_CLASSES := $(GDOM_AUTO_CLASSES) $(GDOM_FIXED_CLASSES)
+GDOM_CLASSES += $(GDOM_AUTO_CLASSES) $(GDOM_FIXED_CLASSES)
 
 # Filter out SVG for now
 FEATURE_DEFINES_GDOM := $(filter-out ENABLE-SVG%, $(FEATURE_DEFINES))
 
 # Autogenerated header files
-GDOM_HEADERS_BUILT := $(patsubst %,DerivedSources/webkit/WebKitDOM%.h,$(GDOM_AUTO_CLASSES)) \
+GDOM_HEADERS_BUILT += $(patsubst %,$(top_builddir)/DerivedSources/webkit/WebKitDOM%.h,$(GDOM_AUTO_CLASSES)) \
        $(top_builddir)/DerivedSources/webkit/webkitdom.h \
        $(top_builddir)/DerivedSources/webkit/webkitdomdefines.h \
        $(top_builddir)/DerivedSources/webkit/WebKitDOMObject.h
@@ -3931,10 +3931,10 @@ GDOM_HEADERS_BUILT := $(patsubst %,DerivedSources/webkit/WebKitDOM%.h,$(GDOM_AUT
 GDOM_SOURCES_BUILT := $(patsubst %,DerivedSources/webkit/WebKitDOM%.cpp,$(GDOM_AUTO_CLASSES))
 
 # Hand-coded header files
-GDOM_HEADERS_FIXED := $(patsubst %,$(srcdir)/WebCore/bindings/gobject/WebKitDOM%.h,$(GDOM_FIXED_CLASSES))
+GDOM_HEADERS_FIXED += $(patsubst %,$(srcdir)/WebCore/bindings/gobject/WebKitDOM%.h,$(GDOM_FIXED_CLASSES))
 
 # All header files that get installed
-libgdom_h_api := $(GDOM_HEADERS_FIXED) $(GDOM_HEADERS_BUILT)
+libgdom_h_api += $(GDOM_HEADERS_FIXED) $(GDOM_HEADERS_BUILT)
 
 DerivedSources/webkit/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl
        echo $(GDOM_CLASSES) | $(PERL) $< gdom > $@