From 32c360b5a0188ec0139218d53db7767698c8bef6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 27 Jan 2016 13:29:21 -0500 Subject: [PATCH] build: Rename doc/ -> apidoc/ This is preparation for introducing a `mkdocs` manual under `doc/` which should be significantly more useful for the world at large than the minimal manual that exists there now. --- Makefile.am | 2 +- {doc => apidoc}/.gitignore | 0 {doc => apidoc}/Makefile.am | 0 {doc => apidoc}/adapting-existing.xml | 0 {doc => apidoc}/atomic-upgrades.xml | 0 {doc => apidoc}/deployment.xml | 0 {doc => apidoc}/ostree-docs.xml | 0 {doc => apidoc}/ostree-sections.txt | 0 {doc => apidoc}/overview.xml | 0 {doc => apidoc}/repo.xml | 0 configure.ac | 5 +++-- 11 files changed, 4 insertions(+), 3 deletions(-) rename {doc => apidoc}/.gitignore (100%) rename {doc => apidoc}/Makefile.am (100%) rename {doc => apidoc}/adapting-existing.xml (100%) rename {doc => apidoc}/atomic-upgrades.xml (100%) rename {doc => apidoc}/deployment.xml (100%) rename {doc => apidoc}/ostree-docs.xml (100%) rename {doc => apidoc}/ostree-sections.txt (100%) rename {doc => apidoc}/overview.xml (100%) rename {doc => apidoc}/repo.xml (100%) diff --git a/Makefile.am b/Makefile.am index 172af0b2..da904da2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode SUBDIRS += . if ENABLE_GTK_DOC -SUBDIRS += doc +SUBDIRS += apidoc endif EXTRA_DIST += autogen.sh COPYING README.md diff --git a/doc/.gitignore b/apidoc/.gitignore similarity index 100% rename from doc/.gitignore rename to apidoc/.gitignore diff --git a/doc/Makefile.am b/apidoc/Makefile.am similarity index 100% rename from doc/Makefile.am rename to apidoc/Makefile.am diff --git a/doc/adapting-existing.xml b/apidoc/adapting-existing.xml similarity index 100% rename from doc/adapting-existing.xml rename to apidoc/adapting-existing.xml diff --git a/doc/atomic-upgrades.xml b/apidoc/atomic-upgrades.xml similarity index 100% rename from doc/atomic-upgrades.xml rename to apidoc/atomic-upgrades.xml diff --git a/doc/deployment.xml b/apidoc/deployment.xml similarity index 100% rename from doc/deployment.xml rename to apidoc/deployment.xml diff --git a/doc/ostree-docs.xml b/apidoc/ostree-docs.xml similarity index 100% rename from doc/ostree-docs.xml rename to apidoc/ostree-docs.xml diff --git a/doc/ostree-sections.txt b/apidoc/ostree-sections.txt similarity index 100% rename from doc/ostree-sections.txt rename to apidoc/ostree-sections.txt diff --git a/doc/overview.xml b/apidoc/overview.xml similarity index 100% rename from doc/overview.xml rename to apidoc/overview.xml diff --git a/doc/repo.xml b/apidoc/repo.xml similarity index 100% rename from doc/repo.xml rename to apidoc/repo.xml diff --git a/configure.ac b/configure.ac index 46b77fbf..140b6c21 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,7 @@ AM_CONDITIONAL(BUILDOPT_STATIC_DELTAS, test x$enable_static_deltas = xyes) AC_CONFIG_FILES([ Makefile -doc/Makefile +apidoc/Makefile src/libostree/ostree-1.pc ]) AC_OUTPUT @@ -248,7 +248,8 @@ echo " SELinux: $with_selinux libarchive (parse tar files directly): $with_libarchive static deltas: $enable_static_deltas - documentation: $enable_gtk_doc + man pages (xsltproc): $XSLTPROC + api docs (gtk-doc): $enable_gtk_doc gjs-based tests: $have_gjs dracut: $with_dracut mkinitcpio: $with_mkinitcpio"