Use var_InheritString for --decklink-video-connection.

[vlc] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2730168d6d8907422b0a0da8ef3dc146a21f2373..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,6 +17,8 @@ CHANGELOGS = \
        ChangeLog-2006 \
        ChangeLog-2007 \
        ChangeLog-2008 \
+       ChangeLog-2009 \
+       ChangeLog-2010 \
        $(NULL)
 
 man1_MANS = \
@@ -29,15 +28,12 @@ man1_MANS = \
 
 EXTRA_DIST = \
        $(CHANGELOGS) \
-        $(man_MANS) \
+        $(man1_MANS) \
         bugreport-howto.txt \
        fortunes.txt \
-       intf-cdda.txt \
        intf-vcd.txt \
        release-howto.txt \
-       arm-crosscompile-howto.sgml \
        Doxyfile.in \
-       Configure.help \
        lirc/example.lircrc \
        skins/skins-howto.txt \
        skins/events-howto.txt \
@@ -48,11 +44,11 @@ EXTRA_DIST = \
        skins/curve_maker/Bezier.vbw \
        strings.txt \
        translations.txt \
-       win32/Cross-Compile-Howto.txt \
        demo.sh \
        $(NULL)
 
-DISTCLEANFILES = $(CHANGELOGS) Doxyfile
+DISTCLEANFILES = Doxyfile
+MAINTAINERCLEANFILES = $(CHANGELOGS)
 
 Doxyfile: Doxyfile.in $(top_builddir)/config.status
        cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
@@ -70,7 +66,7 @@ $(CHANGELOGS): Makefile.am
        fi
 
 # This one needs to be rebuilt all the time :)
-.PHONY: ChangeLog-2008 changelogs doc
+.PHONY: ChangeLog-2010 changelogs doc
 
 changelogs: $(CHANGELOGS)