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

Sat Sep 26 05:54:16 UTC 2009

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

    	Fix bonehead mistakes in last checkin which were killing Jersey.
    
    	* src/kdelibs/khtml/ecma/Makefile.am:
    	* src/kdelibs/khtml/html/Makefile.am:
    	* src/kdelibs/khtml/rendering/Makefile.am:
    	* src/kwq/kde/Makefile.am:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 977ef7d..3921512 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	Fix bonehead mistakes in last checkin which were killing Jersey.
+
+	* src/kdelibs/khtml/ecma/Makefile.am:
+	* src/kdelibs/khtml/html/Makefile.am:
+	* src/kdelibs/khtml/rendering/Makefile.am:
+	* src/kwq/kde/Makefile.am:
+
+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.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 977ef7d..3921512 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	Fix bonehead mistakes in last checkin which were killing Jersey.
+
+	* src/kdelibs/khtml/ecma/Makefile.am:
+	* src/kdelibs/khtml/html/Makefile.am:
+	* src/kdelibs/khtml/rendering/Makefile.am:
+	* src/kwq/kde/Makefile.am:
+
+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.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 977ef7d..3921512 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	Fix bonehead mistakes in last checkin which were killing Jersey.
+
+	* src/kdelibs/khtml/ecma/Makefile.am:
+	* src/kdelibs/khtml/html/Makefile.am:
+	* src/kdelibs/khtml/rendering/Makefile.am:
+	* src/kwq/kde/Makefile.am:
+
+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.
diff --git a/WebCore/khtml/ecma/Makefile.am b/WebCore/khtml/ecma/Makefile.am
index 11b8d98..200def2 100644
--- a/WebCore/khtml/ecma/Makefile.am
+++ b/WebCore/khtml/ecma/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 noinst_LIBRARIES = libkhtmlecma.o
 LDFLAGS = -Wl,-r -nostdlib
-libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkhtmlecma_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkhtmlecma_o_SOURCES = \
 	kjs_binding.cpp \
diff --git a/WebCore/khtml/html/Makefile.am b/WebCore/khtml/html/Makefile.am
index fb12256..269b26b 100644
--- a/WebCore/khtml/html/Makefile.am
+++ b/WebCore/khtml/html/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 noinst_LIBRARIES = libkhtmlhtml.o
 LDFLAGS = -Wl,-r -nostdlib
-libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkhtmlhtml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkhtmlhtml_o_SOURCES = \
 	dtd.cpp \
diff --git a/WebCore/khtml/rendering/Makefile.am b/WebCore/khtml/rendering/Makefile.am
index bb876fe..46503a5 100644
--- a/WebCore/khtml/rendering/Makefile.am
+++ b/WebCore/khtml/rendering/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 noinst_LIBRARIES = libkhtmlrendering.o
 LDFLAGS = -Wl,-r -nostdlib
-libkhtmlxml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkhtmlrendering_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkhtmlrendering_o_SOURCES = \
 	bidi.cpp \
diff --git a/WebCore/kwq/kde/Makefile.am b/WebCore/kwq/kde/Makefile.am
index 6dac094..ecb05de 100644
--- a/WebCore/kwq/kde/Makefile.am
+++ b/WebCore/kwq/kde/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 
 noinst_LIBRARIES = libkde_borrowed.o
-AM_LDFLAGS = -Wl,-r -nostdlib
+LDFLAGS = -Wl,-r -nostdlib
 libkde_borrowed_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkde_borrowed_o_SOURCES = \
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.am b/WebCore/src/kdelibs/khtml/ecma/Makefile.am
index 11b8d98..200def2 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 noinst_LIBRARIES = libkhtmlecma.o
 LDFLAGS = -Wl,-r -nostdlib
-libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkhtmlecma_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkhtmlecma_o_SOURCES = \
 	kjs_binding.cpp \
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.am b/WebCore/src/kdelibs/khtml/html/Makefile.am
index fb12256..269b26b 100644
--- a/WebCore/src/kdelibs/khtml/html/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 noinst_LIBRARIES = libkhtmlhtml.o
 LDFLAGS = -Wl,-r -nostdlib
-libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkhtmlhtml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkhtmlhtml_o_SOURCES = \
 	dtd.cpp \
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.am b/WebCore/src/kdelibs/khtml/rendering/Makefile.am
index bb876fe..46503a5 100644
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 noinst_LIBRARIES = libkhtmlrendering.o
 LDFLAGS = -Wl,-r -nostdlib
-libkhtmlxml_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkhtmlrendering_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkhtmlrendering_o_SOURCES = \
 	bidi.cpp \
diff --git a/WebCore/src/kwq/kde/Makefile.am b/WebCore/src/kwq/kde/Makefile.am
index 6dac094..ecb05de 100644
--- a/WebCore/src/kwq/kde/Makefile.am
+++ b/WebCore/src/kwq/kde/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 
 noinst_LIBRARIES = libkde_borrowed.o
-AM_LDFLAGS = -Wl,-r -nostdlib
+LDFLAGS = -Wl,-r -nostdlib
 libkde_borrowed_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
 
 libkde_borrowed_o_SOURCES = \

-- 
WebKit Debian packaging

