diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-28 18:34:59 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-28 18:34:59 +0000 |
| commit | 7398abf3899f953eda95d925df6bcc64b08461ed (patch) | |
| tree | 4f4f19073804785684bda3866dd59b80e0b54a72 | |
| parent | 71272215d48cd57488653156f47b94aa759fa531 (diff) | |
| download | mpv-7398abf3899f953eda95d925df6bcc64b08461ed.tar.bz2 mpv-7398abf3899f953eda95d925df6bcc64b08461ed.tar.xz | |
Get rid of now obsolete library rules and variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | mpcommon.mak | 15 |
2 files changed, 3 insertions, 17 deletions
@@ -622,12 +622,11 @@ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) 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 diff --git a/mpcommon.mak b/mpcommon.mak index 605e828759..c84732161d 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -10,19 +10,6 @@ OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) 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 @@ $(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(LIBNAME_MENCODER): ALLHEADERS = $(wildcard *.h) checkheaders: $(ALLHEADERS:.h=.ho) -.PHONY: checkheaders libs *clean dep depend +.PHONY: checkheaders *clean dep depend |