Mercurial > mplayer.hg
changeset 26555:a16bf3eba843
Get rid of now obsolete library rules and variables.
| author | diego |
|---|---|
| date | Mon, 28 Apr 2008 18:34:59 +0000 |
| parents | 7702aacd7b4c |
| children | 122944bc35b9 |
| files | Makefile mpcommon.mak |
| diffstat | 2 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Apr 28 18:12:45 2008 +0000 +++ b/Makefile Mon Apr 28 18:34:59 2008 +0000 @@ -622,12 +622,11 @@ ALL_PRG-$(MENCODER) += mencoder$(EXESUF) COMMON_LIBS += $(COMMON_LIBS-yes) -LIBS_MPLAYER += $(LIBS_MPLAYER-yes) OBJS_MPLAYER += $(OBJS_MPLAYER-yes) ALL_PRG += $(ALL_PRG-yes) -MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS) -MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS) +MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) +MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
--- a/mpcommon.mak Mon Apr 28 18:12:45 2008 +0000 +++ b/mpcommon.mak Mon Apr 28 18:34:59 2008 +0000 @@ -10,19 +10,6 @@ CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) -LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER) -LIBS-$(MENCODER) += $(LIBNAME_MENCODER) -LIBS = $(LIBNAME_COMMON) $(LIBS-yes) - -libs: $(LIBS) - -$(LIBNAME_COMMON): $(OBJS_COMMON) -$(LIBNAME_MPLAYER): $(OBJS_MPLAYER) -$(LIBNAME_MENCODER): $(OBJS_MENCODER) -$(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(LIBNAME_MENCODER): - $(AR) r $@ $^ - $(RANLIB) $@ - %.d: %.c $(MPDEPEND_CMD) > $@ @@ -41,4 +28,4 @@ ALLHEADERS = $(wildcard *.h) checkheaders: $(ALLHEADERS:.h=.ho) -.PHONY: checkheaders libs *clean dep depend +.PHONY: checkheaders *clean dep depend