From 8154d2e01a9ef77bb77569e2202a469338c8eefe Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Wed, 18 Dec 2002 16:34:07 +0000
Subject: added ffserver disabling for easier porting

Originally committed as revision 1341 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index afa613c..a954e0e 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)
-- 
cgit v1.1