[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 9053232ebd3d5b01113eb94ef0c1fb99c8d125e6
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 18 01:47:15 2002 +0000

    Top level:
    	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.
    
    WebCore:
    	Build speedups: Don't use libtool, and don't link static libraries
    	into each other.
    
    	* 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:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@542 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
index 17ddd5e..5b8dfdb 100644
--- a/JavaScriptCore/kjs/Makefile.am
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkjs.la
+noinst_LIBRARIES = libkjs.a
 
-libkjs_la_SOURCES = \
+libkjs_a_SOURCES = \
 	array_object.cpp \
 	array_object.h \
 	bool_object.cpp \
@@ -62,7 +62,7 @@ noinst_PROGRAMS = testkjs
 
 testkjs_SOURCES = testkjs.cpp
 
-testkjs_LDADD = $(srcdir)/libkjs.la
+testkjs_LDADD = $(srcdir)/libkjs.a
 
 CLEANFILES = $(BUILT_SOURCES) \
 	$(NULL)
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e8e38b8..04891c4 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-01-17  Maciej Stachowiak  <mjs at apple.com>
+
+	Build speedups: Don't use libtool, and don't link static libraries
+	into each other.
+	
+	* 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-16  Maciej Stachowiak  <mjs at apple.com>
 
 	* src/kwq/qt/_qpoint.h, src/kwq/qt/_qrect.h, src/kwq/qt/_qsize.h,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e8e38b8..04891c4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,23 @@
+2002-01-17  Maciej Stachowiak  <mjs at apple.com>
+
+	Build speedups: Don't use libtool, and don't link static libraries
+	into each other.
+	
+	* 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-16  Maciej Stachowiak  <mjs at apple.com>
 
 	* src/kwq/qt/_qpoint.h, src/kwq/qt/_qrect.h, src/kwq/qt/_qsize.h,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e8e38b8..04891c4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,23 @@
+2002-01-17  Maciej Stachowiak  <mjs at apple.com>
+
+	Build speedups: Don't use libtool, and don't link static libraries
+	into each other.
+	
+	* 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-16  Maciej Stachowiak  <mjs at apple.com>
 
 	* src/kwq/qt/_qpoint.h, src/kwq/qt/_qrect.h, src/kwq/qt/_qsize.h,
diff --git a/WebCore/khtml/Makefile.am b/WebCore/khtml/Makefile.am
index 27cfefe..b002f5b 100644
--- a/WebCore/khtml/Makefile.am
+++ b/WebCore/khtml/Makefile.am
@@ -11,24 +11,13 @@ SUBDIRS = \
 	rendering \
 	$(NULL)
 
-noinst_LTLIBRARIES = libkhtml.la
+noinst_LIBRARIES = libkhtml.a
 
-libkhtml_la_SOURCES = \
+libkhtml_a_SOURCES = \
 	khtml_events.cpp \
 	khtmlview.cpp \
 	$(NULL)
 
-libkhtml_la_LIBADD = \
-	./misc/libkhtmlmisc.la \
-	./css/libkhtmlcss.la \
-	./dom/libkhtmldom.la \
-	./ecma/libkhtmlecma.la \
-	./xml/libkhtmlxml.la \
-	./java/libkhtmljava.la \
-	./html/libkhtmlhtml.la \
-	./rendering/libkhtmlrendering.la \
-	$(NULL)
-
 INCLUDES = \
 	$(KWQ_INCLUDES) \
 	$(KDELIBS_INCLUDES) \
diff --git a/WebCore/khtml/css/Makefile.am b/WebCore/khtml/css/Makefile.am
index 7b1d187..8e2e3ce 100644
--- a/WebCore/khtml/css/Makefile.am
+++ b/WebCore/khtml/css/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlcss.la
+noinst_LIBRARIES = libkhtmlcss.a
 
-libkhtmlcss_la_SOURCES = \
+libkhtmlcss_a_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 49c4609..d9b83e0 100644
--- a/WebCore/khtml/dom/Makefile.am
+++ b/WebCore/khtml/dom/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmldom.la
+noinst_LIBRARIES = libkhtmldom.a
 
-libkhtmldom_la_SOURCES = \
+libkhtmldom_a_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 0e8583d..189210b 100644
--- a/WebCore/khtml/ecma/Makefile.am
+++ b/WebCore/khtml/ecma/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlecma.la
+noinst_LIBRARIES = libkhtmlecma.a
 
-libkhtmlecma_la_SOURCES = \
+libkhtmlecma_a_SOURCES = \
 	kjs_binding.cpp \
 	kjs_binding.h \
 	kjs_css.cpp \
@@ -39,7 +39,7 @@ libkhtmlecma_la_SOURCES = \
 #	testecma.cpp \
 #	$(NULL)
 #
-# testecma_LDADD = ./libkhtmlecma.la
+# testecma_LDADD = ./libkhtmlecma.a
 
 INCLUDES = \
 	$(KWQ_INCLUDES) \
diff --git a/WebCore/khtml/html/Makefile.am b/WebCore/khtml/html/Makefile.am
index 29b350a..5642aff 100644
--- a/WebCore/khtml/html/Makefile.am
+++ b/WebCore/khtml/html/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlhtml.la
+noinst_LIBRARIES = libkhtmlhtml.a
 
-libkhtmlhtml_la_SOURCES = \
+libkhtmlhtml_a_SOURCES = \
 	dtd.cpp \
 	dtd.h \
 	html_baseimpl.cpp \
diff --git a/WebCore/khtml/java/Makefile.am b/WebCore/khtml/java/Makefile.am
index 3a91316..ddb03a9 100644
--- a/WebCore/khtml/java/Makefile.am
+++ b/WebCore/khtml/java/Makefile.am
@@ -2,9 +2,9 @@ NULL =
 
 SUBDIRS = . tests
 
-noinst_LTLIBRARIES = libkhtmljava.la
+noinst_LIBRARIES = libkhtmljava.a
 
-libkhtmljava_la_SOURCES = \
+libkhtmljava_a_SOURCES = \
 	kjavaapplet.cpp \
 	kjavaapplet.h \
 	kjavaappletcontext.cpp \
diff --git a/WebCore/khtml/misc/Makefile.am b/WebCore/khtml/misc/Makefile.am
index ba2563f..28f5ed3 100644
--- a/WebCore/khtml/misc/Makefile.am
+++ b/WebCore/khtml/misc/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlmisc.la
+noinst_LIBRARIES = libkhtmlmisc.a
 
-libkhtmlmisc_la_SOURCES = \
+libkhtmlmisc_a_SOURCES = \
 	decoder.cpp \
 	decoder.h \
 	font.cpp \
diff --git a/WebCore/khtml/rendering/Makefile.am b/WebCore/khtml/rendering/Makefile.am
index 85fc704..2acdc1f 100644
--- a/WebCore/khtml/rendering/Makefile.am
+++ b/WebCore/khtml/rendering/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlrendering.la
+noinst_LIBRARIES = libkhtmlrendering.a
 
-libkhtmlrendering_la_SOURCES = \
+libkhtmlrendering_a_SOURCES = \
 	bidi.cpp \
 	bidi.h \
 	break_lines.cpp \
diff --git a/WebCore/khtml/xml/Makefile.am b/WebCore/khtml/xml/Makefile.am
index 8314781..32555be 100644
--- a/WebCore/khtml/xml/Makefile.am
+++ b/WebCore/khtml/xml/Makefile.am
@@ -1,8 +1,8 @@
 NULL=
 
-noinst_LTLIBRARIES = libkhtmlxml.la
+noinst_LIBRARIES = libkhtmlxml.a
 
-libkhtmlxml_la_SOURCES = \
+libkhtmlxml_a_SOURCES = \
         dom2_eventsimpl.cpp \
         dom2_eventsimpl.h \
         dom2_rangeimpl.cpp \
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 60810e0..339c23c 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -5,9 +5,9 @@ SUBDIRS = \
 	qt \
 	$(NULL)
 
-noinst_LTLIBRARIES = libkwq.la
+noinst_LIBRARIES = libkwq.a
 
-libkwq_la_SOURCES = \
+libkwq_a_SOURCES = \
 	KWQApplication.mm \
 	KWQBitmap.mm \
 	KWQBrush.mm \
@@ -125,11 +125,6 @@ libkwq_la_SOURCES = \
 	npapi.mm \
 	$(NULL)
 
-libkwq_la_LIBADD = \
-	./qt/libqt_borrowed.la \
-	./kde/libkde_borrowed.la \
-	$(NULL)
-
 INCLUDES = \
 	-DNEED_BOGUS_X_DEFINES \
 	$(KWQ_INCLUDES) \
diff --git a/WebCore/kwq/kde/Makefile.am b/WebCore/kwq/kde/Makefile.am
index 2f0b6fe..e45cf52 100644
--- a/WebCore/kwq/kde/Makefile.am
+++ b/WebCore/kwq/kde/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkde_borrowed.la
+noinst_LIBRARIES = libkde_borrowed.a
 
-libkde_borrowed_la_SOURCES = \
+libkde_borrowed_a_SOURCES = \
 	_kurl.cpp \
 	_kurl.h \
 	$(NULL)
diff --git a/WebCore/kwq/qt/Makefile.am b/WebCore/kwq/qt/Makefile.am
index 007bcd2..9515b94 100644
--- a/WebCore/kwq/qt/Makefile.am
+++ b/WebCore/kwq/qt/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libqt_borrowed.la
+noinst_LIBRARIES = libqt_borrowed.a
 
-libqt_borrowed_la_SOURCES = \
+libqt_borrowed_a_SOURCES = \
 	_qbuffer.cpp \
 	_qcollection.cpp \
 	_qcstring.cpp \
diff --git a/WebCore/src/.cvsignore b/WebCore/src/.cvsignore
index dc4caac..8417b30 100644
--- a/WebCore/src/.cvsignore
+++ b/WebCore/src/.cvsignore
@@ -2,5 +2,4 @@ Makefile.in
 Makefile
 .deps
 .libs
-*.lo
-*.la
+*.dylib
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
index 8b9d0c5..039e19b 100644
--- a/WebCore/src/Makefile.am
+++ b/WebCore/src/Makefile.am
@@ -8,23 +8,37 @@ SUBDIRS = \
 
 symrootsdir = $(SYMROOTS)
 
-symroots_LTLIBRARIES = libwebcore.la
+symroots_LIBRARIES = libwebcore.dylib
 
-libwebcore_la_SOURCES = \
+libwebcore_dylib_SOURCES = \
 	dummy.mm \
 	$(NULL)
 
-libwebcore_la_LIBADD = \
-	./kdelibs/kjs/libkjs.la \
-	./kdelibs/khtml/libkhtml.la \
-	./kwq/libkwq.la \
-	/usr/lib/libjpeg.a \
-	/usr/lib/libstdc++.a \
+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 \
+	-ljpeg \
 	$(NULL)
 
-libwebcore_la_LDFLAGS = \
-        -install_name $symrootsdir/libwebcore.dylib
+LDFLAGS = \
+        -dynamiclib \
+        -flat_namespace -undefined suppress \
+        -all_load \
+        -install_name $(symrootsdir)/libwebcore.dylib
 	-version-info $(WEBCORE_VERSION_INFO) \
 	$(NULL)
 
+libwebcore_dylib_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+
 all: install-am
diff --git a/WebCore/src/kdelibs/khtml/Makefile.am b/WebCore/src/kdelibs/khtml/Makefile.am
index 27cfefe..b002f5b 100644
--- a/WebCore/src/kdelibs/khtml/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/Makefile.am
@@ -11,24 +11,13 @@ SUBDIRS = \
 	rendering \
 	$(NULL)
 
-noinst_LTLIBRARIES = libkhtml.la
+noinst_LIBRARIES = libkhtml.a
 
-libkhtml_la_SOURCES = \
+libkhtml_a_SOURCES = \
 	khtml_events.cpp \
 	khtmlview.cpp \
 	$(NULL)
 
-libkhtml_la_LIBADD = \
-	./misc/libkhtmlmisc.la \
-	./css/libkhtmlcss.la \
-	./dom/libkhtmldom.la \
-	./ecma/libkhtmlecma.la \
-	./xml/libkhtmlxml.la \
-	./java/libkhtmljava.la \
-	./html/libkhtmlhtml.la \
-	./rendering/libkhtmlrendering.la \
-	$(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 7b1d187..8e2e3ce 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlcss.la
+noinst_LIBRARIES = libkhtmlcss.a
 
-libkhtmlcss_la_SOURCES = \
+libkhtmlcss_a_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 49c4609..d9b83e0 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmldom.la
+noinst_LIBRARIES = libkhtmldom.a
 
-libkhtmldom_la_SOURCES = \
+libkhtmldom_a_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 0e8583d..189210b 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlecma.la
+noinst_LIBRARIES = libkhtmlecma.a
 
-libkhtmlecma_la_SOURCES = \
+libkhtmlecma_a_SOURCES = \
 	kjs_binding.cpp \
 	kjs_binding.h \
 	kjs_css.cpp \
@@ -39,7 +39,7 @@ libkhtmlecma_la_SOURCES = \
 #	testecma.cpp \
 #	$(NULL)
 #
-# testecma_LDADD = ./libkhtmlecma.la
+# testecma_LDADD = ./libkhtmlecma.a
 
 INCLUDES = \
 	$(KWQ_INCLUDES) \
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.am b/WebCore/src/kdelibs/khtml/html/Makefile.am
index 29b350a..5642aff 100644
--- a/WebCore/src/kdelibs/khtml/html/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlhtml.la
+noinst_LIBRARIES = libkhtmlhtml.a
 
-libkhtmlhtml_la_SOURCES = \
+libkhtmlhtml_a_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 3a91316..ddb03a9 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.am
@@ -2,9 +2,9 @@ NULL =
 
 SUBDIRS = . tests
 
-noinst_LTLIBRARIES = libkhtmljava.la
+noinst_LIBRARIES = libkhtmljava.a
 
-libkhtmljava_la_SOURCES = \
+libkhtmljava_a_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 ba2563f..28f5ed3 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlmisc.la
+noinst_LIBRARIES = libkhtmlmisc.a
 
-libkhtmlmisc_la_SOURCES = \
+libkhtmlmisc_a_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 85fc704..2acdc1f 100644
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkhtmlrendering.la
+noinst_LIBRARIES = libkhtmlrendering.a
 
-libkhtmlrendering_la_SOURCES = \
+libkhtmlrendering_a_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 8314781..32555be 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.am
@@ -1,8 +1,8 @@
 NULL=
 
-noinst_LTLIBRARIES = libkhtmlxml.la
+noinst_LIBRARIES = libkhtmlxml.a
 
-libkhtmlxml_la_SOURCES = \
+libkhtmlxml_a_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 17ddd5e..5b8dfdb 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.am
+++ b/WebCore/src/kdelibs/kjs/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkjs.la
+noinst_LIBRARIES = libkjs.a
 
-libkjs_la_SOURCES = \
+libkjs_a_SOURCES = \
 	array_object.cpp \
 	array_object.h \
 	bool_object.cpp \
@@ -62,7 +62,7 @@ noinst_PROGRAMS = testkjs
 
 testkjs_SOURCES = testkjs.cpp
 
-testkjs_LDADD = $(srcdir)/libkjs.la
+testkjs_LDADD = $(srcdir)/libkjs.a
 
 CLEANFILES = $(BUILT_SOURCES) \
 	$(NULL)
diff --git a/WebCore/src/kwq/Makefile.am b/WebCore/src/kwq/Makefile.am
index 60810e0..339c23c 100644
--- a/WebCore/src/kwq/Makefile.am
+++ b/WebCore/src/kwq/Makefile.am
@@ -5,9 +5,9 @@ SUBDIRS = \
 	qt \
 	$(NULL)
 
-noinst_LTLIBRARIES = libkwq.la
+noinst_LIBRARIES = libkwq.a
 
-libkwq_la_SOURCES = \
+libkwq_a_SOURCES = \
 	KWQApplication.mm \
 	KWQBitmap.mm \
 	KWQBrush.mm \
@@ -125,11 +125,6 @@ libkwq_la_SOURCES = \
 	npapi.mm \
 	$(NULL)
 
-libkwq_la_LIBADD = \
-	./qt/libqt_borrowed.la \
-	./kde/libkde_borrowed.la \
-	$(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 2f0b6fe..e45cf52 100644
--- a/WebCore/src/kwq/kde/Makefile.am
+++ b/WebCore/src/kwq/kde/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libkde_borrowed.la
+noinst_LIBRARIES = libkde_borrowed.a
 
-libkde_borrowed_la_SOURCES = \
+libkde_borrowed_a_SOURCES = \
 	_kurl.cpp \
 	_kurl.h \
 	$(NULL)
diff --git a/WebCore/src/kwq/qt/Makefile.am b/WebCore/src/kwq/qt/Makefile.am
index 007bcd2..9515b94 100644
--- a/WebCore/src/kwq/qt/Makefile.am
+++ b/WebCore/src/kwq/qt/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-noinst_LTLIBRARIES = libqt_borrowed.la
+noinst_LIBRARIES = libqt_borrowed.a
 
-libqt_borrowed_la_SOURCES = \
+libqt_borrowed_a_SOURCES = \
 	_qbuffer.cpp \
 	_qcollection.cpp \
 	_qcstring.cpp \

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list