mirror of
https://github.com/mpv-player/mpv
synced 2025-05-06 02:00:05 +00:00
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
This commit is contained in:
parent
c34564f2f6
commit
47f0629f1a
10
Makefile
10
Makefile
@ -27,12 +27,6 @@ include config.mak
|
|||||||
COMMON_LDFLAGS += $(EXTRA_LIB)\
|
COMMON_LDFLAGS += $(EXTRA_LIB)\
|
||||||
$(EXTRALIBS) \
|
$(EXTRALIBS) \
|
||||||
|
|
||||||
LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
|
|
||||||
$(COMMON_LDFLAGS) \
|
|
||||||
|
|
||||||
LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
|
|
||||||
$(COMMON_LDFLAGS) \
|
|
||||||
|
|
||||||
SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
|
SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
|
||||||
SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
|
SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
|
||||||
SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
|
SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
|
||||||
@ -841,10 +835,10 @@ $(FFMPEGLIBS): $(FFMPEGFILES) config.h
|
|||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
mencoder$(EXESUF): $(MENCODER_DEPS)
|
mencoder$(EXESUF): $(MENCODER_DEPS)
|
||||||
$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
|
$(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MENCODER)
|
||||||
|
|
||||||
mplayer$(EXESUF): $(MPLAYER_DEPS)
|
mplayer$(EXESUF): $(MPLAYER_DEPS)
|
||||||
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
|
$(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MPLAYER)
|
||||||
|
|
||||||
codec-cfg$(EXESUF): codec-cfg.c help_mp.h
|
codec-cfg$(EXESUF): codec-cfg.c help_mp.h
|
||||||
$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
|
$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
|
||||||
|
Loading…
Reference in New Issue
Block a user