From 180a4a37a0924e8c8fa76c2ad5acfaf2aa24fa62 Mon Sep 17 00:00:00 2001 From: "mrobinson@webkit.org" Date: Tue, 7 Feb 2012 03:20:31 +0000 Subject: [PATCH] Fix some miscellaneous 'make dist' error for WebKitGTK+. Source/WebCore: * GNUmakefile.list.am: Add some missing Shadow DOM files to the source list. Source/WebKit2: * GNUmakefile.am: Do not distribute generated files. Tools: * MiniBrowser/gtk/GNUmakefile.am: The MiniBrowser generated files should not be distributed. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106895 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 7 +++++++ Source/WebCore/GNUmakefile.list.am | 3 +++ Source/WebKit2/ChangeLog | 6 ++++++ Source/WebKit2/GNUmakefile.am | 4 +++- Tools/ChangeLog | 7 +++++++ Tools/MiniBrowser/gtk/GNUmakefile.am | 11 ++++++----- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 8c3cb3f..3fafa78 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,10 @@ +2012-02-06 Martin Robinson + + Fix some miscellaneous 'make dist' error for WebKitGTK+. + + * GNUmakefile.list.am: Add some missing Shadow DOM files to the + source list. + 2012-02-06 Dana Jansens Add contains() test to Region diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 3006e83..7374793 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -5767,6 +5767,9 @@ endif # USE_ACCELERATED_COMPOSITING # Shadow DOM support # --- if ENABLE_SHADOW_DOM +webcore_sources += \ + Source/WebCore/html/shadow/HTMLShadowElement.cpp \ + Source/WebCore/html/shadow/HTMLShadowElement.h webcore_built_sources += \ DerivedSources/WebCore/JSHTMLShadowElement.cpp \ DerivedSources/WebCore/JSHTMLShadowElement.h diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index ac7efbc..4ccc600 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,9 @@ +2012-02-06 Martin Robinson + + Fix some miscellaneous 'make dist' error for WebKitGTK+. + + * GNUmakefile.am: Do not distribute generated files. + 2012-02-06 Anders Carlsson Overlay scrollbars flash when window is simply activated diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am index 1f46127..660df9f 100644 --- a/Source/WebKit2/GNUmakefile.am +++ b/Source/WebKit2/GNUmakefile.am @@ -78,8 +78,10 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEA $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2 +nodist_libwebkit2gtkinclude_HEADERS = \ + DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h + libwebkit2gtkinclude_HEADERS = \ - DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \ $(WebKit2)/UIProcess/API/gtk/WebKitBackForwardList.h \ $(WebKit2)/UIProcess/API/gtk/WebKitBackForwardListItem.h \ $(WebKit2)/UIProcess/API/gtk/WebKitDefines.h \ diff --git a/Tools/ChangeLog b/Tools/ChangeLog index eb19594..30380aa 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,10 @@ +2012-02-06 Martin Robinson + + Fix some miscellaneous 'make dist' error for WebKitGTK+. + + * MiniBrowser/gtk/GNUmakefile.am: The MiniBrowser generated + files should not be distributed. + 2012-02-02 Hajime Morrita [PerformanceTests] Each Dromaeo test needs its landing html. diff --git a/Tools/MiniBrowser/gtk/GNUmakefile.am b/Tools/MiniBrowser/gtk/GNUmakefile.am index 8a3b87e..2a020f6 100644 --- a/Tools/MiniBrowser/gtk/GNUmakefile.am +++ b/Tools/MiniBrowser/gtk/GNUmakefile.am @@ -1,10 +1,6 @@ noinst_PROGRAMS += \ Programs/MiniBrowser -minibrowser_built_sources += \ - DerivedSources/WebKit2/BrowserMarshal.h \ - DerivedSources/WebKit2/BrowserMarshal.c - Programs_MiniBrowser_CPPFLAGS = \ -I$(srcdir)/Source \ -I$(top_builddir)/DerivedSources/WebKit2 \ @@ -16,7 +12,6 @@ Programs_MiniBrowser_CPPFLAGS = \ $(GTK_CFLAGS) Programs_MiniBrowser_SOURCES = \ - $(minibrowser_built_sources) \ Tools/MiniBrowser/gtk/BrowserCellRendererVariant.h \ Tools/MiniBrowser/gtk/BrowserCellRendererVariant.c \ Tools/MiniBrowser/gtk/BrowserSettingsDialog.h \ @@ -25,6 +20,12 @@ Programs_MiniBrowser_SOURCES = \ Tools/MiniBrowser/gtk/BrowserWindow.c \ Tools/MiniBrowser/gtk/main.c +minibrowser_built_sources += \ + DerivedSources/WebKit2/BrowserMarshal.h \ + DerivedSources/WebKit2/BrowserMarshal.c +nodist_Programs_MiniBrowser_SOURCES = \ + $(minibrowser_built_sources) + Programs_MiniBrowser_LDADD = \ libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ $(GLIB_LIBS) \ -- 2.7.4