Fix WebKit2GTK+ for 'make distcheck'.
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Feb 2012 09:12:46 +0000 (09:12 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Feb 2012 09:12:46 +0000 (09:12 +0000)
Instead of conditionally including WebKit2 GNUmakefiles, always
include them and conditionally activate the final targets.

.:

* GNUmakefile.am:

Source/WebKit2:

* GNUmakefile.am:
* UIProcess/API/gtk/tests/GNUmakefile.am:

Tools:

* MiniBrowser/gtk/GNUmakefile.am:
* WebKitTestRunner/GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@108222 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
Tools/ChangeLog
Tools/MiniBrowser/gtk/GNUmakefile.am
Tools/WebKitTestRunner/GNUmakefile.am

index 3c34118..edcf11e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-20  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <gyuyoung.kim@samsung.com>
 
         [CMAKE] Check gstreamer minimum required version.
index 4b3ed3b..68a1752 100644 (file)
@@ -241,14 +241,12 @@ include Tools/GNUmakefile.am
 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 += \
index 815fcea..dd899b6 100644 (file)
@@ -1,5 +1,15 @@
 2012-02-20  Martin Robinson  <mrobinson@igalia.com>
 
+        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  <mrobinson@igalia.com>
+
         [GTK][WK2] WebKit2 does not build if gtk-unix-printing-3.0 is not available
         https://bugs.webkit.org/show_bug.cgi?id=79011
 
index cf70545..1e72053 100644 (file)
@@ -1047,9 +1047,11 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXX
 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@.@WEBKITGTK_API_MINOR_VERSION@.la
+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 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
        $(XRENDER_LIBS) \
        $(XT_LIBS)
 
+if ENABLE_WEBKIT2
 pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
+endif
 
 # WebKit2 specific variables
 forwarding_headers := $(GENSOURCES_WEBKIT2)/include
@@ -1237,9 +1241,10 @@ CLEANFILES += \
 DISTCLEANFILES += \
        $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
 
-# WebKitWebProcess
+if ENABLE_WEBKIT2
 libexec_PROGRAMS += \
        Programs/WebKitWebProcess
+endif
 
 Programs_WebKitWebProcess_CPPFLAGS = \
        -I$(srcdir)/Source/WebKit2 \
@@ -1504,7 +1509,7 @@ Programs_WebKitPluginProcess_CXXFLAGS = \
        $(SYMBOL_VISIBILITY_INLINES) \
        $(global_cxxflags)
 
-endif
+endif # ENABLE_PLUGIN_PROCESS
 
 EXTRA_DIST += \
        $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
index d84d7a3..35ece68 100644 (file)
@@ -1,3 +1,5 @@
+if ENABLE_WEBKIT2
+
 TEST_PROGS += \
        Programs/WebKit2APITests/TestWebKitWebContext \
        Programs/WebKit2APITests/TestWebKitWebView \
@@ -125,3 +127,5 @@ Programs_WebKit2APITests_TestPrinting_SOURCES = \
 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
index d9877af..b387c34 100644 (file)
@@ -1,3 +1,13 @@
+2012-02-20  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <gyuyoung.kim@samsung.com>
 
         Enable video option for EFL port in build-webkit.
index 2a020f6..9e42e19 100644 (file)
@@ -1,5 +1,7 @@
+if ENABLE_WEBKIT2
 noinst_PROGRAMS += \
        Programs/MiniBrowser
+endif
 
 Programs_MiniBrowser_CPPFLAGS = \
        -I$(srcdir)/Source \
index 41c90cc..577375f 100644 (file)
@@ -5,8 +5,10 @@ generate-webkittestrunner-forwarding-headers: $(WebKit2)/Scripts/generate-forwar
        $(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 \