From b16a8fa406d5ffda376e7f9a0edb35e089b5d271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 21 Jan 2011 00:44:26 +0100 Subject: configure: remove MEncoder-related options and tests Also remove one MEncoder variable reference from TOOLS/vivodump rule in Makefile. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') 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) -- cgit v1.2.3