[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 41301d4072918e7433396a930a475eec335f89b5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 8 00:53:02 2002 +0000

    	* Tests/libiftest/Makefile.am: Make libiftest a static lib, to
    	avoid concerns over non-libtool libraries named .dylib.
    
    WebCore:
    	* Makefile.am: Rename libwebcore.dylib to libwebcore.a; since this
    	target is just a fake for dependency purposes, it doesn't matter
    	what it's called.
    	* .cvsignore: Update ignorance.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1312 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/.cvsignore b/WebCore/.cvsignore
index 3dde537..dcb2de6 100644
--- a/WebCore/.cvsignore
+++ b/WebCore/.cvsignore
@@ -5,5 +5,5 @@ framework-stamp
 framework-dylib-stamp
 framework-resource-stamp
 framework-header-stamp
-libwebcore.dylib
+libwebcore.a
 *.pfe
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 11edddd..d28fb13 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-06-07  Maciej Stachowiak  <mjs at apple.com>
+
+	* Makefile.am: Rename libwebcore.dylib to libwebcore.a; since this
+	target is just a fake for dependency purposes, it doesn't matter
+	what it's called.
+	* .cvsignore: Update ignorance.
+
 2002-06-07  Darin Adler  <darin at apple.com>
 
 	* Makefile.am: I was running into failures in the embed rule, so I made it
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 11edddd..d28fb13 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-06-07  Maciej Stachowiak  <mjs at apple.com>
+
+	* Makefile.am: Rename libwebcore.dylib to libwebcore.a; since this
+	target is just a fake for dependency purposes, it doesn't matter
+	what it's called.
+	* .cvsignore: Update ignorance.
+
 2002-06-07  Darin Adler  <darin at apple.com>
 
 	* Makefile.am: I was running into failures in the embed rule, so I made it
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 11edddd..d28fb13 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-06-07  Maciej Stachowiak  <mjs at apple.com>
+
+	* Makefile.am: Rename libwebcore.dylib to libwebcore.a; since this
+	target is just a fake for dependency purposes, it doesn't matter
+	what it's called.
+	* .cvsignore: Update ignorance.
+
 2002-06-07  Darin Adler  <darin at apple.com>
 
 	* Makefile.am: I was running into failures in the embed rule, so I made it
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index e68ba2d..86f00af 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -4,13 +4,13 @@ SUBDIRS = khtml kwq
 
 symrootsdir = $(SYMROOTS)
 
-noinst_LIBRARIES = libwebcore.dylib
+noinst_LIBRARIES = libwebcore.a
 
-libwebcore_dylib_SOURCES = \
+libwebcore_a_SOURCES = \
 	dummy.mm \
 	$(NULL)
 
-libwebcore_dylib_LIBADD = \
+libwebcore_a_LIBADD = \
 	khtml/libkhtml.o \
 	kwq/libkwq.o \
 	$(NULL)
@@ -34,7 +34,7 @@ LDFLAGS = \
 	-seg1addr 0x2200000 \
 	$(NULL)
 
-libwebcore_dylib_AR = touch libwebcore.dylib; :
+libwebcore_a_AR = touch libwebcore.a; :
 
 noinst_DATA = framework-stamp framework-resource-stamp framework-dylib-stamp framework-header-stamp WebCore-combined.exp
 
@@ -48,7 +48,7 @@ FRAMEWORK_LOCALIZED_RESOURCES = English.lproj/InfoPlist.strings
 FRAMEWORK_DIR_NAME = $(FRAMEWORK_NAME).framework
 FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_DIR_NAME)
 FRAMEWORK_DYLIB = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
-FRAMEWORK_LINKFLAGS = $(libwebcore_dylib_LIBADD) -install_name @executable_path/../Frameworks/$(FRAMEWORK_DIR_NAME)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
+FRAMEWORK_LINKFLAGS = $(libwebcore_a_LIBADD) -install_name @executable_path/../Frameworks/$(FRAMEWORK_DIR_NAME)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
 FRAMEWORK_RESOURCE_DIR = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/Resources
 FRAMEWORK_LOCALIZED_RESOURCE_DIR = $(FRAMEWORK_RESOURCE_DIR)/English.lproj
 
@@ -78,11 +78,11 @@ framework-header-stamp:
 	ln -sf Versions/Current/PrivateHeaders $(FRAMEWORK_DIR)/PrivateHeaders
 	touch $@
 
-framework-dylib-stamp: $(libwebcore_dylib_OBJECTS) $(libwebcore_dylib_DEPENDENCIES) $(WEBCORE_EXPORTS)
+framework-dylib-stamp: $(libwebcore_a_OBJECTS) $(libwebcore_a_DEPENDENCIES) $(WEBCORE_EXPORTS)
 	mkdir -p $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)
 	rm -f $(FRAMEWORK_DIR)/Versions/Current
 	ln -sf $(FRAMEWORK_VERSION) $(FRAMEWORK_DIR)/Versions/Current
-	$(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(FRAMEWORK_LINKFLAGS) $(libwebcore_dylib_OBJECTS) -o $(FRAMEWORK_DYLIB)
+	$(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(FRAMEWORK_LINKFLAGS) $(libwebcore_a_OBJECTS) -o $(FRAMEWORK_DYLIB)
 	nmedit -s $(WEBCORE_EXPORTS) - $(FRAMEWORK_DYLIB)
 	if test -n "$(STRIP_FLAGS)"; then strip $(STRIP_FLAGS) - $(FRAMEWORK_DYLIB); fi
 	ln -sf Versions/Current/$(FRAMEWORK_NAME) $(FRAMEWORK_DIR)/$(FRAMEWORK_NAME)

-- 
WebKit Debian packaging