[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 8ee519a7644fdfd76ef9b3f901f047d724e9185d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 18 23:55:04 2001 +0000

    	* src/kwq/Makefile.in: Re-apply my changes, which accidentally got
    	clobbered.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 257d81a..f7416dd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2001-12-18  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/Makefile.in: Re-apply my changes, which accidentally got
+	clobbered.
+
 2001-12-13  Maciej Stachowiak  <mjs at apple.com>
 
 	Changes for international character set support. Still needs work,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 257d81a..f7416dd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2001-12-18  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/Makefile.in: Re-apply my changes, which accidentally got
+	clobbered.
+
 2001-12-13  Maciej Stachowiak  <mjs at apple.com>
 
 	Changes for international character set support. Still needs work,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 257d81a..f7416dd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2001-12-18  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/Makefile.in: Re-apply my changes, which accidentally got
+	clobbered.
+
 2001-12-13  Maciej Stachowiak  <mjs at apple.com>
 
 	Changes for international character set support. Still needs work,
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
index 00dc2b0..5e2f0be 100644
--- a/WebCore/kwq/Makefile.in
+++ b/WebCore/kwq/Makefile.in
@@ -2,11 +2,6 @@
 #
 # Makefile
 #
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
 #======================================================================
 # set top source dir relative to this directory
 # include make vars boilerplate
@@ -28,6 +23,7 @@ MMOBJECTS = \
     KWQButton.o \
     KWQCString.o \
     KWQChar.o \
+    KWQCharsets.o \
     KWQCheckBox.o \
     KWQColor.o \
     KWQColorGroup.o \
@@ -141,6 +137,7 @@ COBJECTS = \
 MOBJECTS = \
 	$(NULL)
 
+
 EXPORT_HEADERS = $(HEADERS)
 
 OBJECTS = $(MMOBJECTS) $(MOBJECTS) $(COBJECTS)
@@ -219,6 +216,33 @@ $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJECTS)
 	$(RANLIB) $(LIBRARY)
 
+make-mac-encodings: make-mac-encodings.o
+	$(CC) -o $@ $< $(LDFLAGS) -framework CoreFoundation
+
+mac-encodings.txt: make-mac-encodings
+	./make-mac-encodings $@
+
+KWQCharsetData.c: make-charset-table.pl character-sets.txt mac-encodings.txt
+	./make-charset-table.pl character-sets.txt mac-encodings.txt KWQCharsetData.c 
+
+KWQCharsets.o: KWQCharsetData.c
+
+CHARSET_FILES = make-mac-encodings \
+	 make-mac-encodings.o \
+	mac-encodings.txt \
+	KWQCharsetData.c \
+	$(NULL)
+
+KWQCharsets.o: KWQCharsetData.c
+
+#----------------------------------------------------------------------
+#
+
+CLEAN_FILES = $(OBJECTS) \
+	$(LIBRARY) \
+	$(CHARSET_FILES) \
+	$(NULL)
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
index 00dc2b0..5e2f0be 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kwq/Makefile.in
@@ -2,11 +2,6 @@
 #
 # Makefile
 #
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
 #======================================================================
 # set top source dir relative to this directory
 # include make vars boilerplate
@@ -28,6 +23,7 @@ MMOBJECTS = \
     KWQButton.o \
     KWQCString.o \
     KWQChar.o \
+    KWQCharsets.o \
     KWQCheckBox.o \
     KWQColor.o \
     KWQColorGroup.o \
@@ -141,6 +137,7 @@ COBJECTS = \
 MOBJECTS = \
 	$(NULL)
 
+
 EXPORT_HEADERS = $(HEADERS)
 
 OBJECTS = $(MMOBJECTS) $(MOBJECTS) $(COBJECTS)
@@ -219,6 +216,33 @@ $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJECTS)
 	$(RANLIB) $(LIBRARY)
 
+make-mac-encodings: make-mac-encodings.o
+	$(CC) -o $@ $< $(LDFLAGS) -framework CoreFoundation
+
+mac-encodings.txt: make-mac-encodings
+	./make-mac-encodings $@
+
+KWQCharsetData.c: make-charset-table.pl character-sets.txt mac-encodings.txt
+	./make-charset-table.pl character-sets.txt mac-encodings.txt KWQCharsetData.c 
+
+KWQCharsets.o: KWQCharsetData.c
+
+CHARSET_FILES = make-mac-encodings \
+	 make-mac-encodings.o \
+	mac-encodings.txt \
+	KWQCharsetData.c \
+	$(NULL)
+
+KWQCharsets.o: KWQCharsetData.c
+
+#----------------------------------------------------------------------
+#
+
+CLEAN_FILES = $(OBJECTS) \
+	$(LIBRARY) \
+	$(CHARSET_FILES) \
+	$(NULL)
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 

-- 
WebKit Debian packaging