[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
mrobinson at webkit.org
mrobinson at webkit.org
Fri Jan 21 15:13:44 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit aaa95e8db1266029a30682a89065adf87a5b975d
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 10 08:27:55 2011 +0000
2011-01-10 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
[GTK] Create intermediate libWebCore library
https://bugs.webkit.org/show_bug.cgi?id=52116
* GNUmakefile.am: add XP_UNIX to the global CPP flags, since it's
used by both libWebCore and libwebkitgtk now.
2011-01-10 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
[GTK] Create intermediate libWebCore library
https://bugs.webkit.org/show_bug.cgi?id=52116
Create intermediate libWebCore.la to avoid overflowing the linker
in the final link stage.
* GNUmakefile.am: define the new library.
2011-01-10 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
[GTK] Create intermediate libWebCore library
https://bugs.webkit.org/show_bug.cgi?id=52116
* GNUmakefile.am: add libWebCore.la to LIBADD and remove webcore
sources from the libwebkit library SOURCES.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75362 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index fdc2015..dd465ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-10 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Create intermediate libWebCore library
+ https://bugs.webkit.org/show_bug.cgi?id=52116
+
+ * GNUmakefile.am: add XP_UNIX to the global CPP flags, since it's
+ used by both libWebCore and libwebkitgtk now.
+
2011-01-08 Patrick Gansterer <paroga at webkit.org>
Unreviewed wx build fix for r75313.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 64f0b21..f53581b 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -165,6 +165,12 @@ global_cppflags += \
-DBUILDING_GTK__=1 \
-DWTF_CHANGES
+# For the Gtk port we want to use XP_UNIX both in X11 and Mac
+if !TARGET_WIN32
+global_cppflags += \
+ -DXP_UNIX
+endif
+
if USE_ICU_UNICODE
global_cppflags += \
-DWTF_USE_ICU_UNICODE=1
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cbfc839..d4f6307 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-10 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Create intermediate libWebCore library
+ https://bugs.webkit.org/show_bug.cgi?id=52116
+
+ Create intermediate libWebCore.la to avoid overflowing the linker
+ in the final link stage.
+
+ * GNUmakefile.am: define the new library.
+
2011-01-09 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r75337.
diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
index 0925bd4..62e9a6c 100644
--- a/Source/WebCore/GNUmakefile.am
+++ b/Source/WebCore/GNUmakefile.am
@@ -4818,6 +4818,49 @@ DerivedSources/WebCore/JS%.cpp: DerivedSources/WebCore/JS%.h;
DerivedSources/WebCore/JS%.h: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm
$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator JS $<
+noinst_LTLIBRARIES += \
+ libWebCore.la
+
+nodist_EXTRA_libWebCore_la_SOURCES = \
+ $(webcore_built_nosources)
+
+nodist_libWebCore_la_SOURCES = \
+ $(webcore_built_sources)
+
+libWebCore_la_SOURCES = \
+ $(webcore_sources)
+
+libWebCore_la_CXXFLAGS = \
+ $(SYMBOL_VISIBILITY_INLINES) \
+ $(global_cxxflags)
+
+libWebCore_la_CFLAGS = \
+ $(SYMBOL_VISIBILITY) \
+ $(global_cflags)
+
+libWebCore_la_CPPFLAGS = \
+ -DBUILDING_WEBKIT \
+ $(global_cppflags) \
+ $(webcore_cppflags) \
+ $(webcoregtk_cppflags) \
+ $(javascriptcore_cppflags) \
+ -fno-strict-aliasing \
+ $(HILDON_CPPFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
+ $(GAIL_CFLAGS) \
+ $(GEOCLUE_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GSTREAMER_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(HILDON_CFLAGS) \
+ $(LIBSOUP_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+ $(LIBXSLT_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(UNICODE_CFLAGS) \
+ $(XT_CFLAGS)
+
EXTRA_DIST += \
$(shell ls $(srcdir)/Source/WebCore/css/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/dom/*.idl) \
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index c4909b4..b0a5552 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-10 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Create intermediate libWebCore library
+ https://bugs.webkit.org/show_bug.cgi?id=52116
+
+ * GNUmakefile.am: add libWebCore.la to LIBADD and remove webcore
+ sources from the libwebkit library SOURCES.
+
2011-01-09 Xianzhu Wang <phnixwxz at gmail.com>
Reviewed by Darin Fisher.
diff --git a/WebKit/gtk/GNUmakefile.am b/WebKit/gtk/GNUmakefile.am
index 122accd..04f5efa 100644
--- a/WebKit/gtk/GNUmakefile.am
+++ b/WebKit/gtk/GNUmakefile.am
@@ -6,11 +6,7 @@ GTESTER_REPORT = gtester-report
lib_LTLIBRARIES += \
libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la
-nodist_EXTRA_libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
- $(webcore_built_nosources)
-
nodist_libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
- $(webcore_built_sources) \
$(webkitgtk_built_sources)
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit- at WEBKITGTK_API_VERSION@/webkit
@@ -22,7 +18,6 @@ nodist_libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_
$(GENSOURCES_WEBKIT)/webkitenumtypes.h
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
- $(webcore_sources) \
$(webcoregtk_sources) \
$(webkitgtk_sources)
@@ -69,12 +64,6 @@ libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_CPPF
$(UNICODE_CFLAGS) \
$(XT_CFLAGS)
-# For the Gtk port we want to use XP_UNIX both in X11 and Mac
-if !TARGET_WIN32
-libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
- -DXP_UNIX
-endif
-
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
-version-info @LIBWEBKITGTK_VERSION@ \
$(version_script) \
@@ -82,6 +71,7 @@ libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LDFL
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
-lpthread \
+ libWebCore.la \
libJavaScriptCore.la \
$(webcore_ldflags) \
$(CAIRO_LIBS) \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list