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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 62bc5f02b61dc13bc816c09f77ea2396ff3a138e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 22 23:41:03 2002 +0000

    Top level:
    	* prepare-ChangeLog: Detect added and removed files, fixing Radar
    	2886161 (prepare-ChangeLog ignores added and removed files)
    
    	Hack automake to not complain about libraries ending in .o or
    	.dylib, to avoid the need to run autogen manually sometimes.
    
    	* Updates/automake-1.5-mac-ported.diff:
    	* Updates/install-automake.sh:
    WebCore:
    	Fix some things that were making automake complain.
    
    	* src/kdelibs/kjs/Makefile.am:
    	* src/kwq/Makefile.am:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
index f4260fa..397059a 100644
--- a/JavaScriptCore/kjs/Makefile.am
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
 noinst_LIBRARIES = libkjs.o
-libkjs_o_LDFLAGS = -Wl,-r -nostdlib
-libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_LDFLAGS) -o
+libkjs_o_ldflags = -Wl,-r -nostdlib
+libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_ldflags) -o
 
 INCLUDES = $(KWQ_INCLUDES)
 
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d3b71c1..3368f17 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix some things that were making automake complain.
+
+	* src/kdelibs/kjs/Makefile.am:
+	* src/kwq/Makefile.am:
+
 2002-03-22  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/css/cssstyleselector.cpp: (khtml::applyRule):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d3b71c1..3368f17 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-03-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix some things that were making automake complain.
+
+	* src/kdelibs/kjs/Makefile.am:
+	* src/kwq/Makefile.am:
+
 2002-03-22  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/css/cssstyleselector.cpp: (khtml::applyRule):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d3b71c1..3368f17 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-03-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix some things that were making automake complain.
+
+	* src/kdelibs/kjs/Makefile.am:
+	* src/kwq/Makefile.am:
+
 2002-03-22  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/css/cssstyleselector.cpp: (khtml::applyRule):
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 0f8d8ec..098a8e8 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -6,8 +6,8 @@ SUBDIRS = \
 	$(NULL)
 
 noinst_LIBRARIES = libkwq.o
-libkwq_LDFLAGS = -Wl,-r -nostdlib
-libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkwq_LDFLAGS) -o
+libkwq_o_ldflags = -Wl,-r -nostdlib
+libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkwq_o_ldflags) -o
 
 libkwq_o_SOURCES = \
 	KWQApplication.mm \
diff --git a/WebCore/src/kdelibs/kjs/Makefile.am b/WebCore/src/kdelibs/kjs/Makefile.am
index f4260fa..397059a 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.am
+++ b/WebCore/src/kdelibs/kjs/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
 noinst_LIBRARIES = libkjs.o
-libkjs_o_LDFLAGS = -Wl,-r -nostdlib
-libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_LDFLAGS) -o
+libkjs_o_ldflags = -Wl,-r -nostdlib
+libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_ldflags) -o
 
 INCLUDES = $(KWQ_INCLUDES)
 
diff --git a/WebCore/src/kwq/Makefile.am b/WebCore/src/kwq/Makefile.am
index 0f8d8ec..098a8e8 100644
--- a/WebCore/src/kwq/Makefile.am
+++ b/WebCore/src/kwq/Makefile.am
@@ -6,8 +6,8 @@ SUBDIRS = \
 	$(NULL)
 
 noinst_LIBRARIES = libkwq.o
-libkwq_LDFLAGS = -Wl,-r -nostdlib
-libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkwq_LDFLAGS) -o
+libkwq_o_ldflags = -Wl,-r -nostdlib
+libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkwq_o_ldflags) -o
 
 libkwq_o_SOURCES = \
 	KWQApplication.mm \

-- 
WebKit Debian packaging