Changeset 29033 in webkit


Ignore:
Timestamp:
Dec 29, 2007 7:33:44 PM (16 years ago)
Author:
alp@webkit.org
Message:

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

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r29006 r29033  
     12007-12-29  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=16669
     6        autotools update and fixes
     7
     8        Various fixes to the autotools build
     9
     10        * GNUmakefile.am:
     11          - Remove ICU_FLAGS because it adds -g in the CFLAGS/CXXFLAGS
     12          - Fix clean rules (Rodney Dawes)
     13          - Added webcore specific variables, remove STDINT_H and
     14            PTHREAD_NP_H checks (already included in config.h)
     15        * autogen.sh:
     16          - Loosen automake and aclocal requirement
     17        * configure.ac:
     18          - Workaround AC_PROG_CXX putting -g in CXXFLAGS. Only use -g
     19            when doing a debug build (Rodney Dawes)
     20          - Fix webkit target and remove traces of XBL
     21
    1222007-12-27  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
    223

  • trunk/GNUmakefile.am

    r29006 r29033  
    1 AUTOMAKE_OPTIONS = subdir-objects
     1# Top-level Makefile rule for automake
     2#
     3# Variable conventions:
     4#
     5# _h_api            = API headers that will be installed and included in the distribution
     6# _cppflags         = flags that will be passed to the C/CXX Preprocessor
     7# _sources          = sources that will be compiled and included in the distribution
     8# _headers          = header files that will be part of the distribution
     9# _built_sources    = files that will be autogenerated by the build system and
     10#                     will be part of the _SOURCES primary
     11# _built_nosources  = files that are autogenerated but are not part of the
     12#                     _SOURCES primary
     13# _cleanfiles       = files that will be removed by the clean target
     14#
     15# Sources, headers, flags, etc... should be added to the respective variables
     16# with the above suffix, e.g, webcore-specific sources should go to
     17# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags,
     18# etc... The only exceptions are the global variables. See Global Variables below.
     19#
     20# Global Variables
     21#
     22# global_cppflags   = CPPFLAGS that apply to JSC, WebCore, and to any
     23#                     specific port
     24# global_cflags     = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to
     25#                     any specific port
    226
    327srcdir = @srcdir@
    … …  
    4569lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la
    4670
     71#
    4772# JavaScriptCore
    48 
    49 # Following are the variables we use in JavaScripCore/GNUmakefile.am
    50 #
    51 # javascriptcore_h_api - api headers to be included in the JSC library
    52 # javascriptcore_cppflags - CPP flags for JSC
    53 # javascriptcore_sources - source files to be included
    54 # javascriptcore_built_sources - autogenerated sources and/or header files that are part of _SOURCES
    55 # javascriptcore_built_nosources - same as above but not part of _SOURCES
    56 #
    57 # If you add or remove sources or header files, make sure you update the
    58 # following variables in JavaScriptCore/GNUmakefile.am
    59 
    6073javascriptcore_h_api :=
    6174javascriptcore_cppflags:=
    … …  
    6477javascriptcore_built_nosources :=
    6578
    66 # The variables above are already included below so we don't need to touch
    67 # these variables too often
     79# The variables above are already included below so no need to touch
     80# these variables unless you really have to
    6881libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore
    6982libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api)
    … …  
    8194libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags)
    8295
    83 # WebKitGtk
    84 
    85 # The Following variables have the same meaning as JSC, with addition of:
    86 #
    87 # webcore_sources - These are port-independent sources and header files
    88 # webkitgtk_headers - header files that will be included in _SOURCES
    89 
     96#
     97# WebCore
     98webcore_cppflags :=
    9099webcore_sources :=
     100webcore_headers :=
     101webcore_built_sources :=
     102webcore_built_nosources :=
     103
     104# WebKitGtk
    91105webkitgtk_h_api :=
    92106webkitgtk_headers :=
    93107webkitgtk_sources :=
    94108webkitgtk_cppflags :=
     109webkitgtk_ldflags :=
    95110webkitgtk_built_sources :=
    96111webkitgtk_built_nosources :=
     112webkitgtk_cleanfiles :=
    97113
    98114# No need to touch the following variables unless you have to. If you need to change the values
    … …  
    103119
    104120libWebKitGtk_la_SOURCES := \
     121        $(webcore_built_sources) \
     122        $(webcore_headers) \
    105123        $(webcore_sources) \
    106124        $(webkitgtk_built_sources) \
    … …  
    112130        $(global_cflags) \
    113131        $(DEPENDENCIES_CFLAGS) \
    114         $(ICU_CFLAGS) \
    115132        $(SQLITE3_CFLAGS) \
    116133        $(GSTREAMER_CFLAGS) \
    … …  
    121138        $(global_cflags) \
    122139        $(DEPENDENCIES_CFLAGS) \
    123         $(ICU_CFLAGS) \
    124140        $(SQLITE3_CFLAGS) \
    125141        $(GSTREAMER_CFLAGS) \
    … …  
    129145libWebKitGtk_la_CPPFLAGS := \
    130146        $(global_cppflags) \
     147        $(webcore_cppflags) \
    131148        $(webkitgtk_cppflags)
    132149
    133 libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la 
     150libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la
    134151
    135152libWebKitGtk_la_LDFLAGS := \
     153        $(webkitgtk_ldflags) \
    136154        $(DEPENDENCIES_LIBS) \
    137155        $(ICU_LIBS) \
    … …  
    139157        $(GSTREAMER_LIBS) \
    140158        $(LIBXSLT_LIBS) \
    141         $(COVERAGE_LDFLAGS)
    142 
    143 libWebKitGtk_la_LDFLAGS += \
     159        $(COVERAGE_LDFLAGS) \
    144160        -lpthread \
    145161        -ljpeg \
    146162        -version-info @LIBWEBKITGTK_VERSION@
    147163
     164#
    148165# Extra checks and flags
    149 
    150166global_cppflags += \
    151167        -DBUILDING_GTK__=1 \
    152168        -DUSE_SYSTEM_MALLOC \
    153169        -DWTF_CHANGES
     170
     171if TARGET_X11
     172global_cppflags += -DXP_UNIX
     173endif
    154174
    155175if !ENABLE_DEBUG
    … …  
    166186endif
    167187
    168 if TARGET_X11
    169 global_cppflags += -DXP_UNIX
    170 endif
    171 
    172 if OS_LINUX
    173 global_cppflags += -DHAVE_STDINT_H
    174 endif
    175 
    176 if OS_FREEBSD
    177 global_cppflags += -DHAVE_PTHREAD_NP_H
     188if !ENABLE_DATABASE
     189global_cppflags += -DENABLE_DATABASE=0
     190endif
     191
     192if !ENABLE_ICONDATABASE
     193global_cppflags += -DENABLE_ICONDATABASE=0
    178194endif
    179195
    … …  
    185201
    186202if ENABLE_VIDEO
    187 libWebKitGtk_la_LDFLAGS += -lgstinterfaces-0.10 -lgstvideo-0.10
    188 endif
    189 
    190 # WebKit/GTK+ sources
    191 
     203webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10
     204endif
     205
     206#
     207# WEBKIT GTK+
    192208webkitgtk_cppflags += \
    193209-I $(top_builddir)/WebKit/gtk/WebView \
    … …  
    215231        WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
    216232        WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
    217         WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h 
     233        WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
    218234
    219235webkitgtk_sources += \
    … …  
    231247        WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
    232248
     249webkitgtk_cleanfiles += \
     250        $(top_builddir)/Programs/GtkLauncher \
     251        $(top_builddir)/WebKit/gtk/WebKitGtk.pc
     252
    233253pkgconfigdir = $(libdir)/pkgconfig
    234254pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
    … …  
    249269stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
    250270        echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
    251         $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) \
    252         --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
     271        $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
    253272        echo timestamp > $(@F)
    254273
    255274stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST)
    256         $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) \
    257         --header > $(WEBKIT_MARSHAL).h && \
     275        $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
    258276        echo timestamp > $(@F)
     277
     278# END WEBKIT GTK+
     279
     280# Files that will be cleaned
     281MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
     282DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
     283CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
     284
     285# Include module makefiles
     286include JavaScriptCore/GNUmakefile.am
     287include WebCore/GNUmakefile.am
     288include WebKitTools/GNUmakefile.am
     289
    259290
    260291# Autogenerated sources
    … …  
    262293        $(javascriptcore_built_sources) \
    263294        $(javascriptcore_built_nosources) \
     295        $(webcore_built_sources) \
     296        $(webcore_built_nosources) \
    264297        $(webkitgtk_built_sources) \
    265298        $(webkitgtk_built_nosources)
    266299
    267 # Files that will be cleaned
    268 MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
    269 DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
    270 CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
    271 
    272 # Include module makefiles
    273 include JavaScriptCore/GNUmakefile.am
    274 include WebCore/GNUmakefile.am
    275 include WebKitTools/GNUmakefile.am
    276 
    277300# Project-wide clean rules
    278 clean-local:
    279         -rm -rf $(GENSOURCES)
    280         -rm -f $(top_builddir)/Programs/GtkLauncher $(top_builddir)/Programs/DumpRenderTree
    281         -rm -f $(top_builddir)/Programs/testkjs $(top_builddir)/Programs/dftables
    282         -rm -f $(top_builddir/WebKit/gtk/WebKitGtk-1.0.pc
    283 
    284 distclean-local:
    285         -rm -f $(srcdir)/aconfig.h.in configure config.* GNUmakefile.in \
    286                 INSTALL README
    287 
     301CLEANFILES += \
     302        $(webkitgtk_cleanfiles) \
     303        $(top_builddir)/Programs/DumpRenderTree \
     304        $(top_builddir)/Programs/testkjs \
     305        $(top_builddir)/Programs/dftables \
     306        $(GENSOURCES)
     307
     308MAINTAINERCLEANFILES += \
     309        $(srcdir)/aconfig.h.in \
     310        configure \
     311        config.* \
     312        GNUmakefile.in \
     313        INSTALL \
     314        README

  • trunk/WebCore/ChangeLog

    r29031 r29033  
     12007-12-29  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=16669
     6        autotools update and fixes
     7
     8        Autotools update and database/icon database inclusion guard fixes
     9
     10        * GNUmakefile.am:
     11          - Update autotools config as per -r29012 changes
     12          - Fix CSSGrammar.h/cpp generation (Seo Sanghyeon, sanxiyn)
     13        * dom/Document.cpp:
     14        * loader/icon/IconDatabase.h:
     15        * page/DOMWindow.cpp:
     16        * page/InspectorController.cpp:
     17        * page/Settings.cpp:
     18        * storage/Database.h:
     19          - Remove ENABLE(DATABASE) inclusion guard. Let the includer add the guard instead.
     20
    1212007-12-29  Nikolas Zimmermann  <zimmermann@kde.org>
    222

  • trunk/WebCore/GNUmakefile.am

    r29006 r29033  
    55SVG_FEATURES :=
    66
    7 webkitgtk_cppflags += \
     7webcore_cppflags += \
    88        -I $(srcdir)/WebCore \
    99        -I $(srcdir)/WebCore/ForwardingHeaders \
    … …  
    1313        -I $(srcdir)/WebCore/platform/text \
    1414        -I $(srcdir)/WebCore/loader \
     15        -I $(srcdir)/WebCore/loader/icon \
    1516        -I $(srcdir)/WebCore/css \
    1617        -I $(srcdir)/WebCore/dom \
    … …  
    2324        -I $(srcdir)/WebCore/bindings/js \
    2425        -I $(srcdir)/WebCore/platform/image-decoders \
    25         -I $(srcdir)/WebCore/platform/gtk \
    26         -I $(srcdir)/WebCore/platform/graphics/gtk \
    27         -I $(srcdir)/WebCore/platform/graphics/cairo \
    28         -I $(srcdir)/WebCore/svg/graphics/cairo \
    29         -I $(srcdir)/WebCore/platform/network/curl \
    30         -I $(srcdir)/WebCore/platform/image-decoders \
    3126        -I $(srcdir)/WebCore/platform/image-decoders/bmp \
    3227        -I $(srcdir)/WebCore/platform/image-decoders/gif \
    … …  
    3631        -I $(srcdir)/WebCore/platform/image-decoders/xbm \
    3732        -I $(srcdir)/WebCore/rendering \
     33        -I $(top_builddir)/WebCore/bindings/js
     34
     35webkitgtk_cppflags += \
     36        -I $(srcdir)/WebCore/platform/gtk \
     37        -I $(srcdir)/WebCore/platform/graphics/gtk \
     38        -I $(srcdir)/WebCore/platform/graphics/cairo \
     39        -I $(srcdir)/WebCore/svg/graphics/cairo \
     40        -I $(srcdir)/WebCore/platform/network/curl \
    3841        -I $(srcdir)/WebCore/loader/gtk \
    3942        -I $(srcdir)/WebCore/page/gtk \
    4043        -I $(srcdir)/WebKit/gtk/WebCoreSupport \
    41         -I $(srcdir)/WebKit/gtk/WebView \
    42         -I $(top_builddir)/WebCore/bindings/js
    43 
    44 webkitgtk_built_nosources += \
     44        -I $(srcdir)/WebKit/gtk/WebView
     45
     46webcore_built_nosources += \
    4547        DerivedSources/DocTypeStrings.cpp \
    4648        DerivedSources/tokenizer.cpp \
    … …  
    5759        WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp
    5860
    59 webkitgtk_built_sources += \
     61webcore_built_sources += \
     62        DerivedSources/CSSPropertyNames.h \
     63        DerivedSources/CSSValueKeywords.h \
     64        DerivedSources/XLinkNames.cpp \
     65        DerivedSources/SVGElementFactory.cpp \
     66        DerivedSources/SVGNames.cpp \
    6067        DerivedSources/HTMLNames.h \
    6168        DerivedSources/HTMLNames.cpp \
    … …  
    6572        DerivedSources/CSSGrammar.h \
    6673        DerivedSources/CSSGrammar.cpp \
    67         DerivedSources/CSSPropertyNames.h \
    68         DerivedSources/CSSValueKeywords.h \
    6974        DerivedSources/UserAgentStyleSheets.h \
    7075        DerivedSources/UserAgentStyleSheetsData.cpp \
    … …  
    431436        WebCore/xml/DOMParser.idl \
    432437        WebCore/xml/XMLSerializer.idl
     438
     439webcore_headers += \
     440        WebCore/loader/icon/IconDatabase.h
    433441
    434442webcore_sources += \
    … …  
    968976FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
    969977
    970 webkitgtk_built_sources += \
     978webcore_built_sources += \
    971979        DerivedSources/JSDatabase.h \
    972980        DerivedSources/JSSQLError.h \
    … …  
    987995        WebCore/storage/SQLTransaction.idl
    988996
    989 webkitgtk_cppflags += \
     997webcore_cppflags += \
    990998        -DENABLE_DATABASE=1 \
    991999        -I $(top_srcdir)/WebCore/platform/sql \
    992         -I $(top_srcdir)/WebCore/storage 
    993 
    994 webkitgtk_sources += \
     1000        -I $(top_srcdir)/WebCore/storage
     1001
     1002webcore_sources += \
    9951003        WebCore/platform/sql/SQLiteAuthorizer.cpp \
    9961004        WebCore/platform/sql/SQLiteDatabase.cpp \
    … …  
    10221030# ----
    10231031if ENABLE_ICONDATABASE
    1024 webkitgtk_cppflags += \
    1025         -DENABLE_ICONDATABASE=1 \
    1026         -I $(top_srcdir)/WebCore/loader/icon
    1027 
    1028 webkitgtk_sources += \
     1032webcore_cppflags += -DENABLE_ICONDATABASE=1
     1033
     1034webcore_sources += \
    10291035        WebCore/loader/icon/IconDatabase.cpp \
    10301036        WebCore/loader/icon/IconRecord.cpp \
    … …  
    10321038
    10331039else
    1034 webkitgtk_sources += \
     1040webcore_sources += \
    10351041        WebCore/loader/icon/IconDatabaseNone.cpp
    10361042
    … …  
    10431049FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
    10441050
    1045 webkitgtk_cppflags += -DENABLE_VIDEO=1
     1051webcore_cppflags += -DENABLE_VIDEO=1
    10461052
    10471053if ENABLE_DEBUG
    1048 webkitgtk_cppflags += -DGST_DISABLE_DEPRECATED
     1054webcore_cppflags += -DGST_DISABLE_DEPRECATED
    10491055endif # END ENABLE_DEBUG
    10501056
    1051 webkitgtk_built_sources += \
     1057webcore_built_sources += \
    10521058        DerivedSources/JSHTMLSourceElement.h \
    10531059        DerivedSources/JSHTMLAudioElement.h \
    … …  
    10741080        WebCore/html/VoidCallback.idl
    10751081
    1076 webkitgtk_sources += \
     1082webcore_sources += \
    10771083        WebCore/html/HTMLAudioElement.cpp \
    10781084        WebCore/html/HTMLMediaElement.cpp \
    … …  
    10811087        WebCore/html/TimeRanges.cpp \
    10821088        WebCore/platform/graphics/MediaPlayer.cpp \
    1083         WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
    1084         WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp \
    10851089        WebCore/rendering/RenderVideo.cpp \
    10861090        WebCore/rendering/RenderMedia.cpp \
    1087         WebCore/bindings/js/JSHTMLAudioElementConstructor.cpp
     1091        WebCore/bindings/js/JSHTMLAudioElementConstructor.cpp
     1092
     1093webkitgtk_sources += \
     1094        WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
     1095        WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp
    10881096
    10891097endif # END ENABLE_VIDEO
    … …  
    10951103FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1
    10961104
    1097 webkitgtk_cppflags += -DENABLE_XPATH=1
    1098 
    1099 webkitgtk_built_sources += \
     1105webcore_cppflags += -DENABLE_XPATH=1
     1106
     1107webcore_built_sources += \
    11001108        DerivedSources/XPathGrammar.h \
    11011109        DerivedSources/XPathGrammar.cpp \
    … …  
    11151123        WebCore/xml/XPathEvaluator.idl
    11161124
    1117 webkitgtk_sources += \
     1125webcore_sources += \
    11181126        WebCore/xml/NativeXPathNSResolver.cpp \
    11191127        WebCore/xml/XPathEvaluator.cpp \
    … …  
    11521160FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
    11531161
    1154 webkitgtk_cppflags += -DENABLE_XSLT=1
    1155 
    1156 webkitgtk_sources += \
     1162webcore_cppflags += -DENABLE_XSLT=1
     1163
     1164webcore_sources += \
    11571165        WebCore/xml/XSLImportRule.cpp \
    11581166        WebCore/xml/XSLStyleSheet.cpp \
    … …  
    11631171
    11641172# ----
    1165 # XBL Support
    1166 # ----
    1167 if ENABLE_XBL
    1168 FEATURE_DEFINES_JAVASCRIPT += ENABLE_XBL=1
    1169 
    1170 webkitgtk_cppflags += -DENABLE_XBL=1
    1171 
    1172 endif # END ENABLE_XBL
    1173 
    1174 # ----
    11751173# SVG Support
     1174#
     1175# FIXME: allow a more fine-grained inclusion/generation of sources per SVG feature
    11761176# ----
    11771177if ENABLE_SVG
    11781178FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
    11791179
    1180 webkitgtk_built_sources += \
    1181         DerivedSources/XLinkNames.cpp \
    1182         DerivedSources/SVGElementFactory.cpp \
    1183         DerivedSources/SVGNames.cpp \
     1180webcore_built_sources += \
    11841181        DerivedSources/JSSVGAElement.h \
    11851182        DerivedSources/JSSVGAngle.h \
    … …  
    12951292        DerivedSources/JSSVGFETurbulenceElement.h \
    12961293        DerivedSources/JSSVGFilterElement.h \
     1294        DerivedSources/JSSVGFontElement.h \
    12971295        DerivedSources/JSSVGFontFaceElement.h \
    12981296        DerivedSources/JSSVGFontFaceFormatElement.h \
    … …  
    13021300        DerivedSources/JSSVGForeignObjectElement.h \
    13031301        DerivedSources/JSSVGGElement.h \
     1302        DerivedSources/JSSVGGlyphElement.h \
    13041303        DerivedSources/JSSVGGradientElement.h \
    13051304        DerivedSources/JSSVGImageElement.h \
    … …  
    13091308        DerivedSources/JSSVGMaskElement.h \
    13101309        DerivedSources/JSSVGMarkerElement.h \
     1310        DerivedSources/JSSVGMissingGlyphElement.h \
    13111311        DerivedSources/JSSVGZoomEvent.h \
    13121312        DerivedSources/JSSVGAElement.cpp \
    … …  
    14961496        WebCore/svg/SVGFETurbulenceElement.idl \
    14971497        WebCore/svg/SVGFilterElement.idl \
     1498        WebCore/svg/SVGFontElement.idl \
    14981499        WebCore/svg/SVGFontFaceElement.idl \
    14991500        WebCore/svg/SVGFontFaceFormatElement.idl \
    … …  
    15021503        WebCore/svg/SVGFontFaceUriElement.idl \
    15031504        WebCore/svg/SVGForeignObjectElement.idl \
     1505        WebCore/svg/SVGGElement.idl \
     1506        WebCore/svg/SVGGlyphElement.idl \
    15041507        WebCore/svg/SVGGElement.idl \
    15051508        WebCore/svg/SVGGradientElement.idl \
    … …  
    15131516        WebCore/svg/SVGMatrix.idl \
    15141517        WebCore/svg/SVGMetadataElement.idl \
     1518        WebCore/svg/SVGMissingGlyphElement.idl \
    15151519        WebCore/svg/SVGNumber.idl \
    15161520        WebCore/svg/SVGNumberList.idl \
    … …  
    15691573        WebCore/svg/SVGViewElement.idl
    15701574
    1571 webkitgtk_cppflags += \
     1575webcore_cppflags += \
    15721576        -DENABLE_SVG=1 \
    15731577        -I \$(top_srcdir)/WebCore/svg \
    … …  
    15751579        -I \$(top_srcdir)/WebCore/svg/graphics/filters
    15761580
    1577 webkitgtk_sources += \
     1581webcore_sources += \
    15781582        WebCore/bindings/js/JSSVGElementWrapperFactory.cpp \
    15791583        WebCore/bindings/js/JSSVGMatrixCustom.cpp \
    … …  
    15861590        WebCore/css/SVGCSSParser.cpp \
    15871591        WebCore/css/SVGCSSStyleSelector.cpp \
     1592        WebCore/css/SVGCSSFontFace.cpp \
    15881593        WebCore/rendering/SVGRenderStyle.cpp \
    15891594        WebCore/rendering/SVGRenderStyleDefs.cpp \
    … …  
    16441649        WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp \
    16451650        WebCore/svg/SVGFitToViewBox.cpp \
     1651        WebCore/svg/SVGFont.cpp \
     1652        WebCore/svg/SVGFontElement.cpp \
    16461653        WebCore/svg/SVGFontFaceElement.cpp \
    16471654        WebCore/svg/SVGFontFaceFormatElement.cpp \
    … …  
    16511658        WebCore/svg/SVGForeignObjectElement.cpp \
    16521659        WebCore/svg/SVGGElement.cpp \
     1660        WebCore/svg/SVGGlyphElement.cpp \
    16531661        WebCore/svg/SVGGradientElement.cpp \
    16541662        WebCore/svg/SVGImageElement.cpp \
    … …  
    16621670        WebCore/svg/SVGMaskElement.cpp \
    16631671        WebCore/svg/SVGMetadataElement.cpp \
     1672        WebCore/svg/SVGMissingGlyphElement.cpp \
    16641673        WebCore/svg/SVGMPathElement.cpp \
    16651674        WebCore/svg/SVGNumberList.cpp \
    … …  
    17631772        WebCore/rendering/SVGInlineTextBox.cpp \
    17641773        WebCore/rendering/SVGRenderSupport.cpp \
    1765         WebCore/rendering/SVGRootInlineBox.cpp \
     1774        WebCore/rendering/SVGRootInlineBox.cpp
     1775
     1776webkitgtk_sources += \
    17661777        WebCore/svg/graphics/cairo/RenderPathCairo.cpp \
    17671778        WebCore/svg/graphics/cairo/SVGPaintServerCairo.cpp \
    … …  
    18641875# NOTE: older versions of bison do not inject an inclusion guard, so we do it
    18651876DerivedSources/CSSGrammar.h DerivedSources/CSSGrammar.cpp : $(WebCore)/css/CSSGrammar.y
    1866         $(BISON) -d -p cssyy $< -o $@
     1877        $(BISON) -d -p cssyy $< -o $(GENSOURCES)/CSSGrammar.cpp
    18671878        touch $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
    18681879        echo '#ifndef CSSGrammar_h' > $(GENSOURCES)/CSSGrammar.h
    … …  
    18701881        cat $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp >> $(GENSOURCES)/CSSGrammar.h
    18711882        echo '#endif' >> $(GENSOURCES)/CSSGrammar.h
    1872         rm -f $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
    18731883
    18741884# user agent style sheets
    18751885USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/svg.css
     1886
     1887DerivedSources/UserAgentStyleSheetsData.cpp : DerivedSources/UserAgentStyleSheets.h
     1888
    18761889DerivedSources/UserAgentStyleSheets.h : $(WebCore)/css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS)
    18771890        $(PERL) $< $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)

  • trunk/WebCore/dom/Document.cpp

    r28912 r29033  
    3535#include "CookieJar.h"
    3636#include "DOMImplementation.h"
    37 #include "DatabaseThread.h"
    3837#include "DocLoader.h"
    3938#include "DocumentFragment.h"
    … …  
    106105#include "kjs_proxy.h"
    107106
     107#if ENABLE(DATABASE)
     108#include "DatabaseThread.h"
     109#endif
     110
    108111#if ENABLE(XPATH)
    109112#include "XPathEvaluator.h"

  • trunk/WebCore/loader/icon/IconDatabase.h

    r27717 r29033  
    136136    static String defaultDatabaseFilename();
    137137
     138#if ENABLE(ICONDATABASE)
    138139private:
    139 #if ENABLE(ICONDATABASE)
    140140    IconRecord* getOrCreateIconRecord(const String& iconURL);
    141141    PageURLRecord* getOrCreatePageURLRecord(const String& pageURL);

  • trunk/WebCore/page/DOMWindow.cpp

    r28570 r29033  
    3434#include "Console.h"
    3535#include "DOMSelection.h"
    36 #include "Database.h"
    3736#include "Document.h"
    3837#include "Element.h"
    … …  
    4948#include <algorithm>
    5049#include <wtf/MathExtras.h>
     50
     51#if ENABLE(DATABASE)
     52#include "Database.h"
     53#endif
    5154
    5255using std::min;

  • trunk/WebCore/page/InspectorController.cpp

    r28708 r29033  
    3232#include "CString.h"
    3333#include "CachedResource.h"
    34 #include "Database.h"
    3534#include "DocLoader.h"
    3635#include "Document.h"
    … …  
    6463
    6564#if ENABLE(DATABASE)
     65#include "Database.h"
    6666#include "JSDatabase.h"
    6767#endif

  • trunk/WebCore/page/Settings.cpp

    r28872 r29033  
    2727#include "Settings.h"
    2828
    29 #include "DatabaseTracker.h"
    3029#include "Frame.h"
    3130#include "FrameTree.h"
    … …  
    3332#include "PageCache.h"
    3433#include "HistoryItem.h"
     34
     35#if ENABLE(DATABASE)
     36#include "DatabaseTracker.h"
     37#endif
    3538
    3639namespace WebCore {

  • trunk/WebCore/storage/Database.h

    r28912 r29033  
    2929#ifndef Database_h
    3030#define Database_h
    31 
    32 #if ENABLE(DATABASE)
    3331
    3432#include "PlatformString.h"
    … …  
    158156} // namespace WebCore
    159157
    160 #endif
    161 
    162158#endif // Database_h

  • trunk/WebKit/gtk/ChangeLog

    r29013 r29033  
     12007-12-29  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=16669
     6        autotools update and fixes
     7
     8        pkgconfig file and icon database inclusion fix
     9
     10        * WebKitGtk.pc.in: Remove ICU_FLAGS from Cflags
     11        * WebView/webkitprivate.cpp: Guard ICONDATABASE inclusions
     12
    1132007-12-28  Christian Dywan  <christian@twotoasts.de>
    214

  • trunk/WebKit/gtk/WebKitGtk.pc.in

    r28997 r29033  
    99Requires:glib-2.0, gobject-2.0, gthread-2.0, gdk-2.0, gtk+-2.0, pango, libcurl, cairo, fontconfig, freetype2, libxml-2.0
    1010Libs: -L${libdir} -lWebKitGtk @DEPENDENCIES_LIBS@ @ICU_LIBS@ @SQLITE3_LIBS@ @GSTREAMER_LIBS@ @LIBXSLT_LIBS@
    11 Cflags: -I${includedir}/WebKit @DEPENDENCIES_CFLAGS@ @ICU_CFLAGS@ @SQLITE3_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBXSLT_CFLAGS@
     11Cflags: -I${includedir}/WebKit @DEPENDENCIES_CFLAGS@ @SQLITE3_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBXSLT_CFLAGS@

  • trunk/WebKit/gtk/WebView/webkitprivate.cpp

    r28963 r29033  
    2222#include "webkitprivate.h"
    2323#include "ChromeClientGtk.h"
    24 #include "DatabaseTracker.h"
    2524#include "FrameLoader.h"
    2625#include "FrameLoaderClientGtk.h"
    … …  
    2928#include "Pasteboard.h"
    3029#include "PasteboardHelperGtk.h"
     30#include "Threading.h"
     31
     32#if ENABLE(DATABASE)
     33#include "DatabaseTracker.h"
     34#endif
    3135
    3236using namespace WebCore;

  • trunk/autogen.sh

    r28997 r29033  
    1616}
    1717
    18 if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
    19     AUTOMAKE=automake-1.9
    20     ACLOCAL=aclocal-1.9
    21 else
     18(automake --version) < /dev/null > /dev/null 2>&1 || {
    2219        echo
    23         echo "You must have automake 1.9.x installed to compile $PROJECT."
     20        echo "You must have automake installed to compile $PROJECT."
    2421        echo "Install the appropriate package for your distribution,"
    2522        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
    2623        DIE=1
    27 fi
     24}
    2825
    2926if test "$DIE" -eq 1; then
    … …  
    3532touch README INSTALL
    3633
    37 $ACLOCAL || exit $?
     34aclocal || exit $?
    3835libtoolize --force || exit $?
    3936autoheader || exit $?
    40 $AUTOMAKE --foreign --add-missing || exit $?
     37automake --foreign --add-missing || exit $?
    4138autoconf || exit $?
    4239
    43 ./configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
     40./configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?

  • trunk/configure.ac

    r28997 r29033  
    3838esac
    3939
     40# If CXXFLAGS and CFLAGS are unset, default to -O2
     41# This is to tell automake not to include '-g' if CXXFLAGS is not set
     42# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler
     43if test -z "$CXXFLAGS"; then
     44   CXXFLAGS="-O2"
     45fi
     46if test -z "$CFLAGS"; then
     47   CFLAGS="-O2"
     48fi
     49
    4050# programs
    4151AM_PROG_LIBTOOL
    … …  
    4353AM_PROG_CC_STDC
    4454AC_PROG_CXX
     55AC_PROG_CXX_C_O
    4556AM_PROG_CC_C_O
    4657
    … …  
    116127# determine the GDK/GTK+ target
    117128AC_MSG_CHECKING([the target for WebKit GTK+])
    118 AC_ARG_WITH(webkittarget,
     129AC_ARG_WITH(webkit_target,
    119130            AC_HELP_STRING([--with-webkit-target=@<:@x11/win32/quartz/directfb@:>@],
    120131                           [Select webkit target [default=x11]]),
    121             [],[with_webkittarget="x11"])
    122 
    123 case "$with_webkittarget" in
     132            [],[with_webkit_target="x11"])
     133
     134case "$with_webkit_target" in
    124135     x11|win32|quartz|directfb) ;;
    125136     *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;;
    126137esac
    127138
    128 AC_MSG_RESULT([$with_webkittarget])
     139AC_MSG_RESULT([$with_webkit_target])
    129140
    130141# minimum base dependencies
    … …  
    174185              AC_HELP_STRING([--enable-database],
    175186                             [enable HTML5 client-side storage support [default=no]]),
    176               [],[enable_database="yes"])
     187              [],[enable_database="no"])
    177188AC_MSG_RESULT([$enable_database])
    178189
    179190# check whether to build with icon database support
    180191AC_MSG_CHECKING([whether to enable icon database support])
    181 AC_ARG_ENABLE(icondatabase,
     192AC_ARG_ENABLE(icon_database,
    182193              AC_HELP_STRING([--enable-icon-database],
    183194                             [enable icon database [default=no]]),
    184               [],[enable_icon_database="yes"])
     195              [],[enable_icon_database="no"])
    185196AC_MSG_RESULT([$enable_icon_database])
    186197
    … …  
    201212AC_MSG_RESULT([$enable_xpath])
    202213
    203 # check whether to enable XBL support
    204 AC_MSG_CHECKING([whether to enable XBL support])
    205 AC_ARG_ENABLE(xbl,
    206               AC_HELP_STRING([--enable-xbl],
    207                              [enable support for XBL [default=no]]),
    208               [],[enable_xbl="no"])
    209 AC_MSG_RESULT([$enable_xbl])
    210 
    211214# check whether to enable XSLT support
    212215AC_MSG_CHECKING([whether to enable XSLT support])
    … …  
    272275              [],[enable_coverage="no"])
    273276AC_MSG_RESULT([$enable_coverage])
     277
     278# Add '-g' flag to gcc if it's debug build
     279if test "$enable_debug" = "yes"; then
     280   CXXFLAGS="$CXXFLAGS -g"
     281   CFLAGS="$CFLAGS -g"
     282fi
    274283
    275284# check if sqlite 3 is available
    … …  
    326335
    327336# target conditionals
    328 AM_CONDITIONAL([TARGET_X11], [test "$with_webkittarget" = "x11"])
    329 AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkittarget" = "win32"])
    330 AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkittarget" = "quartz"])
    331 AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkittarget" = "directfb"])
     337AM_CONDITIONAL([TARGET_X11], [test "$with_webkit_target" = "x11"])
     338AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkit_target" = "win32"])
     339AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkit_target" = "quartz"])
     340AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkit_target" = "directfb"])
    332341
    333342# WebKit feature conditionals
    … …  
    336345AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
    337346AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
    338 AM_CONDITIONAL([ENABLE_XBL],[test "$enable_xbl" = "yes"])
    339347AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
    340348AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
    … …  
    348356AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
    349357
    350 
    351358AC_CONFIG_FILES([
    352359GNUmakefile
    … …  
    360367WebKit was configured with the following options:
    361368
    362  Target                            : $with_webkittarget
     369 Target                            : $with_webkit_target
    363370 Enable debug                      : $enable_debug
    364371 Icon database support             : $enable_icon_database
    … …  
    373380 XPATH support                     : $enable_xpath
    374381 XSLT support                      : $enable_xslt
    375  XBL support                       : $enable_xbl
    376382 Code coverage support             : $enable_coverage
    377383"
Note: See TracChangeset for help on using the changeset viewer.