X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=doc%2FMakefile.am;h=3db7d5b7ce866f1150ac6c15167dfda73816b6f0;hb=3fa047734ac771471d75c2972dfe21e72936c8d0;hp=5f8eed628977f0707c56634b3f73878554f884a0;hpb=c432ea068eb385e5e48605049fbe8b23f40445da;p=vlc

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5f8eed6289..3db7d5b7ce 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,21 @@
 NULL =
 
-docdir = $(datadir)/doc/@PACKAGE@
+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)
 
 doc_DATA = \
+	$(LIBVLC_SAMPLES) \
 	bugreport-howto.txt \
 	fortunes.txt \
-	intf-cdda.txt \
 	intf-vcd.txt \
 	$(NULL)
 
@@ -20,19 +30,24 @@ CHANGELOGS = \
 	ChangeLog-2006 \
 	ChangeLog-2007 \
 	ChangeLog-2008 \
+	ChangeLog-2009 \
+	ChangeLog-2010 \
+	ChangeLog-2011 \
 	$(NULL)
 
+man1_MANS = \
+	   vlc.1 \
+	   vlc-wrapper.1
+
 EXTRA_DIST = \
 	$(CHANGELOGS) \
-	vlc.1 \
-	vlc-config.1 \
+	$(man1_MANS) \
+	$(LIBVLC_SAMPLES) \
 	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,18 +58,31 @@ 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
-	y="$$(echo "$@" | sed -e 's,ChangeLog-,,')" ; \
-	git-log \
-		--since="$$y-01-01" \
-		--until="$$y-12-31 23:00:00 -0100" \
-		> "$@"
+	if test -d "$(top_srcdir)/.git"; then \
+		y="$@"; y="$${y##ChangeLog-}" ; \
+		git --git-dir="$(top_srcdir)/.git" log \
+			--since="$$y-01-01" \
+			--until="$$y-12-31 23:00:00 -0100" \
+			> "$@" ; \
+	fi
 
 # This one needs to be rebuilt all the time :)
-.PHONY: ChangeLog-2008
+.PHONY: ChangeLog-2011 changelogs doc
+
+changelogs: $(CHANGELOGS)
+
+#distclean-hook:
+#	test "$(srcdir)" = "$(builddir)" || rm -f -- $(CHANGELOGS)