[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[kov at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 6f322d0f06b9037cbe30e2baf0b8052ab7174cf4
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 19:08:10 2010 +0000

            Reviewed by Xan Lopez.
    
            Based on idea and original patch by Evan Martin.
    
            Remove libWebCore intermediate library, to improve link time.
    
            [GTK] Build time must be reduced
            https://bugs.webkit.org/show_bug.cgi?id=32921
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index dd62727..1f54621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-05  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Reviewed by Xan Lopez.
+
+        Based on idea and original patch by Evan Martin.
+
+        Remove libWebCore intermediate library, to improve link time.
+
+        [GTK] Build time must be reduced
+        https://bugs.webkit.org/show_bug.cgi?id=32921
+
+        * GNUmakefile.am:
+
 2010-01-05  Xan Lopez  <xlopez at igalia.com>
 
         Bump for 1.1.18 release.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index db4f9f5..f9ad21c 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -48,6 +48,7 @@ GTESTER_REPORT = gtester-report
 bin_PROGRAMS :=
 noinst_PROGRAMS :=
 noinst_HEADERS :=
+noinst_LTLIBRARIES :=
 lib_LIBRARIES :=
 IDL_BINDINGS :=
 TEST_PROGS :=
@@ -152,9 +153,8 @@ lib_LTLIBRARIES = \
 	libwebkit-1.0.la
 
 # Convenience libraries
-noinst_LTLIBRARIES = \
-	libJavaScriptCore.la \
-	libWebCore.la
+noinst_LTLIBRARIES += \
+	libJavaScriptCore.la
 
 # JavaScriptCore
 javascriptcore_cppflags += \
@@ -196,30 +196,12 @@ libJavaScriptCore_la_CPPFLAGS = \
 	$(global_cppflags) \
 	$(javascriptcore_cppflags)
 
-# WebCore
-nodist_EXTRA_libWebCore_la_SOURCES = \
+# WebKit
+nodist_EXTRA_libwebkit_1_0_la_SOURCES = \
 	$(webcore_built_nosources)
 
-nodist_libWebCore_la_SOURCES = \
-	$(webcore_built_sources)
-
-libWebCore_la_SOURCES = \
-	$(webcore_sources) \
-	$(webcoregtk_sources)
-
-libWebCore_la_CXXFLAGS = \
-	$(global_cxxflags) \
-	$(corekit_cflags)
-
-libWebCore_la_CFLAGS = \
-	$(global_cflags) \
-	$(corekit_cflags)
-
-libWebCore_la_CPPFLAGS = \
-	$(corekit_cppflags)
-
-# WebKit
 nodist_libwebkit_1_0_la_SOURCES = \
+	$(webcore_built_sources) \
 	$(webkitgtk_built_sources)
 
 libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
@@ -228,6 +210,8 @@ libwebkit_1_0_la_HEADERS = \
 	WebKit/gtk/webkit/webkitenumtypes.h
 
 libwebkit_1_0_la_SOURCES = \
+	$(webcore_sources) \
+	$(webcoregtk_sources) \
 	$(webkitgtk_sources)
 
 libwebkit_1_0_la_CXXFLAGS = \
@@ -251,7 +235,6 @@ libwebkit_1_0_la_LDFLAGS = \
 libwebkit_1_0_la_LIBADD = \
 	-lpthread \
 	libJavaScriptCore.la \
-	libWebCore.la \
 	libWebCoreJS.la \
 	$(webcore_ldflags) \
 	$(CAIRO_LIBS) \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d17f9aa..b45cb15 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-05  Gustavo Noronha Silva <gns at gnome.org>
+
+        Reviewed by Xan Lopez.
+
+        Based on idea and original patch by Evan Martin.
+
+        Remove libWebCore intermediate library, to improve link time.
+
+        [GTK] Build time must be reduced
+        https://bugs.webkit.org/show_bug.cgi?id=32921
+
+        * GNUmakefile.am:
+
 2010-01-05  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index c6c97b7..13e36ad 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3523,6 +3523,12 @@ webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.h,$(notdir $(IDL_
 
 webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.cpp,$(notdir $(IDL_BINDINGS_JS)))
 
+webcore_built_objects = := $(patsubst %.cpp,%.lo,$(webcore_built_nosources))
+
+$(webcore_built_objects): AM_CPPFLAGS+=$(corekit_cppflags)
+
+$(webcore_built_objects): AM_CXXFLAGS+=$(libwebkit_1_0_la_CXXFLAGS)
+
 libWebCoreJS_objects := $(patsubst %.idl,DerivedSources/JS%.lo,$(notdir $(IDL_BINDINGS_JS)))
 
 libWebCoreJS_depfiles := $(patsubst %.idl,DerivedSources/$(DEPDIR)/JS%.Plo,$(notdir $(IDL_BINDINGS_JS)))
@@ -3532,9 +3538,9 @@ libWebCoreJS_depfiles += $(patsubst %.lo,$(DEPDIR)/%.Plo,$(libWebCoreJS_objects)
 
 -include $(libWebCoreJS_depfiles)
 
-$(libWebCoreJS_objects): AM_CPPFLAGS+=$(libWebCore_la_CPPFLAGS)
+$(libWebCoreJS_objects): AM_CPPFLAGS+=$(corekit_cppflags)
 
-$(libWebCoreJS_objects): AM_CXXFLAGS+=$(libWebCore_la_CXXFLAGS)
+$(libWebCoreJS_objects): AM_CXXFLAGS+=$(libwebkit_1_0_la_CXXFLAGS)
 
 libWebCoreJS.la: $(libWebCoreJS_objects)
 	$(CXXLINK) $(libWebCoreJS_objects) $(LIBS)

-- 
WebKit Debian packaging