Title: [111787] trunk
Revision
111787
Author
mrobin...@webkit.org
Date
2012-03-22 16:50:18 -0700 (Thu, 22 Mar 2012)

Log Message

Fixed the GTK+ WTF/_javascript_Core build after r111778.

.:

* GNUmakefile.am: Remove a couple unnecessary gnumake variables.

Source/_javascript_Core:

* GNUmakefile.list.am: Removed an extra trailing backslash.

Source/WTF:

* GNUmakefile.am: Remove some extra trailing backslashes and a few uncessary
  variables.
* GNUmakefile.list.am: Ditto.

Modified Paths

Diff

Modified: trunk/ChangeLog (111786 => 111787)


--- trunk/ChangeLog	2012-03-22 23:47:50 UTC (rev 111786)
+++ trunk/ChangeLog	2012-03-22 23:50:18 UTC (rev 111787)
@@ -1,3 +1,9 @@
+2012-03-22  Martin Robinson  <mrobin...@igalia.com>
+
+        Fixed the GTK+ WTF/_javascript_Core build after r111778.
+
+        * GNUmakefile.am: Remove a couple unnecessary gnumake variables.
+
 2012-03-22  Csaba Osztrogonác  <o...@webkit.org>
 
         Actually move WTF files to their new home

Modified: trunk/GNUmakefile.am (111786 => 111787)


--- trunk/GNUmakefile.am	2012-03-22 23:47:50 UTC (rev 111786)
+++ trunk/GNUmakefile.am	2012-03-22 23:50:18 UTC (rev 111787)
@@ -59,8 +59,6 @@
 USE_LINGUAS :=
 MOFILES :=
 dom_binding_idls :=
-wtf_cppflags:=
-wtf_cflags :=
 wtf_sources :=
 _javascript_core_h_api :=
 _javascript_core_cppflags:=

Modified: trunk/Source/_javascript_Core/ChangeLog (111786 => 111787)


--- trunk/Source/_javascript_Core/ChangeLog	2012-03-22 23:47:50 UTC (rev 111786)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-03-22 23:50:18 UTC (rev 111787)
@@ -1,3 +1,9 @@
+2012-03-22  Martin Robinson  <mrobin...@igalia.com>
+
+        Fixed the GTK+ WTF/_javascript_Core build after r111778.
+
+        * GNUmakefile.list.am: Removed an extra trailing backslash.
+
 2012-03-22  Mark Rowe  <mr...@apple.com>
 
         Fix the build.

Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (111786 => 111787)


--- trunk/Source/_javascript_Core/GNUmakefile.list.am	2012-03-22 23:47:50 UTC (rev 111786)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am	2012-03-22 23:50:18 UTC (rev 111787)
@@ -585,7 +585,7 @@
 if TARGET_WIN32
 else
 _javascript_core_sources += \
-	Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp \
+	Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp
 endif
 
 # minidom

Modified: trunk/Source/WTF/ChangeLog (111786 => 111787)


--- trunk/Source/WTF/ChangeLog	2012-03-22 23:47:50 UTC (rev 111786)
+++ trunk/Source/WTF/ChangeLog	2012-03-22 23:50:18 UTC (rev 111787)
@@ -1,3 +1,11 @@
+2012-03-22  Martin Robinson  <mrobin...@igalia.com>
+
+        Fixed the GTK+ WTF/_javascript_Core build after r111778.
+
+        * GNUmakefile.am: Remove some extra trailing backslashes and a few uncessary
+          variables.
+        * GNUmakefile.list.am: Ditto.
+
 2012-03-22  Dan Bernstein  <m...@apple.com>
 
         Fixed the _javascript_Core debug build after r111778.

Modified: trunk/Source/WTF/GNUmakefile.am (111786 => 111787)


--- trunk/Source/WTF/GNUmakefile.am	2012-03-22 23:47:50 UTC (rev 111786)
+++ trunk/Source/WTF/GNUmakefile.am	2012-03-22 23:50:18 UTC (rev 111787)
@@ -19,20 +19,14 @@
 	$(global_cxxflags) \
 	$(libWTF_la_CFLAGS)
 
-wtf_cflags += \
+libWTF_la_CFLAGS = \
+	-fstrict-aliasing \
+	-O3 \
 	$(global_cflags) \
 	$(GLIB_CFLAGS) \
 	$(UNICODE_CFLAGS)
 
-libWTF_la_CFLAGS = \
-	-fstrict-aliasing \
-	-O3 \
-	$(wtf_cflags)
-
-wtf_cppflags += \
-	-I$(srcdir)/Source \
-	-I$(srcdir)/Source/WTF
-
 libWTF_la_CPPFLAGS = \
 	$(global_cppflags) \
-	$(wtf_cppflags)
+	-I$(srcdir)/Source \
+	-I$(srcdir)/Source/WTF

Modified: trunk/Source/WTF/GNUmakefile.list.am (111786 => 111787)


--- trunk/Source/WTF/GNUmakefile.list.am	2012-03-22 23:47:50 UTC (rev 111786)
+++ trunk/Source/WTF/GNUmakefile.list.am	2012-03-22 23:50:18 UTC (rev 111787)
@@ -216,7 +216,7 @@
     Source/WTF/wtf/unicode/CollatorDefault.cpp \
     Source/WTF/wtf/unicode/UTF8.cpp \
     Source/WTF/wtf/unicode/UTF8.h \
-    Source/WTF/wtf/unicode/Unicode.h \
+    Source/WTF/wtf/unicode/Unicode.h
 
 if TARGET_WIN32
 wtf_sources += \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to