2010-08-24 Xan Lopez <xlopez@igalia.com>
authorxan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Aug 2010 20:20:37 +0000 (20:20 +0000)
committerxan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Aug 2010 20:20:37 +0000 (20:20 +0000)
        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

ChangeLog
GNUmakefile.am
WebCore/ChangeLog
WebCore/GNUmakefile.am

index 61d1abd..c2b0451 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.
index 87b9564..4590e1c 100644 (file)
@@ -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
index 1b308f5..b4f12f1 100644 (file)
@@ -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.
index 2f05367..5e2f2be 100644 (file)
@@ -2580,15 +2580,6 @@ webcore_sources += \
 endif
 
 # ----
-# GTK+ 2.x/3.x support
-# ----
-
-if GTK_API_VERSION_2
-webcore_cppflags += \
-       -DGTK_API_VERSION_2=1
-endif
-
-# ----
 # icu unicode backend
 # ----
 if USE_ICU_UNICODE