Mercurial > mplayer.hg
changeset 29742:3bd28ab606db
Get rid of COMMON_LDFLAGS variable. It was a pointless indirection.
| author | diego |
|---|---|
| date | Mon, 19 Oct 2009 09:56:18 +0000 |
| parents | c9c2befb2409 |
| children | faecce6b4b99 |
| files | Makefile configure |
| diffstat | 2 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Oct 19 09:50:51 2009 +0000 +++ b/Makefile Mon Oct 19 09:56:18 2009 +0000 @@ -24,9 +24,6 @@ ###### variable declarations ####### -COMMON_LDFLAGS += $(EXTRA_LIB)\ - $(EXTRALIBS) \ - SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c @@ -835,11 +832,11 @@ touch $@ mencoder$(EXESUF): $(MENCODER_DEPS) -mencoder$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MENCODER) +mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER) mplayer$(EXESUF): $(MPLAYER_DEPS) -mplayer$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MPLAYER) +mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) mencoder$(EXESUF) mplayer$(EXESUF): - $(CC) -o $@ $^ $(COMMON_LDFLAGS) + $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg$(EXESUF): codec-cfg.c help_mp.h $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< @@ -1046,7 +1043,7 @@ 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) $(COMMON_LDFLAGS) + $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS) REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c) REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
--- a/configure Mon Oct 19 09:50:51 2009 +0000 +++ b/configure Mon Oct 19 09:56:18 2009 +0000 @@ -8208,8 +8208,7 @@ CFLAGS_TREMOR_LOW = $cflags_tremor_low YASMFLAGS = $YASMFLAGS -EXTRALIBS = $extra_libs -EXTRA_LIB = $extra_ldflags $_ld_static $_ld_lm +EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs EXTRALIBS_MPLAYER = $libs_mplayer EXTRALIBS_MENCODER = $libs_mencoder