From 3b1a9aeca019c05f2e8492d535b4c51043ff30eb Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 23 Feb 2009 10:04:51 +0100
Subject: Makefile.am: no recursive makefiles

Recursive Makefiles are inefficient and error prone (no proper way to
declare dependencies).  Since there's no disadvantage in having one
single Makefile, let's do it.
---
 doc/Makefile.am  | 28 ----------------------------
 doc/doxygen.conf |  4 ++--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 doc/Makefile.am

(limited to 'doc')

diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 211a23010..000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-DOCBOOK_FILES = protocol.xml
-DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES))
-
-man_MANS = mpd.1 mpd.conf.5
-doc_DATA = mpdconf.example
-EXTRA_DIST = $(man_MANS) $(DOCBOOK_FILES) mpdconf.example
-
-if ENABLE_DOCUMENTATION
-protocoldir = $(docdir)/protocol
-protocol_DATA = $(wildcard protocol/*.html)
-
-$(DOCBOOK_HTML): %/index.html: %.xml
-	$(XMLTO) -o protocol --stringparam chunker.output.encoding=utf-8 html $<
-
-api/html/index.html: doxygen.conf
-	$(DOXYGEN) $<
-
-all-local: $(DOCBOOK_HTML) api/html/index.html
-
-clean-local:
-	rm -rf $(patsubst %.xml,%,$(DOCBOOK_FILES))
-	rm -rf api
-
-install-data-local: api/html/index.html
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/api/html
-	$(INSTALL_DATA) -c -m 644 api/html/*.html api/html/*.css api/html/*.png api/html/*.gif $(DESTDIR)$(docdir)/api/html
-
-endif
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 5e1ff4aaa..625e070ae 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -38,7 +38,7 @@ PROJECT_NUMBER         =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = api
+OUTPUT_DIRECTORY       = doc/api
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -534,7 +534,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../src
+INPUT                  = src
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-- 
cgit v1.2.3