2011-06-06 Carlos Garcia Campos <cgarcia@igalia.com>
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jun 2011 07:57:26 +0000 (07:57 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jun 2011 07:57:26 +0000 (07:57 +0000)
        Unreviewed. Fix the GTK+ build.

        * GNUmakefile.am: Add javascriptcore_cflags variable.

2011-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>

        Unreviewed. Fix the GTK+ build.

        * GNUmakefile.am: Add javascriptcore_cflags variable.

2011-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>

        Unreviewed. Fix the GTK+ build.

        * GNUmakefile.am: Use javascriptcore_cflags when building libWebCoreInternals.

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

ChangeLog
GNUmakefile.am
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/GNUmakefile.am
Tools/ChangeLog
Tools/GNUmakefile.am

index 56f745a..5828374 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix the GTK+ build.
+
+        * GNUmakefile.am: Add javascriptcore_cflags variable.
+
 2011-06-04  Kevin Ollivier  <kevino@theolliviers.com>
 
         [wx] Unreviewed build fix. Restore the PPC build and allow users to specify architectures
index d1e3bf0..6fbac40 100644 (file)
@@ -53,6 +53,7 @@ POFILES :=
 MOFILES :=
 javascriptcore_h_api :=
 javascriptcore_cppflags:=
+javascriptcore_cflags :=
 javascriptcore_sources :=
 javascriptcore_built_sources :=
 javascriptcore_built_nosources :=
index 3739920..4bf0bb3 100755 (executable)
@@ -1,3 +1,9 @@
+2011-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix the GTK+ build.
+
+        * GNUmakefile.am: Add javascriptcore_cflags variable.
+
 2011-06-04  Kevin Ollivier  <kevino@theolliviers.com>
 
         [wx] Unreviewed build fix. Restore the PPC build and allow users to specify architectures
index dcbbf49..3497ad8 100644 (file)
@@ -35,9 +35,7 @@ libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
        -fstrict-aliasing \
        -O3 \
-       $(global_cflags) \
-       $(GLIB_CFLAGS) \
-       $(UNICODE_CFLAGS)
+       $(javascriptcore_cflags)
 
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
        $(global_cppflags) \
@@ -70,6 +68,11 @@ javascriptcore_cppflags += \
        -I$(top_builddir)/Source/JavaScriptCore/parser \
        -I$(top_builddir)/Source/JavaScriptCore/runtime
 
+javascriptcore_cflags += \
+       $(global_cflags) \
+       $(GLIB_CFLAGS) \
+       $(UNICODE_CFLAGS)
+
 Source/JavaScriptCore/Lexer.lut.h: $(srcdir)/Source/JavaScriptCore/create_hash_table $(srcdir)/Source/JavaScriptCore/parser/Keywords.table
        $(AM_V_GEN)$(PERL) $^ > $@
 
index 182ed54..f45c369 100644 (file)
@@ -1,3 +1,9 @@
+2011-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix the GTK+ build.
+
+        * GNUmakefile.am: Use javascriptcore_cflags when building libWebCoreInternals.
+
 2011-06-05  Alexey Proskuryakov  <ap@apple.com>
 
         Add an e-mail address for Cameron McCormack that matches Bugzilla (so that auto-completion
index c31cfc6..e89baa0 100644 (file)
@@ -61,8 +61,12 @@ libWebCoreInternals_la_CPPFLAGS = \
        -I$(top_builddir)/DerivedSources/WebCore
 
 libWebCoreInternals_la_CXXFLAGS = \
+       $(global_cxxflags) \
+       $(libWebCoreInternals_la_CFLAGS)
+
+libWebCoreInternals_la_CFLAGS = \
        -fno-strict-aliasing \
-       $(global_cxxflags)
+       $(javascriptcore_cflags)
 
 # DumpRenderTree
 Programs_DumpRenderTree_CPPFLAGS = \