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

ChangeLog
GNUmakefile.am

index c2b0451..5f336ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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.
 
         Move GTK_API_VERSION_2 define to here, since we want to use it
index 4590e1c..4c09c92 100644 (file)
@@ -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)