[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:17 UTC 2009


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

    	* src/kwq/Makefile.am: Fix another bonehead mistake.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3921512..04c348e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	* src/kwq/Makefile.am: Fix another bonehead mistake.
+
+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:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3921512..04c348e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,9 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	* src/kwq/Makefile.am: Fix another bonehead mistake.
+
+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:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3921512..04c348e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,9 @@
 2002-01-17  Maciej Stachowiak  <mjs at apple.com>
 
+	* src/kwq/Makefile.am: Fix another bonehead mistake.
+
+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:
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 452d6e2..7295e7e 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -6,8 +6,8 @@ SUBDIRS = \
 	$(NULL)
 
 noinst_LIBRARIES = libkwq.o
-LDFLAGS = -Wl,-r -nostdlib
-libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(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/kwq/Makefile.am b/WebCore/src/kwq/Makefile.am
index 452d6e2..7295e7e 100644
--- a/WebCore/src/kwq/Makefile.am
+++ b/WebCore/src/kwq/Makefile.am
@@ -6,8 +6,8 @@ SUBDIRS = \
 	$(NULL)
 
 noinst_LIBRARIES = libkwq.o
-LDFLAGS = -Wl,-r -nostdlib
-libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(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



More information about the Pkg-webkit-commits mailing list