summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-01-21 00:44:26 +0100
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-25 02:18:06 +0200
commitb16a8fa406d5ffda376e7f9a0edb35e089b5d271 (patch)
treeba9c27bd4fa86aed96318a8e504e5d2b1d804164 /Makefile
parente4fa264a323182f7b59e4040898568c80a5d873e (diff)
downloadmpv-b16a8fa406d5ffda376e7f9a0edb35e089b5d271.tar.bz2
mpv-b16a8fa406d5ffda376e7f9a0edb35e089b5d271.tar.xz
configure: remove MEncoder-related options and tests
Also remove one MEncoder variable reference from TOOLS/vivodump rule in Makefile.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index da2033392b..bb80bc4fad 100644
--- a/Makefile
+++ b/Makefile
@@ -923,8 +923,8 @@ mplayer-nomain.o: mplayer.c
TOOLS/netstream$(EXESUF): TOOLS/netstream.c
TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
-TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
- $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
+TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(OBJS_COMMON) $(COMMON_LIBS)
+ $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS)
REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)