frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmx: Construct paths in doxygen.conf to fix VPATH builds 

The paths in doxygen.conf assumed that srcdir=builddir and broke
otherwise. Use autoconf to fill in the paths to the srcdir so that the
files can be found when users have a separate build directory (as with
distcheck).

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
This commit is contained in:
Dan Nicholson 2011-02-20 09:51:15 -08:00
parent 61ce915bf7
commit 6b951dec69
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -2248,6 +2248,7 @@ hw/xfree86/utils/gtf/Makefile
hw/dmx/config/Makefile hw/dmx/config/Makefile
hw/dmx/config/man/Makefile hw/dmx/config/man/Makefile
hw/dmx/doc/Makefile hw/dmx/doc/Makefile
hw/dmx/doc/doxygen.conf
hw/dmx/examples/Makefile hw/dmx/examples/Makefile
hw/dmx/input/Makefile hw/dmx/input/Makefile
hw/dmx/glxProxy/Makefile hw/dmx/glxProxy/Makefile

1
hw/dmx/doc/.gitignore vendored
View File

@ -8,3 +8,4 @@ scaled.html
scaled.pdf scaled.pdf
scaled.ps scaled.ps
scaled.txt scaled.txt
doxygen.conf

2
hw/dmx/doc/Makefile.am
View File

@ -34,7 +34,7 @@ all-local: html/annotated.html
dist-local: html/annotated.html dist-local: html/annotated.html
html/annotated.html: $(DOXYGEN_SRC) html/annotated.html: $(DOXYGEN_SRC)
$(DOXYGEN) $(srcdir)/doxygen.conf $(DOXYGEN) doxygen.conf
maintainer-clean-local: maintainer-clean-local:
rm -rf html/ rm -rf html/

18
hw/dmx/doc/doxygen.conf → hw/dmx/doc/doxygen.conf.in
View File

@ -344,9 +344,9 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = .. \ INPUT = @srcdir@/.. \
../input \ @srcdir@/../input \
../config @srcdir@/../config
# If the value of the INPUT tag contains directories, you can use the # If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@ -367,9 +367,9 @@ RECURSIVE = NO
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = ../config/parser.c \ EXCLUDE = @srcdir@/../config/parser.c \
../config/parser.h \ @srcdir@/../config/parser.h \
../config/scanner.c @srcdir@/../config/scanner.c
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
# that are symbolic links (a Unix filesystem feature) are excluded from the input. # that are symbolic links (a Unix filesystem feature) are excluded from the input.
@ -510,20 +510,20 @@ HTML_FILE_EXTENSION = .html
# each generated HTML page. If it is left blank doxygen will generate a # each generated HTML page. If it is left blank doxygen will generate a
# standard header. # standard header.
HTML_HEADER = doxygen.head HTML_HEADER = @srcdir@/doxygen.head
# The HTML_FOOTER tag can be used to specify a personal HTML footer for # 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 # each generated HTML page. If it is left blank doxygen will generate a
# standard footer. # standard footer.
HTML_FOOTER = doxygen.foot HTML_FOOTER = @srcdir@/doxygen.foot
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading # 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 # style sheet that is used by each HTML page. It can be used to
# fine-tune the look of the HTML output. If the tag is left blank doxygen # fine-tune the look of the HTML output. If the tag is left blank doxygen
# will generate a default style sheet # will generate a default style sheet
HTML_STYLESHEET = doxygen.css HTML_STYLESHEET = @srcdir@/doxygen.css
# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
# files or namespaces will be aligned in HTML using tables. If set to # files or namespaces will be aligned in HTML using tables. If set to