2009-05-08 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>

        Reviewed by Xan Lopez.

        Ship the gtk-doc.make file, so as to not depend on gtkdoc-tools.

        * GNUmakefile.am:
        * autogen.sh:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43414 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3ce9cd045874aeb93b9d48787ae4509d9430fd00..7a14ae2d61c50fc24e962eef704edfb1a4b88b50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        Ship the gtk-doc.make file, so as to not depend on gtkdoc-tools.
+
+        * GNUmakefile.am:
+        * autogen.sh:
+
 2009-05-06  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         Reviewed by Simon Hausmann.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 17fabc0b7ec2d95a87dd5fd9002751ca1c616a6a..957078fb12a1fafd8ae54ce028b10786c08eeffa 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -455,6 +455,7 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
 
 # Files that will be distributed
 EXTRA_DIST = \
+       $(srcdir)/gtk-doc.make \
        WebKit/LICENSE \
        $(javascriptcore_dist) \
        $(webcore_dist) \

diff --git a/autogen.sh b/autogen.sh
index 8f736c4a54004d66584209032937504881bb9ffe..d32b73eb61c08459bb0231f919b654a79b0be216 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,6 +8,7 @@ test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd $srcdir
 
+GTKDOCIZE_FLAGS="--copy"
 LIBTOOLIZE_FLAGS="--force --automake"
 ACLOCAL_FLAGS="-I autotools"
 AUTOMAKE_FLAGS="--foreign --add-missing"
@@ -58,7 +59,7 @@ rm -rf $top_srcdir/autom4te.cache
 
 touch README INSTALL
 
-gtkdocize || exit $?
+gtkdocize $GTKDOCIZE_FLAGS || exit $?
 aclocal $ACLOCAL_FLAGS || exit $?
 $LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
 autoheader || exit $?