Diff
Modified: trunk/ChangeLog (108221 => 108222)
--- trunk/ChangeLog 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/ChangeLog 2012-02-20 09:12:46 UTC (rev 108222)
@@ -1,3 +1,12 @@
+2012-02-20 Martin Robinson <[email protected]>
+
+ Fix WebKit2GTK+ for 'make distcheck'.
+
+ Instead of conditionally including WebKit2 GNUmakefiles, always
+ include them and conditionally activate the final targets.
+
+ * GNUmakefile.am:
+
2012-02-19 Gyuyoung Kim <[email protected]>
[CMAKE] Check gstreamer minimum required version.
Modified: trunk/GNUmakefile.am (108221 => 108222)
--- trunk/GNUmakefile.am 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/GNUmakefile.am 2012-02-20 09:12:46 UTC (rev 108222)
@@ -241,14 +241,12 @@
include Source/WebKit/gtk/po/GNUmakefile.am
include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
-if ENABLE_WEBKIT2
include Source/WebKit2/GNUmakefile.am
include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
include Tools/MiniBrowser/gtk/GNUmakefile.am
include Tools/WebKitTestRunner/GNUmakefile.am
# [GTK] Refactor the translations now that we have webkit2
# https://bugs.webkit.org/show_bug.cgi?id=55153
-endif
# Autogenerated sources
BUILT_SOURCES += \
Modified: trunk/Source/WebKit2/ChangeLog (108221 => 108222)
--- trunk/Source/WebKit2/ChangeLog 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-20 09:12:46 UTC (rev 108222)
@@ -1,5 +1,15 @@
2012-02-20 Martin Robinson <[email protected]>
+ Fix WebKit2GTK+ for 'make distcheck'.
+
+ Instead of conditionally including WebKit2 GNUmakefiles, always
+ include them and conditionally activate the final targets.
+
+ * GNUmakefile.am:
+ * UIProcess/API/gtk/tests/GNUmakefile.am:
+
+2012-02-20 Martin Robinson <[email protected]>
+
[GTK][WK2] WebKit2 does not build if gtk-unix-printing-3.0 is not available
https://bugs.webkit.org/show_bug.cgi?id=79011
Modified: trunk/Source/WebKit2/GNUmakefile.am (108221 => 108222)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-02-20 09:12:46 UTC (rev 108222)
@@ -1047,9 +1047,11 @@
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
$(global_cflags)
+if ENABLE_WEBKIT2
# Shared libraries
lib_LTLIBRARIES += \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+endif
# Artificial dependency to make sure libwebkit2gtk and libwebkitgtk are not linked at the same time
# The variable creation is to avoid having automake override the entire rule instead of adding the
@@ -1103,7 +1105,9 @@
$(XRENDER_LIBS) \
$(XT_LIBS)
+if ENABLE_WEBKIT2
pkgconfig_DATA += Source/WebKit2/webkit2gtk-@[email protected]
+endif
# WebKit2 specific variables
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
@@ -1237,9 +1241,10 @@
DISTCLEANFILES += \
$(top_builddir)/WebKit2/webkit2gtk-@[email protected]
-# WebKitWebProcess
+if ENABLE_WEBKIT2
libexec_PROGRAMS += \
Programs/WebKitWebProcess
+endif
Programs_WebKitWebProcess_CPPFLAGS = \
-I$(srcdir)/Source/WebKit2 \
@@ -1504,7 +1509,7 @@
$(SYMBOL_VISIBILITY_INLINES) \
$(global_cxxflags)
-endif
+endif # ENABLE_PLUGIN_PROCESS
EXTRA_DIST += \
$(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am (108221 => 108222)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2012-02-20 09:12:46 UTC (rev 108222)
@@ -1,3 +1,5 @@
+if ENABLE_WEBKIT2
+
TEST_PROGS += \
Programs/WebKit2APITests/TestWebKitWebContext \
Programs/WebKit2APITests/TestWebKitWebView \
@@ -125,3 +127,5 @@
Programs_WebKit2APITests_TestPrinting_CPPFLAGS = $(webkit2_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS)
Programs_WebKit2APITests_TestPrinting_LDADD = $(webkit2_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS)
Programs_WebKit2APITests_TestPrinting_LDFLAGS = $(webkit2_tests_ldflags)
+
+endif # ENABLE_WEBKIT2
Modified: trunk/Tools/ChangeLog (108221 => 108222)
--- trunk/Tools/ChangeLog 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/Tools/ChangeLog 2012-02-20 09:12:46 UTC (rev 108222)
@@ -1,3 +1,13 @@
+2012-02-20 Martin Robinson <[email protected]>
+
+ Fix WebKit2GTK+ for 'make distcheck'.
+
+ Instead of conditionally including WebKit2 GNUmakefiles, always
+ include them and conditionally activate the final targets.
+
+ * MiniBrowser/gtk/GNUmakefile.am:
+ * WebKitTestRunner/GNUmakefile.am:
+
2012-02-20 Gyuyoung Kim <[email protected]>
Enable video option for EFL port in build-webkit.
Modified: trunk/Tools/MiniBrowser/gtk/GNUmakefile.am (108221 => 108222)
--- trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2012-02-20 09:12:46 UTC (rev 108222)
@@ -1,5 +1,7 @@
+if ENABLE_WEBKIT2
noinst_PROGRAMS += \
Programs/MiniBrowser
+endif
Programs_MiniBrowser_CPPFLAGS = \
-I$(srcdir)/Source \
Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (108221 => 108222)
--- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2012-02-20 08:59:42 UTC (rev 108221)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2012-02-20 09:12:46 UTC (rev 108222)
@@ -5,8 +5,10 @@
$(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/WebKitTestRunner $(GENSOURCES_WEBKIT2)/include gtk
$(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/WebKitTestRunner $(GENSOURCES_WEBKIT2)/include soup
+if ENABLE_WEBKIT2
noinst_PROGRAMS += \
Programs/WebKitTestRunner
+endif
Programs_WebKitTestRunner_SOURCES = \
Tools/WebKitTestRunner/EventSenderProxy.h \
