Commit 4d15aae1 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Do not build output_example and qt-faststart by default.

Originally committed as revision 7085 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 009618ea
...@@ -15,8 +15,6 @@ ifeq ($(CONFIG_FFMPEG),yes) ...@@ -15,8 +15,6 @@ ifeq ($(CONFIG_FFMPEG),yes)
MANPAGES=doc/ffmpeg.1 MANPAGES=doc/ffmpeg.1
PROGS_G+=ffmpeg_g$(EXESUF) PROGS_G+=ffmpeg_g$(EXESUF)
PROGS+=ffmpeg$(EXESUF) PROGS+=ffmpeg$(EXESUF)
PROGTEST=output_example$(EXESUF)
QTFASTSTART=qt-faststart$(EXESUF)
endif endif
ifeq ($(CONFIG_FFSERVER),yes) ifeq ($(CONFIG_FFSERVER),yes)
...@@ -61,7 +59,7 @@ LDFLAGS+=-L./libswscale ...@@ -61,7 +59,7 @@ LDFLAGS+=-L./libswscale
EXTRALIBS+=-lswscale$(BUILDSUF) EXTRALIBS+=-lswscale$(BUILDSUF)
endif endif
all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) all: lib $(PROGS_G) $(PROGS) $(VHOOK) $(DOC)
lib: lib:
$(MAKE) -C libavutil all $(MAKE) -C libavutil all
...@@ -214,7 +212,7 @@ clean: ...@@ -214,7 +212,7 @@ clean:
$(MAKE) -C vhook clean $(MAKE) -C vhook clean
$(MAKE) -C doc clean $(MAKE) -C doc clean
rm -f *.o *.d *~ .libs gmon.out TAGS \ 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. # Note well: config.log is NOT removed.
distclean: clean distclean: clean
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment