summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-12-18 16:34:07 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-12-18 16:34:07 +0000
commit8154d2e01a9ef77bb77569e2202a469338c8eefe (patch)
treedbd4ad7c0cf08b42f38fa3552cba1007158f362f /Makefile
parent17a70fdeeff1260ac9b2651ea9f36dbd23d0ced8 (diff)
added ffserver disabling for easier porting
Originally committed as revision 1341 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index afa613c1d1..a954e0e7b4 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,10 @@ EXE=.exe
PROG=ffmpeg$(EXE)
else
EXT=
-PROG=ffmpeg ffplay ffserver
+PROG=ffmpeg ffplay
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver
+endif
endif
ifeq ($(CONFIG_AUDIO_BEOS),yes)