Changeset 72275 in webkit


Ignore:
Timestamp:
Nov 17, 2010 10:32:43 PM (13 years ago)
Author:
Martin Robinson
Message:

2010-11-17 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Changing any GNUmakefile.am in the source tree forces a rebuld of the DOM bindings and WebKit APi
​https://bugs.webkit.org/show_bug.cgi?id=49400

Move WebKit API build rules out of GNUmakefile.am. These are now in
WebKit/gtk/GNUmakefile.am.

  • GNUmakefile.am: Remove WebKit API build rules.

2010-11-17 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Changing any GNUmakefile.am in the source tree forces a rebuld of the DOM bindings and WebKit APi
​https://bugs.webkit.org/show_bug.cgi?id=49400

Add GNUmakefile.am and include all WebKit API build rules. Make webkitenum.*
depend on this new file, instead of the generated GNUmakefile.am.

  • GNUmakefile.am: Copied from GNUmakefile.am.
Location:
trunk
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r72227 r72275  
     12010-11-17  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        [GTK] Changing any GNUmakefile.am in the source tree forces a rebuld of the DOM bindings and WebKit APi
     6        https://bugs.webkit.org/show_bug.cgi?id=49400
     7
     8        Move WebKit API build rules out of GNUmakefile.am. These are now in
     9        WebKit/gtk/GNUmakefile.am.
     10
     11        * GNUmakefile.am: Remove WebKit API build rules.
     12
    1132010-11-17  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/GNUmakefile.am

    r70609 r72275  
    3838GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
    3939WebCore := $(srcdir)/WebCore
    40 
    41 # Programs to run the WebKitGtk unit tests
    42 GTESTER = gtester
    43 GTESTER_REPORT = gtester-report
     40WebKit := $(srcdir)/WebKit/gtk
    4441
    4542# Libraries and support components
    … …  
    110107endif
    111108
    112 # Shared libraries
    113 lib_LTLIBRARIES += \
    114         libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
    115 
    116109# Convenience libraries
    117110noinst_LTLIBRARIES += \
    … …  
    150143        $(javascriptcore_cppflags)
    151144
    152 # WebKit
    153 nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
    154         $(webcore_built_nosources)
    155 
    156 nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
    157         $(webcore_built_sources) \
    158         $(webkitgtk_built_sources)
    159 
    160 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
    161 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
    162         $(webkitgtk_static_h_api)
    163 
    164 nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
    165         $(webkitgtk_built_h_api) \
    166         WebKit/gtk/webkit/webkitenumtypes.h
    167 
    168 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
    169         $(webcore_sources) \
    170         $(webcoregtk_sources) \
    171         $(webkitgtk_sources)
    172 
    173 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
    174         $(global_cxxflags)
    175 
    176 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
    177         $(global_cflags)
    178 
    179 # When building WebCore/WebKit, we want WebCore/config.h and NOT JavaScriptCore/config.h,
    180 # hence, it's important that WebCore/ should come first before JavaScriptCore in the
    181 # include path.
    182 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
    183         -DBUILDING_WEBKIT \
    184         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
    185         -DDATA_DIR=\"${datadir}\" \
    186         -I$(top_builddir)/DerivedSources/webkit \
    187         -I$(srcdir)/WebCore/bindings \
    188         -I$(srcdir)/WebCore/bindings/gobject \
    189         -I$(srcdir)/WebKit/gtk \
    190         -I$(srcdir)/WebKit/gtk/WebCoreSupport \
    191         -I$(srcdir)/WebKit/gtk/webkit \
    192         -I$(top_builddir)/WebKit/gtk \
    193         -I$(top_builddir)/WebKit/gtk/webkit \
    194         -I$(GENSOURCES_WEBKIT) \
    195         $(global_cppflags) \
    196         $(webcore_cppflags) \
    197         $(webcoregtk_cppflags) \
    198         $(javascriptcore_cppflags) \
    199         -fno-strict-aliasing \
    200         $(HILDON_CPPFLAGS) \
    201         $(COVERAGE_CFLAGS) \
    202         $(ENCHANT_CFLAGS) \
    203         $(GAIL_CFLAGS) \
    204         $(GEOCLUE_CFLAGS) \
    205         $(GLIB_CFLAGS) \
    206         $(GSTREAMER_CFLAGS) \
    207         $(GTK_CFLAGS) \
    208         $(HILDON_CFLAGS) \
    209         $(LIBSOUP_CFLAGS) \
    210         $(LIBXML_CFLAGS) \
    211         $(LIBXSLT_CFLAGS) \
    212         $(SQLITE3_CFLAGS) \
    213         $(UNICODE_CFLAGS) \
    214         $(XT_CFLAGS)
    215 
    216 # For the Gtk port we want to use XP_UNIX both in X11 and Mac
    217 if !TARGET_WIN32
    218 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
    219         -DXP_UNIX
    220 endif
    221 
    222 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
    223         -version-info @LIBWEBKITGTK_VERSION@ \
    224         $(version_script) \
    225         $(no_undefined)
    226 
    227 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
    228         -lpthread \
    229         libJavaScriptCore.la \
    230         $(webcore_ldflags) \
    231         $(CAIRO_LIBS) \
    232         $(COVERAGE_LDFLAGS) \
    233         $(ENCHANT_LIBS) \
    234         $(FREETYPE_LIBS) \
    235         $(GAIL_LIBS) \
    236         $(GEOCLUE_LIBS) \
    237         $(GLIB_LIBS) \
    238         $(GSTREAMER_LIBS) \
    239         $(GTK_LIBS) \
    240         $(HILDON_LIBS) \
    241         $(JPEG_LIBS) \
    242         $(LIBSOUP_LIBS) \
    243         $(LIBXML_LIBS) \
    244         $(LIBXSLT_LIBS) \
    245         $(PANGO_LIBS) \
    246         $(PNG_LIBS) \
    247         $(SQLITE3_LIBS) \
    248         $(UNICODE_LIBS) \
    249         $(XT_LIBS) \
    250         $(WINMM_LIBS) \
    251         $(SHLWAPI_LIBS) \
    252         $(OLE32_LIBS)
    253 
    254 #
    255145# Extra checks and flags
    256146global_cppflags += \
    … …  
    308198endif
    309199
    310 webkitgtk_static_h_api += \
    311         $(srcdir)/WebCore/platform/network/soup/cache/webkit/soup-cache.h \
    312         $(srcdir)/WebKit/gtk/webkit/webkit.h \
    313         $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
    314         $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
    315         $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
    316         $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
    317         $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
    318         $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
    319         $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
    320         $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
    321         $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
    322         $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
    323         $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
    324         $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
    325         $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
    326         $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \
    327         $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
    328         $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
    329         $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
    330         $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
    331         $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
    332         $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
    333         $(srcdir)/WebKit/gtk/webkit/webkitwebview.h
    334 
    335 webkitgtk_built_h_api += \
    336         WebKit/gtk/webkit/webkitversion.h
    337 
    338 webkitgtk_h_api += \
    339         $(webkitgtk_built_h_api) \
    340         $(webkitgtk_static_h_api)
    341 
    342 # webkitenumtypes.{h,cpp} cannot be in webkitgtk_built_h_api, because
    343 # the rule that builds it depends on webkitgtk_built_h_api (circular dependency).
    344 webkitgtk_built_sources += \
    345         $(webkitgtk_built_h_api) \
    346         $(webkitgtk_gdom_built_sources) \
    347         DerivedSources/webkit/webkitmarshal.cpp \
    348         DerivedSources/webkit/webkitmarshal.h \
    349         WebKit/gtk/webkit/webkitenumtypes.cpp \
    350         WebKit/gtk/webkit/webkitenumtypes.h
    351 
    352 webkitgtk_sources += \
    353         WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
    354         WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
    355         WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
    356         WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
    357         WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
    358         WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
    359         WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
    360         WebKit/gtk/WebCoreSupport/DragClientGtk.h \
    361         WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
    362         WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
    363         WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
    364         WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
    365         WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp \
    366         WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h \
    367         WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h \
    368         WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp \
    369         WebKit/gtk/WebCoreSupport/FullscreenVideoController.h \
    370         WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
    371         WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
    372         WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
    373         WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
    374         WebKit/gtk/webkit/webkitapplicationcache.cpp \
    375         WebKit/gtk/webkit/webkitdownload.cpp \
    376         WebKit/gtk/webkit/webkiterror.cpp \
    377         WebKit/gtk/webkit/webkithittestresult.cpp \
    378         WebKit/gtk/webkit/webkitnetworkrequest.cpp \
    379         WebKit/gtk/webkit/webkitnetworkresponse.cpp \
    380         WebKit/gtk/webkit/webkitprivate.cpp \
    381         WebKit/gtk/webkit/webkitprivate.h \
    382         WebKit/gtk/webkit/webkitsoupauthdialog.c \
    383         WebKit/gtk/webkit/webkitversion.cpp \
    384         WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
    385         WebKit/gtk/webkit/webkitwebdatasource.cpp \
    386         WebKit/gtk/webkit/webkitwebframe.cpp \
    387         WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
    388         WebKit/gtk/webkit/webkitwebinspector.cpp \
    389         WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
    390         WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
    391         WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
    392         WebKit/gtk/webkit/webkitwebresource.cpp \
    393         WebKit/gtk/webkit/webkitwebdatabase.cpp \
    394         WebKit/gtk/webkit/webkitsecurityorigin.cpp \
    395         WebKit/gtk/webkit/webkitwebsettings.cpp \
    396         WebKit/gtk/webkit/webkitwebview.cpp \
    397         WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
    398         WebKit/gtk/webkit/webkitworkers.cpp
    399 
    400 pkgconfigdir = $(libdir)/pkgconfig
    401 pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
    402 
    403 if ENABLE_INTROSPECTION
    404 
    405 JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
    406         $(AM_V_GEN)cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/
    407 
    408 JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
    409 WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
    410 
    411 $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
    412         $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
    413              --symbol-prefix=webkit \
    414              --identifier-prefix=WebKit \
    415              --namespace=WebKit \
    416              --nsversion=@WEBKITGTK_API_VERSION@ \
    417              --include=GObject-2.0 \
    418              --include=Gtk-@GTK_API_VERSION@ \
    419              --include=JSCore-@WEBKITGTK_API_VERSION@ \
    420              --include=Soup-2.4 \
    421              --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
    422              --libtool="$(LIBTOOL)" \
    423              --pkg=gobject-2.0 \
    424              --pkg=gtk+-@GTK_API_VERSION@ \
    425              --pkg=libsoup-2.4 \
    426              --output=$@ \
    427              --add-include-path=$(top_srcdir)/WebKit/gtk \
    428              --add-include-path=$(builddir) \
    429              -I$(top_srcdir)/WebCore/platform/network/soup/cache \
    430              -I$(top_srcdir)/WebKit/gtk \
    431              -I$(top_builddir)/WebKit/gtk \
    432              -I$(top_builddir)/DerivedSources \
    433              -I$(top_builddir)/DerivedSources/webkit \
    434              -I$(top_builddir)/WebKit/gtk/webkit \
    435              -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
    436              -I$(top_srcdir) \
    437              $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
    438              $(webkitgtk_h_api) \
    439              $(top_srcdir)/WebKit/gtk/webkit/*.cpp \
    440              $(top_srcdir)/WebKit/gtk/webkit/*.c
    441 
    442 girdir = $(datadir)/gir-1.0
    443 gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
    444 
    445 typelibsdir += $(libdir)/girepository-1.0
    446 typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
    447 
    448 %.typelib: %.gir $(G_IR_COMPILER)
    449         $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@
    450 
    451 CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
    452 
    453 endif
    454 
    455 EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
    456 
    457 WEBKIT_MARSHAL = $(GENSOURCES_WEBKIT)/webkitmarshal
    458 WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
    459 $(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
    460         @true
    461 
    462 $(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
    463         @true
    464 
    465 stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
    466         $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
    467         $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
    468         echo timestamp > $(@F)
    469 
    470 stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
    471         $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
    472         echo timestamp > $(@F)
    473 
    474 WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
    475         @true
    476 stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
    477         $(AM_V_GEN)glib-mkenums \
    478                         --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
    479                         --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
    480                         --fhead "#include <glib-object.h>\n\n" \
    481                         --fhead "#include <webkit/webkitdefines.h>\n\n" \
    482                         --fhead "G_BEGIN_DECLS\n\n" \
    483                         --ftail "G_END_DECLS\n\n" \
    484                         --ftail "#endif\n" \
    485                         --fprod "#include <webkit/@basename@>\n\n" \
    486                         --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
    487                         --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
    488                 $(webkitgtk_h_api) | \
    489                 sed 's,web_kit,webkit,' | \
    490                 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
    491                 > xgen-gth \
    492         && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
    493         && rm -f xgen-gth \
    494         && echo timestamp > $(@F)
    495 
    496 WebKit/gtk/webkit/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
    497         $(AM_V_GEN)glib-mkenums \
    498                         --fhead "#include <config.h>\n" \
    499                         --fhead "#include <glib-object.h>\n" \
    500                         --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
    501                         --fhead "extern \"C\" {\n\n" \
    502                         --fprod "\n/* enumerations from \"@filename@\" */" \
    503                         --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
    504                         --vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
    505                         --vtail "    { 0, NULL, NULL }\n};\n\n" \
    506                         --vtail "GType @enum_name@_get_type(void)\n{\n" \
    507                         --vtail "    static GType type = 0;\n\n" \
    508                         --vtail "    if (!type)\n" \
    509                         --vtail "        type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
    510                         --vtail "    return type;\n}\n\n" \
    511                         --ftail "}\n" \
    512                 $(webkitgtk_h_api) | \
    513                 sed 's,web_kit,webkit,' \
    514                 > xgen-gtc \
    515         && cp xgen-gtc $@ \
    516         && rm -f xgen-gtc
    517 
    518 # GSettings
    519 if USE_GSETTINGS
    520 gsettings_SCHEMAS = $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
    521 
    522 @GSETTINGS_RULES@
    523 endif
    524 
    525 # Files that will be distributed
    526200EXTRA_DIST += \
     201        $(srcdir)/autotools/symbols.filter \
    527202        $(srcdir)/gtk-doc.make \
    528         WebKit/LICENSE \
    529         $(srcdir)/autotools/symbols.filter \
    530         $(srcdir)/WebKit/gtk/ChangeLog \
    531         $(srcdir)/WebKit/gtk/NEWS \
    532         $(srcdir)/WebKit/gtk/webkitmarshal.list \
    533         $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
    534         $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
    535         $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
    536         $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
    537         $(srcdir)/WebKit/gtk/docs/version.xml.in \
    538         $(srcdir)/WebKit/gtk/po/* \
    539         $(srcdir)/WebKit/gtk/resources/* \
    540         $(srcdir)/WebKit/gtk/tests/resources/* \
    541         $(srcdir)/WebKit/gtk/tests/test_utils.h \
    542         $(srcdir)/WebKit/gtk/org.webkitgtk.gschema.xml.in
    543 
    544 # extra resource files
    545 resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources
    546 dist_resources_DATA = \
    547         $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
    548 
    549 # END WEBKIT GTK+
     203        $(srcdir)/WebKit/LICENSE
    550204
    551205# Include module makefiles
    552206include JavaScriptCore/GNUmakefile.am
    553207include WebCore/GNUmakefile.am
     208include WebKit/gtk/GNUmakefile.am
    554209include WebCore/bindings/gobject/GNUmakefile.am
    555210include WebKitTools/GNUmakefile.am
    556211include WebKit/gtk/po/GNUmakefile.am
    557 
    558 # Build unit tests
    559 noinst_PROGRAMS += $(TEST_PROGS)
    560 
    561 webkit_tests_cflags = \
    562         -fno-strict-aliasing \
    563         -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
    564         -I$(srcdir)/WebCore/platform/network/soup/cache \
    565         -I$(srcdir)/WebKit/gtk \
    566         -I$(top_builddir)/WebKit/gtk \
    567         -I$(top_builddir)/DerivedSources \
    568         -I$(top_srcdir)/WebCore/bindings \
    569         -I$(top_srcdir)/WebCore/bindings/gobject \
    570         $(global_cppflags) \
    571         $(global_cflags) \
    572         $(GLIB_CFLAGS) \
    573         $(GTK_CFLAGS) \
    574         $(LIBSOUP_CFLAGS)
    575 
    576 webkit_tests_ldadd = \
    577         libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
    578         $(GTK_LIBS) \
    579         $(GLIB_LIBS) \
    580         $(LIBSOUP_LIBS)
    581 
    582 webkit_tests_ldflags = \
    583         -no-install \
    584         -no-fast-install
    585 
    586 TEST_PROGS += \
    587         Programs/unittests/testdomdocument \
    588         Programs/unittests/testdomdomwindow \
    589         Programs/unittests/testdomnode \
    590         Programs/unittests/testhttpbackend \
    591         Programs/unittests/testloading \
    592         Programs/unittests/testglobals \
    593         Programs/unittests/testmimehandling \
    594         Programs/unittests/testnetworkrequest \
    595         Programs/unittests/testnetworkresponse \
    596         Programs/unittests/testwebframe \
    597         Programs/unittests/testwebbackforwardlist \
    598         Programs/unittests/testwebhistoryitem \
    599         Programs/unittests/testwindow \
    600         Programs/unittests/testdownload \
    601         Programs/unittests/testatk \
    602         Programs/unittests/testatkroles \
    603         Programs/unittests/testhittestresult \
    604         Programs/unittests/testwebsettings \
    605         Programs/unittests/testwebresource \
    606         Programs/unittests/testwebdatasource \
    607         Programs/unittests/testwebview \
    608         Programs/unittests/testkeyevents \
    609         Programs/unittests/testcopyandpaste
    610 
    611 # Add additional tests here
    612 Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c
    613 Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
    614 Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
    615 Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
    616 
    617 Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c
    618 Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
    619 Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
    620 Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
    621 
    622 Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c
    623 Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
    624 Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
    625 Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
    626 
    627 Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
    628 Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
    629 Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
    630 Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
    631 
    632 Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c
    633 Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
    634 Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
    635 Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
    636 
    637 Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
    638 Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
    639 Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
    640 Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
    641 
    642 Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
    643 Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
    644 Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
    645 Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
    646 
    647 Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
    648 Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
    649 Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
    650 Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
    651 
    652 Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c
    653 Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
    654 Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
    655 Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
    656 
    657 Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
    658 Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
    659 Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
    660 Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
    661 
    662 Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
    663 Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
    664 Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
    665 Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
    666 
    667 Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
    668 Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
    669 Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
    670 Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
    671 
    672 Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c
    673 Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
    674 Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
    675 Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
    676 
    677 Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
    678 Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
    679 Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
    680 Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
    681 
    682 Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c
    683 Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
    684 Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
    685 Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
    686 
    687 Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c
    688 Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
    689 Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
    690 Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
    691 
    692 Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
    693 Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
    694 Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
    695 Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
    696 
    697 Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c
    698 Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags)
    699 Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd)
    700 
    701 Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c
    702 Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
    703 Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
    704 
    705 Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c
    706 Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
    707 Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
    708 Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
    709 
    710 Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
    711 Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
    712 Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
    713 
    714 Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c
    715 Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
    716 Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
    717 Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
    718 
    719 Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c \
    720         WebCore/platform/gtk/GtkVersioning.c
    721 Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \
    722         -I$(srcdir)/WebCore/platform/gtk \
    723         -I$(srcdir)/WebCore
    724 Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
    725 Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
    726212
    727213# Autogenerated sources
    … …  
    734220        $(webkitgtk_built_nosources)
    735221
    736 # Project-wide clean rules
    737 # Files that will be cleaned
    738 CLEANFILES += \
    739         $(BUILT_SOURCES) \
    740         $(top_builddir)/stamp-webkitmarshal.cpp \
    741         $(top_builddir)/stamp-webkitmarshal.h \
    742         $(top_builddir)/stamp-webkitenumtypes.cpp \
    743         $(top_builddir)/stamp-webkitenumtypes.h \
    744         $(top_builddir)/Programs/GtkLauncher
    745 
    746222DISTCLEANFILES += \
    747223        $(CLEANFILES) \
    748224        $(builddir)/doltcompile \
    749         $(builddir)/doltlibtool \
    750         $(top_builddir)/WebKit/gtk/docs/version.xml \
    751         $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
    752         $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
    753         $(top_builddir)/WebKit/gtk/webkit/webkitversion.h \
    754         $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
     225        $(builddir)/doltlibtool
    755226
    756227MAINTAINERCLEANFILES += \
    … …  
    772243# Older automake versions (1.7) place Plo files in a different place so we need
    773244# to create the output directory manually.
    774 all-local: stamp-po
     245all-local:
    775246        $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
    776247
    … …  
    780251
    781252maintainer-clean-local: distclean-local
    782 
    783253distclean-local:
    784254        -rm -rf $(GENSOURCES) $(GENPROGRAMS)
    785 
    786 dist-hook:
    787         cp $(srcdir)/WebKit/gtk/NEWS $(distdir)
    788 
    789 install-data-local: po-install-data-local
    790 
    791 installdirs-data-local: po-installdirs-data-local
    792 
    793 uninstall-local: po-uninstall-local
    794 
    795 # Run all tests in cwd
    796 # FIXME: we should run this under xvfb
    797 test: $(TEST_PROGS)
    798         $(GTESTER) --verbose $(TEST_PROGS);
    799 
    800 # test-report: run tests in cwd and generate report
    801 # full-report: run tests in cwd with -m perf and -m slow and generate report
    802 # perf-report: run tests in cwd with -m perf and generate report
    803 test-report full-report perf-report: $(TEST_PROGS)
    804         @ case $@ in \
    805           test-report) test_options="-k";; \
    806           full-report) test_options="-k -m=perf";; \
    807           perf-report) test_options="-k -m=perf -m=slow";; \
    808           esac ; \
    809           $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \
    810           $(GTESTER_REPORT) test-report.xml > test-report.html ;
    811 
    812 .PHONY: test test-report perf-report full-report
    813 check-local: test

  • trunk/WebKit/gtk/ChangeLog

    r72226 r72275  
     12010-11-17  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        [GTK] Changing any GNUmakefile.am in the source tree forces a rebuld of the DOM bindings and WebKit APi
     6        https://bugs.webkit.org/show_bug.cgi?id=49400
     7
     8        Add GNUmakefile.am and include all WebKit API build rules. Make webkitenum.*
     9        depend on this new file, instead of the generated GNUmakefile.am.
     10
     11        * GNUmakefile.am: Copied from GNUmakefile.am.
     12
    1132010-11-17  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    214

  • trunk/WebKit/gtk/GNUmakefile.am

    r72274 r72275  
    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 # _built_sources    = files that will be autogenerated by the build system and
    9 #                     will be part of the _SOURCES primary
    10 # _built_nosources  = files that are autogenerated but are not part of the
    11 #                     _SOURCES primary
    12 # _cleanfiles       = files that will be removed by the clean target
    13 #
    14 # Sources, headers, flags, etc... should be added to the respective variables
    15 # with the above suffix, e.g, webcore-specific sources should go to
    16 # webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
    17 # etc... The only exceptions are the global variables. See Global Variables
    18 # below.
    19 
    20 # Global Variables Reference
    21 # global_cppflags   = CPPFLAGS that apply to all C/C++ files that are built for any project.
    22 # global_cflags     = CFLAGS that apply to all C files that are built for any project.
    23 # global_cxxflags   = CXXFLAGS that apply to all C++ files that are bult for any project.
    24 
    25 srcdir = @srcdir@
    26 VPATH = @srcdir@
    27 
    28 DISTCHECK_CONFIGURE_FLAGS = \
    29         --enable-introspection  \
    30         --enable-gtk-doc
    31 
    32 # Directory for autogenerated sources
    33 GENSOURCES := $(top_builddir)/DerivedSources
    34 GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
    35 GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
    36 GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
    37 GENPROGRAMS := $(top_builddir)/Programs
    38 GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
    39 WebCore := $(srcdir)/WebCore
    401
    412# Programs to run the WebKitGtk unit tests
    … …  
    434GTESTER_REPORT = gtester-report
    445
    45 # Libraries and support components
    46 bin_PROGRAMS :=
    47 noinst_PROGRAMS :=
    48 noinst_HEADERS :=
    49 noinst_LTLIBRARIES :=
    50 lib_LTLIBRARIES :=
    51 IDL_BINDINGS :=
    52 TEST_PROGS :=
    53 POFILES :=
    54 MOFILES :=
    55 javascriptcore_h_api :=
    56 javascriptcore_cppflags:=
    57 javascriptcore_sources :=
    58 javascriptcore_built_sources :=
    59 javascriptcore_built_nosources :=
    60 webcore_cppflags :=
    61 webcore_sources :=
    62 webcore_libadd :=
    63 webcore_built_sources :=
    64 webcore_built_nosources :=
    65 webcoregtk_sources :=
    66 webcoregtk_cppflags :=
    67 webkitgtk_built_h_api :=
    68 webkitgtk_static_h_api :=
    69 webkitgtk_h_api :=
    70 webkitgtk_sources :=
    71 webkitgtk_cppflags :=
    72 webkitgtk_gdom_built_sources :=
    73 webkitgtk_built_sources :=
    74 webkitgtk_built_nosources :=
    75 global_cppflags :=
    76 global_cflags :=
    77 global_cxxflags :=
    78 JSCORE_GIRSOURCES :=
    79 WEBKIT_GIRSOURCES :=
    80 FEATURE_DEFINES :=
    81 typelibsdir :=
    82 typelibs_DATA :=
    83 EXTRA_DIST :=
    84 BUILT_SOURCES :=
    85 CLEANFILES :=
    86 DISTCLEANFILES :=
    87 MAINTAINERCLEANFILES :=
    88 
    89 global_cppflags += \
    90         -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
    91         -Wformat -Wformat-security -Wno-format-y2k -Wundef \
    92         -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
    93         -Wno-unused-parameter -Wno-parentheses \
    94         -fno-exceptions -DENABLE_GLIB_SUPPORT=1
    95 
    96 
    97 global_cxxflags += \
    98         $(SYMBOL_VISIBILITY_INLINES) \
    99         -fno-rtti
    100 
    101 # -no-undefined required for building DLLs on Windows
    102 # It breaks the build on other platforms, so we use it conditionally
    103 if OS_WIN32
    104 no_undefined = -no-undefined
    105 version_script = -export-symbols-regex "^(webkit_|k?JS).*"
    106 endif
    107 
    108 if OS_GNU
    109 version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
    110 endif
    111 
    112 # Shared libraries
    1136lib_LTLIBRARIES += \
    1147        libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
    1158
    116 # Convenience libraries
    117 noinst_LTLIBRARIES += \
    118         libJavaScriptCore.la
    119 
    120 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
    121         $(javascriptcore_built_nosources)
    122 
    123 nodist_libJavaScriptCore_la_SOURCES = \
    124         $(javascriptcore_built_sources)
    125 
    126 libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
    127 libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
    128 
    129 libJavaScriptCore_la_SOURCES = \
    130         $(javascriptcore_sources)
    131 
    132 libJavaScriptCore_la_LIBADD = \
    133         $(UNICODE_LIBS) \
    134         $(GLIB_LIBS) \
    135         -lpthread
    136 
    137 libJavaScriptCore_la_CXXFLAGS = \
    138         $(global_cxxflags) \
    139         $(libJavaScriptCore_la_CFLAGS)
    140 
    141 libJavaScriptCore_la_CFLAGS = \
    142         -fstrict-aliasing \
    143         -O3 \
    144         $(global_cflags) \
    145         $(GLIB_CFLAGS) \
    146         $(UNICODE_CFLAGS)
    147 
    148 libJavaScriptCore_la_CPPFLAGS = \
    149         $(global_cppflags) \
    150         $(javascriptcore_cppflags)
    151 
    152 # WebKit
    1539nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
    15410        $(webcore_built_nosources)
    … …  
    16420nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
    16521        $(webkitgtk_built_h_api) \
    166         WebKit/gtk/webkit/webkitenumtypes.h
     22        $(GENSOURCES_WEBKIT)/webkitenumtypes.h
    16723
    16824libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
    … …  
    18440        -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
    18541        -DDATA_DIR=\"${datadir}\" \
    186         -I$(top_builddir)/DerivedSources/webkit \
    187         -I$(srcdir)/WebCore/bindings \
    188         -I$(srcdir)/WebCore/bindings/gobject \
    189         -I$(srcdir)/WebKit/gtk \
    190         -I$(srcdir)/WebKit/gtk/WebCoreSupport \
    191         -I$(srcdir)/WebKit/gtk/webkit \
    192         -I$(top_builddir)/WebKit/gtk \
    193         -I$(top_builddir)/WebKit/gtk/webkit \
     42        -I$(WebCore)/bindings \
     43        -I$(WebCore)//bindings/gobject \
     44        -I$(WebKit) \
     45        -I$(WebKit)/WebCoreSupport \
     46        -I$(WebKit)/webkit \
    19447        -I$(GENSOURCES_WEBKIT) \
     48        -IWebKit/gtk/webkit \
    19549        $(global_cppflags) \
    19650        $(webcore_cppflags) \
    … …  
    252106        $(OLE32_LIBS)
    253107
    254 #
    255 # Extra checks and flags
    256 global_cppflags += \
    257         -DBUILDING_CAIRO__=1 \
    258         -DBUILDING_GTK__=1 \
    259         -DWTF_CHANGES
    260 
    261 if USE_ICU_UNICODE
    262 global_cppflags += \
    263         -DWTF_USE_ICU_UNICODE=1
    264 endif
    265 
    266 if USE_GLIB_UNICODE
    267 global_cppflags += \
    268         -DWTF_USE_GLIB_UNICODE=1
    269 endif
    270 
    271 if !ENABLE_FAST_MALLOC
    272 global_cppflags += \
    273         -DUSE_SYSTEM_MALLOC
    274 endif
    275 
    276 if USE_GSTREAMER
    277 global_cppflags += \
    278         -DWTF_USE_GSTREAMER=1
    279 endif
    280 
    281 # ----
    282 # GTK+ 2.x/3.x support
    283 # ----
    284 if GTK_API_VERSION_2
    285 global_cppflags += \
    286         -DGTK_API_VERSION_2=1
    287 endif
    288 
    289 if !ENABLE_DEBUG
    290 global_cppflags += -DNDEBUG
    291 global_cflags += $(SYMBOL_VISIBILITY)
    292 else
    293 global_cppflags += \
    294         -DG_DISABLE_DEPRECATED \
    295         -DGDK_PIXBUF_DISABLE_DEPRECATED \
    296         -DGDK_DISABLE_DEPRECATED \
    297         -DGTK_DISABLE_DEPRECATED \
    298         -DPANGO_DISABLE_DEPRECATED
    299 # Might be useful in the future
    300 #       -DGDK_MULTIHEAD_SAFE \
    301 #       -DGTK_MULTIHEAD_SAFE
    302 endif
    303 
    304 if ENABLE_COVERAGE
    305 global_cppflags += \
    306         -DGCC_GENERATE_TEST_COVERAGE_FILES \
    307         -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
    308 endif
    309 
    310108webkitgtk_static_h_api += \
    311109        $(srcdir)/WebCore/platform/network/soup/cache/webkit/soup-cache.h \
    … …  
    343141# the rule that builds it depends on webkitgtk_built_h_api (circular dependency).
    344142webkitgtk_built_sources += \
    345         $(webkitgtk_built_h_api) \
    346         $(webkitgtk_gdom_built_sources) \
     143        DerivedSources/webkit/webkitenumtypes.cpp \
     144        DerivedSources/webkit/webkitenumtypes.h \
    347145        DerivedSources/webkit/webkitmarshal.cpp \
    348146        DerivedSources/webkit/webkitmarshal.h \
    349         WebKit/gtk/webkit/webkitenumtypes.cpp \
    350         WebKit/gtk/webkit/webkitenumtypes.h
     147        $(webkitgtk_built_h_api) \
     148        $(webkitgtk_gdom_built_sources)
     149BUILT_SOURCES += $(webkitgtk_built_sources)
    351150
    352151webkitgtk_sources += \
    … …  
    425224             --pkg=libsoup-2.4 \
    426225             --output=$@ \
    427              --add-include-path=$(top_srcdir)/WebKit/gtk \
     226             --add-include-path=$(WebKit) \
    428227             --add-include-path=$(builddir) \
    429228             -I$(top_srcdir)/WebCore/platform/network/soup/cache \
    430              -I$(top_srcdir)/WebKit/gtk \
    431              -I$(top_builddir)/WebKit/gtk \
    432              -I$(top_builddir)/DerivedSources \
    433              -I$(top_builddir)/DerivedSources/webkit \
    434              -I$(top_builddir)/WebKit/gtk/webkit \
     229             -I$(WebKit) \
     230             -I$(GENSOURCES) \
     231             -I$(GENSOURCES_WEBKIT) \
    435232             -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
    436233             -I$(top_srcdir) \
    437              $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
     234             $(GENSOURCES_WEBKIT)/webkitenumtypes.h \
    438235             $(webkitgtk_h_api) \
    439              $(top_srcdir)/WebKit/gtk/webkit/*.cpp \
    440              $(top_srcdir)/WebKit/gtk/webkit/*.c
     236             $(WebKit)/webkit/*.cpp \
     237             $(WebKit)/webkit/*.c
    441238
    442239girdir = $(datadir)/gir-1.0
    … …  
    447244
    448245%.typelib: %.gir $(G_IR_COMPILER)
    449         $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@
     246        $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(builddir) $< -o $@
    450247
    451248CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
    … …  
    455252EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
    456253
    457 WEBKIT_MARSHAL = $(GENSOURCES_WEBKIT)/webkitmarshal
    458 WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
    459 $(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
     254WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
     255$(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp
    460256        @true
    461 
    462 $(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
     257$(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h
    463258        @true
    464259
    465260stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
    466         $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
    467         $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
     261        $(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
     262        $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
     263        echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
    468264        echo timestamp > $(@F)
    469265
    470266stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
    471         $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
     267        $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(GENSOURCES_WEBKIT)/webkitmarshal.h && \
    472268        echo timestamp > $(@F)
    473269
    474 WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
     270$(GENSOURCES_WEBKIT)/webkitenumtypes.h: stamp-webkitenumtypes.h
    475271        @true
    476 stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
     272stamp-webkitenumtypes.h: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
    477273        $(AM_V_GEN)glib-mkenums \
    478274                        --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
    … …  
    490286                sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
    491287                > xgen-gth \
    492         && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
     288        && (cmp -s xgen-gth $(GENSOURCES_WEBKIT)/webkitenumtypes.h || cp xgen-gth $(GENSOURCES_WEBKIT)/webkitenumtypes.h) \
    493289        && rm -f xgen-gth \
    494290        && echo timestamp > $(@F)
    495291
    496 WebKit/gtk/webkit/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
     292$(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
    497293        $(AM_V_GEN)glib-mkenums \
    498294                        --fhead "#include <config.h>\n" \
    499295                        --fhead "#include <glib-object.h>\n" \
    500                         --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
     296                        --fhead "#include \"$(GENSOURCES_WEBKIT)/webkitenumtypes.h\"\n\n" \
    501297                        --fhead "extern \"C\" {\n\n" \
    502298                        --fprod "\n/* enumerations from \"@filename@\" */" \
    … …  
    519315if USE_GSETTINGS
    520316gsettings_SCHEMAS = $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
    521 
    522317@GSETTINGS_RULES@
    523318endif
    524319
    525 # Files that will be distributed
    526320EXTRA_DIST += \
    527         $(srcdir)/gtk-doc.make \
    528         WebKit/LICENSE \
    529         $(srcdir)/autotools/symbols.filter \
    530         $(srcdir)/WebKit/gtk/ChangeLog \
    531         $(srcdir)/WebKit/gtk/NEWS \
    532         $(srcdir)/WebKit/gtk/webkitmarshal.list \
    533         $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
    534         $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
    535         $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
    536         $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
    537         $(srcdir)/WebKit/gtk/docs/version.xml.in \
    538         $(srcdir)/WebKit/gtk/po/* \
    539         $(srcdir)/WebKit/gtk/resources/* \
    540         $(srcdir)/WebKit/gtk/tests/resources/* \
    541         $(srcdir)/WebKit/gtk/tests/test_utils.h \
    542         $(srcdir)/WebKit/gtk/org.webkitgtk.gschema.xml.in
     321        $(WebKit)/ChangeLog \
     322        $(WebKit)/NEWS \
     323        $(WebKit)/webkitmarshal.list \
     324        $(WebKit)/docs/GNUmakefile.* \
     325        $(WebKit)/docs/webkitenvironment.xml \
     326        $(WebKit)/docs/webkitgtk-docs.sgml \
     327        $(WebKit)/docs/webkitgtk-sections.txt \
     328        $(WebKit)/docs/version.xml.in \
     329        $(WebKit)/po/* \
     330        $(WebKit)/resources/* \
     331        $(WebKit)/tests/resources/* \
     332        $(WebKit)/tests/test_utils.h \
     333        $(WebKit)/org.webkitgtk.gschema.xml.in
    543334
    544335# extra resource files
    … …  
    547338        $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
    548339
    549 # END WEBKIT GTK+
    550 
    551 # Include module makefiles
    552 include JavaScriptCore/GNUmakefile.am
    553 include WebCore/GNUmakefile.am
    554 include WebCore/bindings/gobject/GNUmakefile.am
    555 include WebKitTools/GNUmakefile.am
    556 include WebKit/gtk/po/GNUmakefile.am
    557 
    558340# Build unit tests
    559341noinst_PROGRAMS += $(TEST_PROGS)
    560 
    561342webkit_tests_cflags = \
    562343        -fno-strict-aliasing \
    563344        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
    564         -I$(srcdir)/WebCore/platform/network/soup/cache \
    565         -I$(srcdir)/WebKit/gtk \
     345        -I$(WebCore)/platform/network/soup/cache \
     346        -I$(WebKit) \
     347        -I$(GENSOURCES) \
    566348        -I$(top_builddir)/WebKit/gtk \
    567         -I$(top_builddir)/DerivedSources \
    568349        -I$(top_srcdir)/WebCore/bindings \
    569350        -I$(top_srcdir)/WebCore/bindings/gobject \
    … …  
    725506Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
    726507
    727 # Autogenerated sources
    728 BUILT_SOURCES += \
    729         $(javascriptcore_built_sources) \
    730         $(javascriptcore_built_nosources) \
    731         $(webcore_built_sources) \
    732         $(webcore_built_nosources) \
    733         $(webkitgtk_built_sources) \
    734         $(webkitgtk_built_nosources)
    735 
    736508# Project-wide clean rules
    737509# Files that will be cleaned
    … …  
    745517
    746518DISTCLEANFILES += \
    747         $(CLEANFILES) \
    748         $(builddir)/doltcompile \
    749         $(builddir)/doltlibtool \
    750519        $(top_builddir)/WebKit/gtk/docs/version.xml \
    751520        $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
    752521        $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
    753         $(top_builddir)/WebKit/gtk/webkit/webkitversion.h \
    754         $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
    755 
    756 MAINTAINERCLEANFILES += \
    757         $(CLEANFILES) \
    758         $(builddir)/doltcompile \
    759         $(builddir)/doltlibtool \
    760         $(srcdir)/aconfig.h.in \
    761         $(srcdir)/autotools/config.* \
    762         $(srcdir)/autotools/compile \
    763         $(srcdir)/autotools/depcomp \
    764         $(srcdir)/autotools/install-sh \
    765         $(srcdir)/autotools/missing \
    766         $(srcdir)/configure \
    767         $(srcdir)/GNUmakefile.in \
    768         $(srcdir)/INSTALL \
    769         $(srcdir)/README \
    770         $(top_builddir)/config.*
    771 
    772 # Older automake versions (1.7) place Plo files in a different place so we need
    773 # to create the output directory manually.
    774 all-local: stamp-po
    775         $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
    776 
    777 # remove built sources and program directories
    778 clean-local:
    779         -rm -rf $(GENPROGRAMS)
    780 
    781 maintainer-clean-local: distclean-local
    782 
    783 distclean-local:
    784         -rm -rf $(GENSOURCES) $(GENPROGRAMS)
     522        $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml \
     523        $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
    785524
    786525dist-hook:
    787         cp $(srcdir)/WebKit/gtk/NEWS $(distdir)
    788 
     526        cp $(WebKit)/NEWS $(distdir)
    789527install-data-local: po-install-data-local
    790 
    791528installdirs-data-local: po-installdirs-data-local
    792 
    793529uninstall-local: po-uninstall-local
    794530
Note: See TracChangeset for help on using the changeset viewer.