2010-08-24 Xan Lopez <xlopez@igalia.com>

        Try to fix GTK+ build.

        Move GTK_API_VERSION_2 define to here, since we want to use it
        outside of WebCore/WebKit.

        * GNUmakefile.am:

WebCore:

2010-08-24  Xan Lopez  <xlopez@igalia.com>

        Try to fix GTK+ build.

        Move GTK_API_VERSION_2 define out.

        * GNUmakefile.am:

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

diff --git a/ChangeLog b/ChangeLog
index 61d1abd50b0c71886cccc1ff38aba7db2813d861..c2b04511c5dd751e265d431b3ea70d6567cdd4bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-24  Xan Lopez  <xlopez@igalia.com>
+
+        Try to fix GTK+ build.
+
+        Move GTK_API_VERSION_2 define to here, since we want to use it
+        outside of WebCore/WebKit.
+
+        * GNUmakefile.am:
+
 2010-08-24  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 
         [EFL] Unreviewed build fix after r65891.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 87b9564dbcf424f290f92bee7909d0d9e62ae72b..4590e1c46087d9ae0e8d78882caef9c345f0a6d1 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -275,6 +275,14 @@ global_cppflags += \
        -DBUILDING_GTK__=1 \
        -DWTF_CHANGES
 
+# ----
+# GTK+ 2.x/3.x support
+# ----
+if GTK_API_VERSION_2
+global_cppflags += \
+       -DGTK_API_VERSION_2=1
+endif
+
 if USE_ICU_UNICODE
 global_cppflags += \
        -DWTF_USE_ICU_UNICODE=1

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1b308f568da9885570e4407f154c0b86a6179d05..b4f12f17a0acae98ea5d42bb26b1bb0c2a932245 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-24  Xan Lopez  <xlopez@igalia.com>
+
+        Try to fix GTK+ build.
+
+        Move GTK_API_VERSION_2 define out.
+
+        * GNUmakefile.am:
+
 2010-08-24  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Sam Weinig.

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 2f0536765412bad11b25ec2ecabfc22625670b5c..5e2f2bed10e40c7f92ed5c6119a67e6f69c191fa 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2579,15 +2579,6 @@ webcore_sources += \
        WebCore/plugins/win/PluginMessageThrottlerWin.h
 endif
 
-# ----
-# GTK+ 2.x/3.x support
-# ----
-
-if GTK_API_VERSION_2
-webcore_cppflags += \
-       -DGTK_API_VERSION_2=1
-endif
-
 # ----
 # icu unicode backend
 # ----