diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-05-17 08:39:50 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-05-17 08:39:50 +0000 |
| commit | e9b19db82bed7a248882c7d345e97bd0f0e55058 (patch) | |
| tree | 9b41b3bb6db216d4005bbe285799aaae4839b21c | |
| parent | 54353abef28310d44595928aee42d713a524df03 (diff) | |
| download | ffmpeg-e9b19db82bed7a248882c7d345e97bd0f0e55058.tar.gz | |
Make documentation build nonrecursive: Merge it into the top-level Makefile.
Originally committed as revision 9042 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | doc/Makefile | 20 |
2 files changed, 13 insertions, 23 deletions
@@ -103,8 +103,18 @@ ffmpeg.o ffplay.o ffserver.o: version.h videohook: .libs $(MAKE) -C vhook all -documentation: - $(MAKE) -C doc all +documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \ + ffplay-doc.html hooks.html $(ALLMANPAGES)) + +doc/%.html: doc/%.texi + texi2html -monolithic -number $< + mv $(@F) $@ + +doc/%.pod: doc/%-doc.texi + doc/texi2pod.pl $< $@ + +doc/%.1: doc/%.pod + pod2man --section=1 --center=" " --release=" " $< > $@ install: install-progs install-libs install-headers @@ -206,9 +216,9 @@ clean: $(MAKE) -C libswscale clean $(MAKE) -C tests clean $(MAKE) -C vhook clean - $(MAKE) -C doc clean rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \ output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF) + rm -f doc/*.html doc/*.pod doc/*.1 distclean: clean $(MAKE) -C libavutil distclean diff --git a/doc/Makefile b/doc/Makefile deleted file mode 100644 index 4fc9dfb8f9..0000000000 --- a/doc/Makefile +++ /dev/null @@ -1,20 +0,0 @@ --include ../config.mak - -VPATH=$(SRC_PATH_BARE)/doc - -all: ffmpeg-doc.html faq.html ffserver-doc.html ffplay-doc.html hooks.html \ - ffmpeg.1 ffserver.1 ffplay.1 - -%.html: %.texi Makefile - texi2html -monolithic -number $< - -%.pod: %-doc.texi - ./texi2pod.pl $< $@ - -%.1: %.pod - pod2man --section=1 --center=" " --release=" " $< > $@ - -clean: - rm -f *.html *.pod *.1 - -.PHONY: all clean |