Commit f93619a7 authored by alp@webkit.org's avatar alp@webkit.org

2007-12-29 Jan Michael Alonzo <jmalonzo@unpluggable.com>

        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=16669
        autotools update and fixes


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@29033 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f6976a0c
2007-12-29 Jan Michael Alonzo <jmalonzo@unpluggable.com>
Reviewed by Alp Toker.
http://bugs.webkit.org/show_bug.cgi?id=16669
autotools update and fixes
Various fixes to the autotools build
* GNUmakefile.am:
- Remove ICU_FLAGS because it adds -g in the CFLAGS/CXXFLAGS
- Fix clean rules (Rodney Dawes)
- Added webcore specific variables, remove STDINT_H and
PTHREAD_NP_H checks (already included in config.h)
* autogen.sh:
- Loosen automake and aclocal requirement
* configure.ac:
- Workaround AC_PROG_CXX putting -g in CXXFLAGS. Only use -g
when doing a debug build (Rodney Dawes)
- Fix webkit target and remove traces of XBL
2007-12-27 Jan Michael Alonzo <jmalonzo@unpluggable.com>
Reviewed by Alp Toker.
......
AUTOMAKE_OPTIONS = subdir-objects
# Top-level Makefile rule for automake
#
# Variable conventions:
#
# _h_api = API headers that will be installed and included in the distribution
# _cppflags = flags that will be passed to the C/CXX Preprocessor
# _sources = sources that will be compiled and included in the distribution
# _headers = header files that will be part of the distribution
# _built_sources = files that will be autogenerated by the build system and
# will be part of the _SOURCES primary
# _built_nosources = files that are autogenerated but are not part of the
# _SOURCES primary
# _cleanfiles = files that will be removed by the clean target
#
# Sources, headers, flags, etc... should be added to the respective variables
# with the above suffix, e.g, webcore-specific sources should go to
# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags,
# etc... The only exceptions are the global variables. See Global Variables below.
#
# Global Variables
#
# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any
# specific port
# global_cflags = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to
# any specific port
srcdir = @srcdir@
VPATH = @srcdir@
......@@ -44,27 +68,16 @@ global_cflags := \
# Libraries
lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la
# JavaScriptCore
# Following are the variables we use in JavaScripCore/GNUmakefile.am
#
# javascriptcore_h_api - api headers to be included in the JSC library
# javascriptcore_cppflags - CPP flags for JSC
# javascriptcore_sources - source files to be included
# javascriptcore_built_sources - autogenerated sources and/or header files that are part of _SOURCES
# javascriptcore_built_nosources - same as above but not part of _SOURCES
#
# If you add or remove sources or header files, make sure you update the
# following variables in JavaScriptCore/GNUmakefile.am
# JavaScriptCore
javascriptcore_h_api :=
javascriptcore_cppflags:=
javascriptcore_sources :=
javascriptcore_built_sources :=
javascriptcore_built_nosources :=
# The variables above are already included below so we don't need to touch
# these variables too often
# The variables above are already included below so no need to touch
# these variables unless you really have to
libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore
libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api)
......@@ -80,20 +93,23 @@ libJavaScriptCore_la_CFLAGS := $(global_cflags)
libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags)
# WebKitGtk
# The Following variables have the same meaning as JSC, with addition of:
#
# webcore_sources - These are port-independent sources and header files
# webkitgtk_headers - header files that will be included in _SOURCES
# WebCore
webcore_cppflags :=
webcore_sources :=
webcore_headers :=
webcore_built_sources :=
webcore_built_nosources :=
# WebKitGtk
webkitgtk_h_api :=
webkitgtk_headers :=
webkitgtk_sources :=
webkitgtk_cppflags :=
webkitgtk_ldflags :=
webkitgtk_built_sources :=
webkitgtk_built_nosources :=
webkitgtk_cleanfiles :=
# No need to touch the following variables unless you have to. If you need to change the values
# for the following variables, use the "webkitgtk_" variables above
......@@ -102,6 +118,8 @@ libWebKitGtk_ladir := $(prefix)/include/WebKit
libWebKitGtk_la_HEADERS := $(webkitgtk_h_api)
libWebKitGtk_la_SOURCES := \
$(webcore_built_sources) \
$(webcore_headers) \
$(webcore_sources) \
$(webkitgtk_built_sources) \
$(webkitgtk_headers) \
......@@ -111,7 +129,6 @@ libWebKitGtk_la_CXXFLAGS := \
-fno-rtti \
$(global_cflags) \
$(DEPENDENCIES_CFLAGS) \
$(ICU_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(LIBXSLT_CFLAGS) \
......@@ -120,7 +137,6 @@ libWebKitGtk_la_CXXFLAGS := \
libWebKitGtk_la_CFLAGS := \
$(global_cflags) \
$(DEPENDENCIES_CFLAGS) \
$(ICU_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(LIBXSLT_CFLAGS) \
......@@ -128,30 +144,34 @@ libWebKitGtk_la_CFLAGS := \
libWebKitGtk_la_CPPFLAGS := \
$(global_cppflags) \
$(webcore_cppflags) \
$(webkitgtk_cppflags)
libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la
libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la
libWebKitGtk_la_LDFLAGS := \
$(webkitgtk_ldflags) \
$(DEPENDENCIES_LIBS) \
$(ICU_LIBS) \
$(SQLITE3_LIBS) \
$(GSTREAMER_LIBS) \
$(LIBXSLT_LIBS) \
$(COVERAGE_LDFLAGS)
libWebKitGtk_la_LDFLAGS += \
$(COVERAGE_LDFLAGS) \
-lpthread \
-ljpeg \
-version-info @LIBWEBKITGTK_VERSION@
#
# Extra checks and flags
global_cppflags += \
-DBUILDING_GTK__=1 \
-DUSE_SYSTEM_MALLOC \
-DWTF_CHANGES
if TARGET_X11
global_cppflags += -DXP_UNIX
endif
if !ENABLE_DEBUG
global_cppflags += -DNDEBUG
else
......@@ -165,16 +185,12 @@ webkitgtk_cppflags += \
-DGTK_MULTIHEAD_SAFE
endif
if TARGET_X11
global_cppflags += -DXP_UNIX
endif
if OS_LINUX
global_cppflags += -DHAVE_STDINT_H
if !ENABLE_DATABASE
global_cppflags += -DENABLE_DATABASE=0
endif
if OS_FREEBSD
global_cppflags += -DHAVE_PTHREAD_NP_H
if !ENABLE_ICONDATABASE
global_cppflags += -DENABLE_ICONDATABASE=0
endif
if ENABLE_COVERAGE
......@@ -184,11 +200,11 @@ global_cppflags += \
endif
if ENABLE_VIDEO
libWebKitGtk_la_LDFLAGS += -lgstinterfaces-0.10 -lgstvideo-0.10
webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10
endif
# WebKit/GTK+ sources
#
# WEBKIT GTK+
webkitgtk_cppflags += \
-I $(top_builddir)/WebKit/gtk/WebView \
-DBUILDING_CAIRO__=1 \
......@@ -214,7 +230,7 @@ webkitgtk_headers += \
WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
webkitgtk_sources += \
WebKit/gtk/WebView/webkitnetworkrequest.cpp \
......@@ -230,6 +246,10 @@ webkitgtk_sources += \
WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
webkitgtk_cleanfiles += \
$(top_builddir)/Programs/GtkLauncher \
$(top_builddir)/WebKit/gtk/WebKitGtk.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
......@@ -248,21 +268,14 @@ WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h
stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) \
--body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
echo timestamp > $(@F)
stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST)
$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) \
--header > $(WEBKIT_MARSHAL).h && \
$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
echo timestamp > $(@F)
# Autogenerated sources
BUILT_SOURCES := \
$(javascriptcore_built_sources) \
$(javascriptcore_built_nosources) \
$(webkitgtk_built_sources) \
$(webkitgtk_built_nosources)
# END WEBKIT GTK+
# Files that will be cleaned
MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
......@@ -274,14 +287,28 @@ include JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
include WebKitTools/GNUmakefile.am
# Project-wide clean rules
clean-local:
-rm -rf $(GENSOURCES)
-rm -f $(top_builddir)/Programs/GtkLauncher $(top_builddir)/Programs/DumpRenderTree
-rm -f $(top_builddir)/Programs/testkjs $(top_builddir)/Programs/dftables
-rm -f $(top_builddir/WebKit/gtk/WebKitGtk-1.0.pc
distclean-local:
-rm -f $(srcdir)/aconfig.h.in configure config.* GNUmakefile.in \
INSTALL README
# Autogenerated sources
BUILT_SOURCES := \
$(javascriptcore_built_sources) \
$(javascriptcore_built_nosources) \
$(webcore_built_sources) \
$(webcore_built_nosources) \
$(webkitgtk_built_sources) \
$(webkitgtk_built_nosources)
# Project-wide clean rules
CLEANFILES += \
$(webkitgtk_cleanfiles) \
$(top_builddir)/Programs/DumpRenderTree \
$(top_builddir)/Programs/testkjs \
$(top_builddir)/Programs/dftables \
$(GENSOURCES)
MAINTAINERCLEANFILES += \
$(srcdir)/aconfig.h.in \
configure \
config.* \
GNUmakefile.in \
INSTALL \
README
2007-12-29 Jan Michael Alonzo <jmalonzo@unpluggable.com>
Reviewed by Alp Toker.
http://bugs.webkit.org/show_bug.cgi?id=16669
autotools update and fixes
Autotools update and database/icon database inclusion guard fixes
* GNUmakefile.am:
- Update autotools config as per -r29012 changes
- Fix CSSGrammar.h/cpp generation (Seo Sanghyeon, sanxiyn)
* dom/Document.cpp:
* loader/icon/IconDatabase.h:
* page/DOMWindow.cpp:
* page/InspectorController.cpp:
* page/Settings.cpp:
* storage/Database.h:
- Remove ENABLE(DATABASE) inclusion guard. Let the includer add the guard instead.
2007-12-29 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Alexey.
......
......@@ -4,7 +4,7 @@ WebCore := $(srcdir)/WebCore
FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1
SVG_FEATURES :=
webkitgtk_cppflags += \
webcore_cppflags += \
-I $(srcdir)/WebCore \
-I $(srcdir)/WebCore/ForwardingHeaders \
-I $(srcdir)/WebCore/platform \
......@@ -12,6 +12,7 @@ webkitgtk_cppflags += \
-I $(srcdir)/WebCore/platform/graphics \
-I $(srcdir)/WebCore/platform/text \
-I $(srcdir)/WebCore/loader \
-I $(srcdir)/WebCore/loader/icon \
-I $(srcdir)/WebCore/css \
-I $(srcdir)/WebCore/dom \
-I $(srcdir)/WebCore/page \
......@@ -22,12 +23,6 @@ webkitgtk_cppflags += \
-I $(srcdir)/WebCore/html \
-I $(srcdir)/WebCore/bindings/js \
-I $(srcdir)/WebCore/platform/image-decoders \
-I $(srcdir)/WebCore/platform/gtk \
-I $(srcdir)/WebCore/platform/graphics/gtk \
-I $(srcdir)/WebCore/platform/graphics/cairo \
-I $(srcdir)/WebCore/svg/graphics/cairo \
-I $(srcdir)/WebCore/platform/network/curl \
-I $(srcdir)/WebCore/platform/image-decoders \
-I $(srcdir)/WebCore/platform/image-decoders/bmp \
-I $(srcdir)/WebCore/platform/image-decoders/gif \
-I $(srcdir)/WebCore/platform/image-decoders/ico \
......@@ -35,13 +30,20 @@ webkitgtk_cppflags += \
-I $(srcdir)/WebCore/platform/image-decoders/png \
-I $(srcdir)/WebCore/platform/image-decoders/xbm \
-I $(srcdir)/WebCore/rendering \
-I $(top_builddir)/WebCore/bindings/js
webkitgtk_cppflags += \
-I $(srcdir)/WebCore/platform/gtk \
-I $(srcdir)/WebCore/platform/graphics/gtk \
-I $(srcdir)/WebCore/platform/graphics/cairo \
-I $(srcdir)/WebCore/svg/graphics/cairo \
-I $(srcdir)/WebCore/platform/network/curl \
-I $(srcdir)/WebCore/loader/gtk \
-I $(srcdir)/WebCore/page/gtk \
-I $(srcdir)/WebKit/gtk/WebCoreSupport \
-I $(srcdir)/WebKit/gtk/WebView \
-I $(top_builddir)/WebCore/bindings/js
-I $(srcdir)/WebKit/gtk/WebView
webkitgtk_built_nosources += \
webcore_built_nosources += \
DerivedSources/DocTypeStrings.cpp \
DerivedSources/tokenizer.cpp \
DerivedSources/ColorData.c \
......@@ -56,7 +58,12 @@ webkitgtk_built_nosources += \
WebCore/bindings/js/kjs_window.lut.h \
WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp
webkitgtk_built_sources += \
webcore_built_sources += \
DerivedSources/CSSPropertyNames.h \
DerivedSources/CSSValueKeywords.h \
DerivedSources/XLinkNames.cpp \
DerivedSources/SVGElementFactory.cpp \
DerivedSources/SVGNames.cpp \
DerivedSources/HTMLNames.h \
DerivedSources/HTMLNames.cpp \
DerivedSources/XMLNames.h \
......@@ -64,8 +71,6 @@ webkitgtk_built_sources += \
DerivedSources/HTMLEntityNames.c \
DerivedSources/CSSGrammar.h \
DerivedSources/CSSGrammar.cpp \
DerivedSources/CSSPropertyNames.h \
DerivedSources/CSSValueKeywords.h \
DerivedSources/UserAgentStyleSheets.h \
DerivedSources/UserAgentStyleSheetsData.cpp \
DerivedSources/JSAttr.h \
......@@ -431,6 +436,9 @@ IDL_BINDINGS += \
WebCore/xml/DOMParser.idl \
WebCore/xml/XMLSerializer.idl
webcore_headers += \
WebCore/loader/icon/IconDatabase.h
webcore_sources += \
WebCore/bindings/js/GCController.cpp \
WebCore/bindings/js/JSAttrCustom.cpp \
......@@ -967,7 +975,7 @@ webkitgtk_sources += \
if ENABLE_DATABASE
FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
webkitgtk_built_sources += \
webcore_built_sources += \
DerivedSources/JSDatabase.h \
DerivedSources/JSSQLError.h \
DerivedSources/JSSQLResultSet.h \
......@@ -986,12 +994,12 @@ IDL_BINDINGS += \
WebCore/storage/SQLResultSetRowList.idl \
WebCore/storage/SQLTransaction.idl
webkitgtk_cppflags += \
webcore_cppflags += \
-DENABLE_DATABASE=1 \
-I $(top_srcdir)/WebCore/platform/sql \
-I $(top_srcdir)/WebCore/storage
-I $(top_srcdir)/WebCore/storage
webkitgtk_sources += \
webcore_sources += \
WebCore/platform/sql/SQLiteAuthorizer.cpp \
WebCore/platform/sql/SQLiteDatabase.cpp \
WebCore/platform/sql/SQLiteStatement.cpp \
......@@ -1021,17 +1029,15 @@ endif # END ENABLE_DATABASE
# Icon Database Support
# ----
if ENABLE_ICONDATABASE
webkitgtk_cppflags += \
-DENABLE_ICONDATABASE=1 \
-I $(top_srcdir)/WebCore/loader/icon
webcore_cppflags += -DENABLE_ICONDATABASE=1
webkitgtk_sources += \
webcore_sources += \
WebCore/loader/icon/IconDatabase.cpp \
WebCore/loader/icon/IconRecord.cpp \
WebCore/loader/icon/PageURLRecord.cpp
else
webkitgtk_sources += \
webcore_sources += \
WebCore/loader/icon/IconDatabaseNone.cpp
endif # END ENABLE_ICONDATABASE
......@@ -1042,13 +1048,13 @@ endif # END ENABLE_ICONDATABASE
if ENABLE_VIDEO
FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
webkitgtk_cppflags += -DENABLE_VIDEO=1
webcore_cppflags += -DENABLE_VIDEO=1
if ENABLE_DEBUG
webkitgtk_cppflags += -DGST_DISABLE_DEPRECATED
webcore_cppflags += -DGST_DISABLE_DEPRECATED
endif # END ENABLE_DEBUG
webkitgtk_built_sources += \
webcore_built_sources += \
DerivedSources/JSHTMLSourceElement.h \
DerivedSources/JSHTMLAudioElement.h \
DerivedSources/JSHTMLMediaElement.h \
......@@ -1073,18 +1079,20 @@ IDL_BINDINGS += \
WebCore/html/TimeRanges.idl \
WebCore/html/VoidCallback.idl
webkitgtk_sources += \
webcore_sources += \
WebCore/html/HTMLAudioElement.cpp \
WebCore/html/HTMLMediaElement.cpp \
WebCore/html/HTMLSourceElement.cpp \
WebCore/html/HTMLVideoElement.cpp \
WebCore/html/TimeRanges.cpp \
WebCore/platform/graphics/MediaPlayer.cpp \
WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp \
WebCore/rendering/RenderVideo.cpp \
WebCore/rendering/RenderMedia.cpp \
WebCore/bindings/js/JSHTMLAudioElementConstructor.cpp
WebCore/bindings/js/JSHTMLAudioElementConstructor.cpp
webkitgtk_sources += \
WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp
endif # END ENABLE_VIDEO
......@@ -1094,9 +1102,9 @@ endif # END ENABLE_VIDEO
if ENABLE_XPATH
FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1
webkitgtk_cppflags += -DENABLE_XPATH=1
webcore_cppflags += -DENABLE_XPATH=1
webkitgtk_built_sources += \
webcore_built_sources += \
DerivedSources/XPathGrammar.h \
DerivedSources/XPathGrammar.cpp \
DerivedSources/JSXPathEvaluator.h \
......@@ -1114,7 +1122,7 @@ IDL_BINDINGS += \
WebCore/xml/XPathResult.idl \
WebCore/xml/XPathEvaluator.idl
webkitgtk_sources += \
webcore_sources += \
WebCore/xml/NativeXPathNSResolver.cpp \
WebCore/xml/XPathEvaluator.cpp \
WebCore/xml/XPathExpression.cpp \
......@@ -1151,9 +1159,9 @@ endif # END ENABLE_XPATH
if ENABLE_XSLT
FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
webkitgtk_cppflags += -DENABLE_XSLT=1
webcore_cppflags += -DENABLE_XSLT=1
webkitgtk_sources += \
webcore_sources += \
WebCore/xml/XSLImportRule.cpp \
WebCore/xml/XSLStyleSheet.cpp \
WebCore/xml/XSLTExtensions.cpp \
......@@ -1161,26 +1169,15 @@ webkitgtk_sources += \
WebCore/xml/XSLTProcessor.cpp
endif # END ENABLE_XSLT
# ----
# XBL Support
# ----
if ENABLE_XBL
FEATURE_DEFINES_JAVASCRIPT += ENABLE_XBL=1
webkitgtk_cppflags += -DENABLE_XBL=1
endif # END ENABLE_XBL
# ----
# SVG Support
#
# FIXME: allow a more fine-grained inclusion/generation of sources per SVG feature
# ----
if ENABLE_SVG
FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
webkitgtk_built_sources += \
DerivedSources/XLinkNames.cpp \
DerivedSources/SVGElementFactory.cpp \
DerivedSources/SVGNames.cpp \
webcore_built_sources += \
DerivedSources/JSSVGAElement.h \
DerivedSources/JSSVGAngle.h \
DerivedSources/JSSVGAnimatedAngle.h \
......@@ -1294,6 +1291,7 @@ webkitgtk_built_sources += \
DerivedSources/JSSVGFETileElement.h \
DerivedSources/JSSVGFETurbulenceElement.h \
DerivedSources/JSSVGFilterElement.h \
DerivedSources/JSSVGFontElement.h \
DerivedSources/JSSVGFontFaceElement.h \
DerivedSources/JSSVGFontFaceFormatElement.h \
DerivedSources/JSSVGFontFaceNameElement.h \
......@@ -1301,6 +1299,7 @@ webkitgtk_built_sources += \
DerivedSources/JSSVGFontFaceUriElement.h \
DerivedSources/JSSVGForeignObjectElement.h \
DerivedSources/JSSVGGElement.h \
DerivedSources/JSSVGGlyphElement.h \
DerivedSources/JSSVGGradientElement.h \
DerivedSources/JSSVGImageElement.h \
DerivedSources/JSSVGLengthList.h \
......@@ -1308,6 +1307,7 @@ webkitgtk_built_sources += \
DerivedSources/JSSVGLinearGradientElement.h \
DerivedSources/JSSVGMaskElement.h \
DerivedSources/JSSVGMarkerElement.h \
DerivedSources/JSSVGMissingGlyphElement.h \
DerivedSources/JSSVGZoomEvent.h \
DerivedSources/JSSVGAElement.cpp \
DerivedSources/JSSVGAngle.cpp \
......@@ -1495,6 +1495,7 @@ IDL_BINDINGS += \
WebCore/svg/SVGFETileElement.idl \
WebCore/svg/SVGFETurbulenceElement.idl \
WebCore/svg/SVGFilterElement.idl \
WebCore/svg/SVGFontElement.idl \
WebCore/svg/SVGFontFaceElement.idl \
WebCore/svg/SVGFontFaceFormatElement.idl \
WebCore/svg/SVGFontFaceNameElement.idl \
......@@ -1502,6 +1503,8 @@ IDL_BINDINGS += \
WebCore/svg/SVGFontFaceUriElement.idl \
WebCore/svg/SVGForeignObjectElement.idl \
WebCore/svg/SVGGElement.idl \
WebCore/svg/SVGGlyphElement.idl \
WebCore/svg/SVGGElement.idl \
WebCore/svg/SVGGradientElement.idl \
WebCore/svg/SVGImageElement.idl \
WebCore/svg/SVGLength.idl \
......@@ -1512,6 +1515,7 @@ IDL_BINDINGS += \
WebCore/svg/SVGMaskElement.idl \
WebCore/svg/SVGMatrix.idl \
WebCore/svg/SVGMetadataElement.idl \
WebCore/svg/SVGMissingGlyphElement.idl \
WebCore/svg/SVGNumber.idl \
WebCore/svg/SVGNumberList.idl \
WebCore/svg/SVGPaint.idl \
......@@ -1568,13 +1572,13 @@ IDL_BINDINGS += \
WebCore/svg/SVGUseElement.idl \
WebCore/svg/SVGViewElement.idl
webkitgtk_cppflags += \
webcore_cppflags += \
-DENABLE_SVG=1 \
-I \$(top_srcdir)/WebCore/svg \
-I \$(top_srcdir)/WebCore/svg/graphics \
-I \$(top_srcdir)/WebCore/svg/graphics/filters
webkitgtk_sources += \
webcore_sources += \
WebCore/bindings/js/JSSVGElementWrapperFactory.cpp \
WebCore/bindings/js/JSSVGMatrixCustom.cpp \
WebCore/bindings/js/JSSVGPathSegCustom.cpp \
......@@ -1585,6 +1589,7 @@ webkitgtk_sources += \
WebCore/css/SVGCSSComputedStyleDeclaration.cpp \
WebCore/css/SVGCSSParser.cpp \
WebCore/css/SVGCSSStyleSelector.cpp \
WebCore/css/SVGCSSFontFace.cpp \
WebCore/rendering/SVGRenderStyle.cpp \
WebCore/rendering/SVGRenderStyleDefs.cpp \
WebCore/rendering/PointerEventsHitRules.cpp \
......@@ -1643,6 +1648,8 @@ webkitgtk_sources += \
WebCore/svg/SVGFilterElement.cpp \
WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp \
WebCore/svg/SVGFitToViewBox.cpp \
WebCore/svg/SVGFont.cpp \
WebCore/svg/SVGFontElement.cpp \
WebCore/svg/SVGFontFaceElement.cpp \
WebCore/svg/SVGFontFaceFormatElement.cpp \
WebCore/svg/SVGFontFaceNameElement.cpp \
......@@ -1650,6 +1657,7 @@ webkitgtk_sources += \
WebCore/svg/SVGFontFaceUriElement.cpp \
WebCore/svg/SVGForeignObjectElement.cpp \
WebCore/svg/SVGGElement.cpp \
WebCore/svg/SVGGlyphElement.cpp \
WebCore/svg/SVGGradientElement.cpp \
WebCore/svg/SVGImageElement.cpp \
WebCore/svg/SVGLangSpace.cpp \
......@@ -1661,6 +1669,7 @@ webkitgtk_sources += \
WebCore/svg/SVGMarkerElement.cpp \
WebCore/svg/SVGMaskElement.cpp \
WebCore/svg/SVGMetadataElement.cpp \
WebCore/svg/SVGMissingGlyphElement.cpp \
WebCore/svg/SVGMPathElement.cpp \
WebCore/svg/SVGNumberList.cpp \
WebCore/svg/SVGPaint.cpp \
......@@ -1762,7 +1771,9 @@ webkitgtk_sources += \
WebCore/rendering/SVGInlineFlowBox.cpp \
WebCore/rendering/SVGInlineTextBox.cpp \
WebCore/rendering/SVGRenderSupport.cpp \
WebCore/rendering/SVGRootInlineBox.cpp \
WebCore/rendering/SVGRootInlineBox.cpp
webkitgtk_sources += \
WebCore/svg/graphics/cairo/RenderPathCairo.cpp \
WebCore/svg/graphics/cairo/SVGPaintServerCairo.cpp \
WebCore/svg/graphics/cairo/SVGPaintServerGradientCairo.cpp \
......@@ -1863,16 +1874,18 @@ DerivedSources/tokenizer.cpp :
# CSS grammar
# NOTE: older versions of bison do not inject an inclusion guard, so we do it
DerivedSources/CSSGrammar.h DerivedSources/CSSGrammar.cpp : $(WebCore)/css/CSSGrammar.y
$(BISON) -d -p cssyy $< -o $@
$(BISON) -d -p cssyy $< -o $(GENSOURCES)/CSSGrammar.cpp
touch $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
echo '#ifndef CSSGrammar_h' > $(GENSOURCES)/CSSGrammar.h
echo '#define CSSGrammar_h' >> $(GENSOURCES)/CSSGrammar.h
cat $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp >> $(GENSOURCES)/CSSGrammar.h
echo '#endif' >> $(GENSOURCES)/CSSGrammar.h
rm -f $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
# user agent style sheets
USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/svg.css
DerivedSources/UserAgentStyleSheetsData.cpp : DerivedSources/UserAgentStyleSheets.h
DerivedSources/UserAgentStyleSheets.h : $(WebCore)/css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS)
$(PERL) $< $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
mv UserAgentStyleSheetsData.cpp $(GENSOURCES)
......
......@@ -34,7 +34,6 @@
#include "Comment.h"
#include "CookieJar.h"
#include "DOMImplementation.h"
#include "DatabaseThread.h"
#include "DocLoader.h"
#include "DocumentFragment.h"
#include "DocumentLoader.h"
......@@ -105,6 +104,10 @@
#include "kjs_binding.h"
#include "kjs_proxy.h"
#if ENABLE(DATABASE)
#include "DatabaseThread.h"
#endif
#if ENABLE(XPATH)
#include "XPathEvaluator.h"
#include "XPathExpression.h"
......
......@@ -135,8 +135,8 @@ public:
String databasePath() const;