Move unaltered rtsp.c comments to the header file.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 3763403a5d54f7c97c193fa022235aef35b98bf6..15d9daf6bdde76ba753ff32b2a493400dcf35415 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,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)
 
@@ -50,7 +49,7 @@ LDFLAGS+=-L./libswscale
 EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
 
-all: lib $(PROGS) $(VHOOK) $(DOC)
+all: lib $(PROGS)
 
 lib:
        $(MAKE) -C libavutil   all
@@ -107,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