Title: [88145] trunk
Revision
88145
Author
[email protected]
Date
2011-06-06 00:57:26 -0700 (Mon, 06 Jun 2011)

Log Message

2011-06-06  Carlos Garcia Campos  <[email protected]>

        Unreviewed. Fix the GTK+ build.

        * GNUmakefile.am: Add _javascript_core_cflags variable.

2011-06-06  Carlos Garcia Campos  <[email protected]>

        Unreviewed. Fix the GTK+ build.

        * GNUmakefile.am: Add _javascript_core_cflags variable.

2011-06-06  Carlos Garcia Campos  <[email protected]>

        Unreviewed. Fix the GTK+ build.

        * GNUmakefile.am: Use _javascript_core_cflags when building libWebCoreInternals.

Modified Paths

Diff

Modified: trunk/ChangeLog (88144 => 88145)


--- trunk/ChangeLog	2011-06-06 07:27:29 UTC (rev 88144)
+++ trunk/ChangeLog	2011-06-06 07:57:26 UTC (rev 88145)
@@ -1,3 +1,9 @@
+2011-06-06  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix the GTK+ build.
+
+        * GNUmakefile.am: Add _javascript_core_cflags variable.
+
 2011-06-04  Kevin Ollivier  <[email protected]>
 
         [wx] Unreviewed build fix. Restore the PPC build and allow users to specify architectures

Modified: trunk/GNUmakefile.am (88144 => 88145)


--- trunk/GNUmakefile.am	2011-06-06 07:27:29 UTC (rev 88144)
+++ trunk/GNUmakefile.am	2011-06-06 07:57:26 UTC (rev 88145)
@@ -53,6 +53,7 @@
 MOFILES :=
 _javascript_core_h_api :=
 _javascript_core_cppflags:=
+_javascript_core_cflags :=
 _javascript_core_sources :=
 _javascript_core_built_sources :=
 _javascript_core_built_nosources :=

Modified: trunk/Source/_javascript_Core/ChangeLog (88144 => 88145)


--- trunk/Source/_javascript_Core/ChangeLog	2011-06-06 07:27:29 UTC (rev 88144)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-06-06 07:57:26 UTC (rev 88145)
@@ -1,3 +1,9 @@
+2011-06-06  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix the GTK+ build.
+
+        * GNUmakefile.am: Add _javascript_core_cflags variable.
+
 2011-06-04  Kevin Ollivier  <[email protected]>
 
         [wx] Unreviewed build fix. Restore the PPC build and allow users to specify architectures

Modified: trunk/Source/_javascript_Core/GNUmakefile.am (88144 => 88145)


--- trunk/Source/_javascript_Core/GNUmakefile.am	2011-06-06 07:27:29 UTC (rev 88144)
+++ trunk/Source/_javascript_Core/GNUmakefile.am	2011-06-06 07:57:26 UTC (rev 88145)
@@ -35,9 +35,7 @@
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
 	-fstrict-aliasing \
 	-O3 \
-	$(global_cflags) \
-	$(GLIB_CFLAGS) \
-	$(UNICODE_CFLAGS)
+	$(_javascript_core_cflags)
 
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
 	$(global_cppflags) \
@@ -70,6 +68,11 @@
 	-I$(top_builddir)/Source/_javascript_Core/parser \
 	-I$(top_builddir)/Source/_javascript_Core/runtime
 
+_javascript_core_cflags += \
+	$(global_cflags) \
+	$(GLIB_CFLAGS) \
+	$(UNICODE_CFLAGS)
+
 Source/_javascript_Core/Lexer.lut.h: $(srcdir)/Source/_javascript_Core/create_hash_table $(srcdir)/Source/_javascript_Core/parser/Keywords.table
 	$(AM_V_GEN)$(PERL) $^ > $@
 

Modified: trunk/Tools/ChangeLog (88144 => 88145)


--- trunk/Tools/ChangeLog	2011-06-06 07:27:29 UTC (rev 88144)
+++ trunk/Tools/ChangeLog	2011-06-06 07:57:26 UTC (rev 88145)
@@ -1,3 +1,9 @@
+2011-06-06  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix the GTK+ build.
+
+        * GNUmakefile.am: Use _javascript_core_cflags when building libWebCoreInternals.
+
 2011-06-05  Alexey Proskuryakov  <[email protected]>
 
         Add an e-mail address for Cameron McCormack that matches Bugzilla (so that auto-completion

Modified: trunk/Tools/GNUmakefile.am (88144 => 88145)


--- trunk/Tools/GNUmakefile.am	2011-06-06 07:27:29 UTC (rev 88144)
+++ trunk/Tools/GNUmakefile.am	2011-06-06 07:57:26 UTC (rev 88145)
@@ -61,8 +61,12 @@
 	-I$(top_builddir)/DerivedSources/WebCore
 
 libWebCoreInternals_la_CXXFLAGS = \
+	$(global_cxxflags) \
+	$(libWebCoreInternals_la_CFLAGS)
+
+libWebCoreInternals_la_CFLAGS = \
 	-fno-strict-aliasing \
-	$(global_cxxflags)
+	$(_javascript_core_cflags)
 
 # DumpRenderTree
 Programs_DumpRenderTree_CPPFLAGS = \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to