Title: [106895] trunk
- Revision
- 106895
- Author
- [email protected]
- Date
- 2012-02-06 19:20:31 -0800 (Mon, 06 Feb 2012)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106894 => 106895)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 03:11:29 UTC (rev 106894)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 03:20:31 UTC (rev 106895)
@@ -1,3 +1,10 @@
+2012-02-06 Martin Robinson <[email protected]>
+
+ 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 <[email protected]>
Add contains() test to Region
Modified: trunk/Source/WebCore/GNUmakefile.list.am (106894 => 106895)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-02-07 03:11:29 UTC (rev 106894)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-02-07 03:20:31 UTC (rev 106895)
@@ -5767,6 +5767,9 @@
# 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
Modified: trunk/Source/WebKit2/ChangeLog (106894 => 106895)
--- trunk/Source/WebKit2/ChangeLog 2012-02-07 03:11:29 UTC (rev 106894)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-07 03:20:31 UTC (rev 106895)
@@ -1,3 +1,9 @@
+2012-02-06 Martin Robinson <[email protected]>
+
+ Fix some miscellaneous 'make dist' error for WebKitGTK+.
+
+ * GNUmakefile.am: Do not distribute generated files.
+
2012-02-06 Anders Carlsson <[email protected]>
Overlay scrollbars flash when window is simply activated
Modified: trunk/Source/WebKit2/GNUmakefile.am (106894 => 106895)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-02-07 03:11:29 UTC (rev 106894)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-02-07 03:20:31 UTC (rev 106895)
@@ -78,8 +78,10 @@
$(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 \
Modified: trunk/Tools/ChangeLog (106894 => 106895)
--- trunk/Tools/ChangeLog 2012-02-07 03:11:29 UTC (rev 106894)
+++ trunk/Tools/ChangeLog 2012-02-07 03:20:31 UTC (rev 106895)
@@ -1,3 +1,10 @@
+2012-02-06 Martin Robinson <[email protected]>
+
+ 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 <[email protected]>
[PerformanceTests] Each Dromaeo test needs its landing html.
Modified: trunk/Tools/MiniBrowser/gtk/GNUmakefile.am (106894 => 106895)
--- trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2012-02-07 03:11:29 UTC (rev 106894)
+++ trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2012-02-07 03:20:31 UTC (rev 106895)
@@ -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 @@
$(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 @@
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@.@[email protected] \
$(GLIB_LIBS) \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
