[MPlayer-cvslog] r26587 - in trunk: Makefile mpcommon.mak

[diego]

Author: diego
Date: Mon Apr 28 20:34:59 2008
New Revision: 26587

Log:
Get rid of now obsolete library rules and variables.


Modified:
   trunk/Makefile
   trunk/mpcommon.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Apr 28 20:34:59 2008
@@ -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

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Mon Apr 28 20:34:59 2008
@@ -10,19 +10,6 @@ OBJS_MENCODER  += $(addsuffix .o, $(base
 
 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) $(L
 ALLHEADERS = $(wildcard *.h)
 checkheaders: $(ALLHEADERS:.h=.ho)
 
-.PHONY: checkheaders libs *clean dep depend
+.PHONY: checkheaders *clean dep depend