From e66333393e5b0be67fc2242e7ed88adc746f5433 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 9 Mar 2016 11:20:06 -0500 Subject: [PATCH] Move gtk-doc into api-doc Since that's all it is now, we use mkdocs for the manual. --- Makefile.am | 2 +- {doc => api-doc}/Makefile.am | 0 {doc => api-doc}/overview.xml | 0 {doc => api-doc}/rpmostree-docs.xml.in | 0 {doc => api-doc}/rpmostree-sections.txt | 0 {doc => api-doc}/treefile-examples/fedora-rawhide-base.json | 0 {doc => api-doc}/treefile-examples/fedora-rawhide-docker.json | 0 {doc => api-doc}/treefile-examples/fedora-rawhide.repo | 0 configure.ac | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename {doc => api-doc}/Makefile.am (100%) rename {doc => api-doc}/overview.xml (100%) rename {doc => api-doc}/rpmostree-docs.xml.in (100%) rename {doc => api-doc}/rpmostree-sections.txt (100%) rename {doc => api-doc}/treefile-examples/fedora-rawhide-base.json (100%) rename {doc => api-doc}/treefile-examples/fedora-rawhide-docker.json (100%) rename {doc => api-doc}/treefile-examples/fedora-rawhide.repo (100%) diff --git a/Makefile.am b/Makefile.am index c0bad761..d7926c62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ include Makefile-decls.am SUBDIRS += . if ENABLE_GTK_DOC -SUBDIRS += doc +SUBDIRS += api-doc endif ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS} diff --git a/doc/Makefile.am b/api-doc/Makefile.am similarity index 100% rename from doc/Makefile.am rename to api-doc/Makefile.am diff --git a/doc/overview.xml b/api-doc/overview.xml similarity index 100% rename from doc/overview.xml rename to api-doc/overview.xml diff --git a/doc/rpmostree-docs.xml.in b/api-doc/rpmostree-docs.xml.in similarity index 100% rename from doc/rpmostree-docs.xml.in rename to api-doc/rpmostree-docs.xml.in diff --git a/doc/rpmostree-sections.txt b/api-doc/rpmostree-sections.txt similarity index 100% rename from doc/rpmostree-sections.txt rename to api-doc/rpmostree-sections.txt diff --git a/doc/treefile-examples/fedora-rawhide-base.json b/api-doc/treefile-examples/fedora-rawhide-base.json similarity index 100% rename from doc/treefile-examples/fedora-rawhide-base.json rename to api-doc/treefile-examples/fedora-rawhide-base.json diff --git a/doc/treefile-examples/fedora-rawhide-docker.json b/api-doc/treefile-examples/fedora-rawhide-docker.json similarity index 100% rename from doc/treefile-examples/fedora-rawhide-docker.json rename to api-doc/treefile-examples/fedora-rawhide-docker.json diff --git a/doc/treefile-examples/fedora-rawhide.repo b/api-doc/treefile-examples/fedora-rawhide.repo similarity index 100% rename from doc/treefile-examples/fedora-rawhide.repo rename to api-doc/treefile-examples/fedora-rawhide.repo diff --git a/configure.ac b/configure.ac index c9d2bc37..59243651 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,7 @@ if test x$enable_compose_tooling != xno; then RPM_OSTREE_FEATURES="$RPM_OSTREE_F AC_CONFIG_FILES([ Makefile -doc/Makefile +api-doc/Makefile src/lib/rpm-ostree-1.pc ]) AC_OUTPUT