# HG changeset patch # User diego # Date 1255891295 0 # Node ID 252ec0ff7e306d0e449eb99a2257599099a33955 # Parent 8adf928e517a6c77b81e714343cc352879782a1b Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables. They are only used in one place so the indirection is pointless. diff -r 8adf928e517a -r 252ec0ff7e30 Makefile --- a/Makefile Sat Oct 17 15:15:07 2009 +0000 +++ b/Makefile Sun Oct 18 18:41:35 2009 +0000 @@ -27,12 +27,6 @@ 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 @@ 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 $@ $<