Title: [149052] trunk
- Revision
- 149052
- Author
- carlo...@webkit.org
- Date
- 2013-04-24 11:34:04 -0700 (Wed, 24 Apr 2013)
Log Message
[GTK] Use stamp files for generate-forwarding-headers makefile rules
https://bugs.webkit.org/show_bug.cgi?id=115118
Reviewed by Martin Robinson.
Source/WebKit2:
Use a stamp file for the WebKit2 forwarding generator rule. Also
fix the rule dependencies that pointed to a non existent variable.
* GNUmakefile.am:
Tools:
Use a stamp file for the TestWebKitAPI and WebKitTestRunner
forwarding generator rules and don't call it for soup since there
aren't soup directories in TestWebKitAPI and WebKitTestRunner.
* TestWebKitAPI/GNUmakefile.am:
* WebKitTestRunner/GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149051 => 149052)
--- trunk/Source/WebKit2/ChangeLog 2013-04-24 18:33:12 UTC (rev 149051)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-24 18:34:04 UTC (rev 149052)
@@ -1,3 +1,15 @@
+2013-04-24 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Use stamp files for generate-forwarding-headers makefile rules
+ https://bugs.webkit.org/show_bug.cgi?id=115118
+
+ Reviewed by Martin Robinson.
+
+ Use a stamp file for the WebKit2 forwarding generator rule. Also
+ fix the rule dependencies that pointed to a non existent variable.
+
+ * GNUmakefile.am:
+
2013-04-24 Zan Dobersek <zdober...@igalia.com>
[GTK][WK2] Implement LayerTreeHostGtk::pageBackgroundTransparencyChanged
Modified: trunk/Source/WebKit2/GNUmakefile.am (149051 => 149052)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-04-24 18:33:12 UTC (rev 149051)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-04-24 18:34:04 UTC (rev 149052)
@@ -315,13 +315,12 @@
endif
endif
-# WebKit2 specific variables
-forwarding_headers := $(GENSOURCES_WEBKIT2)/include
-generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
- $(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) gtk
- $(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) soup
+stamp-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(webkit2_sources)
+ $(AM_V_GEN)$(PERL) $< $(WebKit2) $(GENSOURCES_WEBKIT2)/include gtk \
+ && $(PERL) $< $(WebKit2) $(GENSOURCES_WEBKIT2)/include soup \
+ && echo timestamp > $(@F)
-BUILT_SOURCES += generate-webkit2-forwarding-headers
+BUILT_SOURCES += $(top_builddir)/stamp-webkit2-forwarding-headers
$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(libwebkit2gtkinclude_HEADERS)
$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/include \
Modified: trunk/Tools/ChangeLog (149051 => 149052)
--- trunk/Tools/ChangeLog 2013-04-24 18:33:12 UTC (rev 149051)
+++ trunk/Tools/ChangeLog 2013-04-24 18:34:04 UTC (rev 149052)
@@ -1,3 +1,17 @@
+2013-04-24 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Use stamp files for generate-forwarding-headers makefile rules
+ https://bugs.webkit.org/show_bug.cgi?id=115118
+
+ Reviewed by Martin Robinson.
+
+ Use a stamp file for the TestWebKitAPI and WebKitTestRunner
+ forwarding generator rules and don't call it for soup since there
+ aren't soup directories in TestWebKitAPI and WebKitTestRunner.
+
+ * TestWebKitAPI/GNUmakefile.am:
+ * WebKitTestRunner/GNUmakefile.am:
+
2013-04-24 Simon Pena <simon.p...@samsung.com>
[GTK] Update build dependencies
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (149051 => 149052)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-04-24 18:33:12 UTC (rev 149051)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-04-24 18:34:04 UTC (rev 149052)
@@ -1,10 +1,3 @@
-BUILT_SOURCES += \
- generate-testwebkitapi-forwarding-headers
-wk2_tests_sources = $(shell ls $(srcdir)/Tools/TestWebKitAPI/Tests/WebKit2/*.cpp)
-generate-testwebkitapi-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(wk2_tests_sources)
- $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI $(GENSOURCES_WEBKIT2)/include gtk
- $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI $(GENSOURCES_WEBKIT2)/include soup
-
noinst_LTLIBRARIES += \
Libraries/libTestWebKitAPIMain.la
@@ -229,6 +222,13 @@
Libraries_libTestWebKitAPIInjectedBundle_la_CFLAGS = \
$(global_cflags)
+
+stamp-testwebkitapi-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebKit2_SOURCES) $(Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES)
+ $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI $(GENSOURCES_WEBKIT2)/include gtk \
+ && echo timestamp > $(@F)
+
+BUILT_SOURCES += $(top_builddir)/stamp-testwebkitapi-forwarding-headers
+
endif # ENABLE_WEBKIT2
EXTRA_DIST += \
Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (149051 => 149052)
--- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2013-04-24 18:33:12 UTC (rev 149051)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2013-04-24 18:34:04 UTC (rev 149052)
@@ -1,10 +1,10 @@
-BUILT_SOURCES += \
- generate-webkittestrunner-forwarding-headers
-generate-webkittestrunner-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_WebKitTestRunner_SOURCES)
- $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/WebKitTestRunner $(GENSOURCES_WEBKIT2)/include gtk
- $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/WebKitTestRunner $(GENSOURCES_WEBKIT2)/include soup
+stamp-webkittestrunner-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_WebKitTestRunner_SOURCES)
+ $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/WebKitTestRunner $(GENSOURCES_WEBKIT2)/include gtk \
+ && echo timestamp > $(@F)
+BUILT_SOURCES += $(top_builddir)/stamp-webkittestrunner-forwarding-headers
+
if ENABLE_WEBKIT2
noinst_PROGRAMS += \
Programs/WebKitTestRunner
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
