[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:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0824703c5cbc9fd825dfc567dabf406513cb9d22
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 14 19:21:39 2002 +0000
Convert build system to automake
* Makefile.am: Add this
* Makefile.in: Remove this
* configure.in:
Remove newly autogenerated things,
* aclocal.m4:
* autogen.sh:
* config.guess:
* config.h.in:
* config.sub:
* configure:
* missing:
* acconfig.h, acinclude.m4: Templates for auto*
* libtool.diff: Couple of tweaks needed to automake.
* .cvsignore: Ignore the right stuff
Add these.
* Tests/Makefile.am:
* Tests/draw/Makefile.am:
* Tests/draw/drawApp/Makefile.am:
* Tests/khtmlview/Makefile.am:
* Tests/khtmlview/WebViewTest/Makefile.am:
* Tests/qt/Makefile.am:
Remove these.
* Tests/Makefile.in:
* Tests/draw/Makefile:
* Tests/draw/drawApp/Makefile.in:
* Tests/khtmlview/WebViewTest/Makefile.in:
* Tests/qt/Makefile.in:
Tweak link flags.
* Tests/draw/drawApp/drawApp.pbproj/project.pbxproj:
* Tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj:
Ignore the right stuff.
* Tests/khtmlview/.cvsignore:
* Tests/khtmlview/WebViewTest/.cvsignore:
* Tests/.cvsignore:
* Tests/draw/.cvsignore:
* Tests/qt/.cvsignore:
* Tests/harness.c: Fix a couple of warnings.
* Tests/qt/qarray-test.chk, Tests/qt/qarray-test.cpp (main):
Remove a faulty test case: can't count on contents of
uninitialized array!
* Tests/test.list: Add a newly-enabled javascript test.
* Updates/install-automake.sh,
Updates/automake-1.5-mac-ported.diff, Updates/update:
Install automake 1.5 as an update, patch for Mac OS X
* Updates/install-gperf.sh: Fix potential minor bug for blind cut
& pasters.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@535 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/kjs/ChangeLog b/JavaScriptCore/kjs/ChangeLog
deleted file mode 100644
index 8176cf4..0000000
--- a/JavaScriptCore/kjs/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-2001-01-04 Harri Porten <harri at trolltech.com>
-
- * ustring.h: pack bytes to avoid alignment problems (ARM) reported
- by Stefan Hanske <sh990154 at mail.uni-greifswald.de>
- * nodes.cpp: typeof fix by Emmeran Seehuber <the_emmy at gmx.de>
- * nodes.cpp: fixed order of function declaration proccessing
-
-2000-12-18 Harri Porten <harri at trolltech.com>
-
- * string_object.cpp: fixed out-of-bounds error in fromCharCode()
-
-2000-12-11 Harri Porten <harri at trolltech.com>
-
- * regexp.h: compile fix for buggy libc
- * ustring.cpp: format string conversion of numbers with %g
-
-2000-12-10 Harri Porten <harri at trolltech.com>
-
- * lexer.cpp: parsing != was broken, added \v escape in strings,
- fixed "\u" and "\x" and \x with non hex chars following.
- * nodes.cpp: implemented <<=, >>=, >>>=, &=, ^=, |= and %=
- * internal.cpp: create error message including line no on parse errors
-
-
diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
new file mode 100644
index 0000000..190cc2b
--- /dev/null
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -0,0 +1,76 @@
+NULL =
+
+noinst_LTLIBRARIES = libkjs.la
+
+libkjs_la_SOURCES = \
+ array_object.cpp \
+ array_object.h \
+ bool_object.cpp \
+ bool_object.h \
+ collector.cpp \
+ collector.h \
+ date_object.cpp \
+ date_object.h \
+ debugger.cpp \
+ debugger.h \
+ error_object.cpp \
+ error_object.h \
+ function.cpp \
+ function.h \
+ function_object.cpp \
+ function_object.h \
+ global_object.cpp \
+ grammar.cpp \
+ grammar.h \
+ internal.cpp \
+ internal.h \
+ kjs.cpp \
+ kjs.h \
+ lexer.cpp \
+ lexer.h \
+ lexer.lut.h \
+ lookup.cpp \
+ lookup.h \
+ math_object.cpp \
+ math_object.h \
+ math_object.lut.h \
+ nodes.cpp \
+ nodes.h \
+ number_object.cpp \
+ number_object.h \
+ object.cpp \
+ object.h \
+ object_object.cpp \
+ object_object.h \
+ operations.cpp \
+ operations.h \
+ regexp.cpp \
+ regexp.h \
+ regexp_object.cpp \
+ regexp_object.h \
+ string_object.cpp \
+ string_object.h \
+ types.cpp \
+ types.h \
+ ustring.cpp \
+ ustring.h \
+ $(NULL)
+
+BUILT_SOURCES = grammar.cpp grammar.cpp.h
+
+noinst_PROGRAMS = testkjs
+
+testkjs_SOURCES = testkjs.cpp
+
+testkjs_LDADD = $(srcdir)/libkjs.la
+
+CLEANFILES = $(BUILT_SOURCES) \
+ grammar.h \
+ $(NULL)
+
+YACCFLAGS = -d --output-file=grammar.cpp --file-prefix=grammar --name-prefix=kjsyy
+
+grammar.h grammar.cpp: grammar.y
+ $(YACC) $(YACCFLAGS) $<
+ ln -sf grammar.cpp.h grammar.h
+
diff --git a/JavaScriptCore/kjs/Makefile.in b/JavaScriptCore/kjs/Makefile.in
deleted file mode 100644
index 99ea2e9..0000000
--- a/JavaScriptCore/kjs/Makefile.in
+++ /dev/null
@@ -1,126 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-# Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-CXXYACCOBJECTS = grammar.cpp grammar.h
-
-CXXOBJECTS = \
- array_object.o \
- bool_object.o \
- collector.o \
- date_object.o \
- debugger.o \
- error_object.o \
- function.o \
- function_object.o \
- global_object.o \
- grammar.o \
- internal.o \
- kjs.o \
- lexer.o \
- lookup.o \
- math_object.o \
- nodes.o \
- number_object.o \
- object.o \
- object_object.o \
- operations.o \
- regexp.o \
- regexp_object.o \
- string_object.o \
- types.o \
- ustring.o \
- $(NULL)
-
-PROGRAMS = testkjs
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-GENERATE_OBJECTS = $(CXXYACCOBJECTS)
-
-LIBRARY = libkjs.a
-
-CLEAN_FILES = $(OBJECTS) \
- grammar.h \
- grammar.cpp \
- grammar.cpp.h \
- testkjs.o \
- $(LIBRARY) \
- $(PROGRAMS) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: generate-objects $(OBJECTS) $(LIBRARY) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-$(PROGRAMS): testkjs.o
- $(CC) $< -o $@ -L. -lkjs
-
-depend:
-
-grammar.h: grammar.cpp.h
- ln -s grammar.cpp.h grammar.h
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/JavaScriptCore/kjs/kjs-test b/JavaScriptCore/kjs/kjs-test
new file mode 100755
index 0000000..a427f97
--- /dev/null
+++ b/JavaScriptCore/kjs/kjs-test
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+`dirname $0`/testkjs `dirname $0`/test.js 2>&1
+
+if [ $? -eq 1 ]; then
+ exit 0;
+fi
\ No newline at end of file
diff --git a/JavaScriptCore/kjs/kjs-test.chk b/JavaScriptCore/kjs/kjs-test.chk
new file mode 100644
index 0000000..e5729b7
--- /dev/null
+++ b/JavaScriptCore/kjs/kjs-test.chk
@@ -0,0 +1,16 @@
+---> inside test()
+---> 20
+---> 30
+---> inside test()
+---> 10
+---> 50
+---> s = 60
+---> i = 2
+---> a[0] = 11
+---> a[1] = 22
+---> a[2] = undefined
+---> a[3] = undefined
+---> a[4] = apple
+---> b = [object Boolean]
+---> bbbc
+OK.
diff --git a/WebCore/.cvsignore b/WebCore/.cvsignore
index 58b3fc6..44aa06e 100644
--- a/WebCore/.cvsignore
+++ b/WebCore/.cvsignore
@@ -1,5 +1,4 @@
-Makefile.vars
-Makefile.rules
+Makefile.in
Makefile
config.status
config.log
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5448470..6d2f566 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,71 @@
+2002-01-14 Maciej Stachowiak <mjs at apple.com>
+
+ * .cvsignore:
+ * Makefile.am:
+ * Makefile.in:
+ * include/.cvsignore:
+ * include/Makefile.am:
+ * include/private/.cvsignore:
+ * include/private/Makefile.am:
+ * lib/.cvsignore:
+ * lib/Makefile.in:
+ * src/.cvsignore:
+ * src/Makefile.am:
+ * src/kdelibs/.cvsignore:
+ * src/kdelibs/Makefile.am:
+ * src/kdelibs/kdecore/.cvsignore:
+ * src/kdelibs/kdecore/Makefile.am:
+ * src/kdelibs/kdecore/Makefile.in:
+ * src/kdelibs/khtml/.cvsignore:
+ * src/kdelibs/khtml/Makefile.am:
+ * src/kdelibs/khtml/Makefile.in:
+ * src/kdelibs/khtml/css/.cvsignore:
+ * src/kdelibs/khtml/css/Makefile.am:
+ * src/kdelibs/khtml/css/Makefile.in:
+ * src/kdelibs/khtml/dom/.cvsignore:
+ * src/kdelibs/khtml/dom/Makefile.am:
+ * src/kdelibs/khtml/dom/Makefile.in:
+ * src/kdelibs/khtml/ecma/.cvsignore:
+ * src/kdelibs/khtml/ecma/Makefile.am:
+ * src/kdelibs/khtml/ecma/Makefile.in:
+ * src/kdelibs/khtml/html/.cvsignore:
+ * src/kdelibs/khtml/html/Makefile.am:
+ * src/kdelibs/khtml/html/Makefile.in:
+ * src/kdelibs/khtml/java/.cvsignore:
+ * src/kdelibs/khtml/java/ChangeLog:
+ * src/kdelibs/khtml/java/Makefile.am:
+ * src/kdelibs/khtml/java/Makefile.in:
+ * src/kdelibs/khtml/java/tests/Makefile.am:
+ * src/kdelibs/khtml/misc/.cvsignore:
+ * src/kdelibs/khtml/misc/Makefile.am:
+ * src/kdelibs/khtml/misc/Makefile.in:
+ * src/kdelibs/khtml/pics/Makefile.am:
+ * src/kdelibs/khtml/rendering/.cvsignore:
+ * src/kdelibs/khtml/rendering/Makefile.am:
+ * src/kdelibs/khtml/rendering/Makefile.in:
+ * src/kdelibs/khtml/xml/.cvsignore:
+ * src/kdelibs/khtml/xml/Makefile.am:
+ * src/kdelibs/khtml/xml/Makefile.in:
+ * src/kdelibs/kjs/.cvsignore:
+ * src/kdelibs/kjs/ChangeLog:
+ * src/kdelibs/kjs/Makefile.am:
+ * src/kdelibs/kjs/Makefile.in:
+ * src/kdelibs/kjs/kjs-test:
+ * src/kdelibs/kjs/kjs-test.chk:
+ * src/kwq/.cvsignore:
+ * src/kwq/Makefile.am:
+ * src/kwq/Makefile.in:
+ * src/kwq/_KWQOwner.m: (-[_KWQOwner backForwardUriDone:]):
+ * src/kwq/kde/.cvsignore:
+ * src/kwq/kde/Makefile.am:
+ * src/kwq/kde/Makefile.in:
+ * src/kwq/kdecore/.cvsignore:
+ * src/kwq/kdecore/Makefile.in:
+ * src/kwq/khtml/khtml_factory.h:
+ * src/kwq/qt/.cvsignore:
+ * src/kwq/qt/Makefile.am:
+ * src/kwq/qt/Makefile.in:
+
2002-01-09 Richard Williamson <rjw at apple.com>
Re-implemented underlining. Now it REALLY works, honest.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5448470..6d2f566 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,71 @@
+2002-01-14 Maciej Stachowiak <mjs at apple.com>
+
+ * .cvsignore:
+ * Makefile.am:
+ * Makefile.in:
+ * include/.cvsignore:
+ * include/Makefile.am:
+ * include/private/.cvsignore:
+ * include/private/Makefile.am:
+ * lib/.cvsignore:
+ * lib/Makefile.in:
+ * src/.cvsignore:
+ * src/Makefile.am:
+ * src/kdelibs/.cvsignore:
+ * src/kdelibs/Makefile.am:
+ * src/kdelibs/kdecore/.cvsignore:
+ * src/kdelibs/kdecore/Makefile.am:
+ * src/kdelibs/kdecore/Makefile.in:
+ * src/kdelibs/khtml/.cvsignore:
+ * src/kdelibs/khtml/Makefile.am:
+ * src/kdelibs/khtml/Makefile.in:
+ * src/kdelibs/khtml/css/.cvsignore:
+ * src/kdelibs/khtml/css/Makefile.am:
+ * src/kdelibs/khtml/css/Makefile.in:
+ * src/kdelibs/khtml/dom/.cvsignore:
+ * src/kdelibs/khtml/dom/Makefile.am:
+ * src/kdelibs/khtml/dom/Makefile.in:
+ * src/kdelibs/khtml/ecma/.cvsignore:
+ * src/kdelibs/khtml/ecma/Makefile.am:
+ * src/kdelibs/khtml/ecma/Makefile.in:
+ * src/kdelibs/khtml/html/.cvsignore:
+ * src/kdelibs/khtml/html/Makefile.am:
+ * src/kdelibs/khtml/html/Makefile.in:
+ * src/kdelibs/khtml/java/.cvsignore:
+ * src/kdelibs/khtml/java/ChangeLog:
+ * src/kdelibs/khtml/java/Makefile.am:
+ * src/kdelibs/khtml/java/Makefile.in:
+ * src/kdelibs/khtml/java/tests/Makefile.am:
+ * src/kdelibs/khtml/misc/.cvsignore:
+ * src/kdelibs/khtml/misc/Makefile.am:
+ * src/kdelibs/khtml/misc/Makefile.in:
+ * src/kdelibs/khtml/pics/Makefile.am:
+ * src/kdelibs/khtml/rendering/.cvsignore:
+ * src/kdelibs/khtml/rendering/Makefile.am:
+ * src/kdelibs/khtml/rendering/Makefile.in:
+ * src/kdelibs/khtml/xml/.cvsignore:
+ * src/kdelibs/khtml/xml/Makefile.am:
+ * src/kdelibs/khtml/xml/Makefile.in:
+ * src/kdelibs/kjs/.cvsignore:
+ * src/kdelibs/kjs/ChangeLog:
+ * src/kdelibs/kjs/Makefile.am:
+ * src/kdelibs/kjs/Makefile.in:
+ * src/kdelibs/kjs/kjs-test:
+ * src/kdelibs/kjs/kjs-test.chk:
+ * src/kwq/.cvsignore:
+ * src/kwq/Makefile.am:
+ * src/kwq/Makefile.in:
+ * src/kwq/_KWQOwner.m: (-[_KWQOwner backForwardUriDone:]):
+ * src/kwq/kde/.cvsignore:
+ * src/kwq/kde/Makefile.am:
+ * src/kwq/kde/Makefile.in:
+ * src/kwq/kdecore/.cvsignore:
+ * src/kwq/kdecore/Makefile.in:
+ * src/kwq/khtml/khtml_factory.h:
+ * src/kwq/qt/.cvsignore:
+ * src/kwq/qt/Makefile.am:
+ * src/kwq/qt/Makefile.in:
+
2002-01-09 Richard Williamson <rjw at apple.com>
Re-implemented underlining. Now it REALLY works, honest.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5448470..6d2f566 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,71 @@
+2002-01-14 Maciej Stachowiak <mjs at apple.com>
+
+ * .cvsignore:
+ * Makefile.am:
+ * Makefile.in:
+ * include/.cvsignore:
+ * include/Makefile.am:
+ * include/private/.cvsignore:
+ * include/private/Makefile.am:
+ * lib/.cvsignore:
+ * lib/Makefile.in:
+ * src/.cvsignore:
+ * src/Makefile.am:
+ * src/kdelibs/.cvsignore:
+ * src/kdelibs/Makefile.am:
+ * src/kdelibs/kdecore/.cvsignore:
+ * src/kdelibs/kdecore/Makefile.am:
+ * src/kdelibs/kdecore/Makefile.in:
+ * src/kdelibs/khtml/.cvsignore:
+ * src/kdelibs/khtml/Makefile.am:
+ * src/kdelibs/khtml/Makefile.in:
+ * src/kdelibs/khtml/css/.cvsignore:
+ * src/kdelibs/khtml/css/Makefile.am:
+ * src/kdelibs/khtml/css/Makefile.in:
+ * src/kdelibs/khtml/dom/.cvsignore:
+ * src/kdelibs/khtml/dom/Makefile.am:
+ * src/kdelibs/khtml/dom/Makefile.in:
+ * src/kdelibs/khtml/ecma/.cvsignore:
+ * src/kdelibs/khtml/ecma/Makefile.am:
+ * src/kdelibs/khtml/ecma/Makefile.in:
+ * src/kdelibs/khtml/html/.cvsignore:
+ * src/kdelibs/khtml/html/Makefile.am:
+ * src/kdelibs/khtml/html/Makefile.in:
+ * src/kdelibs/khtml/java/.cvsignore:
+ * src/kdelibs/khtml/java/ChangeLog:
+ * src/kdelibs/khtml/java/Makefile.am:
+ * src/kdelibs/khtml/java/Makefile.in:
+ * src/kdelibs/khtml/java/tests/Makefile.am:
+ * src/kdelibs/khtml/misc/.cvsignore:
+ * src/kdelibs/khtml/misc/Makefile.am:
+ * src/kdelibs/khtml/misc/Makefile.in:
+ * src/kdelibs/khtml/pics/Makefile.am:
+ * src/kdelibs/khtml/rendering/.cvsignore:
+ * src/kdelibs/khtml/rendering/Makefile.am:
+ * src/kdelibs/khtml/rendering/Makefile.in:
+ * src/kdelibs/khtml/xml/.cvsignore:
+ * src/kdelibs/khtml/xml/Makefile.am:
+ * src/kdelibs/khtml/xml/Makefile.in:
+ * src/kdelibs/kjs/.cvsignore:
+ * src/kdelibs/kjs/ChangeLog:
+ * src/kdelibs/kjs/Makefile.am:
+ * src/kdelibs/kjs/Makefile.in:
+ * src/kdelibs/kjs/kjs-test:
+ * src/kdelibs/kjs/kjs-test.chk:
+ * src/kwq/.cvsignore:
+ * src/kwq/Makefile.am:
+ * src/kwq/Makefile.in:
+ * src/kwq/_KWQOwner.m: (-[_KWQOwner backForwardUriDone:]):
+ * src/kwq/kde/.cvsignore:
+ * src/kwq/kde/Makefile.am:
+ * src/kwq/kde/Makefile.in:
+ * src/kwq/kdecore/.cvsignore:
+ * src/kwq/kdecore/Makefile.in:
+ * src/kwq/khtml/khtml_factory.h:
+ * src/kwq/qt/.cvsignore:
+ * src/kwq/qt/Makefile.am:
+ * src/kwq/qt/Makefile.in:
+
2002-01-09 Richard Williamson <rjw at apple.com>
Re-implemented underlining. Now it REALLY works, honest.
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
new file mode 100644
index 0000000..1ccda43
--- /dev/null
+++ b/WebCore/Makefile.am
@@ -0,0 +1,8 @@
+NULL=
+
+SUBDIRS = \
+ src \
+ include \
+ $(NULL)
+
+
diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
deleted file mode 100644
index 603289a..0000000
--- a/WebCore/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#======================================================================
-#
-# Top-level Makefile for WebPageView
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# Include header
-
-TOPSRCDIR = ..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Subdirectories to build
-
-SUBDIRS = \
- src/kdelibs/kjs \
- src/kdelibs/kdecore \
- src/kdelibs/khtml/misc \
- src/kdelibs/khtml/css \
- src/kdelibs/khtml/dom \
- src/kdelibs/khtml/ecma \
- src/kdelibs/khtml/xml \
- src/kdelibs/khtml/java \
- src/kdelibs/khtml/html \
- src/kdelibs/khtml/rendering \
- src/kdelibs/khtml \
- src/kwq/ \
- src/kwq/kde \
- src/kwq/kdecore \
- src/kwq/qt \
- src/kwq/kde \
- lib \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Standard targets
-
-all depend setup install clean distclean maintainer-clean:
- @target=$@; \
- list='$(SUBDIRS)'; \
- for subdir in $$list; do \
- echo ">>> Making $$target in $$subdir"; \
- (cd $$subdir && $(MAKE) $$target) || \
- case "$$amf" in \
- *=*) exit 1;; \
- *k*) fail=yes;; \
- *) exit 1;; \
- esac; \
- done; \
- $(NULL)
-
-#======================================================================
-# end
-#======================================================================
-
diff --git a/WebCore/include/.cvsignore b/WebCore/include/.cvsignore
index 7d0ebe6..de078f2 100644
--- a/WebCore/include/.cvsignore
+++ b/WebCore/include/.cvsignore
@@ -1,2 +1,3 @@
-*.dummy
+Makefile.in
+Makefile
private
diff --git a/WebCore/include/Makefile.am b/WebCore/include/Makefile.am
new file mode 100644
index 0000000..2493fea
--- /dev/null
+++ b/WebCore/include/Makefile.am
@@ -0,0 +1,2 @@
+
+SUBDIRS = private
diff --git a/WebCore/include/private/.cvsignore b/WebCore/include/private/.cvsignore
new file mode 100644
index 0000000..eb92105
--- /dev/null
+++ b/WebCore/include/private/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+*.h
diff --git a/WebCore/include/private/Makefile.am b/WebCore/include/private/Makefile.am
new file mode 100644
index 0000000..f0850c8
--- /dev/null
+++ b/WebCore/include/private/Makefile.am
@@ -0,0 +1,5 @@
+
+all-am:
+ rm -rf *.h
+ ln -sf `find ../.. -name "*.h"` .
+
diff --git a/WebCore/khtml/.cvsignore b/WebCore/khtml/.cvsignore
index cd5b4d2..8bf79da 100644
--- a/WebCore/khtml/.cvsignore
+++ b/WebCore/khtml/.cvsignore
@@ -1,6 +1,5 @@
Makefile
Makefile.in
-libkhtml_la.all_cpp.cpp
testkhtml
testcss
testrender
@@ -8,5 +7,7 @@ SunWS_cache
ir.out
testkhtml_static
*.moc
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/khtml/Makefile.am b/WebCore/khtml/Makefile.am
new file mode 100644
index 0000000..27cfefe
--- /dev/null
+++ b/WebCore/khtml/Makefile.am
@@ -0,0 +1,43 @@
+NULL =
+
+SUBDIRS = \
+ misc \
+ css \
+ dom \
+ ecma \
+ xml \
+ java \
+ html \
+ rendering \
+ $(NULL)
+
+noinst_LTLIBRARIES = libkhtml.la
+
+libkhtml_la_SOURCES = \
+ khtml_events.cpp \
+ khtmlview.cpp \
+ $(NULL)
+
+libkhtml_la_LIBADD = \
+ ./misc/libkhtmlmisc.la \
+ ./css/libkhtmlcss.la \
+ ./dom/libkhtmldom.la \
+ ./ecma/libkhtmlecma.la \
+ ./xml/libkhtmlxml.la \
+ ./java/libkhtmljava.la \
+ ./html/libkhtmlhtml.la \
+ ./rendering/libkhtmlrendering.la \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+khtmlview.moc:
+ echo '#include <khtmlview.h>' > $@
+
+BUILT_SOURCES = khtmlview.moc
+
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/WebCore/khtml/Makefile.in b/WebCore/khtml/Makefile.in
deleted file mode 100644
index d40b65e..0000000
--- a/WebCore/khtml/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = \
- khtml_events.o \
- khtmlview.o \
- $(NULL)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtml.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../kdecore \
- -I../kjs \
- -I./misc \
- -I./css \
- -I./dom \
- -I./xml \
- -I./rendering \
- -I. \
- -I$(TOPSRCDIR) \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-khtmlview.cpp: khtmlview.moc
-khtmlview.moc:
- echo '#include <khtmlview.h>' > $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/css/.cvsignore b/WebCore/khtml/css/.cvsignore
index 1148efd..8a3fb20 100644
--- a/WebCore/khtml/css/.cvsignore
+++ b/WebCore/khtml/css/.cvsignore
@@ -1,9 +1,5 @@
-Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
-*.moc
+Makefile
*.gperf
cssvalues.c
cssvalues.strip
@@ -11,5 +7,7 @@ cssvalues.h
cssproperties.c
cssproperties.strip
cssproperties.h
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
\ No newline at end of file
diff --git a/WebCore/khtml/css/Makefile.am b/WebCore/khtml/css/Makefile.am
new file mode 100644
index 0000000..7b1d187
--- /dev/null
+++ b/WebCore/khtml/css/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlcss.la
+
+libkhtmlcss_la_SOURCES = \
+ css_ruleimpl.cpp \
+ css_ruleimpl.h \
+ css_stylesheetimpl.cpp \
+ css_stylesheetimpl.h \
+ css_valueimpl.cpp \
+ css_valueimpl.h \
+ csshelper.cpp \
+ csshelper.h \
+ cssparser.cpp \
+ cssparser.h \
+ cssproperties.h \
+ cssstyleselector.cpp \
+ cssstyleselector.h \
+ cssvalues.h \
+ $(NULL)
+
+noinst_HEADERS = \
+ cssproperties.c \
+ cssvalues.c \
+ $(NULL)
+
+VALUEFILES = \
+ cssvalues.c \
+ cssvalues.h \
+ cssvalues.gperf \
+ $(NULL)
+
+PROPFILES = \
+ cssproperties.c \
+ cssproperties.h \
+ cssproperties.gperf \
+ $(NULL)
+
+
+BUILT_SOURCES = $(VALUEFILES) $(PROPFILES)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+$(VALUEFILES):
+ sh ./makevalues
+
+$(PROPFILES):
+ sh ./makeprop
+
diff --git a/WebCore/khtml/css/Makefile.in b/WebCore/khtml/css/Makefile.in
deleted file mode 100644
index 8487ec7..0000000
--- a/WebCore/khtml/css/Makefile.in
+++ /dev/null
@@ -1,107 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = css_ruleimpl.o \
- css_stylesheetimpl.o \
- css_valueimpl.o \
- csshelper.o \
- cssparser.o \
- cssstyleselector.o \
- $(NULL)
-
-VALUEFILES = \
- cssvalues.c \
- cssvalues.h \
- cssvalues.gperf \
- $(NULL)
-
-PROPFILES = \
- cssproperties.c \
- cssproperties.h \
- cssproperties.gperf \
- $(NULL)
-
-GENERATE_OBJECTS = $(VALUEFILES) $(PROPFILES)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlcss.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(GENERATE_OBJECTS) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../dom \
- -I../html \
- -I../misc \
- -I../xml \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: generate-objects $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-$(VALUEFILES):
- sh ./makevalues
-
-$(PROPFILES):
- sh ./makeprop
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/dom/.cvsignore b/WebCore/khtml/dom/.cvsignore
index 9b43b7e..dc4caac 100644
--- a/WebCore/khtml/dom/.cvsignore
+++ b/WebCore/khtml/dom/.cvsignore
@@ -1,6 +1,6 @@
-Makefile
Makefile.in
-*.kde
-*.dep
-export-objects
-export-headers
+Makefile
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/khtml/dom/Makefile.am b/WebCore/khtml/dom/Makefile.am
new file mode 100644
index 0000000..49c4609
--- /dev/null
+++ b/WebCore/khtml/dom/Makefile.am
@@ -0,0 +1,66 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmldom.la
+
+libkhtmldom_la_SOURCES = \
+ css_rule.cpp \
+ css_rule.h \
+ css_stylesheet.cpp \
+ css_stylesheet.h \
+ css_value.cpp \
+ css_value.h \
+ dom2_events.cpp \
+ dom2_events.h \
+ dom2_range.cpp \
+ dom2_range.h \
+ dom2_traversal.cpp \
+ dom2_traversal.h \
+ dom2_views.cpp \
+ dom2_views.h \
+ dom_core.h \
+ dom_doc.cpp \
+ dom_doc.h \
+ dom_element.cpp \
+ dom_element.h \
+ dom_exception.h \
+ dom_html.h \
+ dom_misc.cpp \
+ dom_misc.h \
+ dom_node.cpp \
+ dom_node.h \
+ dom_string.cpp \
+ dom_string.h \
+ dom_text.cpp \
+ dom_text.h \
+ dom_xml.cpp \
+ dom_xml.h \
+ html_base.cpp \
+ html_base.h \
+ html_block.cpp \
+ html_block.h \
+ html_document.cpp \
+ html_document.h \
+ html_element.cpp \
+ html_element.h \
+ html_form.cpp \
+ html_form.h \
+ html_head.cpp \
+ html_head.h \
+ html_image.cpp \
+ html_image.h \
+ html_inline.cpp \
+ html_inline.h \
+ html_list.cpp \
+ html_list.h \
+ html_misc.cpp \
+ html_misc.h \
+ html_object.cpp \
+ html_object.h \
+ html_table.cpp \
+ html_table.h \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
diff --git a/WebCore/khtml/dom/Makefile.in b/WebCore/khtml/dom/Makefile.in
deleted file mode 100644
index 3e98cfb..0000000
--- a/WebCore/khtml/dom/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmldom.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I../css \
- -I../html \
- -I../misc \
- -I../xml \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/ecma/.cvsignore b/WebCore/khtml/ecma/.cvsignore
index f8af57a..99682ff 100644
--- a/WebCore/khtml/ecma/.cvsignore
+++ b/WebCore/khtml/ecma/.cvsignore
@@ -1,10 +1,8 @@
-Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
-*.moc
-*.gperf
+Makefile
testecma
-export-objects
-export-headers
+.deps
+.libs
+*.la
+*.lo
+*.moc
diff --git a/WebCore/khtml/ecma/Makefile.am b/WebCore/khtml/ecma/Makefile.am
new file mode 100644
index 0000000..0e8583d
--- /dev/null
+++ b/WebCore/khtml/ecma/Makefile.am
@@ -0,0 +1,55 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlecma.la
+
+libkhtmlecma_la_SOURCES = \
+ kjs_binding.cpp \
+ kjs_binding.h \
+ kjs_css.cpp \
+ kjs_css.h \
+ kjs_debugwin.cpp \
+ kjs_debugwin.h \
+ kjs_dom.cpp \
+ kjs_dom.h \
+ kjs_events.cpp \
+ kjs_events.h \
+ kjs_html.cpp \
+ kjs_html.h \
+ kjs_navigator.cpp \
+ kjs_navigator.h \
+ kjs_proxy.cpp \
+ kjs_proxy.h \
+ kjs_range.cpp \
+ kjs_range.h \
+ kjs_text.cpp \
+ kjs_text.h \
+ kjs_traversal.cpp \
+ kjs_traversal.h \
+ kjs_views.cpp \
+ kjs_views.h \
+ kjs_window.cpp \
+ kjs_window.h \
+ $(NULL)
+
+# FIXME - can't build ecma test because kwq is not yet built at this point
+#
+# noinst_PROGRAMS = testecma
+#
+# testecma_SOURCES = \
+# testecma.cpp \
+# $(NULL)
+#
+# testecma_LDADD = ./libkhtmlecma.la
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+kjs_window.moc:
+ touch $@
+
+BUILT_SOURCES = kjs_window.moc
+CLEANFILES = $(BUILT_SOURCES)
+
+
diff --git a/WebCore/khtml/ecma/Makefile.in b/WebCore/khtml/ecma/Makefile.in
deleted file mode 100644
index 78639d6..0000000
--- a/WebCore/khtml/ecma/Makefile.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(filter-out testecma.o,$(CXXOBJECTS))
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlecma.a
-
-PROGRAMS = testecma
-
-CLEAN_FILES = $(OBJECTS) \
- kjs_window.moc \
- $(LIBRARY) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I../css \
- -I../dom \
- -I../html \
- -I../misc \
- -I../xml \
- -I../.. \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) $(LIBRARY) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-$(PROGRAMS): testecma.o
- $(CC) -o $@ $< -L. -lkhtmlecma
-
-kjs_window.cpp: kjs_window.moc
-kjs_window.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/html/.cvsignore b/WebCore/khtml/html/.cvsignore
index c905f15..e7837c4 100644
--- a/WebCore/khtml/html/.cvsignore
+++ b/WebCore/khtml/html/.cvsignore
@@ -1,7 +1,7 @@
Makefile
Makefile.in
-*.dep
*.moc
-*.kde
-export-objects
-export-headers
+*.lo
+*.la
+.deps
+.libs
diff --git a/WebCore/khtml/html/Makefile.am b/WebCore/khtml/html/Makefile.am
new file mode 100644
index 0000000..29b350a
--- /dev/null
+++ b/WebCore/khtml/html/Makefile.am
@@ -0,0 +1,53 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlhtml.la
+
+libkhtmlhtml_la_SOURCES = \
+ dtd.cpp \
+ dtd.h \
+ html_baseimpl.cpp \
+ html_baseimpl.h \
+ html_blockimpl.cpp \
+ html_blockimpl.h \
+ html_documentimpl.cpp \
+ html_documentimpl.h \
+ html_elementimpl.cpp \
+ html_elementimpl.h \
+ html_formimpl.cpp \
+ html_formimpl.h \
+ html_headimpl.cpp \
+ html_headimpl.h \
+ html_imageimpl.cpp \
+ html_imageimpl.h \
+ html_inlineimpl.cpp \
+ html_inlineimpl.h \
+ html_listimpl.cpp \
+ html_listimpl.h \
+ html_miscimpl.cpp \
+ html_miscimpl.h \
+ html_objectimpl.cpp \
+ html_objectimpl.h \
+ html_tableimpl.cpp \
+ html_tableimpl.h \
+ htmlparser.cpp \
+ htmlparser.h \
+ htmltokenizer.cpp \
+ htmltokenizer.h \
+ $(NULL)
+
+INCLUDES = \
+ -I$(top_srcdir) \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ -I. \
+ $(NULL)
+
+htmltokenizer.moc:
+ touch $@
+
+html_documentimpl.moc:
+ touch $@
+
+BUILT_SOURCES = htmltokenizer.moc html_documentimpl.moc
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/khtml/html/Makefile.in b/WebCore/khtml/html/Makefile.in
deleted file mode 100644
index fe0a001..0000000
--- a/WebCore/khtml/html/Makefile.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlhtml.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../../kdecore \
- -I../../kjs \
- -I.. \
- -I../misc \
- -I../css \
- -I../dom \
- -I../xml \
- -I../rendering \
- -I. \
- -I$(TOPSRCDIR) \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-htmltokenizer.cpp: htmltokenizer.moc
-htmltokenizer.moc:
- touch $@
-
-html_documentimpl.cpp: html_documentimpl.moc
-html_documentimpl.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/java/.cvsignore b/WebCore/khtml/java/.cvsignore
index 58fe1e4..2a6ec4d 100644
--- a/WebCore/khtml/java/.cvsignore
+++ b/WebCore/khtml/java/.cvsignore
@@ -1,8 +1,7 @@
Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
+.deps
+.libs
+*.lo
+*.la
*.moc
-export-objects
-export-headers
diff --git a/WebCore/khtml/java/ChangeLog b/WebCore/khtml/java/ChangeLog
deleted file mode 100644
index b276c27..0000000
--- a/WebCore/khtml/java/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-1999-12-14 Richard Moore <rich at ipso-facto.freeserve.co.uk>
-
- * Added a delay when you reload a class so that a race is less
- likely (yuck!)
- * Added a destructor to kjaw
- * Still has trouble though :-( It only seems to occur whn using
- KWin, KWM has no problem.
-
-Tue Dec 7 23:32:21 GMT 1999
-
- * Many improvements to string handling
- * Moved to value based collections
- * Addition of a d pointer for future binary compatability
- * Added some accessor methods
- * Improvements to kjavaprocess
- * - Now handles system property settings
- * - Detects death of the server
- * - Supports bidirectional comms
- * Applets and contexts are destroyed properly
diff --git a/WebCore/khtml/java/Makefile.am b/WebCore/khtml/java/Makefile.am
new file mode 100644
index 0000000..3a91316
--- /dev/null
+++ b/WebCore/khtml/java/Makefile.am
@@ -0,0 +1,62 @@
+NULL =
+
+SUBDIRS = . tests
+
+noinst_LTLIBRARIES = libkhtmljava.la
+
+libkhtmljava_la_SOURCES = \
+ kjavaapplet.cpp \
+ kjavaapplet.h \
+ kjavaappletcontext.cpp \
+ kjavaappletcontext.h \
+ kjavaappletserver.cpp \
+ kjavaappletserver.h \
+ kjavaappletwidget.cpp \
+ kjavaappletwidget.h \
+ kjavadownloader.cpp \
+ kjavadownloader.h \
+ kjavaprocess.cpp \
+ kjavaprocess.h \
+ $(NULL)
+
+
+# FIXME: Need a hack here to give the xml tokenizer text stream
+# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
+# can be removed when we have Qt text streams implemented
+
+INCLUDES = \
+ -DNEED_BOGUS_TEXTSTREAMS \
+ -DNEED_BOGUS_X_DEFINES \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+
+kjavaapplet.moc:
+ touch $@
+
+kjavaappletcontext.moc:
+ touch $@
+
+kjavaappletserver.moc:
+ touch $@
+
+kjavaappletwidget.moc:
+ touch $@
+
+kjavadownloader.moc:
+ touch $@
+
+kjavaprocess.moc:
+ touch $@
+
+BUILT_SOURCES = \
+ kjavaapplet.moc \
+ kjavaappletcontext.moc \
+ kjavaappletserver.moc \
+ kjavaappletwidget.moc \
+ kjavadownloader.moc \
+ kjavaprocess.moc \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/khtml/java/Makefile.in b/WebCore/khtml/java/Makefile.in
deleted file mode 100644
index af8bbc1..0000000
--- a/WebCore/khtml/java/Makefile.in
+++ /dev/null
@@ -1,102 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-SKIPOBJECTS = javaembed.o
-CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmljava.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-# FIXME: Need a hack here to give the xml tokenizer text stream
-# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-# can be removed when we have Qt text streams implemented
-CXXFLAGS = $(BASECXXFLAGS) \
- -DNEED_BOGUS_TEXTSTREAMS \
- -DNEED_BOGUS_X_DEFINES \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-kjavaapplet.cpp: kjavaapplet.moc
-kjavaapplet.moc:
- touch $@
-
-kjavaappletcontext.cpp: kjavaappletcontext.moc
-kjavaappletcontext.moc:
- touch $@
-
-kjavaappletserver.cpp: kjavaappletserver.moc
-kjavaappletserver.moc:
- touch $@
-
-kjavaappletwidget.cpp: kjavaappletwidget.moc
-kjavaappletwidget.moc:
- touch $@
-
-kjavadownloader.cpp: kjavadownloader.moc
-kjavadownloader.moc:
- touch $@
-
-kjavaprocess.cpp: kjavaprocess.moc
-kjavaprocess.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/java/tests/Makefile.am b/WebCore/khtml/java/tests/Makefile.am
index e996cfb..b31453e 100644
--- a/WebCore/khtml/java/tests/Makefile.am
+++ b/WebCore/khtml/java/tests/Makefile.am
@@ -1,10 +1,13 @@
-INCLUDES = -I$(top_srcdir)/khtml/java/ $(all_includes)
-LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkjava.la
-check_PROGRAMS = testserver
+# FIXME: currently commented out because this would require kwq
-testserver_SOURCES = testkjavaappletserver.cpp
-
-METASOURCES = AUTO
+# INCLUDES = -I$(top_srcdir)/khtml/java/ $(all_includes)
+# LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkjava.la
+#
+# check_PROGRAMS = testserver
+#
+# testserver_SOURCES = testkjavaappletserver.cpp
+#
+# METASOURCES = AUTO
diff --git a/WebCore/khtml/misc/.cvsignore b/WebCore/khtml/misc/.cvsignore
index 2334feb..bdc1485 100644
--- a/WebCore/khtml/misc/.cvsignore
+++ b/WebCore/khtml/misc/.cvsignore
@@ -1,8 +1,5 @@
Makefile
Makefile.in
-*.kde
-*.moc
-*.dep
khtmldata.h
htmltags.c
htmltags.h
@@ -10,5 +7,7 @@ htmltags.gperf
htmlattrs.c
htmlattrs.h
htmlattrs.gperf
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/khtml/misc/Makefile.am b/WebCore/khtml/misc/Makefile.am
new file mode 100644
index 0000000..ba2563f
--- /dev/null
+++ b/WebCore/khtml/misc/Makefile.am
@@ -0,0 +1,58 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlmisc.la
+
+libkhtmlmisc_la_SOURCES = \
+ decoder.cpp \
+ decoder.h \
+ font.cpp \
+ font.h \
+ helper.cpp \
+ helper.h \
+ htmlattrs.h \
+ htmlhashes.cpp \
+ htmlhashes.h \
+ htmltags.h \
+ khtmldata.h \
+ khtmllayout.h \
+ loader.h \
+ loader_client.h \
+ loader_jpeg.cpp \
+ loader_jpeg.h \
+ stringit.h \
+ $(NULL)
+
+noinst_HEADERS = \
+ htmlattrs.c \
+ htmltags.c \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+TAGFILES = \
+ htmltags.c \
+ htmltags.h \
+ htmltags.gperf \
+ $(NULL)
+
+ATTRSFILES = \
+ htmlattrs.c \
+ htmlattrs.h \
+ htmlattrs.gperf \
+ $(NULL)
+
+khtmldata.h:
+ touch $@
+
+$(TAGFILES):
+ perl ./maketags
+
+$(ATTRSFILES):
+ perl ./makeattrs
+
+BUILT_SOURCES = khtmldata.h $(TAGFILES) $(ATTRSFILES)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/khtml/misc/Makefile.in b/WebCore/khtml/misc/Makefile.in
deleted file mode 100644
index c1d82b8..0000000
--- a/WebCore/khtml/misc/Makefile.in
+++ /dev/null
@@ -1,101 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-TAGFILES = \
- htmltags.c \
- htmltags.h \
- htmltags.gperf \
- $(NULL)
-
-ATTRSFILES = \
- htmlattrs.c \
- htmlattrs.h \
- htmlattrs.gperf \
- $(NULL)
-
-GENERATE_OBJECTS = $(TAGFILES) $(ATTRSFILES)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = khtmldata.h $(GENERATE_OBJECTS) $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlmisc.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(GENERATE_OBJECTS) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I../dom \
- -I../html \
- -I../xml \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: generate-objects $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-khtmldata.h:
- touch $@
-
-$(TAGFILES):
- perl ./maketags
-
-$(ATTRSFILES):
- perl ./makeattrs
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/pics/Makefile.am b/WebCore/khtml/pics/Makefile.am
deleted file mode 100644
index 8dc007e..0000000
--- a/WebCore/khtml/pics/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-khtmliconsdir = $(kde_datadir)/khtml/icons
-khtmlicons_ICON = AUTO
-
diff --git a/WebCore/khtml/rendering/.cvsignore b/WebCore/khtml/rendering/.cvsignore
index 708a929..984c9d9 100644
--- a/WebCore/khtml/rendering/.cvsignore
+++ b/WebCore/khtml/rendering/.cvsignore
@@ -1,9 +1,7 @@
Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
+.deps
+.libs
*.moc
-*.gperf
-export-objects
-export-headers
+*.lo
+*.la
diff --git a/WebCore/khtml/rendering/Makefile.am b/WebCore/khtml/rendering/Makefile.am
new file mode 100644
index 0000000..85fc704
--- /dev/null
+++ b/WebCore/khtml/rendering/Makefile.am
@@ -0,0 +1,71 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlrendering.la
+
+libkhtmlrendering_la_SOURCES = \
+ bidi.cpp \
+ bidi.h \
+ break_lines.cpp \
+ break_lines.h \
+ render_applet.cpp \
+ render_applet.h \
+ render_body.cpp \
+ render_body.h \
+ render_box.cpp \
+ render_box.h \
+ render_br.cpp \
+ render_br.h \
+ render_container.cpp \
+ render_container.h \
+ render_flow.cpp \
+ render_flow.h \
+ render_form.cpp \
+ render_form.h \
+ render_frames.cpp \
+ render_frames.h \
+ render_hr.cpp \
+ render_hr.h \
+ render_html.cpp \
+ render_html.h \
+ render_image.cpp \
+ render_image.h \
+ render_list.cpp \
+ render_list.h \
+ render_object.cpp \
+ render_object.h \
+ render_replaced.cpp \
+ render_replaced.h \
+ render_root.cpp \
+ render_root.h \
+ render_style.cpp \
+ render_style.h \
+ render_table.cpp \
+ render_table.h \
+ render_text.cpp \
+ render_text.h \
+ $(NULL)
+
+
+INCLUDES = \
+ -DNEED_BOGUS_X_DEFINES \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+render_form.moc:
+ touch $@
+
+render_frames.moc:
+ touch $@
+
+render_replaced.moc:
+ touch $@
+
+BUILT_SOURCES = \
+ render_form.moc \
+ render_frames.moc \
+ render_replaced.moc \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/WebCore/khtml/rendering/Makefile.in b/WebCore/khtml/rendering/Makefile.in
deleted file mode 100644
index a815ff6..0000000
--- a/WebCore/khtml/rendering/Makefile.in
+++ /dev/null
@@ -1,95 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlrendering.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -DNEED_BOGUS_X_DEFINES \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I../../kdecore \
- -I../../kjs \
- -I../html \
- -I../java \
- -I../misc \
- -I../css \
- -I../dom \
- -I../xml \
- -I. \
- -I.. \
- -I$(TOPSRCDIR) \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) $(LIBRARY) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-render_form.cpp: render_form.moc
-render_form.moc:
- touch $@
-
-render_frames.cpp: render_frames.moc
-render_frames.moc:
- touch $@
-
-render_replaced.cpp: render_replaced.moc
-render_replaced.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/khtml/xml/.cvsignore b/WebCore/khtml/xml/.cvsignore
index 58fe1e4..e7837c4 100644
--- a/WebCore/khtml/xml/.cvsignore
+++ b/WebCore/khtml/xml/.cvsignore
@@ -1,8 +1,7 @@
Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
*.moc
-export-objects
-export-headers
+*.lo
+*.la
+.deps
+.libs
diff --git a/WebCore/khtml/xml/Makefile.am b/WebCore/khtml/xml/Makefile.am
new file mode 100644
index 0000000..8314781
--- /dev/null
+++ b/WebCore/khtml/xml/Makefile.am
@@ -0,0 +1,49 @@
+NULL=
+
+noinst_LTLIBRARIES = libkhtmlxml.la
+
+libkhtmlxml_la_SOURCES = \
+ dom2_eventsimpl.cpp \
+ dom2_eventsimpl.h \
+ dom2_rangeimpl.cpp \
+ dom2_rangeimpl.h \
+ dom2_traversalimpl.cpp \
+ dom2_traversalimpl.h \
+ dom2_viewsimpl.cpp \
+ dom2_viewsimpl.h \
+ dom_docimpl.cpp \
+ dom_docimpl.h \
+ dom_elementimpl.cpp \
+ dom_elementimpl.h \
+ dom_nodeimpl.cpp \
+ dom_nodeimpl.h \
+ dom_stringimpl.cpp \
+ dom_stringimpl.h \
+ dom_textimpl.cpp \
+ dom_textimpl.h \
+ dom_xmlimpl.cpp \
+ dom_xmlimpl.h \
+ xml_tokenizer.cpp \
+ xml_tokenizer.h \
+ $(NULL)
+
+
+# FIXME: Need a hack here to give the xml tokenizer text stream
+# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
+# can be removed when we have Qt text streams implemented
+
+INCLUDES = \
+ -DNEED_BOGUS_TEXTSTREAMS \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+dom_docimpl.moc:
+ touch $@
+
+xml_tokenizer.moc:
+ touch $@
+
+BUILT_SOURCES = dom_docimpl.moc xml_tokenizer.moc
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/khtml/xml/Makefile.in b/WebCore/khtml/xml/Makefile.in
deleted file mode 100644
index 9ce71ed..0000000
--- a/WebCore/khtml/xml/Makefile.in
+++ /dev/null
@@ -1,102 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-
-CXXOBJECTS = \
- dom2_eventsimpl.o \
- dom2_rangeimpl.o \
- dom2_traversalimpl.o \
- dom2_viewsimpl.o \
- dom_docimpl.o \
- dom_elementimpl.o \
- dom_nodeimpl.o \
- dom_stringimpl.o \
- dom_textimpl.o \
- dom_xmlimpl.o \
- xml_tokenizer.o \
- $(NULL)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlxml.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-# FIXME: Need a hack here to give the xml tokenizer text stream
-# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-# can be removed when we have Qt text streams implemented
-CXXFLAGS = $(BASECXXFLAGS) \
- -DNEED_BOGUS_TEXTSTREAMS \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../css \
- -I../dom \
- -I../html \
- -I../misc \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-dom_docimpl.cpp: dom_docimpl.moc
-dom_docimpl.moc:
- touch $@
-xml_tokenizer.cpp: xml_tokenizer.moc
-xml_tokenizer.moc:
- touch $@
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/kwq/.cvsignore b/WebCore/kwq/.cvsignore
index bccb4e5..c78f681 100644
--- a/WebCore/kwq/.cvsignore
+++ b/WebCore/kwq/.cvsignore
@@ -1,7 +1,9 @@
+Makefile.in
Makefile
-*.dummy
-export-objects
-export-headers
KWQCharsetData.c
mac-encodings.txt
make-mac-encodings
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/kwq/KWQKHTMLFactory.h b/WebCore/kwq/KWQKHTMLFactory.h
index 31d8470..6c0063e 100644
--- a/WebCore/kwq/KWQKHTMLFactory.h
+++ b/WebCore/kwq/KWQKHTMLFactory.h
@@ -27,6 +27,7 @@
class KInstance;
class HistoryProvider;
class KHTMLPart;
+class KHTMLSettings;
class KHTMLFactory : public KParts::Factory
{
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
new file mode 100644
index 0000000..e1b337e
--- /dev/null
+++ b/WebCore/kwq/Makefile.am
@@ -0,0 +1,162 @@
+NULL =
+
+SUBDIRS = \
+ kde \
+ qt \
+ $(NULL)
+
+noinst_LTLIBRARIES = libkwq.la
+
+libkwq_la_SOURCES = \
+ KWQApplication.mm \
+ KWQBitmap.mm \
+ KWQBrush.mm \
+ KWQButton.mm \
+ KWQCString.mm \
+ KWQChar.mm \
+ KWQCharsets.mm \
+ KWQCheckBox.mm \
+ KWQColor.mm \
+ KWQColorGroup.mm \
+ KWQComboBox.mm \
+ KWQCompletion.mm \
+ KWQCursor.mm \
+ KWQDCOPClient.mm \
+ KWQDateTime.mm \
+ KWQDrawUtil.mm \
+ KWQEvent.mm \
+ KWQFont.mm \
+ KWQFontDatabase.mm \
+ KWQFontInfo.mm \
+ KWQFontMetrics.mm \
+ KWQFrame.mm \
+ KWQGuardedPtr.mm \
+ KWQPoint.mm \
+ KWQRect.mm \
+ KWQSize.mm \
+ KWQHBox.mm \
+ KWQImage.mm \
+ KWQInputDialog.mm \
+ KWQKApplication.mm \
+ KWQKCharsets.mm \
+ KWQKComboBox.mm \
+ KWQKCompletionBox.mm \
+ KWQKConfigBase.mm \
+ KWQKCursor.mm \
+ KWQKDebug.mm \
+ KWQKFactory.mm \
+ KWQKFileDialog.mm \
+ KWQKFileItem.mm \
+ KWQKGlobal.mm \
+ KWQKGlobalSettings.mm \
+ KWQKHTMLFactory.mm \
+ KWQKHTMLPart.mm \
+ KWQKHTMLPartBrowserExtension.mm \
+ KWQKHTMLSettings.mm \
+ KWQKHTMLView.mm \
+ KWQKHistoryProvider.mm \
+ KWQKIconLoader.mm \
+ KWQKImageIO.mm \
+ KWQKInstance.mm \
+ KWQKJavaEmbed.mm \
+ KWQKJob.mm \
+ KWQKLineEdit.mm \
+ KWQKListBox.mm \
+ KWQKLocale.mm \
+ KWQKMessageBox.mm \
+ KWQKMimeType.mm \
+ KWQKPartsEvent.mm \
+ KWQKPrinter.mm \
+ KWQKProcess.mm \
+ KWQKProtocolManager.mm \
+ KWQKScheduler.mm \
+ KWQKSimpleConfig.mm \
+ KWQKStringHandler.mm \
+ KWQKWin.mm \
+ KWQKWinModule.mm \
+ KWQKjobclasses.mm \
+ KWQKloader.mm \
+ KWQKnetaccess.mm \
+ KWQKstddirs.mm \
+ KWQLabel.mm \
+ KWQLineEdit.mm \
+ KWQListBox.mm \
+ KWQMovie.mm \
+ KWQNSTextField.mm \
+ KWQObject.mm \
+ KWQPaintDevice.mm \
+ KWQPaintDeviceMetrics.mm \
+ KWQPainter.mm \
+ KWQPalette.mm \
+ KWQPart.mm \
+ KWQPen.mm \
+ KWQPixmap.mm \
+ KWQPointArray.mm \
+ KWQPushButton.mm \
+ KWQRadioButton.mm \
+ KWQRegion.mm \
+ KWQScrollView.mm \
+ KWQString.mm \
+ KWQStyle.mm \
+ KWQTextArea.mm \
+ KWQTextContainer.mm \
+ KWQTextEdit.mm \
+ KWQTextStorage.mm \
+ KWQTimer.mm \
+ KWQToolTip.mm \
+ KWQVariant.mm \
+ KWQView.mm \
+ KWQWMatrix.mm \
+ KWQWidget.mm \
+ KWQasyncimageio.mm \
+ KWQasyncio.mm \
+ KWQbrowserextension.mm \
+ KWQbrowserinterface.mm \
+ KWQsignals.mm \
+ KWQtextcodec.mm \
+ KWQtextstream.mm \
+ KWQxml.mm \
+ _KWQOwner.m \
+ kwqdebug.mm \
+ WKPlugin.mm \
+ WKPluginView.mm \
+ WKPluginDatabase.mm \
+ KWQPlugin.mm \
+ npapi.c \
+ $(NULL)
+
+libkwq_la_LIBADD = \
+ ./qt/libqt_borrowed.la \
+ ./kde/libkde_borrowed.la \
+ $(NULL)
+
+INCLUDES = \
+ -DNEED_BOGUS_X_DEFINES \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(WEBCORE_INCLUDES) \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ make-mac-encodings \
+ $(NULL)
+
+make_mac_encodings_SOURCES = make-mac-encodings.c
+
+make_mac_encodings_LDFLAGS = \
+ -framework CoreFoundation \
+ $(NULL)
+
+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
+
+BUILT_SOURCES = \
+ make-mac-encodings \
+ mac-encodings.txt \
+ KWQCharsetData.c \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
deleted file mode 100644
index 8439651..0000000
--- a/WebCore/kwq/Makefile.in
+++ /dev/null
@@ -1,256 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.mm)
-HEADERS = $(wildcard *.h)
-
-MMOBJECTS = \
- KWQApplication.o \
- KWQBitmap.o \
- KWQBrush.o \
- KWQButton.o \
- KWQCString.o \
- KWQChar.o \
- KWQCharsets.o \
- KWQCheckBox.o \
- KWQColor.o \
- KWQColorGroup.o \
- KWQComboBox.o \
- KWQCompletion.o \
- KWQCursor.o \
- KWQDCOPClient.o \
- KWQDateTime.o \
- KWQDrawUtil.o \
- KWQEvent.o \
- KWQFont.o \
- KWQFontDatabase.o \
- KWQFontInfo.o \
- KWQFontMetrics.o \
- KWQFrame.o \
- KWQGuardedPtr.o \
- KWQPoint.o \
- KWQRect.o \
- KWQSize.o \
- KWQHBox.o \
- KWQImage.o \
- KWQInputDialog.o \
- KWQKApplication.o \
- KWQKCharsets.o \
- KWQKComboBox.o \
- KWQKCompletionBox.o \
- KWQKConfigBase.o \
- KWQKCursor.o \
- KWQKDebug.o \
- KWQKFactory.o \
- KWQKFileDialog.o \
- KWQKFileItem.o \
- KWQKGlobal.o \
- KWQKGlobalSettings.o \
- KWQKHTMLFactory.o \
- KWQKHTMLPart.o \
- KWQKHTMLPartBrowserExtension.o \
- KWQKHTMLSettings.o \
- KWQKHTMLView.o \
- KWQKHistoryProvider.o \
- KWQKIconLoader.o \
- KWQKImageIO.o \
- KWQKInstance.o \
- KWQKJavaEmbed.o \
- KWQKJob.o \
- KWQKLineEdit.o \
- KWQKListBox.o \
- KWQKLocale.o \
- KWQKMessageBox.o \
- KWQKMimeType.o \
- KWQKPartsEvent.o \
- KWQKPrinter.o \
- KWQKProcess.o \
- KWQKProtocolManager.o \
- KWQKScheduler.o \
- KWQKSimpleConfig.o \
- KWQKStringHandler.o \
- KWQKWin.o \
- KWQKWinModule.o \
- KWQKjobclasses.o \
- KWQKloader.o \
- KWQKnetaccess.o \
- KWQKstddirs.o \
- KWQLabel.o \
- KWQLineEdit.o \
- KWQListBox.o \
- KWQMovie.o \
- KWQNSTextField.o \
- KWQObject.o \
- KWQPaintDevice.o \
- KWQPaintDeviceMetrics.o \
- KWQPainter.o \
- KWQPalette.o \
- KWQPart.o \
- KWQPen.o \
- KWQPixmap.o \
- KWQPointArray.o \
- KWQPushButton.o \
- KWQRadioButton.o \
- KWQRegion.o \
- KWQScrollView.o \
- KWQString.o \
- KWQStyle.o \
- KWQTextArea.o \
- KWQTextContainer.o \
- KWQTextEdit.o \
- KWQTextStorage.o \
- KWQTimer.o \
- KWQToolTip.o \
- KWQVariant.o \
- KWQView.o \
- KWQWMatrix.o \
- KWQWidget.o \
- KWQasyncimageio.o \
- KWQasyncio.o \
- KWQbrowserextension.o \
- KWQbrowserinterface.o \
- KWQsignals.o \
- KWQtextcodec.o \
- KWQtextstream.o \
- KWQxml.o \
- _KWQOwner.o \
- kwqdebug.o \
- WKPlugin.o \
- WKPluginView.o \
- WKPluginDatabase.o \
- KWQPlugin.o \
- $(NULL)
-
-COBJECTS = \
- npapi.o \
- $(NULL)
-
-MOBJECTS = \
- $(NULL)
-
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(MMOBJECTS) $(MOBJECTS) $(COBJECTS)
-EXPORT_OBJECTS = $(OBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkwq.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CMMFLAGS = $(BASECMMFLAGS) \
- -g \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/include \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/kjs \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/dom \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/html \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/misc \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/xml \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml/java \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CMMFLAGS)
-
-CMFLAGS = $(BASECMFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/include \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I. \
- $(NULL)
-
-CFLAGS = $(BASECFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/include \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CMFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(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
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/kwq/_KWQOwner.m b/WebCore/kwq/_KWQOwner.m
index f9fe747..7063f8f 100644
--- a/WebCore/kwq/_KWQOwner.m
+++ b/WebCore/kwq/_KWQOwner.m
@@ -93,7 +93,6 @@ static BOOL flag = NO;
-(void)backForwardUriDone:(NSNotification *)notification
{
NSString *uriString;
- id <WCURIEntry> entry;
uriString = [notification object];
diff --git a/WebCore/kwq/kde/.cvsignore b/WebCore/kwq/kde/.cvsignore
index f4dee06..dc4caac 100644
--- a/WebCore/kwq/kde/.cvsignore
+++ b/WebCore/kwq/kde/.cvsignore
@@ -1,3 +1,6 @@
+Makefile.in
Makefile
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/kwq/kde/Makefile.am b/WebCore/kwq/kde/Makefile.am
new file mode 100644
index 0000000..2f0b6fe
--- /dev/null
+++ b/WebCore/kwq/kde/Makefile.am
@@ -0,0 +1,13 @@
+NULL =
+
+noinst_LTLIBRARIES = libkde_borrowed.la
+
+libkde_borrowed_la_SOURCES = \
+ _kurl.cpp \
+ _kurl.h \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(NULL)
+
diff --git a/WebCore/kwq/kde/Makefile.in b/WebCore/kwq/kde/Makefile.in
deleted file mode 100644
index 125cfcb..0000000
--- a/WebCore/kwq/kde/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-HEADERS = $(wildcard *.h)
-SOURCES = $(wildcard *.cpp)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = lib_kde.a
-
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I../kdecore \
- -I../qt \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/kwq/kdecore/.cvsignore b/WebCore/kwq/kdecore/.cvsignore
index 71f692b..e69de29 100644
--- a/WebCore/kwq/kdecore/.cvsignore
+++ b/WebCore/kwq/kdecore/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-export-headers
diff --git a/WebCore/kwq/kdecore/Makefile.in b/WebCore/kwq/kdecore/Makefile.in
deleted file mode 100644
index 7383c2e..0000000
--- a/WebCore/kwq/kdecore/Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-HEADERS = $(wildcard *.h)
-
-EXPORT_HEADERS = $(HEADERS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-
-CLEAN_FILES = \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: export-headers
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/kwq/khtml/khtml_factory.h b/WebCore/kwq/khtml/khtml_factory.h
index 31d8470..6c0063e 100644
--- a/WebCore/kwq/khtml/khtml_factory.h
+++ b/WebCore/kwq/khtml/khtml_factory.h
@@ -27,6 +27,7 @@
class KInstance;
class HistoryProvider;
class KHTMLPart;
+class KHTMLSettings;
class KHTMLFactory : public KParts::Factory
{
diff --git a/WebCore/kwq/qt/.cvsignore b/WebCore/kwq/qt/.cvsignore
index e251683..dc4caac 100644
--- a/WebCore/kwq/qt/.cvsignore
+++ b/WebCore/kwq/qt/.cvsignore
@@ -1,6 +1,6 @@
-*.o
-*.a
+Makefile.in
Makefile
-Makefile.dep
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/kwq/qt/Makefile.am b/WebCore/kwq/qt/Makefile.am
new file mode 100644
index 0000000..007bcd2
--- /dev/null
+++ b/WebCore/kwq/qt/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+noinst_LTLIBRARIES = libqt_borrowed.la
+
+libqt_borrowed_la_SOURCES = \
+ _qbuffer.cpp \
+ _qcollection.cpp \
+ _qcstring.cpp \
+ _qdatetime.cpp \
+ _qdir.cpp \
+ _qdir_unix.cpp \
+ _qfile.cpp \
+ _qfileinfo.cpp \
+ _qfileinfo_unix.cpp \
+ _qgarray.cpp \
+ _qgdict.cpp \
+ _qglist.cpp \
+ _qglobal.cpp \
+ _qgvector.cpp \
+ _qiodevice.cpp \
+ _qmap.cpp \
+ _qpoint.cpp \
+ _qrect.cpp \
+ _qregexp.cpp \
+ _qregion.cpp \
+ _qsize.cpp \
+ _qstring.cpp \
+ _qstringlist.cpp \
+ _qurl.cpp \
+ $(NULL)
+
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(NULL)
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/kwq/qt/Makefile.in
deleted file mode 100644
index 4d344fd..0000000
--- a/WebCore/kwq/qt/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-HEADERS = $(wildcard *.h)
-SOURCES = $(wildcard *.cpp)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = lib_qt.a
-
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/lib/.cvsignore b/WebCore/lib/.cvsignore
deleted file mode 100644
index cc2e42d..0000000
--- a/WebCore/lib/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-kjs
-*.dylib
diff --git a/WebCore/lib/Makefile.in b/WebCore/lib/Makefile.in
deleted file mode 100644
index 67a714d..0000000
--- a/WebCore/lib/Makefile.in
+++ /dev/null
@@ -1,66 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# Generated automatically from Makefile.in by configure.
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-OBJECTS = $(wildcard *.o)
-
-LIBRARY_BASE_NAME = libwebcore
-LIBRARY_MAJOR_VERSION = 1
-LIBRARY_MINOR_VERSION = 0
-LIBRARY_MICRO_VERSION = 0
-LIBRARY_COMPAT_VERSION = 1.0
-LIBRARY_VERSION = $(LIBRARY_MAJOR_VERSION).$(LIBRARY_MINOR_VERSION).$(LIBRARY_MICRO_VERSION)
-LIBRARY = $(LIBRARY_BASE_NAME).$(LIBRARY_VERSION).dylib
-LIBRARY_DYNAMIC_LINK = $(LIBRARY_BASE_NAME).$(LIBRARY_MAJOR_VERSION).dylib
-LIBRARY_STATIC_LINK = $(LIBRARY_BASE_NAME).dylib
-
-CLEAN_FILES = $(LIBRARY_BASE_NAME).* \
- *.dylib \
- *.cpp \
- *.o \
- *.a \
- kjs \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(LIBRARY)
-
-$(LIBRARY): $(OBJECTS)
- rm -f $(LIBRARY_BASE_NAME).*.dylib; \
- $(CC) $(PROFILINGFLAGS) -flat_namespace -undefined suppress -compatibility_version $(LIBRARY_COMPAT_VERSION) -current_version $(LIBRARY_VERSION) $(DYLIBFLAGS) -o $(LIBRARY) $(OBJECTS) -lstdc++ -ljpeg -install_name "`echo "@executable_path/../Frameworks/libwebcore.1.0.0.dylib" | /usr/bin/sed 's!//*!/!g'`"
- ln -fs $(LIBRARY) $(LIBRARY_DYNAMIC_LINK)
- ln -fs $(LIBRARY) $(LIBRARY_STATIC_LINK)
- if [ -d "$(SYMROOTS)" ]; then \
- ln -fs `pwd`/$(LIBRARY) $(SYMROOTS)/$(LIBRARY); \
- ln -fs `pwd`/$(LIBRARY) $(SYMROOTS)/$(LIBRARY_DYNAMIC_LINK); \
- ln -fs `pwd`/$(LIBRARY) $(SYMROOTS)/$(LIBRARY_STATIC_LINK); \
- fi
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/.cvsignore b/WebCore/src/.cvsignore
index 4ed060c..dc4caac 100644
--- a/WebCore/src/.cvsignore
+++ b/WebCore/src/.cvsignore
@@ -1 +1,6 @@
-*.dummy
+Makefile.in
+Makefile
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
new file mode 100644
index 0000000..6616fe9
--- /dev/null
+++ b/WebCore/src/Makefile.am
@@ -0,0 +1,29 @@
+NULL=
+
+SUBDIRS = \
+ kdelibs \
+ kwq \
+ $(NULL)
+
+
+symrootsdir = $(SYMROOTS)
+
+symroots_LTLIBRARIES = libwebcore.la
+
+libwebcore_la_SOURCES = \
+ dummy.mm \
+ $(NULL)
+
+libwebcore_la_LIBADD = \
+ ./kdelibs/kjs/libkjs.la \
+ ./kdelibs/khtml/libkhtml.la \
+ ./kwq/libkwq.la \
+ /usr/lib/libjpeg.a \
+ /usr/lib/libstdc++.a \
+ $(NULL)
+
+libwebcore_la_LDFLAGS = \
+ -version-info $(WEBCORE_VERSION_INFO) \
+ $(NULL)
+
+all: install-am
diff --git a/WebCore/src/dummy.mm b/WebCore/src/dummy.mm
new file mode 100644
index 0000000..e69de29
diff --git a/WebCore/src/kdelibs/.cvsignore b/WebCore/src/kdelibs/.cvsignore
new file mode 100644
index 0000000..3dda729
--- /dev/null
+++ b/WebCore/src/kdelibs/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/WebCore/src/kdelibs/Makefile.am b/WebCore/src/kdelibs/Makefile.am
new file mode 100644
index 0000000..17c0dfb
--- /dev/null
+++ b/WebCore/src/kdelibs/Makefile.am
@@ -0,0 +1,8 @@
+NULL=
+
+SUBDIRS = \
+ kjs \
+ kdecore \
+ khtml \
+ $(NULL)
+
diff --git a/WebCore/src/kdelibs/kdecore/.cvsignore b/WebCore/src/kdelibs/kdecore/.cvsignore
index b13b61e..8b04619 100644
--- a/WebCore/src/kdelibs/kdecore/.cvsignore
+++ b/WebCore/src/kdelibs/kdecore/.cvsignore
@@ -1,2 +1,4 @@
+Makefile.in
Makefile
kentities.c
+.deps
diff --git a/WebCore/src/kdelibs/kdecore/Makefile.am b/WebCore/src/kdelibs/kdecore/Makefile.am
new file mode 100644
index 0000000..0e6ba29
--- /dev/null
+++ b/WebCore/src/kdelibs/kdecore/Makefile.am
@@ -0,0 +1,9 @@
+
+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)
\ No newline at end of file
diff --git a/WebCore/src/kdelibs/kdecore/Makefile.in b/WebCore/src/kdelibs/kdecore/Makefile.in
deleted file mode 100644
index 0f372cf..0000000
--- a/WebCore/src/kdelibs/kdecore/Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-CLEAN_FILES = kentities.c
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: kentities.c
-
-depend:
-
-kentities.c: kentities.gperf
- $(GPERF) -a -L "ANSI-C" -C -G -c -o -t -k '*' -NfindEntity -D -s 2 $< > $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/.cvsignore b/WebCore/src/kdelibs/khtml/.cvsignore
index cd5b4d2..8bf79da 100644
--- a/WebCore/src/kdelibs/khtml/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/.cvsignore
@@ -1,6 +1,5 @@
Makefile
Makefile.in
-libkhtml_la.all_cpp.cpp
testkhtml
testcss
testrender
@@ -8,5 +7,7 @@ SunWS_cache
ir.out
testkhtml_static
*.moc
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/src/kdelibs/khtml/Makefile.am b/WebCore/src/kdelibs/khtml/Makefile.am
new file mode 100644
index 0000000..27cfefe
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/Makefile.am
@@ -0,0 +1,43 @@
+NULL =
+
+SUBDIRS = \
+ misc \
+ css \
+ dom \
+ ecma \
+ xml \
+ java \
+ html \
+ rendering \
+ $(NULL)
+
+noinst_LTLIBRARIES = libkhtml.la
+
+libkhtml_la_SOURCES = \
+ khtml_events.cpp \
+ khtmlview.cpp \
+ $(NULL)
+
+libkhtml_la_LIBADD = \
+ ./misc/libkhtmlmisc.la \
+ ./css/libkhtmlcss.la \
+ ./dom/libkhtmldom.la \
+ ./ecma/libkhtmlecma.la \
+ ./xml/libkhtmlxml.la \
+ ./java/libkhtmljava.la \
+ ./html/libkhtmlhtml.la \
+ ./rendering/libkhtmlrendering.la \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+khtmlview.moc:
+ echo '#include <khtmlview.h>' > $@
+
+BUILT_SOURCES = khtmlview.moc
+
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/WebCore/src/kdelibs/khtml/Makefile.in b/WebCore/src/kdelibs/khtml/Makefile.in
deleted file mode 100644
index d40b65e..0000000
--- a/WebCore/src/kdelibs/khtml/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = \
- khtml_events.o \
- khtmlview.o \
- $(NULL)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtml.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../kdecore \
- -I../kjs \
- -I./misc \
- -I./css \
- -I./dom \
- -I./xml \
- -I./rendering \
- -I. \
- -I$(TOPSRCDIR) \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-khtmlview.cpp: khtmlview.moc
-khtmlview.moc:
- echo '#include <khtmlview.h>' > $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/css/.cvsignore b/WebCore/src/kdelibs/khtml/css/.cvsignore
index 1148efd..8a3fb20 100644
--- a/WebCore/src/kdelibs/khtml/css/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/css/.cvsignore
@@ -1,9 +1,5 @@
-Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
-*.moc
+Makefile
*.gperf
cssvalues.c
cssvalues.strip
@@ -11,5 +7,7 @@ cssvalues.h
cssproperties.c
cssproperties.strip
cssproperties.h
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
\ No newline at end of file
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.am b/WebCore/src/kdelibs/khtml/css/Makefile.am
new file mode 100644
index 0000000..7b1d187
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlcss.la
+
+libkhtmlcss_la_SOURCES = \
+ css_ruleimpl.cpp \
+ css_ruleimpl.h \
+ css_stylesheetimpl.cpp \
+ css_stylesheetimpl.h \
+ css_valueimpl.cpp \
+ css_valueimpl.h \
+ csshelper.cpp \
+ csshelper.h \
+ cssparser.cpp \
+ cssparser.h \
+ cssproperties.h \
+ cssstyleselector.cpp \
+ cssstyleselector.h \
+ cssvalues.h \
+ $(NULL)
+
+noinst_HEADERS = \
+ cssproperties.c \
+ cssvalues.c \
+ $(NULL)
+
+VALUEFILES = \
+ cssvalues.c \
+ cssvalues.h \
+ cssvalues.gperf \
+ $(NULL)
+
+PROPFILES = \
+ cssproperties.c \
+ cssproperties.h \
+ cssproperties.gperf \
+ $(NULL)
+
+
+BUILT_SOURCES = $(VALUEFILES) $(PROPFILES)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+$(VALUEFILES):
+ sh ./makevalues
+
+$(PROPFILES):
+ sh ./makeprop
+
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in b/WebCore/src/kdelibs/khtml/css/Makefile.in
deleted file mode 100644
index 8487ec7..0000000
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in
+++ /dev/null
@@ -1,107 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = css_ruleimpl.o \
- css_stylesheetimpl.o \
- css_valueimpl.o \
- csshelper.o \
- cssparser.o \
- cssstyleselector.o \
- $(NULL)
-
-VALUEFILES = \
- cssvalues.c \
- cssvalues.h \
- cssvalues.gperf \
- $(NULL)
-
-PROPFILES = \
- cssproperties.c \
- cssproperties.h \
- cssproperties.gperf \
- $(NULL)
-
-GENERATE_OBJECTS = $(VALUEFILES) $(PROPFILES)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlcss.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(GENERATE_OBJECTS) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../dom \
- -I../html \
- -I../misc \
- -I../xml \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: generate-objects $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-$(VALUEFILES):
- sh ./makevalues
-
-$(PROPFILES):
- sh ./makeprop
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/dom/.cvsignore b/WebCore/src/kdelibs/khtml/dom/.cvsignore
index 9b43b7e..dc4caac 100644
--- a/WebCore/src/kdelibs/khtml/dom/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/dom/.cvsignore
@@ -1,6 +1,6 @@
-Makefile
Makefile.in
-*.kde
-*.dep
-export-objects
-export-headers
+Makefile
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.am b/WebCore/src/kdelibs/khtml/dom/Makefile.am
new file mode 100644
index 0000000..49c4609
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.am
@@ -0,0 +1,66 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmldom.la
+
+libkhtmldom_la_SOURCES = \
+ css_rule.cpp \
+ css_rule.h \
+ css_stylesheet.cpp \
+ css_stylesheet.h \
+ css_value.cpp \
+ css_value.h \
+ dom2_events.cpp \
+ dom2_events.h \
+ dom2_range.cpp \
+ dom2_range.h \
+ dom2_traversal.cpp \
+ dom2_traversal.h \
+ dom2_views.cpp \
+ dom2_views.h \
+ dom_core.h \
+ dom_doc.cpp \
+ dom_doc.h \
+ dom_element.cpp \
+ dom_element.h \
+ dom_exception.h \
+ dom_html.h \
+ dom_misc.cpp \
+ dom_misc.h \
+ dom_node.cpp \
+ dom_node.h \
+ dom_string.cpp \
+ dom_string.h \
+ dom_text.cpp \
+ dom_text.h \
+ dom_xml.cpp \
+ dom_xml.h \
+ html_base.cpp \
+ html_base.h \
+ html_block.cpp \
+ html_block.h \
+ html_document.cpp \
+ html_document.h \
+ html_element.cpp \
+ html_element.h \
+ html_form.cpp \
+ html_form.h \
+ html_head.cpp \
+ html_head.h \
+ html_image.cpp \
+ html_image.h \
+ html_inline.cpp \
+ html_inline.h \
+ html_list.cpp \
+ html_list.h \
+ html_misc.cpp \
+ html_misc.h \
+ html_object.cpp \
+ html_object.h \
+ html_table.cpp \
+ html_table.h \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in b/WebCore/src/kdelibs/khtml/dom/Makefile.in
deleted file mode 100644
index 3e98cfb..0000000
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmldom.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I../css \
- -I../html \
- -I../misc \
- -I../xml \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/ecma/.cvsignore b/WebCore/src/kdelibs/khtml/ecma/.cvsignore
index f8af57a..99682ff 100644
--- a/WebCore/src/kdelibs/khtml/ecma/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/ecma/.cvsignore
@@ -1,10 +1,8 @@
-Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
-*.moc
-*.gperf
+Makefile
testecma
-export-objects
-export-headers
+.deps
+.libs
+*.la
+*.lo
+*.moc
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.am b/WebCore/src/kdelibs/khtml/ecma/Makefile.am
new file mode 100644
index 0000000..0e8583d
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.am
@@ -0,0 +1,55 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlecma.la
+
+libkhtmlecma_la_SOURCES = \
+ kjs_binding.cpp \
+ kjs_binding.h \
+ kjs_css.cpp \
+ kjs_css.h \
+ kjs_debugwin.cpp \
+ kjs_debugwin.h \
+ kjs_dom.cpp \
+ kjs_dom.h \
+ kjs_events.cpp \
+ kjs_events.h \
+ kjs_html.cpp \
+ kjs_html.h \
+ kjs_navigator.cpp \
+ kjs_navigator.h \
+ kjs_proxy.cpp \
+ kjs_proxy.h \
+ kjs_range.cpp \
+ kjs_range.h \
+ kjs_text.cpp \
+ kjs_text.h \
+ kjs_traversal.cpp \
+ kjs_traversal.h \
+ kjs_views.cpp \
+ kjs_views.h \
+ kjs_window.cpp \
+ kjs_window.h \
+ $(NULL)
+
+# FIXME - can't build ecma test because kwq is not yet built at this point
+#
+# noinst_PROGRAMS = testecma
+#
+# testecma_SOURCES = \
+# testecma.cpp \
+# $(NULL)
+#
+# testecma_LDADD = ./libkhtmlecma.la
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+kjs_window.moc:
+ touch $@
+
+BUILT_SOURCES = kjs_window.moc
+CLEANFILES = $(BUILT_SOURCES)
+
+
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
deleted file mode 100644
index 78639d6..0000000
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(filter-out testecma.o,$(CXXOBJECTS))
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlecma.a
-
-PROGRAMS = testecma
-
-CLEAN_FILES = $(OBJECTS) \
- kjs_window.moc \
- $(LIBRARY) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I../css \
- -I../dom \
- -I../html \
- -I../misc \
- -I../xml \
- -I../.. \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) $(LIBRARY) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-$(PROGRAMS): testecma.o
- $(CC) -o $@ $< -L. -lkhtmlecma
-
-kjs_window.cpp: kjs_window.moc
-kjs_window.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/html/.cvsignore b/WebCore/src/kdelibs/khtml/html/.cvsignore
index c905f15..e7837c4 100644
--- a/WebCore/src/kdelibs/khtml/html/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/html/.cvsignore
@@ -1,7 +1,7 @@
Makefile
Makefile.in
-*.dep
*.moc
-*.kde
-export-objects
-export-headers
+*.lo
+*.la
+.deps
+.libs
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.am b/WebCore/src/kdelibs/khtml/html/Makefile.am
new file mode 100644
index 0000000..29b350a
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.am
@@ -0,0 +1,53 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlhtml.la
+
+libkhtmlhtml_la_SOURCES = \
+ dtd.cpp \
+ dtd.h \
+ html_baseimpl.cpp \
+ html_baseimpl.h \
+ html_blockimpl.cpp \
+ html_blockimpl.h \
+ html_documentimpl.cpp \
+ html_documentimpl.h \
+ html_elementimpl.cpp \
+ html_elementimpl.h \
+ html_formimpl.cpp \
+ html_formimpl.h \
+ html_headimpl.cpp \
+ html_headimpl.h \
+ html_imageimpl.cpp \
+ html_imageimpl.h \
+ html_inlineimpl.cpp \
+ html_inlineimpl.h \
+ html_listimpl.cpp \
+ html_listimpl.h \
+ html_miscimpl.cpp \
+ html_miscimpl.h \
+ html_objectimpl.cpp \
+ html_objectimpl.h \
+ html_tableimpl.cpp \
+ html_tableimpl.h \
+ htmlparser.cpp \
+ htmlparser.h \
+ htmltokenizer.cpp \
+ htmltokenizer.h \
+ $(NULL)
+
+INCLUDES = \
+ -I$(top_srcdir) \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ -I. \
+ $(NULL)
+
+htmltokenizer.moc:
+ touch $@
+
+html_documentimpl.moc:
+ touch $@
+
+BUILT_SOURCES = htmltokenizer.moc html_documentimpl.moc
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.in b/WebCore/src/kdelibs/khtml/html/Makefile.in
deleted file mode 100644
index fe0a001..0000000
--- a/WebCore/src/kdelibs/khtml/html/Makefile.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlhtml.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../../kdecore \
- -I../../kjs \
- -I.. \
- -I../misc \
- -I../css \
- -I../dom \
- -I../xml \
- -I../rendering \
- -I. \
- -I$(TOPSRCDIR) \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-htmltokenizer.cpp: htmltokenizer.moc
-htmltokenizer.moc:
- touch $@
-
-html_documentimpl.cpp: html_documentimpl.moc
-html_documentimpl.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/java/.cvsignore b/WebCore/src/kdelibs/khtml/java/.cvsignore
index 58fe1e4..2a6ec4d 100644
--- a/WebCore/src/kdelibs/khtml/java/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/java/.cvsignore
@@ -1,8 +1,7 @@
Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
+.deps
+.libs
+*.lo
+*.la
*.moc
-export-objects
-export-headers
diff --git a/WebCore/src/kdelibs/khtml/java/ChangeLog b/WebCore/src/kdelibs/khtml/java/ChangeLog
deleted file mode 100644
index b276c27..0000000
--- a/WebCore/src/kdelibs/khtml/java/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-1999-12-14 Richard Moore <rich at ipso-facto.freeserve.co.uk>
-
- * Added a delay when you reload a class so that a race is less
- likely (yuck!)
- * Added a destructor to kjaw
- * Still has trouble though :-( It only seems to occur whn using
- KWin, KWM has no problem.
-
-Tue Dec 7 23:32:21 GMT 1999
-
- * Many improvements to string handling
- * Moved to value based collections
- * Addition of a d pointer for future binary compatability
- * Added some accessor methods
- * Improvements to kjavaprocess
- * - Now handles system property settings
- * - Detects death of the server
- * - Supports bidirectional comms
- * Applets and contexts are destroyed properly
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.am b/WebCore/src/kdelibs/khtml/java/Makefile.am
new file mode 100644
index 0000000..3a91316
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.am
@@ -0,0 +1,62 @@
+NULL =
+
+SUBDIRS = . tests
+
+noinst_LTLIBRARIES = libkhtmljava.la
+
+libkhtmljava_la_SOURCES = \
+ kjavaapplet.cpp \
+ kjavaapplet.h \
+ kjavaappletcontext.cpp \
+ kjavaappletcontext.h \
+ kjavaappletserver.cpp \
+ kjavaappletserver.h \
+ kjavaappletwidget.cpp \
+ kjavaappletwidget.h \
+ kjavadownloader.cpp \
+ kjavadownloader.h \
+ kjavaprocess.cpp \
+ kjavaprocess.h \
+ $(NULL)
+
+
+# FIXME: Need a hack here to give the xml tokenizer text stream
+# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
+# can be removed when we have Qt text streams implemented
+
+INCLUDES = \
+ -DNEED_BOGUS_TEXTSTREAMS \
+ -DNEED_BOGUS_X_DEFINES \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+
+kjavaapplet.moc:
+ touch $@
+
+kjavaappletcontext.moc:
+ touch $@
+
+kjavaappletserver.moc:
+ touch $@
+
+kjavaappletwidget.moc:
+ touch $@
+
+kjavadownloader.moc:
+ touch $@
+
+kjavaprocess.moc:
+ touch $@
+
+BUILT_SOURCES = \
+ kjavaapplet.moc \
+ kjavaappletcontext.moc \
+ kjavaappletserver.moc \
+ kjavaappletwidget.moc \
+ kjavadownloader.moc \
+ kjavaprocess.moc \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.in b/WebCore/src/kdelibs/khtml/java/Makefile.in
deleted file mode 100644
index af8bbc1..0000000
--- a/WebCore/src/kdelibs/khtml/java/Makefile.in
+++ /dev/null
@@ -1,102 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-SKIPOBJECTS = javaembed.o
-CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmljava.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-# FIXME: Need a hack here to give the xml tokenizer text stream
-# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-# can be removed when we have Qt text streams implemented
-CXXFLAGS = $(BASECXXFLAGS) \
- -DNEED_BOGUS_TEXTSTREAMS \
- -DNEED_BOGUS_X_DEFINES \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-kjavaapplet.cpp: kjavaapplet.moc
-kjavaapplet.moc:
- touch $@
-
-kjavaappletcontext.cpp: kjavaappletcontext.moc
-kjavaappletcontext.moc:
- touch $@
-
-kjavaappletserver.cpp: kjavaappletserver.moc
-kjavaappletserver.moc:
- touch $@
-
-kjavaappletwidget.cpp: kjavaappletwidget.moc
-kjavaappletwidget.moc:
- touch $@
-
-kjavadownloader.cpp: kjavadownloader.moc
-kjavadownloader.moc:
- touch $@
-
-kjavaprocess.cpp: kjavaprocess.moc
-kjavaprocess.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/java/tests/Makefile.am b/WebCore/src/kdelibs/khtml/java/tests/Makefile.am
index e996cfb..b31453e 100644
--- a/WebCore/src/kdelibs/khtml/java/tests/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/java/tests/Makefile.am
@@ -1,10 +1,13 @@
-INCLUDES = -I$(top_srcdir)/khtml/java/ $(all_includes)
-LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkjava.la
-check_PROGRAMS = testserver
+# FIXME: currently commented out because this would require kwq
-testserver_SOURCES = testkjavaappletserver.cpp
-
-METASOURCES = AUTO
+# INCLUDES = -I$(top_srcdir)/khtml/java/ $(all_includes)
+# LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkjava.la
+#
+# check_PROGRAMS = testserver
+#
+# testserver_SOURCES = testkjavaappletserver.cpp
+#
+# METASOURCES = AUTO
diff --git a/WebCore/src/kdelibs/khtml/misc/.cvsignore b/WebCore/src/kdelibs/khtml/misc/.cvsignore
index 2334feb..bdc1485 100644
--- a/WebCore/src/kdelibs/khtml/misc/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/misc/.cvsignore
@@ -1,8 +1,5 @@
Makefile
Makefile.in
-*.kde
-*.moc
-*.dep
khtmldata.h
htmltags.c
htmltags.h
@@ -10,5 +7,7 @@ htmltags.gperf
htmlattrs.c
htmlattrs.h
htmlattrs.gperf
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.am b/WebCore/src/kdelibs/khtml/misc/Makefile.am
new file mode 100644
index 0000000..ba2563f
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.am
@@ -0,0 +1,58 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlmisc.la
+
+libkhtmlmisc_la_SOURCES = \
+ decoder.cpp \
+ decoder.h \
+ font.cpp \
+ font.h \
+ helper.cpp \
+ helper.h \
+ htmlattrs.h \
+ htmlhashes.cpp \
+ htmlhashes.h \
+ htmltags.h \
+ khtmldata.h \
+ khtmllayout.h \
+ loader.h \
+ loader_client.h \
+ loader_jpeg.cpp \
+ loader_jpeg.h \
+ stringit.h \
+ $(NULL)
+
+noinst_HEADERS = \
+ htmlattrs.c \
+ htmltags.c \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+TAGFILES = \
+ htmltags.c \
+ htmltags.h \
+ htmltags.gperf \
+ $(NULL)
+
+ATTRSFILES = \
+ htmlattrs.c \
+ htmlattrs.h \
+ htmlattrs.gperf \
+ $(NULL)
+
+khtmldata.h:
+ touch $@
+
+$(TAGFILES):
+ perl ./maketags
+
+$(ATTRSFILES):
+ perl ./makeattrs
+
+BUILT_SOURCES = khtmldata.h $(TAGFILES) $(ATTRSFILES)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in b/WebCore/src/kdelibs/khtml/misc/Makefile.in
deleted file mode 100644
index c1d82b8..0000000
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in
+++ /dev/null
@@ -1,101 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-TAGFILES = \
- htmltags.c \
- htmltags.h \
- htmltags.gperf \
- $(NULL)
-
-ATTRSFILES = \
- htmlattrs.c \
- htmlattrs.h \
- htmlattrs.gperf \
- $(NULL)
-
-GENERATE_OBJECTS = $(TAGFILES) $(ATTRSFILES)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = khtmldata.h $(GENERATE_OBJECTS) $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlmisc.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(GENERATE_OBJECTS) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I../dom \
- -I../html \
- -I../xml \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: generate-objects $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-khtmldata.h:
- touch $@
-
-$(TAGFILES):
- perl ./maketags
-
-$(ATTRSFILES):
- perl ./makeattrs
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/pics/Makefile.am b/WebCore/src/kdelibs/khtml/pics/Makefile.am
deleted file mode 100644
index 8dc007e..0000000
--- a/WebCore/src/kdelibs/khtml/pics/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-khtmliconsdir = $(kde_datadir)/khtml/icons
-khtmlicons_ICON = AUTO
-
diff --git a/WebCore/src/kdelibs/khtml/rendering/.cvsignore b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
index 708a929..984c9d9 100644
--- a/WebCore/src/kdelibs/khtml/rendering/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
@@ -1,9 +1,7 @@
Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
+.deps
+.libs
*.moc
-*.gperf
-export-objects
-export-headers
+*.lo
+*.la
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.am b/WebCore/src/kdelibs/khtml/rendering/Makefile.am
new file mode 100644
index 0000000..85fc704
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.am
@@ -0,0 +1,71 @@
+NULL =
+
+noinst_LTLIBRARIES = libkhtmlrendering.la
+
+libkhtmlrendering_la_SOURCES = \
+ bidi.cpp \
+ bidi.h \
+ break_lines.cpp \
+ break_lines.h \
+ render_applet.cpp \
+ render_applet.h \
+ render_body.cpp \
+ render_body.h \
+ render_box.cpp \
+ render_box.h \
+ render_br.cpp \
+ render_br.h \
+ render_container.cpp \
+ render_container.h \
+ render_flow.cpp \
+ render_flow.h \
+ render_form.cpp \
+ render_form.h \
+ render_frames.cpp \
+ render_frames.h \
+ render_hr.cpp \
+ render_hr.h \
+ render_html.cpp \
+ render_html.h \
+ render_image.cpp \
+ render_image.h \
+ render_list.cpp \
+ render_list.h \
+ render_object.cpp \
+ render_object.h \
+ render_replaced.cpp \
+ render_replaced.h \
+ render_root.cpp \
+ render_root.h \
+ render_style.cpp \
+ render_style.h \
+ render_table.cpp \
+ render_table.h \
+ render_text.cpp \
+ render_text.h \
+ $(NULL)
+
+
+INCLUDES = \
+ -DNEED_BOGUS_X_DEFINES \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+render_form.moc:
+ touch $@
+
+render_frames.moc:
+ touch $@
+
+render_replaced.moc:
+ touch $@
+
+BUILT_SOURCES = \
+ render_form.moc \
+ render_frames.moc \
+ render_replaced.moc \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.in b/WebCore/src/kdelibs/khtml/rendering/Makefile.in
deleted file mode 100644
index a815ff6..0000000
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.in
+++ /dev/null
@@ -1,95 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlrendering.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -DNEED_BOGUS_X_DEFINES \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I../../kdecore \
- -I../../kjs \
- -I../html \
- -I../java \
- -I../misc \
- -I../css \
- -I../dom \
- -I../xml \
- -I. \
- -I.. \
- -I$(TOPSRCDIR) \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) $(LIBRARY) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-render_form.cpp: render_form.moc
-render_form.moc:
- touch $@
-
-render_frames.cpp: render_frames.moc
-render_frames.moc:
- touch $@
-
-render_replaced.cpp: render_replaced.moc
-render_replaced.moc:
- touch $@
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/khtml/xml/.cvsignore b/WebCore/src/kdelibs/khtml/xml/.cvsignore
index 58fe1e4..e7837c4 100644
--- a/WebCore/src/kdelibs/khtml/xml/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/xml/.cvsignore
@@ -1,8 +1,7 @@
Makefile
-Makefile.am
Makefile.in
-*.kde
-*.dep
*.moc
-export-objects
-export-headers
+*.lo
+*.la
+.deps
+.libs
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.am b/WebCore/src/kdelibs/khtml/xml/Makefile.am
new file mode 100644
index 0000000..8314781
--- /dev/null
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.am
@@ -0,0 +1,49 @@
+NULL=
+
+noinst_LTLIBRARIES = libkhtmlxml.la
+
+libkhtmlxml_la_SOURCES = \
+ dom2_eventsimpl.cpp \
+ dom2_eventsimpl.h \
+ dom2_rangeimpl.cpp \
+ dom2_rangeimpl.h \
+ dom2_traversalimpl.cpp \
+ dom2_traversalimpl.h \
+ dom2_viewsimpl.cpp \
+ dom2_viewsimpl.h \
+ dom_docimpl.cpp \
+ dom_docimpl.h \
+ dom_elementimpl.cpp \
+ dom_elementimpl.h \
+ dom_nodeimpl.cpp \
+ dom_nodeimpl.h \
+ dom_stringimpl.cpp \
+ dom_stringimpl.h \
+ dom_textimpl.cpp \
+ dom_textimpl.h \
+ dom_xmlimpl.cpp \
+ dom_xmlimpl.h \
+ xml_tokenizer.cpp \
+ xml_tokenizer.h \
+ $(NULL)
+
+
+# FIXME: Need a hack here to give the xml tokenizer text stream
+# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
+# can be removed when we have Qt text streams implemented
+
+INCLUDES = \
+ -DNEED_BOGUS_TEXTSTREAMS \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(NULL)
+
+dom_docimpl.moc:
+ touch $@
+
+xml_tokenizer.moc:
+ touch $@
+
+BUILT_SOURCES = dom_docimpl.moc xml_tokenizer.moc
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in b/WebCore/src/kdelibs/khtml/xml/Makefile.in
deleted file mode 100644
index 9ce71ed..0000000
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in
+++ /dev/null
@@ -1,102 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.cpp)
-HEADERS = $(wildcard *.h)
-
-CXXOBJECTS = \
- dom2_eventsimpl.o \
- dom2_rangeimpl.o \
- dom2_traversalimpl.o \
- dom2_viewsimpl.o \
- dom_docimpl.o \
- dom_elementimpl.o \
- dom_nodeimpl.o \
- dom_stringimpl.o \
- dom_textimpl.o \
- dom_xmlimpl.o \
- xml_tokenizer.o \
- $(NULL)
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkhtmlxml.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- *.moc \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-# FIXME: Need a hack here to give the xml tokenizer text stream
-# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-# can be removed when we have Qt text streams implemented
-CXXFLAGS = $(BASECXXFLAGS) \
- -DNEED_BOGUS_TEXTSTREAMS \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I../css \
- -I../dom \
- -I../html \
- -I../misc \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-dom_docimpl.cpp: dom_docimpl.moc
-dom_docimpl.moc:
- touch $@
-xml_tokenizer.cpp: xml_tokenizer.moc
-xml_tokenizer.moc:
- touch $@
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/kjs/.cvsignore b/WebCore/src/kdelibs/kjs/.cvsignore
index 4afaf60..2c167c6 100644
--- a/WebCore/src/kdelibs/kjs/.cvsignore
+++ b/WebCore/src/kdelibs/kjs/.cvsignore
@@ -1,14 +1,10 @@
-Makefile
-Makefile.am
Makefile.in
-configure.in.in
+Makefile
testkjs
-libkjs_la.all_cpp.cpp
-SunWS_cache
grammar.cpp
grammar.cpp.h
grammar.h
-*.kde
-*.dep
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
\ No newline at end of file
diff --git a/WebCore/src/kdelibs/kjs/ChangeLog b/WebCore/src/kdelibs/kjs/ChangeLog
deleted file mode 100644
index 8176cf4..0000000
--- a/WebCore/src/kdelibs/kjs/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-2001-01-04 Harri Porten <harri at trolltech.com>
-
- * ustring.h: pack bytes to avoid alignment problems (ARM) reported
- by Stefan Hanske <sh990154 at mail.uni-greifswald.de>
- * nodes.cpp: typeof fix by Emmeran Seehuber <the_emmy at gmx.de>
- * nodes.cpp: fixed order of function declaration proccessing
-
-2000-12-18 Harri Porten <harri at trolltech.com>
-
- * string_object.cpp: fixed out-of-bounds error in fromCharCode()
-
-2000-12-11 Harri Porten <harri at trolltech.com>
-
- * regexp.h: compile fix for buggy libc
- * ustring.cpp: format string conversion of numbers with %g
-
-2000-12-10 Harri Porten <harri at trolltech.com>
-
- * lexer.cpp: parsing != was broken, added \v escape in strings,
- fixed "\u" and "\x" and \x with non hex chars following.
- * nodes.cpp: implemented <<=, >>=, >>>=, &=, ^=, |= and %=
- * internal.cpp: create error message including line no on parse errors
-
-
diff --git a/WebCore/src/kdelibs/kjs/Makefile.am b/WebCore/src/kdelibs/kjs/Makefile.am
new file mode 100644
index 0000000..190cc2b
--- /dev/null
+++ b/WebCore/src/kdelibs/kjs/Makefile.am
@@ -0,0 +1,76 @@
+NULL =
+
+noinst_LTLIBRARIES = libkjs.la
+
+libkjs_la_SOURCES = \
+ array_object.cpp \
+ array_object.h \
+ bool_object.cpp \
+ bool_object.h \
+ collector.cpp \
+ collector.h \
+ date_object.cpp \
+ date_object.h \
+ debugger.cpp \
+ debugger.h \
+ error_object.cpp \
+ error_object.h \
+ function.cpp \
+ function.h \
+ function_object.cpp \
+ function_object.h \
+ global_object.cpp \
+ grammar.cpp \
+ grammar.h \
+ internal.cpp \
+ internal.h \
+ kjs.cpp \
+ kjs.h \
+ lexer.cpp \
+ lexer.h \
+ lexer.lut.h \
+ lookup.cpp \
+ lookup.h \
+ math_object.cpp \
+ math_object.h \
+ math_object.lut.h \
+ nodes.cpp \
+ nodes.h \
+ number_object.cpp \
+ number_object.h \
+ object.cpp \
+ object.h \
+ object_object.cpp \
+ object_object.h \
+ operations.cpp \
+ operations.h \
+ regexp.cpp \
+ regexp.h \
+ regexp_object.cpp \
+ regexp_object.h \
+ string_object.cpp \
+ string_object.h \
+ types.cpp \
+ types.h \
+ ustring.cpp \
+ ustring.h \
+ $(NULL)
+
+BUILT_SOURCES = grammar.cpp grammar.cpp.h
+
+noinst_PROGRAMS = testkjs
+
+testkjs_SOURCES = testkjs.cpp
+
+testkjs_LDADD = $(srcdir)/libkjs.la
+
+CLEANFILES = $(BUILT_SOURCES) \
+ grammar.h \
+ $(NULL)
+
+YACCFLAGS = -d --output-file=grammar.cpp --file-prefix=grammar --name-prefix=kjsyy
+
+grammar.h grammar.cpp: grammar.y
+ $(YACC) $(YACCFLAGS) $<
+ ln -sf grammar.cpp.h grammar.h
+
diff --git a/WebCore/src/kdelibs/kjs/Makefile.in b/WebCore/src/kdelibs/kjs/Makefile.in
deleted file mode 100644
index 99ea2e9..0000000
--- a/WebCore/src/kdelibs/kjs/Makefile.in
+++ /dev/null
@@ -1,126 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-# Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-CXXYACCOBJECTS = grammar.cpp grammar.h
-
-CXXOBJECTS = \
- array_object.o \
- bool_object.o \
- collector.o \
- date_object.o \
- debugger.o \
- error_object.o \
- function.o \
- function_object.o \
- global_object.o \
- grammar.o \
- internal.o \
- kjs.o \
- lexer.o \
- lookup.o \
- math_object.o \
- nodes.o \
- number_object.o \
- object.o \
- object_object.o \
- operations.o \
- regexp.o \
- regexp_object.o \
- string_object.o \
- types.o \
- ustring.o \
- $(NULL)
-
-PROGRAMS = testkjs
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-GENERATE_OBJECTS = $(CXXYACCOBJECTS)
-
-LIBRARY = libkjs.a
-
-CLEAN_FILES = $(OBJECTS) \
- grammar.h \
- grammar.cpp \
- grammar.cpp.h \
- testkjs.o \
- $(LIBRARY) \
- $(PROGRAMS) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: generate-objects $(OBJECTS) $(LIBRARY) export-headers export-objects
-
-$(LIBRARY): $(CXXOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-$(PROGRAMS): testkjs.o
- $(CC) $< -o $@ -L. -lkjs
-
-depend:
-
-grammar.h: grammar.cpp.h
- ln -s grammar.cpp.h grammar.h
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kdelibs/kjs/kjs-test b/WebCore/src/kdelibs/kjs/kjs-test
new file mode 100755
index 0000000..a427f97
--- /dev/null
+++ b/WebCore/src/kdelibs/kjs/kjs-test
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+`dirname $0`/testkjs `dirname $0`/test.js 2>&1
+
+if [ $? -eq 1 ]; then
+ exit 0;
+fi
\ No newline at end of file
diff --git a/WebCore/src/kdelibs/kjs/kjs-test.chk b/WebCore/src/kdelibs/kjs/kjs-test.chk
new file mode 100644
index 0000000..e5729b7
--- /dev/null
+++ b/WebCore/src/kdelibs/kjs/kjs-test.chk
@@ -0,0 +1,16 @@
+---> inside test()
+---> 20
+---> 30
+---> inside test()
+---> 10
+---> 50
+---> s = 60
+---> i = 2
+---> a[0] = 11
+---> a[1] = 22
+---> a[2] = undefined
+---> a[3] = undefined
+---> a[4] = apple
+---> b = [object Boolean]
+---> bbbc
+OK.
diff --git a/WebCore/src/kwq/.cvsignore b/WebCore/src/kwq/.cvsignore
index bccb4e5..c78f681 100644
--- a/WebCore/src/kwq/.cvsignore
+++ b/WebCore/src/kwq/.cvsignore
@@ -1,7 +1,9 @@
+Makefile.in
Makefile
-*.dummy
-export-objects
-export-headers
KWQCharsetData.c
mac-encodings.txt
make-mac-encodings
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/src/kwq/Makefile.am b/WebCore/src/kwq/Makefile.am
new file mode 100644
index 0000000..e1b337e
--- /dev/null
+++ b/WebCore/src/kwq/Makefile.am
@@ -0,0 +1,162 @@
+NULL =
+
+SUBDIRS = \
+ kde \
+ qt \
+ $(NULL)
+
+noinst_LTLIBRARIES = libkwq.la
+
+libkwq_la_SOURCES = \
+ KWQApplication.mm \
+ KWQBitmap.mm \
+ KWQBrush.mm \
+ KWQButton.mm \
+ KWQCString.mm \
+ KWQChar.mm \
+ KWQCharsets.mm \
+ KWQCheckBox.mm \
+ KWQColor.mm \
+ KWQColorGroup.mm \
+ KWQComboBox.mm \
+ KWQCompletion.mm \
+ KWQCursor.mm \
+ KWQDCOPClient.mm \
+ KWQDateTime.mm \
+ KWQDrawUtil.mm \
+ KWQEvent.mm \
+ KWQFont.mm \
+ KWQFontDatabase.mm \
+ KWQFontInfo.mm \
+ KWQFontMetrics.mm \
+ KWQFrame.mm \
+ KWQGuardedPtr.mm \
+ KWQPoint.mm \
+ KWQRect.mm \
+ KWQSize.mm \
+ KWQHBox.mm \
+ KWQImage.mm \
+ KWQInputDialog.mm \
+ KWQKApplication.mm \
+ KWQKCharsets.mm \
+ KWQKComboBox.mm \
+ KWQKCompletionBox.mm \
+ KWQKConfigBase.mm \
+ KWQKCursor.mm \
+ KWQKDebug.mm \
+ KWQKFactory.mm \
+ KWQKFileDialog.mm \
+ KWQKFileItem.mm \
+ KWQKGlobal.mm \
+ KWQKGlobalSettings.mm \
+ KWQKHTMLFactory.mm \
+ KWQKHTMLPart.mm \
+ KWQKHTMLPartBrowserExtension.mm \
+ KWQKHTMLSettings.mm \
+ KWQKHTMLView.mm \
+ KWQKHistoryProvider.mm \
+ KWQKIconLoader.mm \
+ KWQKImageIO.mm \
+ KWQKInstance.mm \
+ KWQKJavaEmbed.mm \
+ KWQKJob.mm \
+ KWQKLineEdit.mm \
+ KWQKListBox.mm \
+ KWQKLocale.mm \
+ KWQKMessageBox.mm \
+ KWQKMimeType.mm \
+ KWQKPartsEvent.mm \
+ KWQKPrinter.mm \
+ KWQKProcess.mm \
+ KWQKProtocolManager.mm \
+ KWQKScheduler.mm \
+ KWQKSimpleConfig.mm \
+ KWQKStringHandler.mm \
+ KWQKWin.mm \
+ KWQKWinModule.mm \
+ KWQKjobclasses.mm \
+ KWQKloader.mm \
+ KWQKnetaccess.mm \
+ KWQKstddirs.mm \
+ KWQLabel.mm \
+ KWQLineEdit.mm \
+ KWQListBox.mm \
+ KWQMovie.mm \
+ KWQNSTextField.mm \
+ KWQObject.mm \
+ KWQPaintDevice.mm \
+ KWQPaintDeviceMetrics.mm \
+ KWQPainter.mm \
+ KWQPalette.mm \
+ KWQPart.mm \
+ KWQPen.mm \
+ KWQPixmap.mm \
+ KWQPointArray.mm \
+ KWQPushButton.mm \
+ KWQRadioButton.mm \
+ KWQRegion.mm \
+ KWQScrollView.mm \
+ KWQString.mm \
+ KWQStyle.mm \
+ KWQTextArea.mm \
+ KWQTextContainer.mm \
+ KWQTextEdit.mm \
+ KWQTextStorage.mm \
+ KWQTimer.mm \
+ KWQToolTip.mm \
+ KWQVariant.mm \
+ KWQView.mm \
+ KWQWMatrix.mm \
+ KWQWidget.mm \
+ KWQasyncimageio.mm \
+ KWQasyncio.mm \
+ KWQbrowserextension.mm \
+ KWQbrowserinterface.mm \
+ KWQsignals.mm \
+ KWQtextcodec.mm \
+ KWQtextstream.mm \
+ KWQxml.mm \
+ _KWQOwner.m \
+ kwqdebug.mm \
+ WKPlugin.mm \
+ WKPluginView.mm \
+ WKPluginDatabase.mm \
+ KWQPlugin.mm \
+ npapi.c \
+ $(NULL)
+
+libkwq_la_LIBADD = \
+ ./qt/libqt_borrowed.la \
+ ./kde/libkde_borrowed.la \
+ $(NULL)
+
+INCLUDES = \
+ -DNEED_BOGUS_X_DEFINES \
+ $(KWQ_INCLUDES) \
+ $(KDELIBS_INCLUDES) \
+ $(WEBCORE_INCLUDES) \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ make-mac-encodings \
+ $(NULL)
+
+make_mac_encodings_SOURCES = make-mac-encodings.c
+
+make_mac_encodings_LDFLAGS = \
+ -framework CoreFoundation \
+ $(NULL)
+
+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
+
+BUILT_SOURCES = \
+ make-mac-encodings \
+ mac-encodings.txt \
+ KWQCharsetData.c \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
deleted file mode 100644
index 8439651..0000000
--- a/WebCore/src/kwq/Makefile.in
+++ /dev/null
@@ -1,256 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-SOURCES = $(wildcard *.mm)
-HEADERS = $(wildcard *.h)
-
-MMOBJECTS = \
- KWQApplication.o \
- KWQBitmap.o \
- KWQBrush.o \
- KWQButton.o \
- KWQCString.o \
- KWQChar.o \
- KWQCharsets.o \
- KWQCheckBox.o \
- KWQColor.o \
- KWQColorGroup.o \
- KWQComboBox.o \
- KWQCompletion.o \
- KWQCursor.o \
- KWQDCOPClient.o \
- KWQDateTime.o \
- KWQDrawUtil.o \
- KWQEvent.o \
- KWQFont.o \
- KWQFontDatabase.o \
- KWQFontInfo.o \
- KWQFontMetrics.o \
- KWQFrame.o \
- KWQGuardedPtr.o \
- KWQPoint.o \
- KWQRect.o \
- KWQSize.o \
- KWQHBox.o \
- KWQImage.o \
- KWQInputDialog.o \
- KWQKApplication.o \
- KWQKCharsets.o \
- KWQKComboBox.o \
- KWQKCompletionBox.o \
- KWQKConfigBase.o \
- KWQKCursor.o \
- KWQKDebug.o \
- KWQKFactory.o \
- KWQKFileDialog.o \
- KWQKFileItem.o \
- KWQKGlobal.o \
- KWQKGlobalSettings.o \
- KWQKHTMLFactory.o \
- KWQKHTMLPart.o \
- KWQKHTMLPartBrowserExtension.o \
- KWQKHTMLSettings.o \
- KWQKHTMLView.o \
- KWQKHistoryProvider.o \
- KWQKIconLoader.o \
- KWQKImageIO.o \
- KWQKInstance.o \
- KWQKJavaEmbed.o \
- KWQKJob.o \
- KWQKLineEdit.o \
- KWQKListBox.o \
- KWQKLocale.o \
- KWQKMessageBox.o \
- KWQKMimeType.o \
- KWQKPartsEvent.o \
- KWQKPrinter.o \
- KWQKProcess.o \
- KWQKProtocolManager.o \
- KWQKScheduler.o \
- KWQKSimpleConfig.o \
- KWQKStringHandler.o \
- KWQKWin.o \
- KWQKWinModule.o \
- KWQKjobclasses.o \
- KWQKloader.o \
- KWQKnetaccess.o \
- KWQKstddirs.o \
- KWQLabel.o \
- KWQLineEdit.o \
- KWQListBox.o \
- KWQMovie.o \
- KWQNSTextField.o \
- KWQObject.o \
- KWQPaintDevice.o \
- KWQPaintDeviceMetrics.o \
- KWQPainter.o \
- KWQPalette.o \
- KWQPart.o \
- KWQPen.o \
- KWQPixmap.o \
- KWQPointArray.o \
- KWQPushButton.o \
- KWQRadioButton.o \
- KWQRegion.o \
- KWQScrollView.o \
- KWQString.o \
- KWQStyle.o \
- KWQTextArea.o \
- KWQTextContainer.o \
- KWQTextEdit.o \
- KWQTextStorage.o \
- KWQTimer.o \
- KWQToolTip.o \
- KWQVariant.o \
- KWQView.o \
- KWQWMatrix.o \
- KWQWidget.o \
- KWQasyncimageio.o \
- KWQasyncio.o \
- KWQbrowserextension.o \
- KWQbrowserinterface.o \
- KWQsignals.o \
- KWQtextcodec.o \
- KWQtextstream.o \
- KWQxml.o \
- _KWQOwner.o \
- kwqdebug.o \
- WKPlugin.o \
- WKPluginView.o \
- WKPluginDatabase.o \
- KWQPlugin.o \
- $(NULL)
-
-COBJECTS = \
- npapi.o \
- $(NULL)
-
-MOBJECTS = \
- $(NULL)
-
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(MMOBJECTS) $(MOBJECTS) $(COBJECTS)
-EXPORT_OBJECTS = $(OBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = libkwq.a
-
-CLEAN_FILES = $(OBJECTS) \
- $(LIBRARY) \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CMMFLAGS = $(BASECMMFLAGS) \
- -g \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/include \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/kjs \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/dom \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/ecma \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/html \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/misc \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/xml \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq/khtml/java \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CMMFLAGS)
-
-CMFLAGS = $(BASECMFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/include \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I. \
- $(NULL)
-
-CFLAGS = $(BASECFLAGS) \
- -I$(TOPSRCDIR) \
- -I$(TOPSRCDIR)/WebCore/include \
- -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
- -I$(TOPSRCDIR)/WebCore/src/kwq \
- -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
- -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CMFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(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
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kwq/_KWQOwner.m b/WebCore/src/kwq/_KWQOwner.m
index f9fe747..7063f8f 100644
--- a/WebCore/src/kwq/_KWQOwner.m
+++ b/WebCore/src/kwq/_KWQOwner.m
@@ -93,7 +93,6 @@ static BOOL flag = NO;
-(void)backForwardUriDone:(NSNotification *)notification
{
NSString *uriString;
- id <WCURIEntry> entry;
uriString = [notification object];
diff --git a/WebCore/src/kwq/kde/.cvsignore b/WebCore/src/kwq/kde/.cvsignore
index f4dee06..dc4caac 100644
--- a/WebCore/src/kwq/kde/.cvsignore
+++ b/WebCore/src/kwq/kde/.cvsignore
@@ -1,3 +1,6 @@
+Makefile.in
Makefile
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/src/kwq/kde/Makefile.am b/WebCore/src/kwq/kde/Makefile.am
new file mode 100644
index 0000000..2f0b6fe
--- /dev/null
+++ b/WebCore/src/kwq/kde/Makefile.am
@@ -0,0 +1,13 @@
+NULL =
+
+noinst_LTLIBRARIES = libkde_borrowed.la
+
+libkde_borrowed_la_SOURCES = \
+ _kurl.cpp \
+ _kurl.h \
+ $(NULL)
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(NULL)
+
diff --git a/WebCore/src/kwq/kde/Makefile.in b/WebCore/src/kwq/kde/Makefile.in
deleted file mode 100644
index 125cfcb..0000000
--- a/WebCore/src/kwq/kde/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-HEADERS = $(wildcard *.h)
-SOURCES = $(wildcard *.cpp)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = lib_kde.a
-
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I../kdecore \
- -I../qt \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kwq/kdecore/.cvsignore b/WebCore/src/kwq/kdecore/.cvsignore
index 71f692b..e69de29 100644
--- a/WebCore/src/kwq/kdecore/.cvsignore
+++ b/WebCore/src/kwq/kdecore/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-export-headers
diff --git a/WebCore/src/kwq/kdecore/Makefile.in b/WebCore/src/kwq/kdecore/Makefile.in
deleted file mode 100644
index 7383c2e..0000000
--- a/WebCore/src/kwq/kdecore/Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-HEADERS = $(wildcard *.h)
-
-EXPORT_HEADERS = $(HEADERS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-
-CLEAN_FILES = \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: export-headers
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebCore/src/kwq/khtml/khtml_factory.h b/WebCore/src/kwq/khtml/khtml_factory.h
index 31d8470..6c0063e 100644
--- a/WebCore/src/kwq/khtml/khtml_factory.h
+++ b/WebCore/src/kwq/khtml/khtml_factory.h
@@ -27,6 +27,7 @@
class KInstance;
class HistoryProvider;
class KHTMLPart;
+class KHTMLSettings;
class KHTMLFactory : public KParts::Factory
{
diff --git a/WebCore/src/kwq/qt/.cvsignore b/WebCore/src/kwq/qt/.cvsignore
index e251683..dc4caac 100644
--- a/WebCore/src/kwq/qt/.cvsignore
+++ b/WebCore/src/kwq/qt/.cvsignore
@@ -1,6 +1,6 @@
-*.o
-*.a
+Makefile.in
Makefile
-Makefile.dep
-export-objects
-export-headers
+.deps
+.libs
+*.lo
+*.la
diff --git a/WebCore/src/kwq/qt/Makefile.am b/WebCore/src/kwq/qt/Makefile.am
new file mode 100644
index 0000000..007bcd2
--- /dev/null
+++ b/WebCore/src/kwq/qt/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+noinst_LTLIBRARIES = libqt_borrowed.la
+
+libqt_borrowed_la_SOURCES = \
+ _qbuffer.cpp \
+ _qcollection.cpp \
+ _qcstring.cpp \
+ _qdatetime.cpp \
+ _qdir.cpp \
+ _qdir_unix.cpp \
+ _qfile.cpp \
+ _qfileinfo.cpp \
+ _qfileinfo_unix.cpp \
+ _qgarray.cpp \
+ _qgdict.cpp \
+ _qglist.cpp \
+ _qglobal.cpp \
+ _qgvector.cpp \
+ _qiodevice.cpp \
+ _qmap.cpp \
+ _qpoint.cpp \
+ _qrect.cpp \
+ _qregexp.cpp \
+ _qregion.cpp \
+ _qsize.cpp \
+ _qstring.cpp \
+ _qstringlist.cpp \
+ _qurl.cpp \
+ $(NULL)
+
+
+INCLUDES = \
+ $(KWQ_INCLUDES) \
+ $(NULL)
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kwq/qt/Makefile.in
deleted file mode 100644
index 4d344fd..0000000
--- a/WebCore/src/kwq/qt/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# set top source dir relative to this directory
-# include make vars boilerplate
-#
-
-TOPSRCDIR = ../../../..
-include $(TOPSRCDIR)/Makefile.vars
-
-#----------------------------------------------------------------------
-# Set variables for this directory
-
-HEADERS = $(wildcard *.h)
-SOURCES = $(wildcard *.cpp)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-
-EXPORT_HEADERS = $(HEADERS)
-
-OBJECTS = $(CXXOBJECTS)
-EXPORT_OBJECTS = $(CXXOBJECTS)
-
-EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
-
-LIBRARY = lib_qt.a
-
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
-
-#----------------------------------------------------------------------
-# Set flags for this directory
-
-CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
- -I.. \
- -I. \
- $(NULL)
-
-DEPFLAGS = $(CXXFLAGS)
-
-#----------------------------------------------------------------------
-# Set targets for this directory
-
-all: $(OBJECTS) export-headers export-objects
-
-$(LIBRARY): $(OBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
- $(RANLIB) $(LIBRARY)
-
-#----------------------------------------------------------------------
-# include make rules boilerplate
-
-include $(TOPSRCDIR)/Makefile.rules
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebKit/.cvsignore b/WebKit/.cvsignore
index 336f309..dd9d024 100644
--- a/WebKit/.cvsignore
+++ b/WebKit/.cvsignore
@@ -1,3 +1,4 @@
+Makefile.in
Makefile
.DS_Store
-
+.deps
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e161d7f..49eab83 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-14 Maciej Stachowiak <mjs at apple.com>
+
+ Convert build system to automake
+
+ * Makefile.am: Add this
+ * Makefile.in: Remove this (now autogenerated)
+ * .cvsignore: Fix ignores
+ * WebKit.pbproj/project.pbxproj: Twiddle link flags
+
2001-12-21 John Sullivan <sullivan at apple.com>
* .cvsignore:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e161d7f..49eab83 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-01-14 Maciej Stachowiak <mjs at apple.com>
+
+ Convert build system to automake
+
+ * Makefile.am: Add this
+ * Makefile.in: Remove this (now autogenerated)
+ * .cvsignore: Fix ignores
+ * WebKit.pbproj/project.pbxproj: Twiddle link flags
+
2001-12-21 John Sullivan <sullivan at apple.com>
* .cvsignore:
diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
new file mode 100644
index 0000000..e31d0f0
--- /dev/null
+++ b/WebKit/Makefile.am
@@ -0,0 +1,6 @@
+
+all:
+ pbxbuild
+
+clean:
+ pbxbuild clean
diff --git a/WebKit/Makefile.in b/WebKit/Makefile.in
deleted file mode 100644
index d0f49eb..0000000
--- a/WebKit/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#======================================================================
-#
-# Makefile
-#
-# $RCSfile$
-#
-#======================================================================
-# Set targets for this directory
-
-all:
- pbxbuild
-
-generate-objects:
-
-clean:
- pbxbuild clean
-
-#======================================================================
-# end
-#======================================================================
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 30b8778..5b90451 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -125,6 +125,7 @@
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-Wall -Werror -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare";
+ OTHER_LDFLAGS = "-ljpeg -lwebcore";
PRODUCT_NAME = WebKit;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list