+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.
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 :=
$(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 \
--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)
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 \
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
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 > $@