[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:15 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit a99f3ae55bf374720932f14590ff203e6ccaaa28
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 18 02:56:12 2002 +0000

    Top level:
    	* configure.in: always substitute OBJCXXLD, for the benefit of
    	WebCore speedups.
    
    WebCore:
    	Build speedups:
    
    	* autogen.sh, configure.in: Don't use libtool any more. Set RANLIB
    	to 'echo' since ranlib is really slow and we don't really need to
    	run it.
    
    	* libtool.diff: Removed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@543 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
index 5b8dfdb..5c3d3c2 100644
--- a/JavaScriptCore/kjs/Makefile.am
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkjs.a
+noinst_LIBRARIES = libkjs.o
+LDFLAGS = -Wl,-r -nostdlib
+libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkjs_a_SOURCES = \
+libkjs_o_SOURCES = \
 	array_object.cpp \
 	array_object.h \
 	bool_object.cpp \
@@ -62,7 +64,7 @@ noinst_PROGRAMS = testkjs
 
 testkjs_SOURCES = testkjs.cpp
 
-testkjs_LDADD = $(srcdir)/libkjs.a
+testkjs_LDADD = $(srcdir)/libkjs.o
 
 CLEANFILES = $(BUILT_SOURCES) \
 	$(NULL)
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 04891c4..977ef7d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,26 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	More build system speedups; instead of building static libraries
+	in each directory, build relocatble object files, using the magic
+	of incremental linking.
+
+	* src/Makefile.am:
+	* src/kdelibs/khtml/Makefile.am:
+	* src/kdelibs/khtml/css/Makefile.am:
+	* src/kdelibs/khtml/dom/Makefile.am:
+	* src/kdelibs/khtml/ecma/Makefile.am:
+	* src/kdelibs/khtml/html/Makefile.am:
+	* src/kdelibs/khtml/java/Makefile.am:
+	* src/kdelibs/khtml/misc/Makefile.am:
+	* src/kdelibs/khtml/rendering/Makefile.am:
+	* src/kdelibs/khtml/xml/Makefile.am:
+	* src/kdelibs/kjs/Makefile.am:
+	* src/kwq/Makefile.am:
+	* src/kwq/kde/Makefile.am:
+	* src/kwq/qt/Makefile.am:
+
+2002-01-17  Maciej Stachowiak  <mjs at apple.com>
+
 	Build speedups: Don't use libtool, and don't link static libraries
 	into each other.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 04891c4..977ef7d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,26 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	More build system speedups; instead of building static libraries
+	in each directory, build relocatble object files, using the magic
+	of incremental linking.
+
+	* src/Makefile.am:
+	* src/kdelibs/khtml/Makefile.am:
+	* src/kdelibs/khtml/css/Makefile.am:
+	* src/kdelibs/khtml/dom/Makefile.am:
+	* src/kdelibs/khtml/ecma/Makefile.am:
+	* src/kdelibs/khtml/html/Makefile.am:
+	* src/kdelibs/khtml/java/Makefile.am:
+	* src/kdelibs/khtml/misc/Makefile.am:
+	* src/kdelibs/khtml/rendering/Makefile.am:
+	* src/kdelibs/khtml/xml/Makefile.am:
+	* src/kdelibs/kjs/Makefile.am:
+	* src/kwq/Makefile.am:
+	* src/kwq/kde/Makefile.am:
+	* src/kwq/qt/Makefile.am:
+
+2002-01-17  Maciej Stachowiak  <mjs at apple.com>
+
 	Build speedups: Don't use libtool, and don't link static libraries
 	into each other.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 04891c4..977ef7d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,26 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	More build system speedups; instead of building static libraries
+	in each directory, build relocatble object files, using the magic
+	of incremental linking.
+
+	* src/Makefile.am:
+	* src/kdelibs/khtml/Makefile.am:
+	* src/kdelibs/khtml/css/Makefile.am:
+	* src/kdelibs/khtml/dom/Makefile.am:
+	* src/kdelibs/khtml/ecma/Makefile.am:
+	* src/kdelibs/khtml/html/Makefile.am:
+	* src/kdelibs/khtml/java/Makefile.am:
+	* src/kdelibs/khtml/misc/Makefile.am:
+	* src/kdelibs/khtml/rendering/Makefile.am:
+	* src/kdelibs/khtml/xml/Makefile.am:
+	* src/kdelibs/kjs/Makefile.am:
+	* src/kwq/Makefile.am:
+	* src/kwq/kde/Makefile.am:
+	* src/kwq/qt/Makefile.am:
+
+2002-01-17  Maciej Stachowiak  <mjs at apple.com>
+
 	Build speedups: Don't use libtool, and don't link static libraries
 	into each other.
 	
diff --git a/WebCore/khtml/Makefile.am b/WebCore/khtml/Makefile.am
index b002f5b..0ce13e7 100644
--- a/WebCore/khtml/Makefile.am
+++ b/WebCore/khtml/Makefile.am
@@ -11,13 +11,26 @@ SUBDIRS = \
 	rendering \
 	$(NULL)
 
-noinst_LIBRARIES = libkhtml.a
+noinst_LIBRARIES = libkhtml.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtml_a_SOURCES = \
+libkhtml_o_SOURCES = \
 	khtml_events.cpp \
 	khtmlview.cpp \
 	$(NULL)
 
+libkhtml_o_LIBADD = \
+	./misc/libkhtmlmisc.o \
+	./css/libkhtmlcss.o \
+	./dom/libkhtmldom.o \
+	./ecma/libkhtmlecma.o \
+	./xml/libkhtmlxml.o \
+	./java/libkhtmljava.o \
+	./html/libkhtmlhtml.o \
+	./rendering/libkhtmlrendering.o \
+	$(NULL)
+
 INCLUDES = \
 	$(KWQ_INCLUDES) \
 	$(KDELIBS_INCLUDES) \
diff --git a/WebCore/khtml/css/Makefile.am b/WebCore/khtml/css/Makefile.am
index 8e2e3ce..90e28bc 100644
--- a/WebCore/khtml/css/Makefile.am
+++ b/WebCore/khtml/css/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlcss.a
+noinst_LIBRARIES = libkhtmlcss.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlcss_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlcss_a_SOURCES = \
+libkhtmlcss_o_SOURCES = \
 	css_ruleimpl.cpp \
 	css_ruleimpl.h \
 	css_stylesheetimpl.cpp \
diff --git a/WebCore/khtml/dom/Makefile.am b/WebCore/khtml/dom/Makefile.am
index d9b83e0..5894ace 100644
--- a/WebCore/khtml/dom/Makefile.am
+++ b/WebCore/khtml/dom/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmldom.a
+noinst_LIBRARIES = libkhtmldom.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmldom_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmldom_a_SOURCES = \
+libkhtmldom_o_SOURCES = \
 	css_rule.cpp \
 	css_rule.h \
 	css_stylesheet.cpp \
diff --git a/WebCore/khtml/ecma/Makefile.am b/WebCore/khtml/ecma/Makefile.am
index 189210b..11b8d98 100644
--- a/WebCore/khtml/ecma/Makefile.am
+++ b/WebCore/khtml/ecma/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlecma.a
+noinst_LIBRARIES = libkhtmlecma.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlecma_a_SOURCES = \
+libkhtmlecma_o_SOURCES = \
 	kjs_binding.cpp \
 	kjs_binding.h \
 	kjs_css.cpp \
diff --git a/WebCore/khtml/html/Makefile.am b/WebCore/khtml/html/Makefile.am
index 5642aff..fb12256 100644
--- a/WebCore/khtml/html/Makefile.am
+++ b/WebCore/khtml/html/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlhtml.a
+noinst_LIBRARIES = libkhtmlhtml.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlhtml_a_SOURCES = \
+libkhtmlhtml_o_SOURCES = \
 	dtd.cpp \
 	dtd.h \
 	html_baseimpl.cpp \
diff --git a/WebCore/khtml/java/Makefile.am b/WebCore/khtml/java/Makefile.am
index ddb03a9..4e0a9f8 100644
--- a/WebCore/khtml/java/Makefile.am
+++ b/WebCore/khtml/java/Makefile.am
@@ -2,9 +2,11 @@ NULL =
 
 SUBDIRS = . tests
 
-noinst_LIBRARIES = libkhtmljava.a
+noinst_LIBRARIES = libkhtmljava.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmljava_a_SOURCES = \
+libkhtmljava_o_SOURCES = \
 	kjavaapplet.cpp \
 	kjavaapplet.h \
 	kjavaappletcontext.cpp \
diff --git a/WebCore/khtml/misc/Makefile.am b/WebCore/khtml/misc/Makefile.am
index 28f5ed3..af9eb9e 100644
--- a/WebCore/khtml/misc/Makefile.am
+++ b/WebCore/khtml/misc/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlmisc.a
+noinst_LIBRARIES = libkhtmlmisc.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlmisc_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlmisc_a_SOURCES = \
+libkhtmlmisc_o_SOURCES = \
 	decoder.cpp \
 	decoder.h \
 	font.cpp \
diff --git a/WebCore/khtml/rendering/Makefile.am b/WebCore/khtml/rendering/Makefile.am
index 2acdc1f..bb876fe 100644
--- a/WebCore/khtml/rendering/Makefile.am
+++ b/WebCore/khtml/rendering/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlrendering.a
+noinst_LIBRARIES = libkhtmlrendering.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlxml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlrendering_a_SOURCES = \
+libkhtmlrendering_o_SOURCES = \
 	bidi.cpp \
 	bidi.h \
 	break_lines.cpp \
diff --git a/WebCore/khtml/xml/Makefile.am b/WebCore/khtml/xml/Makefile.am
index 32555be..21e2073 100644
--- a/WebCore/khtml/xml/Makefile.am
+++ b/WebCore/khtml/xml/Makefile.am
@@ -1,8 +1,10 @@
 NULL=
 
-noinst_LIBRARIES = libkhtmlxml.a
+noinst_LIBRARIES = libkhtmlxml.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlxml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlxml_a_SOURCES = \
+libkhtmlxml_o_SOURCES = \
         dom2_eventsimpl.cpp \
         dom2_eventsimpl.h \
         dom2_rangeimpl.cpp \
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 339c23c..452d6e2 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -5,9 +5,11 @@ SUBDIRS = \
 	qt \
 	$(NULL)
 
-noinst_LIBRARIES = libkwq.a
+noinst_LIBRARIES = libkwq.o
+LDFLAGS = -Wl,-r -nostdlib
+libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkwq_a_SOURCES = \
+libkwq_o_SOURCES = \
 	KWQApplication.mm \
 	KWQBitmap.mm \
 	KWQBrush.mm \
@@ -125,6 +127,11 @@ libkwq_a_SOURCES = \
 	npapi.mm \
 	$(NULL)
 
+libkwq_o_LIBADD = \
+	./qt/libqt_borrowed.o \
+	./kde/libkde_borrowed.o \
+	$(NULL)
+
 INCLUDES = \
 	-DNEED_BOGUS_X_DEFINES \
 	$(KWQ_INCLUDES) \
diff --git a/WebCore/kwq/kde/Makefile.am b/WebCore/kwq/kde/Makefile.am
index e45cf52..6dac094 100644
--- a/WebCore/kwq/kde/Makefile.am
+++ b/WebCore/kwq/kde/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkde_borrowed.a
+noinst_LIBRARIES = libkde_borrowed.o
+AM_LDFLAGS = -Wl,-r -nostdlib
+libkde_borrowed_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkde_borrowed_a_SOURCES = \
+libkde_borrowed_o_SOURCES = \
 	_kurl.cpp \
 	_kurl.h \
 	$(NULL)
diff --git a/WebCore/kwq/qt/Makefile.am b/WebCore/kwq/qt/Makefile.am
index 9515b94..c286cf4 100644
--- a/WebCore/kwq/qt/Makefile.am
+++ b/WebCore/kwq/qt/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libqt_borrowed.a
+noinst_LIBRARIES = libqt_borrowed.o
+LDFLAGS = -Wl,-r -nostdlib
+libqt_borrowed_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libqt_borrowed_a_SOURCES = \
+libqt_borrowed_o_SOURCES = \
 	_qbuffer.cpp \
 	_qcollection.cpp \
 	_qcstring.cpp \
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
index 039e19b..f95802d 100644
--- a/WebCore/src/Makefile.am
+++ b/WebCore/src/Makefile.am
@@ -15,19 +15,9 @@ libwebcore_dylib_SOURCES = \
 	$(NULL)
 
 libwebcore_dylib_LIBADD = \
-	./kdelibs/kjs/libkjs.a \
-	./kdelibs/khtml/libkhtml.a \
-	./kdelibs/khtml/misc/libkhtmlmisc.a \
-	./kdelibs/khtml/css/libkhtmlcss.a \
-	./kdelibs/khtml/dom/libkhtmldom.a \
-	./kdelibs/khtml/ecma/libkhtmlecma.a \
-	./kdelibs/khtml/xml/libkhtmlxml.a \
-	./kdelibs/khtml/java/libkhtmljava.a \
-	./kdelibs/khtml/html/libkhtmlhtml.a \
-	./kdelibs/khtml/rendering/libkhtmlrendering.a \
-	./kwq/libkwq.a \
-	./kwq/qt/libqt_borrowed.a \
-	./kwq/kde/libkde_borrowed.a \
+	./kdelibs/kjs/libkjs.o \
+	./kdelibs/khtml/libkhtml.o \
+	./kwq/libkwq.o \
 	-ljpeg \
 	$(NULL)
 
diff --git a/WebCore/src/kdelibs/khtml/Makefile.am b/WebCore/src/kdelibs/khtml/Makefile.am
index b002f5b..0ce13e7 100644
--- a/WebCore/src/kdelibs/khtml/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/Makefile.am
@@ -11,13 +11,26 @@ SUBDIRS = \
 	rendering \
 	$(NULL)
 
-noinst_LIBRARIES = libkhtml.a
+noinst_LIBRARIES = libkhtml.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtml_a_SOURCES = \
+libkhtml_o_SOURCES = \
 	khtml_events.cpp \
 	khtmlview.cpp \
 	$(NULL)
 
+libkhtml_o_LIBADD = \
+	./misc/libkhtmlmisc.o \
+	./css/libkhtmlcss.o \
+	./dom/libkhtmldom.o \
+	./ecma/libkhtmlecma.o \
+	./xml/libkhtmlxml.o \
+	./java/libkhtmljava.o \
+	./html/libkhtmlhtml.o \
+	./rendering/libkhtmlrendering.o \
+	$(NULL)
+
 INCLUDES = \
 	$(KWQ_INCLUDES) \
 	$(KDELIBS_INCLUDES) \
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.am b/WebCore/src/kdelibs/khtml/css/Makefile.am
index 8e2e3ce..90e28bc 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlcss.a
+noinst_LIBRARIES = libkhtmlcss.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlcss_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlcss_a_SOURCES = \
+libkhtmlcss_o_SOURCES = \
 	css_ruleimpl.cpp \
 	css_ruleimpl.h \
 	css_stylesheetimpl.cpp \
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.am b/WebCore/src/kdelibs/khtml/dom/Makefile.am
index d9b83e0..5894ace 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmldom.a
+noinst_LIBRARIES = libkhtmldom.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmldom_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmldom_a_SOURCES = \
+libkhtmldom_o_SOURCES = \
 	css_rule.cpp \
 	css_rule.h \
 	css_stylesheet.cpp \
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.am b/WebCore/src/kdelibs/khtml/ecma/Makefile.am
index 189210b..11b8d98 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlecma.a
+noinst_LIBRARIES = libkhtmlecma.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlecma_a_SOURCES = \
+libkhtmlecma_o_SOURCES = \
 	kjs_binding.cpp \
 	kjs_binding.h \
 	kjs_css.cpp \
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.am b/WebCore/src/kdelibs/khtml/html/Makefile.am
index 5642aff..fb12256 100644
--- a/WebCore/src/kdelibs/khtml/html/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlhtml.a
+noinst_LIBRARIES = libkhtmlhtml.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlhtml_a_SOURCES = \
+libkhtmlhtml_o_SOURCES = \
 	dtd.cpp \
 	dtd.h \
 	html_baseimpl.cpp \
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.am b/WebCore/src/kdelibs/khtml/java/Makefile.am
index ddb03a9..4e0a9f8 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.am
@@ -2,9 +2,11 @@ NULL =
 
 SUBDIRS = . tests
 
-noinst_LIBRARIES = libkhtmljava.a
+noinst_LIBRARIES = libkhtmljava.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmljava_a_SOURCES = \
+libkhtmljava_o_SOURCES = \
 	kjavaapplet.cpp \
 	kjavaapplet.h \
 	kjavaappletcontext.cpp \
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.am b/WebCore/src/kdelibs/khtml/misc/Makefile.am
index 28f5ed3..af9eb9e 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlmisc.a
+noinst_LIBRARIES = libkhtmlmisc.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlmisc_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlmisc_a_SOURCES = \
+libkhtmlmisc_o_SOURCES = \
 	decoder.cpp \
 	decoder.h \
 	font.cpp \
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.am b/WebCore/src/kdelibs/khtml/rendering/Makefile.am
index 2acdc1f..bb876fe 100644
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkhtmlrendering.a
+noinst_LIBRARIES = libkhtmlrendering.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlxml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlrendering_a_SOURCES = \
+libkhtmlrendering_o_SOURCES = \
 	bidi.cpp \
 	bidi.h \
 	break_lines.cpp \
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.am b/WebCore/src/kdelibs/khtml/xml/Makefile.am
index 32555be..21e2073 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.am
@@ -1,8 +1,10 @@
 NULL=
 
-noinst_LIBRARIES = libkhtmlxml.a
+noinst_LIBRARIES = libkhtmlxml.o
+LDFLAGS = -Wl,-r -nostdlib
+libkhtmlxml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkhtmlxml_a_SOURCES = \
+libkhtmlxml_o_SOURCES = \
         dom2_eventsimpl.cpp \
         dom2_eventsimpl.h \
         dom2_rangeimpl.cpp \
diff --git a/WebCore/src/kdelibs/kjs/Makefile.am b/WebCore/src/kdelibs/kjs/Makefile.am
index 5b8dfdb..5c3d3c2 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.am
+++ b/WebCore/src/kdelibs/kjs/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkjs.a
+noinst_LIBRARIES = libkjs.o
+LDFLAGS = -Wl,-r -nostdlib
+libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkjs_a_SOURCES = \
+libkjs_o_SOURCES = \
 	array_object.cpp \
 	array_object.h \
 	bool_object.cpp \
@@ -62,7 +64,7 @@ noinst_PROGRAMS = testkjs
 
 testkjs_SOURCES = testkjs.cpp
 
-testkjs_LDADD = $(srcdir)/libkjs.a
+testkjs_LDADD = $(srcdir)/libkjs.o
 
 CLEANFILES = $(BUILT_SOURCES) \
 	$(NULL)
diff --git a/WebCore/src/kwq/Makefile.am b/WebCore/src/kwq/Makefile.am
index 339c23c..452d6e2 100644
--- a/WebCore/src/kwq/Makefile.am
+++ b/WebCore/src/kwq/Makefile.am
@@ -5,9 +5,11 @@ SUBDIRS = \
 	qt \
 	$(NULL)
 
-noinst_LIBRARIES = libkwq.a
+noinst_LIBRARIES = libkwq.o
+LDFLAGS = -Wl,-r -nostdlib
+libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkwq_a_SOURCES = \
+libkwq_o_SOURCES = \
 	KWQApplication.mm \
 	KWQBitmap.mm \
 	KWQBrush.mm \
@@ -125,6 +127,11 @@ libkwq_a_SOURCES = \
 	npapi.mm \
 	$(NULL)
 
+libkwq_o_LIBADD = \
+	./qt/libqt_borrowed.o \
+	./kde/libkde_borrowed.o \
+	$(NULL)
+
 INCLUDES = \
 	-DNEED_BOGUS_X_DEFINES \
 	$(KWQ_INCLUDES) \
diff --git a/WebCore/src/kwq/kde/Makefile.am b/WebCore/src/kwq/kde/Makefile.am
index e45cf52..6dac094 100644
--- a/WebCore/src/kwq/kde/Makefile.am
+++ b/WebCore/src/kwq/kde/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libkde_borrowed.a
+noinst_LIBRARIES = libkde_borrowed.o
+AM_LDFLAGS = -Wl,-r -nostdlib
+libkde_borrowed_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libkde_borrowed_a_SOURCES = \
+libkde_borrowed_o_SOURCES = \
 	_kurl.cpp \
 	_kurl.h \
 	$(NULL)
diff --git a/WebCore/src/kwq/qt/Makefile.am b/WebCore/src/kwq/qt/Makefile.am
index 9515b94..c286cf4 100644
--- a/WebCore/src/kwq/qt/Makefile.am
+++ b/WebCore/src/kwq/qt/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-noinst_LIBRARIES = libqt_borrowed.a
+noinst_LIBRARIES = libqt_borrowed.o
+LDFLAGS = -Wl,-r -nostdlib
+libqt_borrowed_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
-libqt_borrowed_a_SOURCES = \
+libqt_borrowed_o_SOURCES = \
 	_qbuffer.cpp \
 	_qcollection.cpp \
 	_qcstring.cpp \

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list