Mercurial > mplayer.hg
comparison Makefile @ 29736:252ec0ff7e30
Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables.
They are only used in one place so the indirection is pointless.
| author | diego |
|---|---|
| date | Sun, 18 Oct 2009 18:41:35 +0000 |
| parents | 9c8f8e375823 |
| children | 25166964e1ec |
comparison
equal
deleted
inserted
replaced
| 29735:8adf928e517a | 29736:252ec0ff7e30 |
|---|---|
| 24 | 24 |
| 25 ###### variable declarations ####### | 25 ###### variable declarations ####### |
| 26 | 26 |
| 27 COMMON_LDFLAGS += $(EXTRA_LIB)\ | 27 COMMON_LDFLAGS += $(EXTRA_LIB)\ |
| 28 $(EXTRALIBS) \ | 28 $(EXTRALIBS) \ |
| 29 | |
| 30 LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \ | |
| 31 $(COMMON_LDFLAGS) \ | |
| 32 | |
| 33 LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \ | |
| 34 $(COMMON_LDFLAGS) \ | |
| 35 | 29 |
| 36 SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c | 30 SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c |
| 37 SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c | 31 SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c |
| 38 SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c | 32 SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c |
| 39 SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes) | 33 SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes) |
| 839 $(FFMPEGLIBS): $(FFMPEGFILES) config.h | 833 $(FFMPEGLIBS): $(FFMPEGFILES) config.h |
| 840 $(MAKE) -C $(@D) | 834 $(MAKE) -C $(@D) |
| 841 touch $@ | 835 touch $@ |
| 842 | 836 |
| 843 mencoder$(EXESUF): $(MENCODER_DEPS) | 837 mencoder$(EXESUF): $(MENCODER_DEPS) |
| 844 $(CC) -o $@ $^ $(LDFLAGS_MENCODER) | 838 $(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MENCODER) |
| 845 | 839 |
| 846 mplayer$(EXESUF): $(MPLAYER_DEPS) | 840 mplayer$(EXESUF): $(MPLAYER_DEPS) |
| 847 $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) | 841 $(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MPLAYER) |
| 848 | 842 |
| 849 codec-cfg$(EXESUF): codec-cfg.c help_mp.h | 843 codec-cfg$(EXESUF): codec-cfg.c help_mp.h |
| 850 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< | 844 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< |
| 851 | 845 |
| 852 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf | 846 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf |