Use gtk-doc for libcrystfel only (not the contents of src)

7 files changed, 5 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index b65dea30..f398c693 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ src/check_hkl
 src/partial_sim
 src/.dirstamp
 *~
-doc/reference/*
+doc/reference/libcrystfel/*
 gtk-doc.make
 build-aux/compile
 build-aux/config.sub
diff --git a/Makefile.am b/Makefile.am
index 961135a3..f465ba36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 docdir = ${datadir}/doc/${PACKAGE}
 EXTRA_DIST = configure m4/gnulib-cache.m4
-SUBDIRS = lib doc/reference libcrystfel
+SUBDIRS = lib doc/reference/libcrystfel libcrystfel
 ACLOCAL_AMFLAGS = -I m4
 
 bin_PROGRAMS = src/pattern_sim src/process_hkl src/get_hkl src/indexamajig \
diff --git a/configure.ac b/configure.ac
index a3a15482..97f9513d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,9 +301,9 @@ AC_SUBST([LIBCRYSTFEL_LIBS])
 GTK_DOC_CHECK([1.9],[--flavour no-tmpl])
 AC_CONFIG_MACRO_DIR(m4)
 
-HTML_DIR=${docdir}/reference
+HTML_DIR=${docdir}/reference/libcrystfel
 
 
-AC_CONFIG_FILES(Makefile lib/Makefile doc/reference/Makefile libcrystfel/Makefile)
+AC_CONFIG_FILES(Makefile lib/Makefile doc/reference/libcrystfel/Makefile libcrystfel/Makefile)
 AC_CONFIG_FILES(libcrystfel/crystfel.pc)
 AC_OUTPUT
diff --git a/doc/reference/CrystFEL-docs.sgml b/doc/reference/libcrystfel/CrystFEL-docs.sgml
index 4e6cc877..4e6cc877 100644
--- a/doc/reference/CrystFEL-docs.sgml
+++ b/doc/reference/libcrystfel/CrystFEL-docs.sgml
diff --git a/doc/reference/CrystFEL-sections.txt b/doc/reference/libcrystfel/CrystFEL-sections.txt
index 5df1f2d5..5df1f2d5 100644
--- a/doc/reference/CrystFEL-sections.txt
+++ b/doc/reference/libcrystfel/CrystFEL-sections.txt
diff --git a/doc/reference/Makefile.am b/doc/reference/libcrystfel/Makefile.am
index 3b03513d..e4f49b03 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/libcrystfel/Makefile.am
@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
-DOC_SOURCE_DIR=../../libcrystfel/src ../../src
+DOC_SOURCE_DIR=../../../libcrystfel/src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
diff --git a/doc/reference/xml/coding-standards.xml b/doc/reference/libcrystfel/xml/coding-standards.xml
index d51ba293..d51ba293 100644
--- a/doc/reference/xml/coding-standards.xml
+++ b/doc/reference/libcrystfel/xml/coding-standards.xml