[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:45:37 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c64a1623ad5babf1d8dd7305b3103dab588c7bb5
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 20 14:56:32 2001 +0000
Added new Makefile.in files for the updated build system
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/khtml/css/Makefile.in
similarity index 53%
copy from WebCore/kwq/qt/Makefile.in
copy to WebCore/khtml/css/Makefile.in
index b6631c3..aa30d83 100644
--- a/WebCore/kwq/qt/Makefile.in
+++ b/WebCore/khtml/css/Makefile.in
@@ -3,53 +3,90 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+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)
+
+CFILES = $(VALUEFILES) $(PROPFILES)
OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlcss.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ $(CFILES) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I../dom \
+ -I../html \
+ -I../misc \
+ -I../xml \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+$(VALUEFILES):
+ sh ./makevalues
+
+$(PROPFILES):
+ sh ./makeprop
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/khtml/dom/Makefile.in
similarity index 67%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/khtml/dom/Makefile.in
index b6631c3..fa6e5c6 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/khtml/dom/Makefile.in
@@ -3,40 +3,52 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmldom.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I../css \
+ -I../html \
+ -I../misc \
+ -I../xml \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -45,12 +57,10 @@ DEPFLAGS = $(CXXFLAGS)
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/khtml/ecma/Makefile.in
similarity index 62%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/khtml/ecma/Makefile.in
index b6631c3..4324305 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/khtml/ecma/Makefile.in
@@ -9,47 +9,64 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlecma.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+PROGRAM = testecma
+
+CLEAN_FILES = $(OBJECTS) \
+ kjs_window.moc \
+ $(LIBRARY) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/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)
+all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+$(PROGRAM): testecma.o
+ $(CC) -o $@ $< -L. -lkhtmlecma
+
+kjs_window.cpp: kjs_window.moc
+kjs_window.moc:
+ touch $@
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/khtml/html/Makefile.in
similarity index 63%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/khtml/html/Makefile.in
index b6631c3..4880c11 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/khtml/html/Makefile.in
@@ -9,34 +9,47 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlhtml.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ *.moc \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I../../kdecore \
+ -I../../kjs \
+ -I.. \
+ -I../misc \
+ -I../css \
+ -I../dom \
+ -I../xml \
+ -I../rendering \
+ -I. \
+ -I$(TOPSRCDIR) \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -49,7 +62,13 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+htmltokenizer.cpp: htmltokenizer.moc
+htmltokenizer.moc:
+ touch $@
+
+html_documentimpl.cpp: html_documentimpl.moc
+html_documentimpl.moc:
+ touch $@
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/khtml/java/Makefile.in
similarity index 56%
copy from WebCore/kwq/qt/Makefile.in
copy to WebCore/khtml/java/Makefile.in
index b6631c3..8e96b68 100644
--- a/WebCore/kwq/qt/Makefile.in
+++ b/WebCore/khtml/java/Makefile.in
@@ -3,40 +3,45 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmljava.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ *.moc \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -DNEED_BOGUS_X_DEFINES \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -45,11 +50,33 @@ DEPFLAGS = $(CXXFLAGS)
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+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
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/khtml/misc/Makefile.in
similarity index 56%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/khtml/misc/Makefile.in
index b6631c3..2d33b07 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/khtml/misc/Makefile.in
@@ -3,53 +3,89 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+TAGFILES = \
+ htmltags.c \
+ htmltags.h \
+ htmltags.gperf \
+ $(NULL)
-LIBRARY = lib_qt.a
+ATTRSFILES = \
+ htmlattrs.c \
+ htmlattrs.h \
+ htmlattrs.gperf \
+ $(NULL)
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CFILES = $(TAGFILES) $(ATTRSFILES)
+
+OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
+
+LIBRARY = libkhtmlmisc.a
+
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ $(CFILES) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I../dom \
+ -I../html \
+ -I../xml \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+loader.cpp: loader.moc
+loader.moc:
+ touch loader.moc
+
+khtmldata.h:
+ touch $@
+
+$(TAGFILES):
+ ./maketags
+
+$(ATTRSFILES):
+ ./makeattrs
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/khtml/rendering/Makefile.in
similarity index 59%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/khtml/rendering/Makefile.in
index b6631c3..7b190b7 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/khtml/rendering/Makefile.in
@@ -9,34 +9,50 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlrendering.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ *.moc \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -DNEED_BOGUS_X_DEFINES \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kfile \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/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)
@@ -49,7 +65,17 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+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
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/khtml/xml/Makefile.in
similarity index 61%
copy from WebCore/src/kwq/Makefile.in
copy to WebCore/khtml/xml/Makefile.in
index c55f8b4..e57416f 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/khtml/xml/Makefile.in
@@ -12,60 +12,71 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-SOURCES = $(wildcard *.mm)
+SOURCES = $(wildcard *.cpp)
HEADERS = $(wildcard *.h)
-MMOBJECTS = \
- KWQApplication.o \
- KWQBrush.o \
- KWQFont.o \
- KWQFontMetrics.o \
- KWQPainter.o \
- KWQPen.o \
- KWQPixmap.o \
- KWQWMatrix.o \
- KWQWidget.o \
-# FIXME: add back in when this file builds -> KWQString.o \
+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)
-OBJECTS = $(MMOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = libkwq.a
+LIBRARY = libkhtmlxml.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
+ *.moc \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
-CMMFLAGS = $(BASECMMFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
+CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I../css \
+ -I../dom \
+ -I../html \
+ -I../misc \
+ -I.. \
-I. \
$(NULL)
-DEPFLAGS = $(CMMFLAGS)
+DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(MMOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(MMOBJECTS)
+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)
#----------------------------------------------------------------------
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/src/kdelibs/khtml/css/Makefile.in
similarity index 53%
copy from WebCore/kwq/qt/Makefile.in
copy to WebCore/src/kdelibs/khtml/css/Makefile.in
index b6631c3..aa30d83 100644
--- a/WebCore/kwq/qt/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in
@@ -3,53 +3,90 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+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)
+
+CFILES = $(VALUEFILES) $(PROPFILES)
OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlcss.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ $(CFILES) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I../dom \
+ -I../html \
+ -I../misc \
+ -I../xml \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+$(VALUEFILES):
+ sh ./makevalues
+
+$(PROPFILES):
+ sh ./makeprop
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kdelibs/khtml/dom/Makefile.in
similarity index 67%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/src/kdelibs/khtml/dom/Makefile.in
index b6631c3..fa6e5c6 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in
@@ -3,40 +3,52 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmldom.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I../css \
+ -I../html \
+ -I../misc \
+ -I../xml \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -45,12 +57,10 @@ DEPFLAGS = $(CXXFLAGS)
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
similarity index 62%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/src/kdelibs/khtml/ecma/Makefile.in
index b6631c3..4324305 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
@@ -9,47 +9,64 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlecma.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+PROGRAM = testecma
+
+CLEAN_FILES = $(OBJECTS) \
+ kjs_window.moc \
+ $(LIBRARY) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/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)
+all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+$(PROGRAM): testecma.o
+ $(CC) -o $@ $< -L. -lkhtmlecma
+
+kjs_window.cpp: kjs_window.moc
+kjs_window.moc:
+ touch $@
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kdelibs/khtml/html/Makefile.in
similarity index 63%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/src/kdelibs/khtml/html/Makefile.in
index b6631c3..4880c11 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.in
@@ -9,34 +9,47 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlhtml.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ *.moc \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I../../kdecore \
+ -I../../kjs \
+ -I.. \
+ -I../misc \
+ -I../css \
+ -I../dom \
+ -I../xml \
+ -I../rendering \
+ -I. \
+ -I$(TOPSRCDIR) \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -49,7 +62,13 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+htmltokenizer.cpp: htmltokenizer.moc
+htmltokenizer.moc:
+ touch $@
+
+html_documentimpl.cpp: html_documentimpl.moc
+html_documentimpl.moc:
+ touch $@
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/src/kdelibs/khtml/java/Makefile.in
similarity index 56%
copy from WebCore/kwq/qt/Makefile.in
copy to WebCore/src/kdelibs/khtml/java/Makefile.in
index b6631c3..8e96b68 100644
--- a/WebCore/kwq/qt/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in
@@ -3,40 +3,45 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmljava.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ *.moc \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -DNEED_BOGUS_X_DEFINES \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -45,11 +50,33 @@ DEPFLAGS = $(CXXFLAGS)
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+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
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kdelibs/khtml/misc/Makefile.in
similarity index 56%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/src/kdelibs/khtml/misc/Makefile.in
index b6631c3..2d33b07 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in
@@ -3,53 +3,89 @@
# Makefile
#
# $RCSfile$
+# $Revision$
+# $Author$
+# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-OBJECTS = $(CXXOBJECTS)
+TAGFILES = \
+ htmltags.c \
+ htmltags.h \
+ htmltags.gperf \
+ $(NULL)
-LIBRARY = lib_qt.a
+ATTRSFILES = \
+ htmlattrs.c \
+ htmlattrs.h \
+ htmlattrs.gperf \
+ $(NULL)
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CFILES = $(TAGFILES) $(ATTRSFILES)
+
+OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
+
+LIBRARY = libkhtmlmisc.a
+
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ $(CFILES) \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -I$(TOPSRCDIR) \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I../dom \
+ -I../html \
+ -I../xml \
+ -I.. \
+ -I. \
+ $(NULL)
DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+loader.cpp: loader.moc
+loader.moc:
+ touch loader.moc
+
+khtmldata.h:
+ touch $@
+
+$(TAGFILES):
+ ./maketags
+
+$(ATTRSFILES):
+ ./makeattrs
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kdelibs/khtml/rendering/Makefile.in
similarity index 59%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/src/kdelibs/khtml/rendering/Makefile.in
index b6631c3..7b190b7 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.in
@@ -9,34 +9,50 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
+HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
-LIBRARY = lib_qt.a
+LIBRARY = libkhtmlrendering.a
-CLEAN_FILES = *.o \
- *.a \
- $(NULL)
+CLEAN_FILES = $(OBJECTS) \
+ $(LIBRARY) \
+ *.moc \
+ $(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
- -I.. \
- -I. \
- $(NULL)
+ -DNEED_BOGUS_X_DEFINES \
+ -I$(TOPSRCDIR)/src/kwq \
+ -I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kfile \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/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)
@@ -49,7 +65,17 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
+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
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kdelibs/khtml/xml/Makefile.in
similarity index 61%
copy from WebCore/src/kwq/Makefile.in
copy to WebCore/src/kdelibs/khtml/xml/Makefile.in
index c55f8b4..e57416f 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in
@@ -12,60 +12,71 @@
# include make vars boilerplate
#
-TOPSRCDIR = ../..
+TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-SOURCES = $(wildcard *.mm)
+SOURCES = $(wildcard *.cpp)
HEADERS = $(wildcard *.h)
-MMOBJECTS = \
- KWQApplication.o \
- KWQBrush.o \
- KWQFont.o \
- KWQFontMetrics.o \
- KWQPainter.o \
- KWQPen.o \
- KWQPixmap.o \
- KWQWMatrix.o \
- KWQWidget.o \
-# FIXME: add back in when this file builds -> KWQString.o \
+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)
-OBJECTS = $(MMOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = libkwq.a
+LIBRARY = libkhtmlxml.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
+ *.moc \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
-CMMFLAGS = $(BASECMMFLAGS) \
- -DQ_DELETING_VOID_UNDEFINED \
- -DQT_NO_TEXTCODEC \
- -DQT_NO_DATASTREAM \
- -D_KWQ_COMPLETE_ \
- -D_KWQ_IOSTREAM_ \
+CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/qt \
+ -I$(TOPSRCDIR)/src/kwq/kdecore \
+ -I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I../css \
+ -I../dom \
+ -I../html \
+ -I../misc \
+ -I.. \
-I. \
$(NULL)
-DEPFLAGS = $(CMMFLAGS)
+DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(MMOBJECTS)
- $(AR) $(ARFLAGS) $(LIBRARY) $(MMOBJECTS)
+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)
#----------------------------------------------------------------------
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list