Second try at fixing the GTK+ build.

Patch by Gustavo Noronha Silva <gustavo.noronha@collabora.com> on 2011-09-28

Source/WebKit2:

* GNUmakefile.am:

Tools:

* GNUmakefile.am:

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d5da18b..0bdd691 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,11 @@
 2011-09-28  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
 
+        Second try at fixing the GTK+ build.
+
+        * GNUmakefile.am:
+
+2011-09-28  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
+
         Try to fix GTK+ build.
 
         * GNUmakefile.am:

diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
index 5587c54..a02fd67 100644 (file)
--- a/Source/WebKit2/GNUmakefile.am
+++ b/Source/WebKit2/GNUmakefile.am
@@ -67,6 +67,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEA
        $(WebKit2)/UIProcess/API/C/WKResourceCacheManager.h \
        $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h
 
+libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
 webkit2gtk_headers = \
        $(WebKit2)/UIProcess/API/gtk/WebKitError.h \
        $(WebKit2)/UIProcess/API/gtk/WebKitWebContext.h \
@@ -75,10 +76,6 @@ webkit2gtk_headers = \
        $(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
        $(WebKit2)/UIProcess/API/gtk/webkit2.h
 
-libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
-libwebkit2gtkinclude_HEADERS = \
-       $(webkit2gtk_headers)
-
 webkit2_built_sources += \
        DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
        DerivedSources/WebKit2/AuthenticationManagerMessages.h \

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0012a87..d8983e0 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-28  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
+
+        Second try at fixing the GTK+ build.
+
+        * GNUmakefile.am:
+
 2011-09-28  Xianzhu Wang  <wangxianzhu@chromium.org>
 
         Let TestWebKitAPI and webkit_unit_tests work for chromium-win

diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
index af1e69d..0c22006 100644 (file)
--- a/Tools/GNUmakefile.am
+++ b/Tools/GNUmakefile.am
@@ -5,6 +5,10 @@ noinst_PROGRAMS += \
 if ENABLE_WEBKIT2
 noinst_PROGRAMS += \
        Programs/GtkLauncher2
+
+# FIXME: should this dependency be automatically identified by
+# automake somehow?
+Tools/GtkLauncher/main.c: $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp
 endif
 
 # GtkLauncher