From 47f0629f1a3898f11f4789eafa6bb11bee162cfc Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 18 Oct 2009 18:41:35 +0000
Subject: Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables. They are
 only used in one place so the indirection is pointless.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29778 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 330798c93b..a7fad88629 100644
--- a/Makefile
+++ b/Makefile
@@ -27,12 +27,6 @@ include config.mak
 COMMON_LDFLAGS += $(EXTRA_LIB)\
                   $(EXTRALIBS) \
 
-LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
-                  $(COMMON_LDFLAGS) \
-
-LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
-                   $(COMMON_LDFLAGS) \
-
 SRCS_AUDIO_INPUT-$(ALSA1X)           += stream/ai_alsa1x.c
 SRCS_AUDIO_INPUT-$(ALSA9)            += stream/ai_alsa.c
 SRCS_AUDIO_INPUT-$(OSS)              += stream/ai_oss.c
@@ -841,10 +835,10 @@ $(FFMPEGLIBS): $(FFMPEGFILES) config.h
 	touch $@
 
 mencoder$(EXESUF): $(MENCODER_DEPS)
-	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
+	$(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MENCODER)
 
 mplayer$(EXESUF): $(MPLAYER_DEPS)
-	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
+	$(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MPLAYER)
 
 codec-cfg$(EXESUF): codec-cfg.c help_mp.h
 	$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
-- 
cgit v1.2.3