cosmetics: use one type per field in every structs

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 50fb3bedf186204ef3856a55df8282711f36abbb..a70d85ed19b96d1fdfe6a2e1fbe38822a611a55c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,7 @@ all: documentation
 install: install-man
 endif
 
-OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
-SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
+SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
 LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
 EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
@@ -104,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
 
@@ -207,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
@@ -226,11 +235,11 @@ TAGS:
 
 # regression tests
 
-codectest libavtest test-server fulltest test mpeg4 mpeg: $(PROGS)
+codectest libavtest seektest test-server fulltest test: $(PROGS)
        $(MAKE) -C tests $@
 
 .PHONY: all lib videohook documentation install* wininstaller uninstall*
 .PHONY: dep depend clean distclean TAGS
-.PHONY: codectest libavtest test-server fulltest test mpeg4 mpeg
+.PHONY: codectest libavtest seektest test-server fulltest test
 
 -include .depend