[Xfce4-commits] <xfce4-panel:master> Remove package documentation.

[Nick Schermer]

Updating branch refs/heads/master
         to 8f8b3357bcdcfd65518fb15b12b49ed63c249c0d (commit)
       from 3047ee12ab2d3c232227ab7dc0c35d7153bb37a1 (commit)

commit 8f8b3357bcdcfd65518fb15b12b49ed63c249c0d
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Jan 6 22:25:02 2012 +0100

    Remove package documentation.
    
    Everything is redirected to docs.xfce.org now.

 .gitmodules      |    3 ---
 Makefile.am      |    3 +--
 autogen.sh       |    1 -
 configure.ac.in  |   39 ---------------------------------------
 docs/Makefile.am |    1 -
 docs/manual      |    1 -
 6 files changed, 1 insertions(+), 47 deletions(-)

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 566fc72..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "docs/manual"]
-	path = docs/manual
-	url = git://git.xfce.org/xfce/xfce4-docs
diff --git a/Makefile.am b/Makefile.am
index 7683b44..0ad0780 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,6 @@ DISTCLEANFILES = \
 	intltool-update-tmp
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-gtk-doc \
-	--enable-gen-doc
+	--enable-gtk-doc
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/autogen.sh b/autogen.sh
index 093879a..6eae715 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,5 +30,4 @@ EOF
 }
 
 XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
-XDT_AUTOGEN_CHECK_DOCS="docs/manual" \
 exec xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 4320795..9fbe0db 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -144,35 +144,6 @@ dnl **********************************
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0],
                            [2.18.0], [gio-unix], [GIO UNIX features])
 
-dnl ***************************************************
-dnl *** Check if we need to build the documentation ***
-dnl ***************************************************
-AC_ARG_ENABLE([gen-doc], [AC_HELP_STRING([--enable-gen-doc], 
-              [Generate HTML documentation (requires gnome-doc-utils) [default=no]])],,
-              [enable_gen_doc=no])
-if test x"$enable_gen_doc" = x"yes"; then
-  XDT_CHECK_PACKAGE([GNOME_DOC_UTILS], [gnome-doc-utils], [0.19.2],
-  [
-    AC_PATH_PROG([XML2PO], [xml2po], [no])
-    if test x"$XML2PO" = x"no"; then
-        enable_gen_doc=no
-    fi
-
-    AC_PATH_PROG([GNOME_DOC_TOOL], [gnome-doc-tool], [no])
-    if test x"$GNOME_DOC_TOOL" = x"no"; then
-        enable_gen_doc=no
-    fi
-  ],
-  [
-    enable_gen_doc=no
-  ])
-
-  if test x"$enable_gen_doc" = x"no"; then
-    AC_MSG_ERROR([Compiling with --enable-gen-doc but no suitable gnome-doc-utils found.])
-  fi
-fi
-AM_CONDITIONAL([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"])
-
 dnl *************************
 dnl *** Check for gtk-doc ***
 dnl *************************
@@ -245,9 +216,6 @@ AC_OUTPUT([
 Makefile
 common/Makefile
 docs/Makefile
-docs/manual/Makefile
-docs/manual/figures/Makefile
-docs/manual/po/Makefile
 docs/references/Makefile
 docs/references/version.xml
 icons/Makefile
@@ -287,11 +255,4 @@ echo "Build Configuration:"
 echo
 echo "* Debug Support:          $enable_debug"
 echo "* GNU Visibility:         $have_gnuc_visibility"
-if test x"$enable_gen_doc" = x"yes"; then
-echo "* Documentation:          yes (generate)"
-elif test -d "${srcdir}/docs/manual/html"; then
-echo "* Documentation:          yes (in tarball)"
-else
-echo "* Documentation:          no"
-fi
 echo
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 0faac59..38daef2 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = \
-	manual \
 	references
 
 doc_DATA = \
diff --git a/docs/manual b/docs/manual
deleted file mode 160000
index f89f667..0000000
--- a/docs/manual
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f89f667d58522dea8ee6fd3f63ebbbf3cf97c948