2011-01-10 Xan Lopez <xlopez@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Jan 2011 08:27:55 +0000 (08:27 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Jan 2011 08:27:55 +0000 (08:27 +0000)
        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@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@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: https://svn.webkit.org/repository/webkit/trunk@75362 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
WebKit/gtk/ChangeLog
WebKit/gtk/GNUmakefile.am

index fdc2015..dd465ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-10  Xan Lopez  <xlopez@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@webkit.org>
 
         Unreviewed wx build fix for r75313.
index 64f0b21..f53581b 100644 (file)
@@ -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
index cbfc839..d4f6307 100644 (file)
@@ -1,3 +1,15 @@
+2011-01-10  Xan Lopez  <xlopez@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@gmail.com>
 
         Unreviewed, rolling out r75337.
index 0925bd4..62e9a6c 100644 (file)
@@ -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) \
index c4909b4..b0a5552 100644 (file)
@@ -1,3 +1,13 @@
+2011-01-10  Xan Lopez  <xlopez@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@gmail.com>
 
         Reviewed by Darin Fisher.
index 122accd..04f5efa 100644 (file)
@@ -6,11 +6,7 @@ GTESTER_REPORT = gtester-report
 lib_LTLIBRARIES += \
        libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
 
-nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-       $(webcore_built_nosources)
-
 nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-       $(webcore_built_sources) \
        $(webkitgtk_built_sources)
 
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
@@ -22,7 +18,6 @@ nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_
        $(GENSOURCES_WEBKIT)/webkitenumtypes.h
 
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-       $(webcore_sources) \
        $(webcoregtk_sources) \
        $(webkitgtk_sources)
 
@@ -69,12 +64,6 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@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_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
-       -DXP_UNIX
-endif
-
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
        -version-info @LIBWEBKITGTK_VERSION@ \
        $(version_script) \
@@ -82,6 +71,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFL
 
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
        -lpthread \
+       libWebCore.la \
        libJavaScriptCore.la \
        $(webcore_ldflags) \
        $(CAIRO_LIBS) \