Merge branch 'master' into lpcm_encoder

[vlc] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index fc817df856e39578379897e4808d66fca441348b..43fdd2d5853deadde89586d1fe38d25ff9e442e6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,8 @@
 NULL =
 
-docdir = $(datadir)/doc/@PACKAGE@
-
 doc_DATA = \
        bugreport-howto.txt \
        fortunes.txt \
-       intf-cdda.txt \
        intf-vcd.txt \
        $(NULL)
 
@@ -20,19 +17,23 @@ CHANGELOGS = \
        ChangeLog-2006 \
        ChangeLog-2007 \
        ChangeLog-2008 \
+       ChangeLog-2009 \
+       ChangeLog-2010 \
        $(NULL)
 
+man1_MANS = \
+          vlc.1 \
+          vlc-wrapper.1 \
+          vlc-config.1
+
 EXTRA_DIST = \
        $(CHANGELOGS) \
-       vlc.1 \
-       vlc-config.1 \
-       bugreport-howto.txt \
+        $(man1_MANS) \
+        bugreport-howto.txt \
        fortunes.txt \
-       intf-cdda.txt \
        intf-vcd.txt \
        release-howto.txt \
-       arm-crosscompile-howto.sgml \
-       Configure.help \
+       Doxyfile.in \
        lirc/example.lircrc \
        skins/skins-howto.txt \
        skins/events-howto.txt \
@@ -43,15 +44,21 @@ EXTRA_DIST = \
        skins/curve_maker/Bezier.vbw \
        strings.txt \
        translations.txt \
-       win32/Cross-Compile-Howto.txt \
        demo.sh \
        $(NULL)
 
-DISTCLEANFILES = $(CHANGELOGS)
+DISTCLEANFILES = Doxyfile
+MAINTAINERCLEANFILES = $(CHANGELOGS)
+
+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 \
-               y="$@"; y="$${y##ChangeLog-}" ;
+               y="$@"; y="$${y##ChangeLog-}" ; \
                git --git-dir="$(top_srcdir)/.git" log \
                        --since="$$y-01-01" \
                        --until="$$y-12-31 23:00:00 -0100" \
@@ -59,7 +66,9 @@ $(CHANGELOGS): Makefile.am
        fi
 
 # This one needs to be rebuilt all the time :)
-.PHONY: ChangeLog-2008
-#
+.PHONY: ChangeLog-2010 changelogs doc
+
+changelogs: $(CHANGELOGS)
+
 #distclean-hook:
 #      test "$(srcdir)" = "$(builddir)" || rm -f -- $(CHANGELOGS)