Commit 119a49ff authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Add make doc and fix Doxygen from top_builddir

parent ebd80034
...@@ -316,7 +316,10 @@ libvlc: ...@@ -316,7 +316,10 @@ libvlc:
core: core:
cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
.PHONY: libvlc core doc:
cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
.PHONY: libvlc core doc
#To get some nice output #To get some nice output
nice: nice:
......
ChangeLog-* ChangeLog-*
vlc.tags vlc.tags
Doxyfile
doxygen doxygen
...@@ -23,7 +23,7 @@ PROJECT_NAME = VLC ...@@ -23,7 +23,7 @@ PROJECT_NAME = VLC
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = PROJECT_NUMBER = @VERSION@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.
...@@ -450,9 +450,9 @@ WARN_LOGFILE = ...@@ -450,9 +450,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 = ../src \ INPUT = @top_srcdir@/src \
../include \ @top_srcdir@/include \
../modules @top_srcdir@/modules
# 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
...@@ -473,7 +473,7 @@ RECURSIVE = YES ...@@ -473,7 +473,7 @@ RECURSIVE = YES
# 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 = ../src/extras EXCLUDE = @top_srcdir@/src/extras
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded # directories that are symbolic links (a Unix filesystem feature) are excluded
...@@ -521,7 +521,7 @@ IMAGE_PATH = ...@@ -521,7 +521,7 @@ IMAGE_PATH =
# to standard output. If FILTER_PATTERNS is specified, this tag will be # to standard output. If FILTER_PATTERNS is specified, this tag will be
# ignored. # ignored.
INPUT_FILTER = "../toolbox --add-include" INPUT_FILTER = "@top_srcdir@/toolbox --add-include"
# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
# basis. Doxygen will compare the file name with each pattern and apply the # basis. Doxygen will compare the file name with each pattern and apply the
...@@ -971,8 +971,8 @@ SEARCH_INCLUDES = YES ...@@ -971,8 +971,8 @@ SEARCH_INCLUDES = YES
# contain include files that are not input files but should be processed by # contain include files that are not input files but should be processed by
# the preprocessor. # the preprocessor.
INCLUDE_PATH = ../include \ INCLUDE_PATH = @top_srcdir@/include \
../include/vlc @top_srcdir@/include/vlc
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the # patterns (like *.h and *.hpp) to filter out the header-files in the
......
...@@ -32,6 +32,7 @@ EXTRA_DIST = \ ...@@ -32,6 +32,7 @@ EXTRA_DIST = \
intf-vcd.txt \ intf-vcd.txt \
release-howto.txt \ release-howto.txt \
arm-crosscompile-howto.sgml \ arm-crosscompile-howto.sgml \
Doxyfile.in \
Configure.help \ Configure.help \
lirc/example.lircrc \ lirc/example.lircrc \
skins/skins-howto.txt \ skins/skins-howto.txt \
...@@ -47,7 +48,13 @@ EXTRA_DIST = \ ...@@ -47,7 +48,13 @@ EXTRA_DIST = \
demo.sh \ demo.sh \
$(NULL) $(NULL)
DISTCLEANFILES = $(CHANGELOGS) DISTCLEANFILES = $(CHANGELOGS) Doxyfile
Doxyfile: Doxyfile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
doc: Doxyfile
doxygen
$(CHANGELOGS): Makefile.am $(CHANGELOGS): Makefile.am
if test -d "$(top_srcdir)/.git"; then \ if test -d "$(top_srcdir)/.git"; then \
...@@ -59,7 +66,7 @@ $(CHANGELOGS): Makefile.am ...@@ -59,7 +66,7 @@ $(CHANGELOGS): Makefile.am
fi fi
# This one needs to be rebuilt all the time :) # This one needs to be rebuilt all the time :)
.PHONY: ChangeLog-2008 changelogs .PHONY: ChangeLog-2008 changelogs doc
changelogs: $(CHANGELOGS) changelogs: $(CHANGELOGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment