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

        Build fix, strike 2.

        The unit tests are C files, so put the flag in global_cflags.

        * GNUmakefile.am:

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

diff --git a/ChangeLog b/ChangeLog
index c2b04511c5dd751e265d431b3ea70d6567cdd4bc..5f336ff1b1d055a9038a0ccc33e6b4612e7c99ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-24  Xan Lopez  <xlopez@igalia.com>
+
+        Build fix, strike 2.
+
+        The unit tests are C files, so put the flag in global_cflags.
+
+        * GNUmakefile.am:
+
 2010-08-24  Xan Lopez  <xlopez@igalia.com>
 
         Try to fix GTK+ build.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 4590e1c46087d9ae0e8d78882caef9c345f0a6d1..4c09c92d9bd838a6a79f8cf065203805037b686f 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -275,14 +275,6 @@ 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
@@ -298,6 +290,14 @@ global_cppflags += \
        -DUSE_SYSTEM_MALLOC
 endif
 
+# ----
+# GTK+ 2.x/3.x support
+# ----
+if GTK_API_VERSION_2
+global_cflags += \
+       -DGTK_API_VERSION_2=1
+endif
+
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
 global_cflags += $(SYMBOL_VISIBILITY)