[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:48:22 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4c2c811b97f33ec50dd25625eeffe5924a28017f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 2 21:21:08 2001 +0000
Added directory to the build
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/Makefile.am b/WebCore/khtml/Makefile.am
deleted file mode 100644
index db984e9..0000000
--- a/WebCore/khtml/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-# This file is part of the KDE libraries
-# Copyright (C) 1997 Martin Jones (mjones at kde.org)
-# (C) 1997 Torben Weis (weis at kde.org)
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-
-# You should have received a copy of the GNU Library General Public License
-# along with this library; see the file COPYING.LIB. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-
-
-#AM_CXXFLAGS += -DTABLE_DEBUG
-#AM_CXXFLAGS += -DDEBUG_LAYOUT
-#AM_CXXFLAGS += -DDEBUG_EVENTS
-#AM_CXXFLAGS += -DTOKEN_DEBUG
-#AM_CXXFLAGS += -DPARSER_DEBUG
-#AM_CXXFLAGS += -DCACHE_DEBUG
-#AM_CXXFLAGS += -DDEBUG=1
-
-# for profiling.
-# command line for line by line profiling (into seperate files):
-# gprof -l -y
-# AM_CXXFLAGS += -pg
-
-SUBDIRS = misc dom css xml html rendering pics java . ecma
-
-lib_LTLIBRARIES = libkhtml.la libkhtmlimage.la
-libkhtml_la_SOURCES = khtmlview.cpp khtml_part.cpp khtml_run.cpp khtml_factory.cpp khtml_settings.cc \
- khtml_events.cpp khtml_find.cpp khtml_ext.cpp khtml_pagecache.cpp
-
-libkhtml_la_METASOURCES = AUTO
-
-include_HEADERS = khtmlview.h khtml_part.h khtml_events.h khtml_settings.h khtmldefaults.h
-
-noinst_HEADERS = design.h testkhtml.h testrender.h khtml_find.h khtml_ext.h khtml_pagecache.h \
- khtmlimage.h
-
-libkhtml_la_LDFLAGS = -version-info 3:0 -module -no-undefined $(all_libraries)
-libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
- ./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
- ./misc/libkhtmlmisc.la ./dom/libkhtmldom.la ./java/libkjava.la \
- ../kio/libkio.la \
- $(top_builddir)/kparts/libkparts.la \
- $(top_builddir)/kfile/libkfile.la \
- $(top_builddir)/kssl/libkssl.la \
- $(top_builddir)/kdeprint/libkdeprint.la
-
-libkhtmlimage_la_SOURCES = khtmlimage.cpp
-libkhtmlimage_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkhtmlimage_la_LIBADD = libkhtml.la
-
-INCLUDES = -I$(top_srcdir)/kjs -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio \
- -I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
- -I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
- -I$(top_srcdir)/kfile -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/kssl -I$(top_srcdir)/kdeprint \
- -I$(top_srcdir) $(all_includes)
-
-servicedir = $(kde_servicesdir)
-service_DATA = khtml.desktop khtmlimage.desktop
-
-rcdir = $(kde_datadir)/khtml
-rc_DATA = khtml.rc khtml_browser.rc khtml_popupmenu.rc
-
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
-
-## generate lib documentation
-srcdoc:
- $(mkinstalldirs) $(SRCDOC_DEST)
- kdoc -H -d $(SRCDOC_DEST) kdecore \
- $(include_HEADERS) -lqt
-
-EXTRA_DIST = CHANGES DESIGN README.HTMLWidget README.tags
-
-parser:
- cd $(srcdir) && \
- perl scripts/makeattrs && \
- bash scripts/maketags && \
- bash scripts/makeprop
-
-## test program
-check_PROGRAMS = testkhtml testcss testrender testkhtml_static
-testkhtml_SOURCES = testkhtml.cpp domtreeview.cpp
-testkhtml_LDADD = libkhtml.la
-testkhtml_static_SOURCES = testkhtml.cpp domtreeview.cpp $(libkhtml_la_SOURCES)
-testkhtml_static_LDADD = $(LIB_KDEUI) $(libkhtml_la_LIBADD)
-testcss_SOURCES = testcss.cpp
-testcss_LDADD = libkhtml.la
-testrender_SOURCES = testrender.cpp
-testrender_LDADD = libkhtml.la
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in b/WebCore/khtml/Makefile.in
similarity index 82%
copy from WebCore/src/kdelibs/khtml/dom/Makefile.in
copy to WebCore/khtml/Makefile.in
index 44797c2..7b2d2c8 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in
+++ b/WebCore/khtml/Makefile.in
@@ -3,16 +3,13 @@
# Makefile
#
# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
@@ -20,35 +17,40 @@ include $(TOPSRCDIR)/Makefile.vars
SOURCES = $(wildcard *.cpp)
HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+CXXOBJECTS = \
+ khtmlview.o \
+ $(NULL)
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = libkhtmldom.a
+LIBRARY = libkhtml.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
+ *.moc \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/kde \
-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/kdeui \
-I$(TOPSRCDIR)/src/kwq/kparts \
- -I../css \
- -I../html \
- -I../misc \
- -I../xml \
- -I.. \
+ -I../kdecore \
+ -I../kjs \
+ -I./misc \
+ -I./css \
+ -I./dom \
+ -I./xml \
+ -I./rendering \
-I. \
+ -I$(TOPSRCDIR) \
$(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -58,10 +60,14 @@ DEPFLAGS = $(CXXFLAGS)
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(CXXOBJECTS)
+$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+khtmlview.cpp: khtmlview.moc
+khtmlview.moc:
+ echo '#include <khtmlview.h>' > $@
+
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kdelibs/khtml/Makefile.am b/WebCore/src/kdelibs/khtml/Makefile.am
deleted file mode 100644
index db984e9..0000000
--- a/WebCore/src/kdelibs/khtml/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-# This file is part of the KDE libraries
-# Copyright (C) 1997 Martin Jones (mjones at kde.org)
-# (C) 1997 Torben Weis (weis at kde.org)
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-
-# You should have received a copy of the GNU Library General Public License
-# along with this library; see the file COPYING.LIB. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-
-
-#AM_CXXFLAGS += -DTABLE_DEBUG
-#AM_CXXFLAGS += -DDEBUG_LAYOUT
-#AM_CXXFLAGS += -DDEBUG_EVENTS
-#AM_CXXFLAGS += -DTOKEN_DEBUG
-#AM_CXXFLAGS += -DPARSER_DEBUG
-#AM_CXXFLAGS += -DCACHE_DEBUG
-#AM_CXXFLAGS += -DDEBUG=1
-
-# for profiling.
-# command line for line by line profiling (into seperate files):
-# gprof -l -y
-# AM_CXXFLAGS += -pg
-
-SUBDIRS = misc dom css xml html rendering pics java . ecma
-
-lib_LTLIBRARIES = libkhtml.la libkhtmlimage.la
-libkhtml_la_SOURCES = khtmlview.cpp khtml_part.cpp khtml_run.cpp khtml_factory.cpp khtml_settings.cc \
- khtml_events.cpp khtml_find.cpp khtml_ext.cpp khtml_pagecache.cpp
-
-libkhtml_la_METASOURCES = AUTO
-
-include_HEADERS = khtmlview.h khtml_part.h khtml_events.h khtml_settings.h khtmldefaults.h
-
-noinst_HEADERS = design.h testkhtml.h testrender.h khtml_find.h khtml_ext.h khtml_pagecache.h \
- khtmlimage.h
-
-libkhtml_la_LDFLAGS = -version-info 3:0 -module -no-undefined $(all_libraries)
-libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
- ./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
- ./misc/libkhtmlmisc.la ./dom/libkhtmldom.la ./java/libkjava.la \
- ../kio/libkio.la \
- $(top_builddir)/kparts/libkparts.la \
- $(top_builddir)/kfile/libkfile.la \
- $(top_builddir)/kssl/libkssl.la \
- $(top_builddir)/kdeprint/libkdeprint.la
-
-libkhtmlimage_la_SOURCES = khtmlimage.cpp
-libkhtmlimage_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkhtmlimage_la_LIBADD = libkhtml.la
-
-INCLUDES = -I$(top_srcdir)/kjs -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio \
- -I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
- -I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
- -I$(top_srcdir)/kfile -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/kssl -I$(top_srcdir)/kdeprint \
- -I$(top_srcdir) $(all_includes)
-
-servicedir = $(kde_servicesdir)
-service_DATA = khtml.desktop khtmlimage.desktop
-
-rcdir = $(kde_datadir)/khtml
-rc_DATA = khtml.rc khtml_browser.rc khtml_popupmenu.rc
-
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
-
-## generate lib documentation
-srcdoc:
- $(mkinstalldirs) $(SRCDOC_DEST)
- kdoc -H -d $(SRCDOC_DEST) kdecore \
- $(include_HEADERS) -lqt
-
-EXTRA_DIST = CHANGES DESIGN README.HTMLWidget README.tags
-
-parser:
- cd $(srcdir) && \
- perl scripts/makeattrs && \
- bash scripts/maketags && \
- bash scripts/makeprop
-
-## test program
-check_PROGRAMS = testkhtml testcss testrender testkhtml_static
-testkhtml_SOURCES = testkhtml.cpp domtreeview.cpp
-testkhtml_LDADD = libkhtml.la
-testkhtml_static_SOURCES = testkhtml.cpp domtreeview.cpp $(libkhtml_la_SOURCES)
-testkhtml_static_LDADD = $(LIB_KDEUI) $(libkhtml_la_LIBADD)
-testcss_SOURCES = testcss.cpp
-testcss_LDADD = libkhtml.la
-testrender_SOURCES = testrender.cpp
-testrender_LDADD = libkhtml.la
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in b/WebCore/src/kdelibs/khtml/Makefile.in
similarity index 82%
copy from WebCore/src/kdelibs/khtml/dom/Makefile.in
copy to WebCore/src/kdelibs/khtml/Makefile.in
index 44797c2..7b2d2c8 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/Makefile.in
@@ -3,16 +3,13 @@
# Makefile
#
# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
@@ -20,35 +17,40 @@ include $(TOPSRCDIR)/Makefile.vars
SOURCES = $(wildcard *.cpp)
HEADERS = $(wildcard *.h)
-CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+CXXOBJECTS = \
+ khtmlview.o \
+ $(NULL)
-OBJECTS = $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
-LIBRARY = libkhtmldom.a
+LIBRARY = libkhtml.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
+ *.moc \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
- -I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/kde \
-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/kdeui \
-I$(TOPSRCDIR)/src/kwq/kparts \
- -I../css \
- -I../html \
- -I../misc \
- -I../xml \
- -I.. \
+ -I../kdecore \
+ -I../kjs \
+ -I./misc \
+ -I./css \
+ -I./dom \
+ -I./xml \
+ -I./rendering \
-I. \
+ -I$(TOPSRCDIR) \
$(NULL)
DEPFLAGS = $(CXXFLAGS)
@@ -58,10 +60,14 @@ DEPFLAGS = $(CXXFLAGS)
all: $(OBJECTS) $(LIBRARY)
-$(LIBRARY): $(CXXOBJECTS)
+$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+khtmlview.cpp: khtmlview.moc
+khtmlview.moc:
+ echo '#include <khtmlview.h>' > $@
+
#----------------------------------------------------------------------
# include make rules boilerplate
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list