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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 833ed3db608d0588e5e396e4c8c0988dbb1a27f5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 17 23:37:35 2002 +0000

    	Fix build problem.
    
    	* Makefile.am: Don't build this directory before subdirs, because
    	we link at this level. Move the kentities.c build out of here,
    	because it needs to be done before khtml/html.
    	* khtml/html/Makefile.am: Move kentities.c build rules here.
    
    	* kentities.gperf: Removed.
    	* khtml/html/kentities.gperf: Added.
    
    	* .cvsignore: Don't ignore kentities.c.
    	* khtml/html/.cvsignore: Ignore kentities.c.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/.cvsignore b/WebCore/.cvsignore
index d72c116..933fbbe 100644
--- a/WebCore/.cvsignore
+++ b/WebCore/.cvsignore
@@ -1,6 +1,5 @@
 Makefile
 Makefile.in
-kentities.c
 libwebcore.dylib
 libwebcorecombined.exp
 libwebcorenmedited.dylib
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d60c3f9..e9c70b0 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,20 @@
 2002-04-17  Darin Adler  <darin at apple.com>
 
+	Fix build problem.
+
+	* Makefile.am: Don't build this directory before subdirs, because
+	we link at this level. Move the kentities.c build out of here,
+	because it needs to be done before khtml/html.
+	* khtml/html/Makefile.am: Move kentities.c build rules here.
+
+	* kentities.gperf: Removed.
+	* khtml/html/kentities.gperf: Added.
+
+	* .cvsignore: Don't ignore kentities.c.
+	* khtml/html/.cvsignore: Ignore kentities.c.
+
+2002-04-17  Darin Adler  <darin at apple.com>
+
 	* .cvsignore: Ignore new generated files at this level.
 
 	* include/*: Removed. We don't need this hack any more.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d60c3f9..e9c70b0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,20 @@
 2002-04-17  Darin Adler  <darin at apple.com>
 
+	Fix build problem.
+
+	* Makefile.am: Don't build this directory before subdirs, because
+	we link at this level. Move the kentities.c build out of here,
+	because it needs to be done before khtml/html.
+	* khtml/html/Makefile.am: Move kentities.c build rules here.
+
+	* kentities.gperf: Removed.
+	* khtml/html/kentities.gperf: Added.
+
+	* .cvsignore: Don't ignore kentities.c.
+	* khtml/html/.cvsignore: Ignore kentities.c.
+
+2002-04-17  Darin Adler  <darin at apple.com>
+
 	* .cvsignore: Ignore new generated files at this level.
 
 	* include/*: Removed. We don't need this hack any more.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d60c3f9..e9c70b0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
 2002-04-17  Darin Adler  <darin at apple.com>
 
+	Fix build problem.
+
+	* Makefile.am: Don't build this directory before subdirs, because
+	we link at this level. Move the kentities.c build out of here,
+	because it needs to be done before khtml/html.
+	* khtml/html/Makefile.am: Move kentities.c build rules here.
+
+	* kentities.gperf: Removed.
+	* khtml/html/kentities.gperf: Added.
+
+	* .cvsignore: Don't ignore kentities.c.
+	* khtml/html/.cvsignore: Ignore kentities.c.
+
+2002-04-17  Darin Adler  <darin at apple.com>
+
 	* .cvsignore: Ignore new generated files at this level.
 
 	* include/*: Removed. We don't need this hack any more.
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index 322ab03..465aff7 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-SUBDIRS = . khtml kwq
+SUBDIRS = khtml kwq
 
 symrootsdir = $(SYMROOTS)
 
@@ -80,12 +80,3 @@ webcore-install-stamp: libwebcore.dylib
 	$(MAKE) install-symrootsLIBRARIES
 	$(MAKE) embed
 	touch ./webcore-install-stamp
-
-noinst_HEADERS = kentities.c
-
-BUILT_SOURCES = $(noinst_HEADERS)
-
-kentities.c: kentities.gperf
-	$(GPERF) -a -L "ANSI-C" -C -G -c -o -t -k '*' -NfindEntity -D -s 2 $< > $@
-
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/khtml/html/.cvsignore b/WebCore/khtml/html/.cvsignore
index e7837c4..253780f 100644
--- a/WebCore/khtml/html/.cvsignore
+++ b/WebCore/khtml/html/.cvsignore
@@ -1,7 +1,3 @@
 Makefile
 Makefile.in
 *.moc
-*.lo
-*.la
-.deps
-.libs
diff --git a/WebCore/khtml/html/Makefile.am b/WebCore/khtml/html/Makefile.am
index 07a2970..0e199aa 100644
--- a/WebCore/khtml/html/Makefile.am
+++ b/WebCore/khtml/html/Makefile.am
@@ -50,6 +50,13 @@ htmltokenizer.moc:
 html_documentimpl.moc:
 	touch $@
 
-BUILT_SOURCES = htmltokenizer.moc html_documentimpl.moc
+noinst_HEADERS = kentities.c
+
+kentities.c: kentities.gperf
+	$(GPERF) -a -L "ANSI-C" -C -G -c -o -t -k '*' -NfindEntity -D -s 2 $< > $@
+
+CLEANFILES = $(BUILT_SOURCES)
+
+BUILT_SOURCES = $(noinst_HEADERS) htmltokenizer.moc html_documentimpl.moc
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/kentities.gperf b/WebCore/khtml/html/kentities.gperf
similarity index 100%
rename from WebCore/kentities.gperf
rename to WebCore/khtml/html/kentities.gperf

-- 
WebKit Debian packaging