Add make doc and fix Doxygen from top_builddir

diff --git a/Makefile.am b/Makefile.am
index f43e120cb7cee42a72a8f68e35eff9b276fa324e..1caf4eed24429eb13815b29c90e507a7c7016623 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -316,7 +316,10 @@ libvlc:
 core:
        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
 nice:

diff --git a/doc/.gitignore b/doc/.gitignore
index b1cd668a18b5e58f4836ee9b3893969944879c7b..b1a0012447a5cddd7794093b259044e1a6bd3fb5 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,3 +1,4 @@
 ChangeLog-*
 vlc.tags
+Doxyfile
 doxygen

diff --git a/doc/Doxyfile b/doc/Doxyfile.in
similarity index 99%
rename from doc/Doxyfile
rename to doc/Doxyfile.in
index 30b40ec2293a8e50b7d2747082321ac0b5e34233..aefc32317366582773ae6f80bc60cf940b206446 100644 (file)
--- a/doc/Doxyfile
+++ b/doc/Doxyfile.in
@@ -23,7 +23,7 @@ PROJECT_NAME           = VLC
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = @VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -450,9 +450,9 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../src \
-                         ../include \
-                         ../modules
+INPUT                  = @top_srcdir@/src \
+                         @top_srcdir@/include \
+                         @top_srcdir@/modules
 
 # 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 
@@ -473,7 +473,7 @@ RECURSIVE              = YES
 # 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.
 
-EXCLUDE                = ../src/extras
+EXCLUDE                = @top_srcdir@/src/extras
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -521,7 +521,7 @@ IMAGE_PATH             =
 # to standard output.  If FILTER_PATTERNS is specified, this tag will be 
 # 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 
 # basis.  Doxygen will compare the file name with each pattern and apply the 
@@ -971,8 +971,8 @@ SEARCH_INCLUDES        = YES
 # contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH           = ../include \
-                         ../include/vlc
+INCLUDE_PATH           = @top_srcdir@/include \
+                         @top_srcdir@/include/vlc
 
 # 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 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d16c337313667c0663b352529438f1a45ccfa38e..8a34727e6067bdc877c5787505351b832e30aa5b 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST = \
        intf-vcd.txt \
        release-howto.txt \
        arm-crosscompile-howto.sgml \
+       Doxyfile.in \
        Configure.help \
        lirc/example.lircrc \
        skins/skins-howto.txt \
@@ -47,7 +48,13 @@ EXTRA_DIST = \
        demo.sh \
        $(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
        if test -d "$(top_srcdir)/.git"; then \
@@ -59,7 +66,7 @@ $(CHANGELOGS): Makefile.am
        fi
 
 # This one needs to be rebuilt all the time :)
-.PHONY: ChangeLog-2008 changelogs
+.PHONY: ChangeLog-2008 changelogs doc
 
 changelogs: $(CHANGELOGS)