[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 11:28:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 65b6245059bb96655afacfc3002bd7e25dbe3f9b
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 26 21:32:18 2010 +0000
2010-07-26 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
[GTK] Get rid of libgdom
https://bugs.webkit.org/show_bug.cgi?id=42378
Remove the need to build the libgdom intermediate library.
* GNUmakefile.am: Move the source list for the GObject DOM bindings to
the top-level GNUmakefile.am, since they are logically part of WebKit, instead
of WebCore. List all auto-generated files statically and remove no-longer-
used variables. Fix an issue where some places expected webkitenumtypes.cpp
to be generated in different directories.
2010-07-26 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
[GTK] Get rid of libgdom
https://bugs.webkit.org/show_bug.cgi?id=42378
Remove all build steps for building GObject DOM bindings.
* GNUmakefile.am: Remove GObject DOM bindings build.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64075 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 205c9f5..8e6db02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-26 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Get rid of libgdom
+ https://bugs.webkit.org/show_bug.cgi?id=42378
+
+ Remove the need to build the libgdom intermediate library.
+
+ * GNUmakefile.am: Move the source list for the GObject DOM bindings to
+ the top-level GNUmakefile.am, since they are logically part of WebKit, instead
+ of WebCore. List all auto-generated files statically and remove no-longer-
+ used variables. Fix an issue where some places expected webkitenumtypes.cpp
+ to be generated in different directories.
+
2010-07-24 Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Reviewed by Xan Lopez.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 755b51b..367c467 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -39,6 +39,7 @@ GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
GENPROGRAMS := $(top_builddir)/Programs
+WebCore := $(srcdir)/WebCore
# Programs to run the WebKitGtk unit tests
GTESTER = gtester
@@ -66,20 +67,14 @@ webcore_built_sources :=
webcore_built_nosources :=
webcoregtk_cppflags :=
webcoregtk_sources :=
-IDL_BINDINGS_GDOM :=
-GDOM_AUTO_CLASSES :=
-GDOM_FIXED_CLASSES :=
-GDOM_CLASSES :=
-GDOM_HEADERS_BUILT :=
-GDOM_HEADERS_FIXED :=
-libgdom_h_api :=
-libgdom_cleanfiles :=
+webkitgtk_built_h_api :=
+webkitgtk_static_h_api :=
webkitgtk_h_api :=
webkitgtk_sources :=
webkitgtk_cppflags :=
+webkitgtk_gdom_built_sources :=
webkitgtk_built_sources :=
webkitgtk_built_nosources :=
-webkitgtk_cleanfiles :=
global_cppflags :=
global_cflags :=
global_cxxflags :=
@@ -219,7 +214,7 @@ nodist_libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit- at WEBKITGTK_API_VERSION@/webkit
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
- $(webkitgtk_h_api) \
+ $(webkitgtk_static_h_api) \
WebKit/gtk/webkit/webkitenumtypes.h
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
@@ -248,7 +243,6 @@ libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LDFL
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
-lpthread \
libJavaScriptCore.la \
- libgdom.la \
$(webcore_ldflags) \
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
@@ -270,15 +264,6 @@ libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LIBA
$(UNICODE_LIBS) \
$(XT_LIBS)
-libgdom_ladir = $(prefix)/include/webkit- at WEBKITGTK_API_VERSION@/webkit
-nodist_libgdom_la_HEADERS = \
- $(libgdom_h_api)
-
-libgdom_cleanfiles += \
- $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \
- $(top_builddir)/libgdom.la \
- $(top_builddir)/stamp-webkitdomenumtypes.h
-
#
# Extra checks and flags
global_cppflags += \
@@ -323,7 +308,7 @@ global_cppflags += \
-DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
endif
-webkitgtk_h_api += \
+webkitgtk_static_h_api += \
$(srcdir)/WebKit/gtk/webkit/webkit.h \
$(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
$(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
@@ -345,14 +330,385 @@ webkitgtk_h_api += \
$(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
$(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
+ $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h
+
+webkitgtk_built_h_api += \
+ DerivedSources/webkit/WebKitDOMCSSRule.h \
+ DerivedSources/webkit/WebKitDOMCSSRuleList.h \
+ DerivedSources/webkit/WebKitDOMCSSStyleDeclaration.h \
+ DerivedSources/webkit/WebKitDOMCSSStyleSheet.h \
+ DerivedSources/webkit/WebKitDOMCSSValue.h \
+ DerivedSources/webkit/WebKitDOMMediaList.h \
+ DerivedSources/webkit/WebKitDOMStyleMedia.h \
+ DerivedSources/webkit/WebKitDOMStyleSheet.h \
+ DerivedSources/webkit/WebKitDOMStyleSheetList.h \
+ DerivedSources/webkit/WebKitDOMAttr.h \
+ DerivedSources/webkit/WebKitDOMCDATASection.h \
+ DerivedSources/webkit/WebKitDOMCharacterData.h \
+ DerivedSources/webkit/WebKitDOMComment.h \
+ DerivedSources/webkit/WebKitDOMDocument.h \
+ DerivedSources/webkit/WebKitDOMDocumentFragment.h \
+ DerivedSources/webkit/WebKitDOMDocumentType.h \
+ DerivedSources/webkit/WebKitDOMDOMImplementation.h \
+ DerivedSources/webkit/WebKitDOMDOMStringList.h \
+ DerivedSources/webkit/WebKitDOMDOMStringMap.h \
+ DerivedSources/webkit/WebKitDOMElement.h \
+ DerivedSources/webkit/WebKitDOMEntityReference.h \
+ DerivedSources/webkit/WebKitDOMEvent.h \
+ DerivedSources/webkit/WebKitDOMMessagePort.h \
+ DerivedSources/webkit/WebKitDOMNamedNodeMap.h \
+ DerivedSources/webkit/WebKitDOMNode.h \
+ DerivedSources/webkit/WebKitDOMNodeFilter.h \
+ DerivedSources/webkit/WebKitDOMNodeIterator.h \
+ DerivedSources/webkit/WebKitDOMNodeList.h \
+ DerivedSources/webkit/WebKitDOMProcessingInstruction.h \
+ DerivedSources/webkit/WebKitDOMRange.h \
+ DerivedSources/webkit/WebKitDOMText.h \
+ DerivedSources/webkit/WebKitDOMTreeWalker.h \
+ DerivedSources/webkit/WebKitDOMBlob.h \
+ DerivedSources/webkit/WebKitDOMFile.h \
+ DerivedSources/webkit/WebKitDOMFileList.h \
+ DerivedSources/webkit/WebKitDOMHTMLAnchorElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLAppletElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLAreaElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLBaseElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLBaseFontElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLBlockquoteElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLBodyElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLBRElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLButtonElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLCanvasElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLCollection.h \
+ DerivedSources/webkit/WebKitDOMHTMLDirectoryElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLDivElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLDListElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLDocument.h \
+ DerivedSources/webkit/WebKitDOMHTMLElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLEmbedElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLFieldSetElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLFontElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLFormElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLFrameElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLFrameSetElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLHeadElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLHeadingElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLHRElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLHtmlElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLIFrameElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLImageElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLInputElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLIsIndexElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLLabelElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLLegendElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLLIElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLLinkElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLMapElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLMarqueeElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLMenuElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLMetaElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLModElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLObjectElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLOListElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLOptGroupElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLOptionElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLOptionsCollection.h \
+ DerivedSources/webkit/WebKitDOMHTMLParagraphElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLParamElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLPreElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLQuoteElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLScriptElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLSelectElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLStyleElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableCaptionElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableColElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableSectionElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableCellElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTextAreaElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTitleElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableRowElement.h \
+ DerivedSources/webkit/WebKitDOMHTMLUListElement.h \
+ DerivedSources/webkit/WebKitDOMValidityState.h \
+ DerivedSources/webkit/WebKitDOMDOMApplicationCache.h \
+ DerivedSources/webkit/WebKitDOMBarInfo.h \
+ DerivedSources/webkit/WebKitDOMConsole.h \
+ DerivedSources/webkit/WebKitDOMDOMWindow.h \
+ DerivedSources/webkit/WebKitDOMDOMSelection.h \
+ DerivedSources/webkit/WebKitDOMEventTarget.h \
+ DerivedSources/webkit/WebKitDOMHistory.h \
+ DerivedSources/webkit/WebKitDOMLocation.h \
+ DerivedSources/webkit/WebKitDOMMemoryInfo.h \
+ DerivedSources/webkit/WebKitDOMObject.h \
+ DerivedSources/webkit/WebKitDOMNavigator.h \
+ DerivedSources/webkit/WebKitDOMScreen.h \
+ DerivedSources/webkit/WebKitDOMWebKitPoint.h \
+ DerivedSources/webkit/WebKitDOMDOMMimeType.h \
+ DerivedSources/webkit/WebKitDOMDOMMimeTypeArray.h \
+ DerivedSources/webkit/WebKitDOMDOMPlugin.h \
+ DerivedSources/webkit/WebKitDOMDOMPluginArray.h \
+ DerivedSources/webkit/WebKitDOMDatabase.h \
+ DerivedSources/webkit/WebKitDOMStorage.h \
+ DerivedSources/webkit/WebKitDOMXPathExpression.h \
+ DerivedSources/webkit/WebKitDOMXPathNSResolver.h \
+ DerivedSources/webkit/WebKitDOMXPathResult.h \
+ DerivedSources/webkit/webkitdom.h \
+ WebKit/gtk/webkit/webkitversion.h
+
+webkitgtk_h_api += \
+ $(webkitgtk_built_h_api) \
+ $(webkitgtk_static_h_api)
+
+webkitgtk_gdom_built_sources += \
+ DerivedSources/webkit/WebKitDOMAttr.cpp \
+ DerivedSources/webkit/WebKitDOMAttrPrivate.h \
+ DerivedSources/webkit/WebKitDOMBarInfo.cpp \
+ DerivedSources/webkit/WebKitDOMBarInfoPrivate.h \
+ DerivedSources/webkit/WebKitDOMBlob.cpp \
+ DerivedSources/webkit/WebKitDOMBlobPrivate.h \
+ DerivedSources/webkit/WebKitDOMCDATASection.cpp \
+ DerivedSources/webkit/WebKitDOMCDATASectionPrivate.h \
+ DerivedSources/webkit/WebKitDOMCharacterData.cpp \
+ DerivedSources/webkit/WebKitDOMCharacterDataPrivate.h \
+ DerivedSources/webkit/WebKitDOMComment.cpp \
+ DerivedSources/webkit/WebKitDOMCommentPrivate.h \
+ DerivedSources/webkit/WebKitDOMConsole.cpp \
+ DerivedSources/webkit/WebKitDOMConsolePrivate.h \
+ DerivedSources/webkit/WebKitDOMCSSRule.cpp \
+ DerivedSources/webkit/WebKitDOMCSSRuleList.cpp \
+ DerivedSources/webkit/WebKitDOMCSSRuleListPrivate.h \
+ DerivedSources/webkit/WebKitDOMCSSRulePrivate.h \
+ DerivedSources/webkit/WebKitDOMCSSStyleDeclaration.cpp \
+ DerivedSources/webkit/WebKitDOMCSSStyleDeclarationPrivate.h \
+ DerivedSources/webkit/WebKitDOMCSSStyleSheet.cpp \
+ DerivedSources/webkit/WebKitDOMCSSStyleSheetPrivate.h \
+ DerivedSources/webkit/WebKitDOMCSSValue.cpp \
+ DerivedSources/webkit/WebKitDOMCSSValuePrivate.h \
+ DerivedSources/webkit/WebKitDOMDatabase.cpp \
+ DerivedSources/webkit/WebKitDOMDatabasePrivate.h \
+ DerivedSources/webkit/WebKitDOMDocument.cpp \
+ DerivedSources/webkit/WebKitDOMDocumentFragment.cpp \
+ DerivedSources/webkit/WebKitDOMDocumentFragmentPrivate.h \
+ DerivedSources/webkit/WebKitDOMDocumentPrivate.h \
+ DerivedSources/webkit/WebKitDOMDocumentType.cpp \
+ DerivedSources/webkit/WebKitDOMDocumentTypePrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMApplicationCache.cpp \
+ DerivedSources/webkit/WebKitDOMDOMApplicationCachePrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMImplementation.cpp \
+ DerivedSources/webkit/WebKitDOMDOMImplementationPrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMMimeTypeArray.cpp \
+ DerivedSources/webkit/WebKitDOMDOMMimeTypeArrayPrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMMimeType.cpp \
+ DerivedSources/webkit/WebKitDOMDOMMimeTypePrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMPluginArray.cpp \
+ DerivedSources/webkit/WebKitDOMDOMPluginArrayPrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMPlugin.cpp \
+ DerivedSources/webkit/WebKitDOMDOMPluginPrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMSelection.cpp \
+ DerivedSources/webkit/WebKitDOMDOMSelectionPrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMStringList.cpp \
+ DerivedSources/webkit/WebKitDOMDOMStringListPrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMStringMap.cpp \
+ DerivedSources/webkit/WebKitDOMDOMStringMapPrivate.h \
+ DerivedSources/webkit/WebKitDOMDOMWindow.cpp \
+ DerivedSources/webkit/WebKitDOMDOMWindowPrivate.h \
+ DerivedSources/webkit/WebKitDOMElement.cpp \
+ DerivedSources/webkit/WebKitDOMElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMEntityReference.cpp \
+ DerivedSources/webkit/WebKitDOMEntityReferencePrivate.h \
+ DerivedSources/webkit/WebKitDOMEvent.cpp \
+ DerivedSources/webkit/WebKitDOMEventPrivate.h \
+ DerivedSources/webkit/WebKitDOMFile.cpp \
+ DerivedSources/webkit/WebKitDOMFileList.cpp \
+ DerivedSources/webkit/WebKitDOMFileListPrivate.h \
+ DerivedSources/webkit/WebKitDOMFilePrivate.h \
+ DerivedSources/webkit/WebKitDOMHistory.cpp \
+ DerivedSources/webkit/WebKitDOMHistoryPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLAnchorElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLAnchorElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLAppletElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLAppletElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLAreaElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLAreaElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLBaseElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLBaseElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLBaseFontElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLBaseFontElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLBlockquoteElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLBlockquoteElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLBodyElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLBodyElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLBRElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLBRElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLButtonElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLButtonElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLCanvasElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLCanvasElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLCollection.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLCollectionPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLDirectoryElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLDirectoryElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLDivElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLDivElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLDListElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLDListElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLDocument.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLDocumentPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLEmbedElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLEmbedElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLFieldSetElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLFieldSetElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLFontElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLFontElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLFormElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLFormElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLFrameElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLFrameElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLFrameSetElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLFrameSetElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLHeadElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLHeadElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLHeadingElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLHeadingElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLHRElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLHRElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLHtmlElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLHtmlElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLIFrameElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLIFrameElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLImageElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLImageElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLInputElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLInputElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLIsIndexElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLIsIndexElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLLabelElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLLabelElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLLegendElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLLegendElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLLIElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLLIElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLLinkElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLLinkElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLMapElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLMapElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLMarqueeElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLMarqueeElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLMenuElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLMenuElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLMetaElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLMetaElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLModElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLModElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLObjectElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLObjectElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLOListElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLOListElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLOptGroupElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLOptGroupElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLOptionElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLOptionElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLOptionsCollection.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLOptionsCollectionPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLParagraphElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLParagraphElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLParamElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLParamElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLPreElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLPreElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLQuoteElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLQuoteElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLScriptElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLScriptElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLSelectElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLSelectElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLStyleElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLStyleElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableCaptionElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTableCaptionElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableCellElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTableCellElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableColElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTableColElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTableElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableRowElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTableRowElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTableSectionElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTableSectionElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTextAreaElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTextAreaElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLTitleElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLTitleElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMHTMLUListElement.cpp \
+ DerivedSources/webkit/WebKitDOMHTMLUListElementPrivate.h \
+ DerivedSources/webkit/WebKitDOMLocation.cpp \
+ DerivedSources/webkit/WebKitDOMLocationPrivate.h \
+ DerivedSources/webkit/WebKitDOMMediaList.cpp \
+ DerivedSources/webkit/WebKitDOMMediaListPrivate.h \
+ DerivedSources/webkit/WebKitDOMMemoryInfo.cpp \
+ DerivedSources/webkit/WebKitDOMMemoryInfoPrivate.h \
+ DerivedSources/webkit/WebKitDOMMessagePort.cpp \
+ DerivedSources/webkit/WebKitDOMMessagePortPrivate.h \
+ DerivedSources/webkit/WebKitDOMNamedNodeMap.cpp \
+ DerivedSources/webkit/WebKitDOMNamedNodeMapPrivate.h \
+ DerivedSources/webkit/WebKitDOMNavigator.cpp \
+ DerivedSources/webkit/WebKitDOMNavigatorPrivate.h \
+ DerivedSources/webkit/WebKitDOMNode.cpp \
+ DerivedSources/webkit/WebKitDOMNodeFilter.cpp \
+ DerivedSources/webkit/WebKitDOMNodeFilterPrivate.h \
+ DerivedSources/webkit/WebKitDOMNodeIterator.cpp \
+ DerivedSources/webkit/WebKitDOMNodeIteratorPrivate.h \
+ DerivedSources/webkit/WebKitDOMNodeList.cpp \
+ DerivedSources/webkit/WebKitDOMNodeListPrivate.h \
+ DerivedSources/webkit/WebKitDOMNodePrivate.h \
+ DerivedSources/webkit/WebKitDOMProcessingInstruction.cpp \
+ DerivedSources/webkit/WebKitDOMProcessingInstructionPrivate.h \
+ DerivedSources/webkit/WebKitDOMRange.cpp \
+ DerivedSources/webkit/WebKitDOMRangePrivate.h \
+ DerivedSources/webkit/WebKitDOMScreen.cpp \
+ DerivedSources/webkit/WebKitDOMScreenPrivate.h \
+ DerivedSources/webkit/WebKitDOMStorage.cpp \
+ DerivedSources/webkit/WebKitDOMStoragePrivate.h \
+ DerivedSources/webkit/WebKitDOMStyleMedia.cpp \
+ DerivedSources/webkit/WebKitDOMStyleMediaPrivate.h \
+ DerivedSources/webkit/WebKitDOMStyleSheet.cpp \
+ DerivedSources/webkit/WebKitDOMStyleSheetList.cpp \
+ DerivedSources/webkit/WebKitDOMStyleSheetListPrivate.h \
+ DerivedSources/webkit/WebKitDOMStyleSheetPrivate.h \
+ DerivedSources/webkit/WebKitDOMText.cpp \
+ DerivedSources/webkit/WebKitDOMTextPrivate.h \
+ DerivedSources/webkit/WebKitDOMTreeWalker.cpp \
+ DerivedSources/webkit/WebKitDOMTreeWalkerPrivate.h \
+ DerivedSources/webkit/WebKitDOMValidityState.cpp \
+ DerivedSources/webkit/WebKitDOMValidityStatePrivate.h \
+ DerivedSources/webkit/WebKitDOMWebKitPoint.cpp \
+ DerivedSources/webkit/WebKitDOMWebKitPointPrivate.h \
+ DerivedSources/webkit/WebKitDOMXPathExpression.cpp \
+ DerivedSources/webkit/WebKitDOMXPathExpressionPrivate.h \
+ DerivedSources/webkit/WebKitDOMXPathNSResolver.cpp \
+ DerivedSources/webkit/WebKitDOMXPathNSResolverPrivate.h \
+ DerivedSources/webkit/WebKitDOMXPathResult.cpp \
+ DerivedSources/webkit/WebKitDOMXPathResultPrivate.h
+
+if ENABLE_GEOLOCATION
+webkitgtk_built_h_api += \
+ $(top_builddir)/DerivedSources/webkit/WebKitDOMGeolocation.h
+
+webkitgtk_gdom_built_sources += \
+ DerivedSources/webkit/WebKitDOMGeolocation.cpp \
+ DerivedSources/webkit/WebKitDOMGeolocationPrivate.h
+endif
+# webkitenumtypes.{h,cpp} cannot be in webkitgtk_built_h_api, because
+# the rule that builds it depends on webkitgtk_built_h_api (circular dependency).
webkitgtk_built_sources += \
- DerivedSources/webkit/webkitenumtypes.cpp \
- DerivedSources/webkit/webkitdomenumtypes.cpp \
+ $(webkitgtk_built_h_api) \
+ $(webkitgtk_gdom_built_sources) \
DerivedSources/webkit/webkitmarshal.cpp \
DerivedSources/webkit/webkitmarshal.h \
+ WebKit/gtk/webkit/webkitenumtypes.cpp \
WebKit/gtk/webkit/webkitenumtypes.h
webkitgtk_sources += \
@@ -398,6 +754,30 @@ webkitgtk_sources += \
WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
WebKit/gtk/webkit/webkitworkers.cpp
+gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources)))))
+gdom_class_list += Object EventTarget
+DerivedSources/webkit/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl GNUmakefile
+ $(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< gdom > $@
+
+DerivedSources/webkit/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl GNUmakefile
+ $(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< defines > $@
+
+# Because WebCore/bindings/gobject/WebKitDOMObject.h is static source but is also a distributed header
+# required by other distributed headers (both static and auto-generated), need to move this to the
+# DerivedSources/webkit directory. The reason is that we want all header files distributed in the
+# include/webkit-x.y/webkit directory, but do not want to name the WebCore/bindings/gobject directory
+# "webkit", as that's a bit presumptuous for a GTK binding.
+$(top_builddir)/DerivedSources/webkit/WebKitDOMObject.h: $(WebCore)/bindings/gobject/WebKitDOMObject.h
+ $(AM_V_GEN)cp -f $< $@
+
+$(top_builddir)/DerivedSources/webkit/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h
+ $(AM_V_GEN)cp -f $< $@
+
+# Filter out SVG for now
+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 $<
+
webkitgtk_cppflags += \
-DBUILDING_WEBKIT \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@@ -409,18 +789,6 @@ webkitgtk_cppflags += \
-I$(top_builddir)/WebKit/gtk/webkit \
-I$(GENSOURCES_WEBKIT)
-webkitgtk_cleanfiles += \
- $(top_builddir)/stamp-webkitmarshal.cpp \
- $(top_builddir)/stamp-webkitmarshal.h \
- $(top_builddir)/stamp-webkitenumtypes.cpp \
- $(top_builddir)/stamp-webkitenumtypes.h \
- $(top_builddir)/Programs/GtkLauncher \
- $(top_builddir)/WebKit/gtk/docs/version.xml \
- $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
- $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME at -@WEBKITGTK_API_VERSION at .pc \
- $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
- $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME at -@WEBKITGTK_API_VERSION at .pc
@@ -452,8 +820,7 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk- at WEBKITG
-I$(top_builddir)/DerivedSources/webkit \
-I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
-I$(top_srcdir) \
- $(webkitgtk_h_api) \
- $(libgdom_h_api)
+ $(webkitgtk_h_api)
girdir = $(datadir)/gir-1.0
gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
@@ -472,7 +839,6 @@ EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore- at WEBKITGTK_API_VERSION@.gir
WEBKIT_MARSHAL = $(GENSOURCES_WEBKIT)/webkitmarshal
WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
-
$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
@true
@@ -510,7 +876,7 @@ stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
&& rm -f xgen-gth \
&& echo timestamp > $(@F)
-DerivedSources/webkit/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
+WebKit/gtk/webkit/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
$(AM_V_GEN)glib-mkenums \
--fhead "#include <config.h>\n" \
--fhead "#include <glib-object.h>\n" \
@@ -532,49 +898,6 @@ DerivedSources/webkit/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
&& cp xgen-gtc $@ \
&& rm -f xgen-gtc
-WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h
- @true
-stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile
- $(AM_V_GEN)glib-mkenums \
- --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \
- --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \
- --fhead "#include <glib-object.h>\n\n" \
- --fhead "G_BEGIN_DECLS\n\n" \
- --ftail "G_END_DECLS\n\n" \
- --ftail "#endif\n" \
- --fprod "#include <webkit/@basename@>\n\n" \
- --eprod "#define WEBKIT_DOM_TYPE_ at ENUMSHORT@ @enum_name at _get_type()\n\n" \
- --eprod "WEBKIT_API GType\n at enum_name@_get_type(void);n\n" \
- $(libgdom_h_api) | \
- sed 's,web_kit,webkit_dom,' | \
- sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \
- > xgen-cgth \
- && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \
- && rm -f xgen-cgth \
- && echo timestamp > $(@F)
-
-DerivedSources/webkit/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile
- $(AM_V_GEN)glib-mkenums \
- --fhead "#include <config.h>\n" \
- --fhead "#include <glib-object.h>\n" \
- --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \
- --fhead "extern \"C\" {\n\n" \
- --fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "static const G at Type@Value _ at enum_name@_values] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n};\n\n" \
- --vtail "GType @enum_name at _get_type(void)\n{\n" \
- --vtail " static GType type = 0;\n\n" \
- --vtail " if (!type)\n" \
- --vtail " type = g_ at type@_register_static(\"@EnumName@\", _ at enum_name@_values);\n\n" \
- --vtail " return type;\n}\n\n" \
- --ftail "}\n" \
- $(libgdom_h_api) | \
- sed 's,web_kit,webkitdom,' \
- > xgen-cgtc \
- && cp xgen-cgtc $@ \
- && rm -f xgen-cgtc
-
# Files that will be distributed
EXTRA_DIST += \
$(srcdir)/gtk-doc.make \
@@ -777,15 +1100,21 @@ BUILT_SOURCES += \
$(webcore_built_sources) \
$(webcore_built_nosources) \
$(webkitgtk_built_sources) \
- $(webkitgtk_built_nosources) \
- $(gdom_built_nosources)
+ $(webkitgtk_built_nosources)
# Project-wide clean rules
# Files that will be cleaned
CLEANFILES += \
$(BUILT_SOURCES) \
- $(webkitgtk_cleanfiles) \
- $(libgdom_cleanfiles)
+ $(top_builddir)/stamp-webkitmarshal.cpp \
+ $(top_builddir)/stamp-webkitmarshal.h \
+ $(top_builddir)/stamp-webkitenumtypes.cpp \
+ $(top_builddir)/stamp-webkitenumtypes.h \
+ $(top_builddir)/Programs/GtkLauncher \
+ $(top_builddir)/WebKit/gtk/docs/version.xml \
+ $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
+ $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME at -@WEBKITGTK_API_VERSION at .pc \
+ $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
DISTCLEANFILES += \
$(CLEANFILES) \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b0d5208..434bb8e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-26 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Get rid of libgdom
+ https://bugs.webkit.org/show_bug.cgi?id=42378
+
+ Remove all build steps for building GObject DOM bindings.
+
+ * GNUmakefile.am: Remove GObject DOM bindings build.
+
2010-07-26 Mark Rowe <mrowe at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 5b1950f..8339ffb 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1,6 +1,3 @@
-
-WebCore := $(srcdir)/WebCore
-
FEATURE_DEFINES :=
SVG_FEATURES :=
HTML_FEATURES :=
@@ -86,8 +83,7 @@ webcoregtk_cppflags += \
webcore_built_nosources += \
DerivedSources/WebCore/DocTypeStrings.cpp \
DerivedSources/WebCore/tokenizer.cpp \
- DerivedSources/WebCore/ColorData.cpp \
- DerivedSources/webkit/webkitdomdummy.c
+ DerivedSources/WebCore/ColorData.cpp
webcore_built_sources += \
DerivedSources/WebCore/CSSGrammar.cpp \
@@ -4428,197 +4424,6 @@ DerivedSources/WebCore/JS%.h: DerivedSources/WebCore/JS%.cpp;
DerivedSources/WebCore/JS%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm
$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator JS $<
-DerivedSources/webkit/webkitdomdummy.c:
- $(AM_V_GEN)mkdir -p DerivedSources/webkit || echo > $@
-
-# Because WebCore/bindings/gobject/WebKitDOMObject.h is static source but is also a distributed header
-# required by other distributed headers (both static and auto-generated), need to move this to the
-# DerivedSources/webkit directory. The reason is that we want all header files distributed in the
-# include/webkit-x.y/webkit directory, but do not want to name the WebCore/bindings/gobject directory
-# "webkit", as that's a bit presumptuous for a GTK binding.
-$(top_builddir)/DerivedSources/webkit/WebKitDOMObject.h: $(WebCore)/bindings/gobject/WebKitDOMObject.h
- $(AM_V_GEN)cp -f $< $@
-
-$(top_builddir)/DerivedSources/webkit/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h
- $(AM_V_GEN)cp -f $< $@
-
-# Start with a subset of all the DOM bindings
-IDL_BINDINGS_GDOM += \
- WebCore/css/CSSRule.idl \
- WebCore/css/CSSRuleList.idl \
- WebCore/css/CSSStyleDeclaration.idl \
- WebCore/css/CSSStyleSheet.idl \
- WebCore/css/CSSValue.idl \
- WebCore/css/MediaList.idl \
- WebCore/css/StyleMedia.idl \
- WebCore/css/StyleSheet.idl \
- WebCore/css/StyleSheetList.idl \
- WebCore/dom/Attr.idl \
- WebCore/dom/CDATASection.idl \
- WebCore/dom/CharacterData.idl \
- WebCore/dom/Comment.idl \
- WebCore/dom/Document.idl \
- WebCore/dom/DocumentFragment.idl \
- WebCore/dom/DocumentType.idl \
- WebCore/dom/DOMImplementation.idl \
- WebCore/dom/DOMStringList.idl \
- WebCore/dom/DOMStringMap.idl \
- WebCore/dom/Element.idl \
- WebCore/dom/EntityReference.idl \
- WebCore/dom/Event.idl \
- WebCore/dom/MessagePort.idl \
- WebCore/dom/NamedNodeMap.idl \
- WebCore/dom/Node.idl \
- WebCore/dom/NodeFilter.idl \
- WebCore/dom/NodeIterator.idl \
- WebCore/dom/NodeList.idl \
- WebCore/dom/ProcessingInstruction.idl \
- WebCore/dom/Range.idl \
- WebCore/dom/Text.idl \
- WebCore/dom/TreeWalker.idl \
- WebCore/html/Blob.idl \
- WebCore/html/File.idl \
- WebCore/html/FileList.idl \
- WebCore/html/HTMLAnchorElement.idl \
- WebCore/html/HTMLAppletElement.idl \
- WebCore/html/HTMLAreaElement.idl \
- WebCore/html/HTMLBaseElement.idl \
- WebCore/html/HTMLBaseFontElement.idl \
- WebCore/html/HTMLBlockquoteElement.idl \
- WebCore/html/HTMLBodyElement.idl \
- WebCore/html/HTMLBRElement.idl \
- WebCore/html/HTMLButtonElement.idl \
- WebCore/html/HTMLCanvasElement.idl \
- WebCore/html/HTMLCollection.idl \
- WebCore/html/HTMLDirectoryElement.idl \
- WebCore/html/HTMLDivElement.idl \
- WebCore/html/HTMLDListElement.idl \
- WebCore/html/HTMLDocument.idl \
- WebCore/html/HTMLElement.idl \
- WebCore/html/HTMLEmbedElement.idl \
- WebCore/html/HTMLFieldSetElement.idl \
- WebCore/html/HTMLFontElement.idl \
- WebCore/html/HTMLFormElement.idl \
- WebCore/html/HTMLFrameElement.idl \
- WebCore/html/HTMLFrameSetElement.idl \
- WebCore/html/HTMLHeadElement.idl \
- WebCore/html/HTMLHeadingElement.idl \
- WebCore/html/HTMLHRElement.idl \
- WebCore/html/HTMLHtmlElement.idl \
- WebCore/html/HTMLIFrameElement.idl \
- WebCore/html/HTMLImageElement.idl \
- WebCore/html/HTMLInputElement.idl \
- WebCore/html/HTMLIsIndexElement.idl \
- WebCore/html/HTMLLabelElement.idl \
- WebCore/html/HTMLLegendElement.idl \
- WebCore/html/HTMLLIElement.idl \
- WebCore/html/HTMLLinkElement.idl \
- WebCore/html/HTMLMapElement.idl \
- WebCore/html/HTMLMarqueeElement.idl \
- WebCore/html/HTMLMenuElement.idl \
- WebCore/html/HTMLMetaElement.idl \
- WebCore/html/HTMLModElement.idl \
- WebCore/html/HTMLObjectElement.idl \
- WebCore/html/HTMLOListElement.idl \
- WebCore/html/HTMLOptGroupElement.idl \
- WebCore/html/HTMLOptionElement.idl \
- WebCore/html/HTMLOptionsCollection.idl \
- WebCore/html/HTMLParagraphElement.idl \
- WebCore/html/HTMLParamElement.idl \
- WebCore/html/HTMLPreElement.idl \
- WebCore/html/HTMLQuoteElement.idl \
- WebCore/html/HTMLScriptElement.idl \
- WebCore/html/HTMLSelectElement.idl \
- WebCore/html/HTMLStyleElement.idl \
- WebCore/html/HTMLTableElement.idl \
- WebCore/html/HTMLTableCaptionElement.idl \
- WebCore/html/HTMLTableColElement.idl \
- WebCore/html/HTMLTableSectionElement.idl \
- WebCore/html/HTMLTableCellElement.idl \
- WebCore/html/HTMLTextAreaElement.idl \
- WebCore/html/HTMLTitleElement.idl \
- WebCore/html/HTMLTableRowElement.idl \
- WebCore/html/HTMLUListElement.idl \
- WebCore/html/ValidityState.idl \
- WebCore/loader/appcache/DOMApplicationCache.idl \
- WebCore/page/BarInfo.idl \
- WebCore/page/Console.idl \
- WebCore/page/DOMWindow.idl \
- WebCore/page/DOMSelection.idl \
- WebCore/page/History.idl \
- WebCore/page/Location.idl \
- WebCore/page/MemoryInfo.idl \
- WebCore/page/Navigator.idl \
- WebCore/page/Screen.idl \
- WebCore/page/WebKitPoint.idl \
- WebCore/plugins/DOMMimeType.idl \
- WebCore/plugins/DOMMimeTypeArray.idl \
- WebCore/plugins/DOMPlugin.idl \
- WebCore/plugins/DOMPluginArray.idl \
- WebCore/storage/Database.idl \
- WebCore/storage/Storage.idl \
- WebCore/xml/XPathExpression.idl \
- WebCore/xml/XPathNSResolver.idl \
- WebCore/xml/XPathResult.idl
-
-if ENABLE_GEOLOCATION
-IDL_BINDINGS_GDOM += \
- WebCore/page/Geolocation.idl
-endif # END ENABLE_GEOLOCATION
-
-
-# All classes autogenerated in the GObject DOM bindings
-GDOM_AUTO_CLASSES += $(basename $(notdir $(IDL_BINDINGS_GDOM)))
-
-# The classes implemented manually
-GDOM_FIXED_CLASSES += Object EventTarget
-
-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 %,$(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/WebKitDOMEventTarget.h \
- $(top_builddir)/DerivedSources/webkit/WebKitDOMObject.h
-
-# Autogenerated source files
-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))
-
-# All header files that get installed
-libgdom_h_api += $(GDOM_HEADERS_FIXED) $(GDOM_HEADERS_BUILT)
-
-DerivedSources/webkit/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/GNUmakefile.am
- $(AM_V_GEN)echo $(GDOM_CLASSES) | $(PERL) $< gdom > $@
-
-DerivedSources/webkit/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(IDL_BINDINGS_GDOM) $(WebCore)/GNUmakefile.am
- $(AM_V_GEN)echo $(GDOM_CLASSES) | $(PERL) $< defines > $@
-
-DerivedSources/webkit/WebKitDOM%.h: DerivedSources/webkit/WebKitDOM%.cpp;
-
-DerivedSources/webkit/WebKitDOM%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(webcoregtk_dom_sources)
- $(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 $(FEATURE_DEFINES_GDOM)" --generator GObject $<
-
-gdom_built_nosources := $(GDOM_HEADERS_BUILT) $(GDOM_SOURCES_BUILT)
-
-libgdom_objects := $(subst .cpp,.lo,$(GDOM_SOURCES_BUILT))
-libgdom_depfiles := $(patsubst %.lo,$(top_builddir)/DerivedSources/webkit/$(DEPDIR)/%.Plo,$(notdir $(libgdom_objects)))
-libgdom_depfiles += $(patsubst %.h,$(WebCore)/bindings/gobject/$(DEPDIR)/%.Plo,$(notdir $(GDOM_HEADERS_FIXED)))
-
--include $(libgdom_depfiles)
-
-$(libgdom_objects): AM_CPPFLAGS+=$(libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS)
-$(libgdom_objects): AM_CXXFLAGS+=$(libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS)
-
-libgdom.la: $(libgdom_objects)
- $(CXXLINK) $(libgdom_objects) $(LIBS)
-
EXTRA_DIST += \
$(shell ls $(srcdir)/WebCore/css/*.idl) \
$(shell ls $(srcdir)/WebCore/dom/*.idl) \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list