comparison Makefile @ 29737:25166964e1ec

Merge rules for building mencoder and mplayer. Just the dependencies are different, so specify them separately.
author diego
date Sun, 18 Oct 2009 18:44:51 +0000
parents 252ec0ff7e30
children 3bd28ab606db
comparison
equal deleted inserted replaced
29736:252ec0ff7e30 29737:25166964e1ec
833 $(FFMPEGLIBS): $(FFMPEGFILES) config.h 833 $(FFMPEGLIBS): $(FFMPEGFILES) config.h
834 $(MAKE) -C $(@D) 834 $(MAKE) -C $(@D)
835 touch $@ 835 touch $@
836 836
837 mencoder$(EXESUF): $(MENCODER_DEPS) 837 mencoder$(EXESUF): $(MENCODER_DEPS)
838 $(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MENCODER) 838 mencoder$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MENCODER)
839
840 mplayer$(EXESUF): $(MPLAYER_DEPS) 839 mplayer$(EXESUF): $(MPLAYER_DEPS)
841 $(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MPLAYER) 840 mplayer$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MPLAYER)
841 mencoder$(EXESUF) mplayer$(EXESUF):
842 $(CC) -o $@ $^ $(COMMON_LDFLAGS)
842 843
843 codec-cfg$(EXESUF): codec-cfg.c help_mp.h 844 codec-cfg$(EXESUF): codec-cfg.c help_mp.h
844 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< 845 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
845 846
846 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf 847 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf