Title: [104289] trunk
- Revision
- 104289
- Author
- [email protected]
- Date
- 2012-01-06 06:25:39 -0800 (Fri, 06 Jan 2012)
Log Message
Make the new WTF module build on Gtk
https://bugs.webkit.org/show_bug.cgi?id=75669
Patch by Eric Seidel <[email protected]> and Gustavo Noronha Silva <[email protected]> on 2012-01-06
Source/_javascript_Core:
* GNUmakefile.am:
Source/WTF:
* GNUmakefile.am: Added.
* GNUmakefile.list.am: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/GNUmakefile.am (104288 => 104289)
--- trunk/GNUmakefile.am 2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/GNUmakefile.am 2012-01-06 14:25:39 UTC (rev 104289)
@@ -56,6 +56,9 @@
POFILES :=
MOFILES :=
dom_binding_idls :=
+wtf_cppflags:=
+wtf_cflags :=
+wtf_sources :=
_javascript_core_h_api :=
_javascript_core_cppflags:=
_javascript_core_cflags :=
@@ -219,6 +222,8 @@
$(srcdir)/Source/WebKit/LICENSE
# Include module makefiles
+include Source/WTF/GNUmakefile.am
+
if USE_JSC
include Source/_javascript_Core/GNUmakefile.am
endif
Modified: trunk/Source/_javascript_Core/ChangeLog (104288 => 104289)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-06 14:25:39 UTC (rev 104289)
@@ -1,3 +1,10 @@
+2012-01-06 Eric Seidel <[email protected]> and Gustavo Noronha Silva <[email protected]>
+
+ Make the new WTF module build on Gtk
+ https://bugs.webkit.org/show_bug.cgi?id=75669
+
+ * GNUmakefile.am:
+
2012-01-06 Tor Arne Vestbø <[email protected]>
[Qt] Remove un-needed VPATHs from project includes
Modified: trunk/Source/_javascript_Core/GNUmakefile.am (104288 => 104289)
--- trunk/Source/_javascript_Core/GNUmakefile.am 2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/Source/_javascript_Core/GNUmakefile.am 2012-01-06 14:25:39 UTC (rev 104289)
@@ -23,10 +23,11 @@
$(_javascript_core_sources)
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
+ -lpthread \
+ libWTF.la \
$(UNICODE_LIBS) \
$(GLIB_LIBS) \
- $(WINMM_LIBS) \
- -lpthread
+ $(WINMM_LIBS)
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
$(global_cxxflags) \
@@ -68,6 +69,9 @@
-I$(srcdir)/Source/_javascript_Core/yarr \
-I$(top_builddir)/DerivedSources/_javascript_Core
+_javascript_core_cppflags += \
+ -I$(srcdir)/Source/WTF
+
_javascript_core_cflags += \
$(global_cflags) \
$(GLIB_CFLAGS) \
Modified: trunk/Source/WTF/ChangeLog (104288 => 104289)
--- trunk/Source/WTF/ChangeLog 2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/Source/WTF/ChangeLog 2012-01-06 14:25:39 UTC (rev 104289)
@@ -1,3 +1,11 @@
+2012-01-06 Eric Seidel <[email protected]> and Gustavo Noronha Silva <[email protected]>
+
+ Make the new WTF module build on Gtk
+ https://bugs.webkit.org/show_bug.cgi?id=75669
+
+ * GNUmakefile.am: Added.
+ * GNUmakefile.list.am: Added.
+
2011-11-19 Adam Barth <[email protected]>
Integrate Source/WTF with the Chromium build system
Added: trunk/Source/WTF/GNUmakefile.am (0 => 104289)
--- trunk/Source/WTF/GNUmakefile.am (rev 0)
+++ trunk/Source/WTF/GNUmakefile.am 2012-01-06 14:25:39 UTC (rev 104289)
@@ -0,0 +1,38 @@
+include $(srcdir)/Source/WTF/GNUmakefile.list.am
+
+noinst_LTLIBRARIES += \
+ libWTF.la
+
+libWTF_la_LDFLAGS = \
+ $(no_undefined)
+
+libWTF_la_SOURCES = \
+ $(wtf_sources)
+
+libWTF_la_LIBADD = \
+ $(UNICODE_LIBS) \
+ $(GLIB_LIBS) \
+ $(WINMM_LIBS) \
+ -lpthread
+
+libWTF_la_CXXFLAGS = \
+ $(global_cxxflags) \
+ $(libWTF_la_CFLAGS)
+
+wtf_cflags += \
+ $(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)
Added: trunk/Source/WTF/GNUmakefile.list.am (0 => 104289)
--- trunk/Source/WTF/GNUmakefile.list.am (rev 0)
+++ trunk/Source/WTF/GNUmakefile.list.am 2012-01-06 14:25:39 UTC (rev 104289)
@@ -0,0 +1,3 @@
+wtf_sources += \
+ Source/WTF/Stub.cpp \
+ Source/WTF/Stub.h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
