summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rwxr-xr-xbootstrap.sh2
-rw-r--r--configure.ac2
-rw-r--r--gtkdoc/.gitignore (renamed from doc/.gitignore)0
-rw-r--r--gtkdoc/Makefile.am (renamed from doc/Makefile.am)0
-rw-r--r--gtkdoc/libcanberra-docs.sgml (renamed from doc/libcanberra-docs.sgml)0
-rw-r--r--gtkdoc/libcanberra-sections.txt (renamed from doc/libcanberra-sections.txt)0
-rw-r--r--gtkdoc/libcanberra.types (renamed from doc/libcanberra.types)0
8 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 4ad7cd2..2fa898c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
dist_doc_DATA = README
EXTRA_DIST = bootstrap.sh autogen.sh LGPL
-SUBDIRS = src doc libltdl
+SUBDIRS = src gtkdoc libltdl
MAINTAINERCLEANFILES =
noinst_DATA =
diff --git a/bootstrap.sh b/bootstrap.sh
index 9c9a68b..a6ebd73 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -53,7 +53,7 @@ else
test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
mkdir -p m4
- gtkdocize --copy --flavour no-tmpl
+ gtkdocize --copy --flavour no-tmpl --docdir gtkdoc
"$LIBTOOLIZE" -c --force --ltdl
run_versioned aclocal "$VERSION" -I m4
run_versioned autoconf 2.62 -Wall
diff --git a/configure.ac b/configure.ac
index 2828e29..56cce26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,7 +387,7 @@ Makefile
src/Makefile
libcanberra.pc
libcanberra-gtk.pc
-doc/Makefile
+gtkdoc/Makefile
])
AC_OUTPUT
diff --git a/doc/.gitignore b/gtkdoc/.gitignore
index 38fb245..38fb245 100644
--- a/doc/.gitignore
+++ b/gtkdoc/.gitignore
diff --git a/doc/Makefile.am b/gtkdoc/Makefile.am
index 963a93d..963a93d 100644
--- a/doc/Makefile.am
+++ b/gtkdoc/Makefile.am
diff --git a/doc/libcanberra-docs.sgml b/gtkdoc/libcanberra-docs.sgml
index 6505314..6505314 100644
--- a/doc/libcanberra-docs.sgml
+++ b/gtkdoc/libcanberra-docs.sgml
diff --git a/doc/libcanberra-sections.txt b/gtkdoc/libcanberra-sections.txt
index 326faa1..326faa1 100644
--- a/doc/libcanberra-sections.txt
+++ b/gtkdoc/libcanberra-sections.txt
diff --git a/doc/libcanberra.types b/gtkdoc/libcanberra.types
index e69de29..e69de29 100644
--- a/doc/libcanberra.types
+++ b/gtkdoc/libcanberra.types