Title: [106132] trunk/Source/WebKit2
- Revision
- 106132
- Author
- [email protected]
- Date
- 2012-01-27 10:27:45 -0800 (Fri, 27 Jan 2012)
Log Message
[GTK] Sometimes fails to build when using make -j
https://bugs.webkit.org/show_bug.cgi?id=77226
Reviewed by Martin Robinson.
* GNUmakefile.am: use a different name for the scripts used to
generate enum files for WebKitGTK+ and WebKit2GTK+, so they do not
clash;
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (106131 => 106132)
--- trunk/Source/WebKit2/ChangeLog 2012-01-27 18:24:21 UTC (rev 106131)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-27 18:27:45 UTC (rev 106132)
@@ -1,3 +1,14 @@
+2012-01-27 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Sometimes fails to build when using make -j
+ https://bugs.webkit.org/show_bug.cgi?id=77226
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: use a different name for the scripts used to
+ generate enum files for WebKitGTK+ and WebKit2GTK+, so they do not
+ clash;
+
2012-01-27 Jocelyn Turcotte <[email protected]>
Fix overridePreference for WebKitHixie76WebSocketProtocolEnabled in WebKitTestRunner.
Modified: trunk/Source/WebKit2/GNUmakefile.am (106131 => 106132)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-01-27 18:24:21 UTC (rev 106131)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-01-27 18:27:45 UTC (rev 106132)
@@ -1155,9 +1155,9 @@
$(libwebkit2gtkinclude_HEADERS) | \
sed 's,web_kit,webkit,' | \
sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
- > xgen-gth \
- && (cmp -s xgen-gth $(webkit2gtk_built_headers_dir)/WebKitEnumTypes.h || cp xgen-gth $(webkit2gtk_built_headers_dir)/WebKitEnumTypes.h) \
- && rm -f xgen-gth \
+ > wk2-xgen-gth \
+ && (cmp -s wk2-xgen-gth $(webkit2gtk_built_headers_dir)/WebKitEnumTypes.h || cp wk2-xgen-gth $(webkit2gtk_built_headers_dir)/WebKitEnumTypes.h) \
+ && rm -f wk2-xgen-gth \
&& echo timestamp > $(@F)
$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am
@@ -1179,9 +1179,9 @@
--ftail "}\n" \
$(libwebkit2gtkinclude_HEADERS) | \
sed 's,web_kit,webkit,' \
- > xgen-gtc \
- && cp xgen-gtc $@ \
- && rm -f xgen-gtc
+ > wk2-xgen-gtc \
+ && cp wk2-xgen-gtc $@ \
+ && rm -f wk2-xgen-gtc
WEBKIT2_MARSHAL_LIST = $(WebKit2)/UIProcess/API/gtk/webkit2marshal.list
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
