Move unaltered rtsp.c comments to the header file.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 084452bac3d7388982234d57a7f55d7ca61c8fb0..15d9daf6bdde76ba753ff32b2a493400dcf35415 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,24 +11,13 @@ CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 LDFLAGS+= -g
 
-ifeq ($(CONFIG_FFMPEG),yes)
-MANPAGES=doc/ffmpeg.1
-PROGS_G+=ffmpeg_g$(EXESUF)
-PROGS+=ffmpeg$(EXESUF)
-PROGTEST=output_example$(EXESUF)
-QTFASTSTART=qt-faststart$(EXESUF)
-endif
-
-ifeq ($(CONFIG_FFSERVER),yes)
-MANPAGES+=doc/ffserver.1
-PROGS+=ffserver$(EXESUF)
-endif
+PROGS-$(CONFIG_FFMPEG)   += ffmpeg
+PROGS-$(CONFIG_FFPLAY)   += ffplay
+PROGS-$(CONFIG_FFSERVER) += ffserver
 
-ifeq ($(CONFIG_FFPLAY),yes)
-MANPAGES+=doc/ffplay.1
-PROGS_G+=ffplay_g$(EXESUF)
-PROGS+=ffplay$(EXESUF)
-endif
+PROGS = $(addsuffix $(EXESUF), $(PROGS-yes))
+PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes))
+MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
 
 BASENAMES=ffmpeg ffplay ffserver
 ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
@@ -42,17 +31,16 @@ DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(L
 endif
 
 ifeq ($(CONFIG_VHOOK),yes)
-VHOOK=videohook
-INSTALLVHOOK=install-vhook
+all: videohook
+install: install-vhook
 endif
 
 ifeq ($(BUILD_DOC),yes)
-DOC=documentation
-INSTALLMAN=install-man
+all: documentation
+install: install-man
 endif
 
-OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
-SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
+SRCS = ffmpeg.c ffserver.c cmdutils.c ffplay.c
 LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
 EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
@@ -61,7 +49,7 @@ LDFLAGS+=-L./libswscale
 EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
 
-all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+all: lib $(PROGS)
 
 lib:
        $(MAKE) -C libavutil   all
@@ -87,6 +75,11 @@ ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
        cp -p $< $@
        $(STRIP) $@
 
+SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
+ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
+version.h: $(SVN_ENTRIES)
+endif
+
 version.h:
        $(SRC_PATH)/version.sh $(SRC_PATH)
 
@@ -113,7 +106,7 @@ videohook: .libs
 documentation:
        $(MAKE) -C doc all
 
-install: install-progs install-libs install-headers $(INSTALLMAN) $(INSTALLVHOOK)
+install: install-progs install-libs install-headers
 
 ifeq ($(BUILD_SHARED),yes)
 install-progs: $(PROGS) install-libs
@@ -121,9 +114,9 @@ else
 install-progs: $(PROGS)
 endif
        install -d "$(bindir)"
-       install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
+       install -c -m 755 $(PROGS) "$(bindir)"
 
-# create the window installer
+# Create the Windows installer.
 wininstaller: all install
        makensis ffinstall.nsi
 
@@ -200,9 +193,10 @@ endif
 .depend: $(SRCS) version.h
        $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
 
-.libs: lib
-       @test -f .libs || touch .libs
-       @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
+$(DEP_LIBS): lib
+
+.libs: $(DEP_LIBS)
+       touch $@
 
 clean:
        $(MAKE) -C libavutil   clean
@@ -213,10 +207,9 @@ clean:
        $(MAKE) -C tests       clean
        $(MAKE) -C vhook       clean
        $(MAKE) -C doc         clean
-       rm -f *.o *.d *~ .libs gmon.out TAGS \
-          $(ALLPROGS) $(ALLPROGS_G) $(PROGTEST) $(QTFASTSTART)
+       rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
+          output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
 
-# Note well: config.log is NOT removed.
 distclean: clean
        $(MAKE) -C libavutil   distclean
        $(MAKE) -C libavcodec  distclean
@@ -239,6 +232,4 @@ codectest libavtest test-server fulltest test mpeg4 mpeg: $(PROGS)
 .PHONY: dep depend clean distclean TAGS
 .PHONY: codectest libavtest test-server fulltest test mpeg4 mpeg
 
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend