[libdvdcss-devel] build: get rid of recursion within doc/ for Doxygen API doc.

Diego Elio Pettenò

2013-02-14 15:49:14 UTC

libdvdcss | branch: master | Diego Elio Pettenò <***@flameeyes.eu> | Thu Feb 14 07:26:17 2013 -0800| [c19d7b4c0bd817b5382bd074c84cafe853fc3469] | committer: Jean-Baptiste Kempf

build: get rid of recursion within doc/ for Doxygen API doc.

It still recurses for latex documentation.

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=c19d7b4c0bd817b5382bd074c84cafe853fc3469

---

Makefile.am | 24 ++++++++++++++++--------
configure.ac | 2 +-
doc/Makefile.am | 28 ----------------------------
doc/doxygen.cfg.in | 14 +++++++-------
4 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a5df3c9..58a0d5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,6 @@
ACLOCAL_AMFLAGS = -I m4

-SUBDIRS = doc
-
-EXTRA_DIST = libdvdcss.spec
-
-doc-dummy:
-
-doc: doc-dummy
- $(MAKE) -C doc
+EXTRA_DIST = libdvdcss.spec doc/header.html doc/footer.html doc/latex/

lib_LTLIBRARIES = libdvdcss.la
EXTRA_PROGRAMS = csstest dvd_region
@@ -55,3 +48,18 @@ pkginclude_HEADERS = src/dvdcss/dvdcss.h

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = src/libdvdcss.pc
+
+apidoc: stamp-doxygen stamp-latex
+
+stamp-doxygen: doc/doxygen.cfg
+ cd doc && $(DOXYGEN) doxygen.cfg
+ touch $@
+
+stamp-latex: stamp-doxygen
+if LATEX
+ $(MAKE) -C doc/latex ps
+endif
+ touch $@
+
+clean-local:
+ -rm -Rf stamp-latex stamp-doxygen doc/html doc/latex
diff --git a/configure.ac b/configure.ac
index 010f6c8..535fec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,7 @@ AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")
AC_SUBST(DVDCSS_LDFLAGS)
AC_OUTPUT([
Makefile
- doc/Makefile
+ doc/doxygen.cfg
src/libdvdcss.pc
])

diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 801a1f1..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-EXTRA_DIST = doxygen.cfg.in footer.html header.html
-DISTCLEANFILES = doxygen.cfg
-
-all: stamp-doxygen stamp-latex
-
-doxygen.cfg: $(srcdir)/doxygen.cfg.in
- -rm -f $@
- sed 's|@SRCDIR@|$(srcdir)|g; s|@TOP_SRCDIR@|$(top_srcdir)|g' $< > $@
-
-stamp-doxygen: doxygen.cfg
-if DOXYGEN
- doxygen doxygen.cfg
- touch stamp-doxygen
-endif
-
-stamp-latex: stamp-doxygen
-if DOXYGEN
-if LATEX
- $(MAKE) -C latex ps
- touch stamp-latex
-endif
-endif
-
-clean: clean-local
-clean-local:
- -rm -f stamp-latex stamp-doxygen
- -rm -Rf html latex
-
diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in
index 45eb9ca..81c33c7 100644
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@@ -25,20 +25,20 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.

-PROJECT_NAME = libdvdcss
+PROJECT_NAME = @PACKAGE_NAME

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.

-PROJECT_NUMBER = 1.2.12
+PROJECT_NUMBER = @PACKAGE_VERSION@

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# 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 = .
+OUTPUT_DIRECTORY = @top_builddir@/doc

# 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,8 +534,8 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.

-INPUT = @TOP_SRCDIR@/src/dvdcss/dvdcss.h \
- @TOP_SRCDIR@/src/libdvdcss.c
+INPUT = @top_srcdir@/src/dvdcss/dvdcss.h \
+ @top_srcdir@/src/libdvdcss.c

# 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
@@ -743,13 +743,13 @@ HTML_FILE_EXTENSION = .html
# each generated HTML page. If it is left blank doxygen will generate a
# standard header.

-HTML_HEADER = @SRCDIR@/header.html
+HTML_HEADER = @top_srcdir@/doc/header.html

# The HTML_FOOTER tag can be used to specify a personal HTML footer for
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.

-HTML_FOOTER = @SRCDIR@/footer.html
+HTML_FOOTER = @top_srcdir@/doc/footer.html

# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to