[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.1-2-5-g718e901
Michael Gilbert
michael.s.gilbert at gmail.com
Sun Jun 27 13:52:59 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 718e9010d4ff53d2b8277891c0280703d9e818fa
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Sun Jun 27 09:53:53 2010 -0400
remove accidental inclusion of GNUmakefile in patch
diff --git a/debian/patches/03-use-system-libtool.patch b/debian/patches/03-use-system-libtool.patch
index c61dca4..5c2ad81 100644
--- a/debian/patches/03-use-system-libtool.patch
+++ b/debian/patches/03-use-system-libtool.patch
@@ -119,775 +119,3 @@ author: Michael Gilbert <michael.s.gilbert at gmail.com>
$(top_srcdir)/autotools/webkit.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
---- /dev/null
-+++ webkit-1.2.1/WebKit/gtk/docs/GNUmakefile
-@@ -0,0 +1,756 @@
-+# GNUmakefile.in generated by automake 1.11.1 from GNUmakefile.am.
-+# WebKit/gtk/docs/GNUmakefile. Generated from GNUmakefile.in by configure.
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+
-+# -*- mode: makefile -*-
-+
-+####################################
-+# Everything below here is generic #
-+####################################
-+
-+pkgdatadir = $(datadir)/webkit
-+pkgincludedir = $(includedir)/webkit
-+pkglibdir = $(libdir)/webkit
-+pkglibexecdir = $(libexecdir)/webkit
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = x86_64-pc-linux-gnu
-+DIST_COMMON = $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in \
-+ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
-+subdir = WebKit/gtk/docs
-+ACLOCAL_M4 = /usr/share/libtool/libltdl/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/autotools/dolt.m4 \
-+ /usr/share/aclocal/gtk-doc.m4 \
-+ /usr/share/aclocal/libtool.m4 \
-+ /usr/share/aclocal/ltoptions.m4 \
-+ /usr/share/aclocal/ltsugar.m4 \
-+ /usr/share/aclocal/ltversion.m4 \
-+ /usr/share/aclocal/lt~obsolete.m4 \
-+ $(top_srcdir)/autotools/webkit.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autotoolsconfig.h
-+CONFIG_CLEAN_FILES = version.xml
-+CONFIG_CLEAN_VPATH_FILES =
-+AM_V_GEN = $(am__v_GEN_$(V))
-+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-+am__v_GEN_0 = @echo " GEN " $@;
-+AM_V_at = $(am__v_at_$(V))
-+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-+am__v_at_0 = @
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = ${SHELL} /home/zero79/newhd/git/webkit-1.2.1/autotools/missing --run aclocal-1.11
-+ACLOCAL_AMFLAGS = -I autotools
-+AMTAR = ${SHELL} /home/zero79/newhd/git/webkit-1.2.1/autotools/missing --run tar
-+AM_DEFAULT_VERBOSITY = 0
-+AR = ar
-+AS = as
-+AUTOCONF = ${SHELL} /home/zero79/newhd/git/webkit-1.2.1/autotools/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/zero79/newhd/git/webkit-1.2.1/autotools/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/zero79/newhd/git/webkit-1.2.1/autotools/missing --run automake-1.11
-+AWK = gawk
-+BISON = /usr/bin/bison
-+CAIRO_CFLAGS = -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-+CAIRO_LIBS = -lcairo
-+CC = gcc -Wl,--as-needed
-+CCDEPMODE = depmode=gcc3
-+CFLAGS = -g -Wall -O2 -O2
-+COVERAGE_CFLAGS =
-+COVERAGE_LDFLAGS =
-+CPP = gcc -Wl,--as-needed -E
-+CPPFLAGS =
-+CXX = g++ -Wl,--as-needed
-+CXXCPP = g++ -Wl,--as-needed -E
-+CXXDEPMODE = depmode=gcc3
-+CXXFLAGS = -g -Wall -O2 -O2
-+CYGPATH_W = echo
-+DEFS = -DHAVE_CONFIG_H
-+DEPDIR = .deps
-+DLLTOOL = dlltool
-+DOLT_BASH = /bin/bash
-+DSYMUTIL =
-+DUMPBIN =
-+ECHO_C =
-+ECHO_N = -n
-+ECHO_T =
-+EGREP = /bin/grep -E
-+ENCHANT_CFLAGS = -pthread -I/usr/include/enchant -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-+ENCHANT_LIBS = -pthread -lenchant -lgmodule-2.0 -lrt -lglib-2.0
-+EXEEXT =
-+FGREP = /bin/grep -F
-+FLEX = /usr/bin/flex
-+FREETYPE_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/pixman-1 -I/usr/include/libpng12
-+FREETYPE_LIBS = -lcairo -lfontconfig -lfreetype
-+GAIL_CFLAGS = -pthread -I/usr/include/gail-1.0 -I/usr/include/atk-1.0 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-+GAIL_LIBS = -pthread -lgailutil -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lgio-2.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-+GEOCLUE_CFLAGS =
-+GEOCLUE_LIBS =
-+GETTEXT_PACKAGE = webkit
-+GIRDIR = /usr/share/gir-1.0
-+GIRTYPELIBDIR = /usr/lib/girepository-1.0
-+GLIB_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-+GLIB_GENMARSHAL = /usr/bin/glib-genmarshal
-+GLIB_LIBS = -pthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0
-+GLIB_MKENUMS = /usr/bin/glib-mkenums
-+GPERF = /usr/bin/gperf
-+GREP = /bin/grep
-+GSTREAMER_CFLAGS = -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
-+GSTREAMER_LIBS = -pthread -lgstapp-0.10 -lgstpbutils-0.10 -lgstvideo-0.10 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lrt -lglib-2.0
-+GTKDOC_CHECK = /usr/bin/gtkdoc-check
-+GTKDOC_MKPDF = /usr/bin/gtkdoc-mkpdf
-+GTKDOC_REBASE = /usr/bin/gtkdoc-rebase
-+GTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-+GTK_LIBS = -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lgio-2.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-+G_IR_COMPILER = /usr/bin/g-ir-compiler
-+G_IR_GENERATE = /usr/bin/g-ir-generate
-+G_IR_SCANNER = /usr/bin/g-ir-scanner
-+HILDON_CFLAGS =
-+HILDON_CPPFLAGS =
-+HILDON_LIBS =
-+HTML_DIR = ${datadir}/gtk-doc/html
-+INSTALL = /usr/bin/install -c
-+INSTALL_DATA = ${INSTALL} -m 644
-+INSTALL_PROGRAM = ${INSTALL}
-+INSTALL_SCRIPT = ${INSTALL}
-+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-+INTROSPECTION_CFLAGS = -pthread -I/usr/include/gobject-introspection-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-+INTROSPECTION_LIBS = -Wl,--export-dynamic -pthread -lgirepository-1.0 -lgobject-2.0 -lgmodule-2.0 -lffi -lgthread-2.0 -lrt -lglib-2.0
-+JPEG_LIBS = -ljpeg
-+LD = /usr/bin/ld -m elf_x86_64
-+LDFLAGS =
-+LIBOBJS =
-+LIBS =
-+LIBSOUP_2_29_90_CFLAGS = -pthread -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-+LIBSOUP_2_29_90_LIBS = -pthread -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-+LIBSOUP_CFLAGS = -pthread -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-+LIBSOUP_LIBS = -pthread -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-+LIBTOOL = $(top_builddir)/doltlibtool
-+LIBWEBKITGTK_VERSION = 19:3:17
-+LIBXML_CFLAGS = -I/usr/include/libxml2
-+LIBXML_LIBS = -lxml2
-+LIBXSLT_CFLAGS = -I/usr/include/libxml2
-+LIBXSLT_LIBS = -lxslt -lxml2
-+LIPO =
-+LN_S = ln -s
-+LTCOMPILE = $(top_builddir)/doltcompile $(COMPILE)
-+LTCXXCOMPILE = $(top_builddir)/doltcompile $(CXXCOMPILE)
-+LTLIBOBJS =
-+MAKEINFO = ${SHELL} /home/zero79/newhd/git/webkit-1.2.1/autotools/missing --run makeinfo
-+MKDIR_P = /bin/mkdir -p
-+MV = /bin/mv
-+NM = /usr/bin/nm -B
-+NMEDIT =
-+OBJDUMP = objdump
-+OBJEXT = o
-+OTOOL =
-+OTOOL64 =
-+PACKAGE = webkit
-+PACKAGE_BUGREPORT = http://bugs.webkit.org/
-+PACKAGE_NAME = WebKit
-+PACKAGE_STRING = WebKit 1.2.1
-+PACKAGE_TARNAME = webkit
-+PACKAGE_URL =
-+PACKAGE_VERSION = 1.2.1
-+PANGO_CFLAGS = -pthread -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2
-+PANGO_LIBS = -pthread -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-+PATH_SEPARATOR = :
-+PERL = /usr/bin/perl
-+PKG_CONFIG = /usr/bin/pkg-config
-+PNG_LIBS = -lpng12
-+RANLIB = ranlib
-+SED = /bin/sed
-+SET_MAKE =
-+SHELL = /bin/bash
-+SQLITE3_CFLAGS =
-+SQLITE3_LIBS = -lsqlite3
-+STRIP = strip
-+SYMBOL_VISIBILITY = -fvisibility=hidden
-+SYMBOL_VISIBILITY_INLINES = -fvisibility-inlines-hidden
-+UNICODE_CFLAGS = -D_REENTRANT -I/usr/include
-+UNICODE_LIBS = -licui18n -licuuc -licudata
-+VERSION = 1.2.1
-+WEBKIT_MAJOR_VERSION = 1
-+WEBKIT_MICRO_VERSION = 1
-+WEBKIT_MINOR_VERSION = 2
-+WEBKIT_USER_AGENT_MAJOR_VERSION = 531
-+WEBKIT_USER_AGENT_MINOR_VERSION = 2
-+XT_CFLAGS =
-+XT_LIBS = -lXt
-+abs_builddir = /home/zero79/newhd/git/webkit-1.2.1/WebKit/gtk/docs
-+abs_srcdir = /home/zero79/newhd/git/webkit-1.2.1/WebKit/gtk/docs
-+abs_top_builddir = /home/zero79/newhd/git/webkit-1.2.1
-+abs_top_srcdir = /home/zero79/newhd/git/webkit-1.2.1
-+ac_ct_CC =
-+ac_ct_CXX =
-+ac_ct_DUMPBIN =
-+am__include = include
-+am__leading_dot = .
-+am__quote =
-+am__tar = tar --format=ustar -chf - "$$tardir"
-+am__untar = tar -xf -
-+bindir = ${exec_prefix}/bin
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
-+build_os = linux-gnu
-+build_vendor = pc
-+builddir = .
-+datadir = ${datarootdir}
-+datarootdir = ${prefix}/share
-+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-+dvidir = ${docdir}
-+exec_prefix = ${prefix}
-+host = x86_64-pc-linux-gnu
-+host_alias = x86_64-linux-gnu
-+host_cpu = x86_64
-+host_os = linux-gnu
-+host_vendor = pc
-+htmldir = ${docdir}
-+icu_config = /usr/bin/icu-config
-+includedir = ${prefix}/include
-+infodir = ${datarootdir}/info
-+install_sh = ${SHELL} /home/zero79/newhd/git/webkit-1.2.1/autotools/install-sh
-+libdir = ${exec_prefix}/lib
-+libexecdir = ${exec_prefix}/libexec
-+localedir = ${datarootdir}/locale
-+localstatedir = ${prefix}/var
-+lt_ECHO = echo
-+mandir = ${datarootdir}/man
-+mkdir_p = /bin/mkdir -p
-+oldincludedir = /usr/include
-+pdfdir = ${docdir}
-+prefix = /usr
-+program_transform_name = s,x,x,
-+psdir = ${docdir}
-+sbindir = ${exec_prefix}/sbin
-+sharedstatedir = ${prefix}/com
-+srcdir = .
-+sysconfdir = ${prefix}/etc
-+target_alias =
-+top_build_prefix = ../../../
-+top_builddir = ../../..
-+top_srcdir = ../../..
-+
-+# We require automake 1.6 at least.
-+AUTOMAKE_OPTIONS = 1.6
-+
-+# This is a blank Makefile.am for using gtk-doc.
-+# Copy this to your project's API docs directory and modify the variables to
-+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-+# of using the various options.
-+
-+# The name of the module, e.g. 'glib'.
-+DOC_MODULE = webkitgtk
-+
-+# The top-level SGML file. You can change this if you want to.
-+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
-+
-+# The directory containing the source code. Relative to $(srcdir).
-+# gtk-doc will search all .c & .h files beneath here for inline comments
-+# documenting the functions and macros.
-+# e.g. DOC_SOURCE_DIR=../../../gtk
-+DOC_SOURCE_DIR = ../webkit
-+
-+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-+SCANGOBJ_OPTIONS = "--type-init-func=g_thread_init(NULL);g_type_init()"
-+
-+# Extra options to supply to gtkdoc-scan.
-+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-+SCAN_OPTIONS = --deprecated-guards="WEBKIT_DISABLE_DEPRECATED" --ignore-decorators="WEBKIT_API"
-+
-+# Extra options to supply to gtkdoc-mkdb.
-+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-+MKDB_OPTIONS = --sgml-mode --output-format=xml --source-suffixes=h,c,cpp
-+
-+# Extra options to supply to gtkdoc-mktmpl
-+# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-+MKTMPL_OPTIONS =
-+
-+# Extra options to supply to gtkdoc-fixref. Not normally needed.
-+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-+FIXXREF_OPTIONS =
-+
-+# Used for dependencies. The docs will be rebuilt if any of these change.
-+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-+HFILE_GLOB = $(top_srcdir)/WebKit/gtk/webkit/*.h
-+CFILE_GLOB = $(top_srcdir)/WebKit/gtk/webkit/*.cpp
-+
-+# Header files to ignore when scanning.
-+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-+IGNORE_HFILES = webkitprivate.h
-+
-+# Images to copy into HTML directory.
-+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-+HTML_IMAGES =
-+
-+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-+content_files = webkitenvironment.xml
-+
-+# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-+# These files must be listed here *and* in content_files
-+# e.g. expand_content_files=running.sgml
-+expand_content_files =
-+
-+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-+# signals and properties.
-+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-+INCLUDES = \
-+ -I$(top_srcdir)/WebKit/gtk \
-+ -I$(top_builddir)/WebKit/gtk \
-+ $(global_cppflags) \
-+ $(global_cflags) \
-+ -I$(top_srcdir) \
-+ -I$(top_srcdir)/JavaScriptCore \
-+ -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
-+ -I$(top_srcdir)/JavaScriptCore/parser \
-+ -I$(top_srcdir)/JavaScriptCore/wtf \
-+ -I$(top_builddir)/DerivedSources \
-+ $(GLOBALDEPS_CFLAGS) \
-+ $(CAIRO_CFLAGS) \
-+ $(GLIB_CFLAGS) \
-+ $(GTK_CFLAGS) \
-+ $(LIBSOUP_CFLAGS)
-+
-+GTKDOC_LIBS = \
-+ $(top_builddir)/libwebkit-1.0.la \
-+ $(GLIB_LIBS) \
-+ $(GTK_LIBS) \
-+ $(LIBSOUP_LIBS)
-+
-+#GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+#GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+#GTKDOC_RUN =
-+GTKDOC_RUN = $(LIBTOOL) --mode=execute
-+
-+# We set GPATH here; this gives us semantics for GNU make
-+# which are more like other make's VPATH, when it comes to
-+# whether a source that is a target of one rule is then
-+# searched for in VPATH/GPATH.
-+#
-+GPATH = $(srcdir)
-+TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-+
-+# This includes the standard gtk-doc make rules, copied by gtkdocize.
-+
-+# Other files to distribute
-+# e.g. EXTRA_DIST += version.xml.in
-+EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
-+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-+DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-+ pdf-build.stamp \
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-+ $(srcdir)/pdf.stamp
-+
-+SCANOBJ_FILES = \
-+ $(DOC_MODULE).args \
-+ $(DOC_MODULE).hierarchy \
-+ $(DOC_MODULE).interfaces \
-+ $(DOC_MODULE).prerequisites \
-+ $(DOC_MODULE).signals
-+
-+REPORT_FILES = \
-+ $(DOC_MODULE)-undocumented.txt \
-+ $(DOC_MODULE)-undeclared.txt \
-+ $(DOC_MODULE)-unused.txt
-+
-+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-+#HTML_BUILD_STAMP =
-+HTML_BUILD_STAMP = html-build.stamp
-+PDF_BUILD_STAMP =
-+#PDF_BUILD_STAMP = pdf-build.stamp
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/GNUmakefile.in: $(srcdir)/GNUmakefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps)
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign WebKit/gtk/docs/GNUmakefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign WebKit/gtk/docs/GNUmakefile
-+.PRECIOUS: GNUmakefile
-+GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-+
-+mostlyclean-libtool:
-+ -rm -f *.lo
-+
-+clean-libtool:
-+ -rm -rf .libs _libs
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+ else \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
-+ || exit 1; \
-+ fi; \
-+ done
-+ $(MAKE) $(AM_MAKEFLAGS) \
-+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
-+ dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: GNUmakefile all-local
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-+
-+distclean: distclean-am
-+ -rm -f GNUmakefile
-+distclean-am: clean-am distclean-generic distclean-local
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+ -rm -f GNUmakefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic \
-+ maintainer-clean-local
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-local
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am all-local check check-am clean clean-generic \
-+ clean-libtool clean-local dist-hook distclean \
-+ distclean-generic distclean-libtool distclean-local distdir \
-+ dvi dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-data-local install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic \
-+ maintainer-clean-local mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+ uninstall-local
-+
-+
-+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+#all-local:
-+
-+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+
-+$(REPORT_FILES): sgml-build.stamp
-+
-+#### scan ####
-+
-+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-+ @echo 'gtk-doc: Scanning header files'
-+ @-chmod -R u+w $(srcdir)
-+ @cd $(srcdir) && \
-+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-+ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-+ else \
-+ cd $(srcdir) ; \
-+ for i in $(SCANOBJ_FILES) ; do \
-+ test -f $$i || touch $$i ; \
-+ done \
-+ fi
-+ @touch scan-build.stamp
-+
-+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-+ @true
-+
-+#### templates ####
-+
-+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-+ @echo 'gtk-doc: Rebuilding template files'
-+ @-chmod -R u+w $(srcdir)
-+ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ @touch tmpl-build.stamp
-+
-+tmpl.stamp: tmpl-build.stamp
-+ @true
-+
-+$(srcdir)/tmpl/*.sgml:
-+ @true
-+
-+#### xml ####
-+
-+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+ @echo 'gtk-doc: Building XML'
-+ @-chmod -R u+w $(srcdir)
-+ @cd $(srcdir) && \
-+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-+ @touch sgml-build.stamp
-+
-+sgml.stamp: sgml-build.stamp
-+ @true
-+
-+#### html ####
-+
-+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-+ @echo 'gtk-doc: Building HTML'
-+ @-chmod -R u+w $(srcdir)
-+ @rm -rf $(srcdir)/html
-+ @mkdir $(srcdir)/html
-+ @mkhtml_options=""; \
-+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
-+ if test "$(?)" = "0"; then \
-+ mkhtml_options=--path="$(srcdir)"; \
-+ fi; \
-+ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ @echo 'gtk-doc: Fixing cross-references'
-+ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ @touch html-build.stamp
-+
-+#### pdf ####
-+
-+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-+ @echo 'gtk-doc: Building PDF'
-+ @-chmod -R u+w $(srcdir)
-+ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-+ @mkpdf_imgdirs=""; \
-+ if test "x$(HTML_IMAGES)" != "x"; then \
-+ for img in $(HTML_IMAGES); do \
-+ part=`dirname $$img`; \
-+ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-+ if test $$? != 0; then \
-+ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-+ fi; \
-+ done; \
-+ fi; \
-+ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-+ @touch pdf-build.stamp
-+
-+##############
-+
-+clean-local:
-+ rm -f *~ *.bak
-+ rm -rf .libs
-+
-+distclean-local:
-+ cd $(srcdir) && \
-+ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-+
-+maintainer-clean-local: clean
-+ cd $(srcdir) && rm -rf xml html
-+
-+install-data-local:
-+ @installfiles=`echo $(srcdir)/html/*`; \
-+ if test "$$installfiles" = '$(srcdir)/html/*'; \
-+ then echo '-- Nothing to install' ; \
-+ else \
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
-+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-+ else \
-+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
-+ fi; \
-+ $(mkinstalldirs) $${installdir} ; \
-+ for i in $$installfiles; do \
-+ echo '-- Installing '$$i ; \
-+ $(INSTALL_DATA) $$i $${installdir}; \
-+ done; \
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
-+ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
-+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
-+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
-+ fi; \
-+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+ fi
-+
-+uninstall-local:
-+ @if test -n "$(DOC_MODULE_VERSION)"; then \
-+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-+ else \
-+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
-+ fi; \
-+ rm -rf $${installdir}
-+
-+#
-+# Require gtk-doc when making dist
-+#
-+dist-check-gtkdoc:
-+#dist-check-gtkdoc:
-+# @echo "*** gtk-doc must be installed and enabled in order to make dist"
-+# @false
-+
-+dist-hook: dist-check-gtkdoc dist-hook-local
-+ mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/html
-+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ cp $(srcdir)/html/* $(distdir)/html
-+ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-+ cd $(distdir) && rm -f $(DISTCLEANFILES)
-+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-+
-+.PHONY : dist-hook-local docs
-+
-+# Files not to distribute
-+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-+#DISTCLEANFILES +=
-+
-+# Comment this out if you want your docs-status tested during 'make check'
-+#TESTS = $(GTKDOC_CHECK)
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- webkit-1.2.1.orig/WebCore/GNUmakefile.am
-+++ webkit-1.2.1/WebCore/GNUmakefile.am
-@@ -3768,9 +3768,7 @@ webcore_dist += \
- webinspectordir = ${datadir}/webkit-1.0/webinspector
- dist_webinspector_DATA = \
- $(WebCore)/English.lproj/localizedStrings.js \
-- $(shell ls $(WebCore)/inspector/front-end/*.js) \
-- $(shell ls $(WebCore)/inspector/front-end/*.html) \
-- $(shell ls $(WebCore)/inspector/front-end/*.css)
-+ $(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
-
- webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
- dist_webinspectorimages_DATA = \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list