decoder: do not mix and match condidition variable and mutex pairings

[vlc] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3f69c3b2a1a5e58ed2be9bc5a080aa315a060226..7e48d27cb91d2a6b16ba63a154d6cd2f0dbaefe5 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,21 @@
 NULL =
 
+LIBVLC_SAMPLES = \
+       libvlc/gtk_player.c \
+       libvlc/libvlc_DVD_ripper.c \
+       libvlc/QtPlayer/LICENSE \
+       libvlc/QtPlayer/main.cpp \
+       libvlc/QtPlayer/player.cpp \
+       libvlc/QtPlayer/player.h \
+       libvlc/QtPlayer/QtVLC.pro \
+       libvlc/vlc-thumb.c \
+       libvlc/wx_player.cpp \
+       $(NULL)
+
+nobase_doc_DATA = $(LIBVLC_SAMPLES)
+
 doc_DATA = \
-       bugreport-howto.txt \
        fortunes.txt \
-       intf-cdda.txt \
        intf-vcd.txt \
        $(NULL)
 
@@ -19,24 +31,26 @@ CHANGELOGS = \
        ChangeLog-2007 \
        ChangeLog-2008 \
        ChangeLog-2009 \
+       ChangeLog-2010 \
+       ChangeLog-2011 \
+       ChangeLog-2012 \
+       ChangeLog-2013 \
+       ChangeLog-2014 \
+       ChangeLog-2015 \
        $(NULL)
 
 man1_MANS = \
           vlc.1 \
-          vlc-wrapper.1 \
-          vlc-config.1
+          vlc-wrapper.1
 
 EXTRA_DIST = \
        $(CHANGELOGS) \
-        $(man1_MANS) \
-        bugreport-howto.txt \
+       $(man1_MANS) \
+       $(LIBVLC_SAMPLES) \
        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 \
@@ -47,11 +61,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)/$@
@@ -69,7 +83,7 @@ $(CHANGELOGS): Makefile.am
        fi
 
 # This one needs to be rebuilt all the time :)
-.PHONY: ChangeLog-2009 changelogs doc
+.PHONY: ChangeLog-2015 changelogs doc
 
 changelogs: $(CHANGELOGS)