[Xfce4-commits] <xfce4-clipman-plugin:master> remove doc submodule

Mike Massonnet noreply at xfce.org
Sun Feb 2 22:16:02 CET 2014


Updating branch refs/heads/master
         to 47263528ba69f5b9758ab87d58be1998132144b9 (commit)
       from 139d277dcc1eeb6c35643e074ddfe07d0d6055cc (commit)

commit 47263528ba69f5b9758ab87d58be1998132144b9
Author: Mike Massonnet <m8t at gandi.net>
Date:   Sun Feb 2 22:05:53 2014 +0100

    remove doc submodule
    
    documentation is available online at http://docs.xfce.org/panel-plugins/clipman/start

 Makefile.am     |    5 -----
 autogen.sh      |    1 -
 configure.ac.in |   36 ------------------------------------
 doc             |    1 -
 4 files changed, 43 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1d82c6b..618524b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,16 +6,11 @@ SUBDIRS =								\
 	panel-plugin							\
 	tests								\
 	po								\
-	doc								\
 	$(NULL)
 
 distclean-local:
 	rm -rf *.cache *~
 
-DISTCHECK_CONFIGURE_FLAGS =						\
-	--enable-gen-doc						\
-	$(NULL)
-
 EXTRA_DIST =								\
 	AUTHORS								\
 	ChangeLog							\
diff --git a/autogen.sh b/autogen.sh
index 76fba59..cb7e1a0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,5 +11,4 @@ EOF
 }
 
 XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
-XDT_AUTOGEN_CHECK_DOCS="doc" \
 exec xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 98159ec..932a839 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -91,35 +91,6 @@ else
 	enable_qrencode=no
 fi
 
-dnl *******************************
-dnl *** Check for 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([ITSTOOL], [itstool], [no])
-    if test x"$ITSTOOL" = 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 and/or itstool found.])
-  fi
-fi
-AM_CONDITIONAL([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"])
-
 dnl ******************************
 dnl *** Check for i18n support ***
 dnl ******************************
@@ -145,9 +116,6 @@ x11-clipboard-manager/Makefile
 panel-plugin/Makefile
 tests/Makefile
 po/Makefile.in
-doc/Makefile
-doc/media/Makefile
-doc/po/Makefile
 ])
 
 dnl ***************************
@@ -160,7 +128,3 @@ echo "    * Debug Support:    $enable_debug"
 echo "    * Unique:           $enable_unique"
 echo "    * QR Code:          $enable_qrencode"
 echo
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-echo "Enable Documentation: $enable_gen_doc"
-echo
-fi
diff --git a/doc b/doc
deleted file mode 160000
index cf87175..0000000
--- a/doc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf87175977008f876cea8a1bd0b2b503045d3213


More information about the Xfce4-commits mailing list