diff options
author | Diego Biurrun <diego@biurrun.de> | 2006-11-15 02:11:24 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2006-11-15 02:11:24 +0000 |
commit | 4d15aae193e4eb04f26ded1491a3fcbc8585abcd (patch) | |
tree | c3265cd9b8c4b42cfec2e5fa218ec455cf068d9c /Makefile | |
parent | 009618ea0d814d310e23cd1189624ad047cb58f9 (diff) | |
download | ffmpeg-4d15aae193e4eb04f26ded1491a3fcbc8585abcd.tar.gz |
Do not build output_example and qt-faststart by default.
Originally committed as revision 7085 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -15,8 +15,6 @@ 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) @@ -61,7 +59,7 @@ LDFLAGS+=-L./libswscale EXTRALIBS+=-lswscale$(BUILDSUF) endif -all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) +all: lib $(PROGS_G) $(PROGS) $(VHOOK) $(DOC) lib: $(MAKE) -C libavutil all @@ -214,7 +212,7 @@ clean: $(MAKE) -C vhook clean $(MAKE) -C doc clean rm -f *.o *.d *~ .libs gmon.out TAGS \ - $(ALLPROGS) $(ALLPROGS_G) $(PROGTEST) $(QTFASTSTART) + $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF) qt-faststart$(EXESUF) # Note well: config.log is NOT removed. distclean: clean |