summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-20 11:13:40 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-20 11:13:40 +0000
commit519c0331bdc762af6cad89d86674fc2d4ca6b6c6 (patch)
treed0f2970e0f8f73620548edf54a2044cc38456cc5 /Makefile
parent1390d0cf9325099a386a87205318b090758ba428 (diff)
downloadmpv-519c0331bdc762af6cad89d86674fc2d4ca6b6c6.tar.bz2
mpv-519c0331bdc762af6cad89d86674fc2d4ca6b6c6.tar.xz
Remove nonsense ifeq around MEncoder target and variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21094 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bde0724362..6a1a92ba96 100644
--- a/Makefile
+++ b/Makefile
@@ -312,14 +312,12 @@ LIBS_MPLAYER = libvo/libvo.a \
mplayer$(EXESUF): $(MPLAYER_DEP)
$(CC) -o $@ $(OBJS_MPLAYER) $(LIBS_MPLAYER)
-ifeq ($(MENCODER),yes)
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
$(EXTRA_LIB_MENCODER) \
$(COMMON_LIBS) \
mencoder$(EXESUF): $(MENCODER_DEP)
$(CC) -o $@ $(OBJS_MENCODER) $(LIBS_MENCODER)
-endif
osdep/mplayer-rc.o: osdep/mplayer.rc
windres -o $@ osdep/mplayer.rc