[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
jmalonzo at webkit.org
jmalonzo at webkit.org
Thu Oct 29 20:32:26 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit ea8d0e9399cfc1134ab5398089ced43b2c23d6bf
Author: jmalonzo at webkit.org <jmalonzo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 23 13:08:51 2009 +0000
2009-09-23 Jan Michael Alonzo <jmalonzo at webkit.org>
Reviewed by Xan Lopez.
Minor reorganization to the patch landed in
http://trac.webkit.org/changeset/48670. Also move JSCore-1.0.gir
in the gtk directory as that's only useful to the Gtk port at the
moment.
* JSCore-1.0.gir: Renamed from JSCore-1.0.gir.
* GNUmakefile.am:
* configure.ac:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48672 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index ede4fe7..f86b570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-23 Jan Michael Alonzo <jmalonzo at webkit.org>
+
+ Reviewed by Xan Lopez.
+
+ Minor reorganization to the patch landed in
+ http://trac.webkit.org/changeset/48670. Also move JSCore-1.0.gir
+ in the gtk directory as that's only useful to the Gtk port at the
+ moment.
+
+ * GNUmakefile.am:
+ * configure.ac:
+
2009-09-23 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index ecb17a3..4982340 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -45,6 +45,7 @@ bin_PROGRAMS :=
noinst_PROGRAMS :=
noinst_HEADERS :=
lib_LIBRARIES :=
+EXTRA_DIST :=
IDL_BINDINGS :=
TEST_PROGS :=
POFILES :=
@@ -405,6 +406,44 @@ webkitgtk_cleanfiles += \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
+# Files that will be cleaned
+MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
+DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
+CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+
+if ENABLE_INTROSPECTION
+JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
+WEBKIT_GIRSOURCES = WebKit-1.0.gir
+
+$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
+ $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
+ --add-include-path=$(srcdir) --add-include-path=. \
+ --include=GObject-2.0 \
+ --include=Gtk-2.0 \
+ --include=JSCore-1.0 \
+ --include=Soup-2.4 \
+ --library=webkit-1.0 \
+ --libtool="$(LIBTOOL)" \
+ --pkg gobject-2.0 \
+ --pkg gtk+-2.0 \
+ --pkg webkit-1.0 \
+ --output $@ \
+ $(webkitgtk_h_api)
+
+girdir = $(GIRDIR)
+gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
+
+typelibsdir = $(GIRTYPELIBDIR)
+typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
+
+%.typelib: %.gir $(G_IR_COMPILER)
+ $(AM_V_GEN)$(G_IR_COMPILER) $< -o $@
+
+EXTRA_DIST += $(JSCORE_GIRSOURCES)
+CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
+
+endif
+
stamp_files := \
stamp-webkitmarshal.cpp \
stamp-webkitmarshal.h \
@@ -474,7 +513,7 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
&& rm -f xgen-gtc
# Files that will be distributed
-EXTRA_DIST = \
+EXTRA_DIST += \
$(srcdir)/gtk-doc.make \
WebKit/LICENSE \
$(javascriptcore_dist) \
@@ -498,43 +537,6 @@ dist_resources_DATA = \
# END WEBKIT GTK+
-# Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-
-if ENABLE_INTROSPECTION
-JSCORE_GIRSOURCES = JSCore-1.0.gir # JSCore-1.0.gir is handwritten
-WEBKIT_GIRSOURCES = WebKit-1.0.gir
-
-$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
- $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
- --add-include-path=$(srcdir) --add-include-path=. \
- --include=GObject-2.0 \
- --include=Gtk-2.0 \
- --include=JSCore-1.0 \
- --include=Soup-2.4 \
- --library=webkit-1.0 \
- --libtool="$(LIBTOOL)" \
- --pkg gobject-2.0 \
- --pkg gtk+-2.0 \
- --pkg webkit-1.0 \
- --output $@ \
- $(webkitgtk_h_api)
-
-girdir = $(GIRDIR)
-gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
-
-typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
-
-%.typelib: %.gir $(G_IR_COMPILER)
- $(AM_V_GEN)$(G_IR_COMPILER) $< -o $@
-
-EXTRA_DIST += $(JSCORE_GIRSOURCES)
-CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
-endif
-
# Include module makefiles
include JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 9cbf430..3fa3b59 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-23 Jan Michael Alonzo <jmalonzo at webkit.org>
+
+ Reviewed by Xan Lopez.
+
+ Minor reorganization to the patch landed in
+ http://trac.webkit.org/changeset/48670. Also move JSCore-1.0.gir
+ in the gtk directory as that's only useful to the Gtk port at the
+ moment.
+
+ * JSCore-1.0.gir: Renamed from JSCore-1.0.gir.
+
2009-09-22 Xan Lopez <xlopez at igalia.com>
Reviewed by Jan Alonzo.
diff --git a/JSCore-1.0.gir b/WebKit/gtk/JSCore-1.0.gir
similarity index 100%
rename from JSCore-1.0.gir
rename to WebKit/gtk/JSCore-1.0.gir
diff --git a/configure.ac b/configure.ac
index 1d3c0ee..cc338d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -600,8 +600,6 @@ AC_SUBST([G_IR_GENERATE])
AC_SUBST([GIRDIR])
AC_SUBST([GIRTYPELIBDIR])
-AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
-
# determine the font backend
AC_MSG_CHECKING([the font backend to use])
AC_ARG_WITH(font_backend,
@@ -758,6 +756,10 @@ AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
+# Gtk conditionals
+AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
+
+
AC_CONFIG_FILES([
GNUmakefile
WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in
@@ -806,10 +808,10 @@ Features:
Web Workers support : $enable_workers
XPATH support : $enable_xpath
XSLT support : $enable_xslt
- Introspection support : $enable_introspection
GTK+ configuration:
GDK target : $with_target
Hildon UI extensions : $with_hildon
+ Introspection support : $enable_introspection
"
if test "$with_unicode_backend" = "glib"; then
echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list