[MPlayer-cvslog] r21303 - in trunk: libmpcodecs/Makefile libvo/Makefile mpcommon.mak

[diego]

Author: diego
Date: Mon Nov 27 02:40:39 2006
New Revision: 21303

Modified:
   trunk/libmpcodecs/Makefile
   trunk/libvo/Makefile
   trunk/mpcommon.mak

Log:
Move common code for generating multiple libraries to mpcommon.mak.


Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Mon Nov 27 02:40:39 2006
@@ -2,11 +2,8 @@
 include ../config.mak
 
 LIBNAME = libmpcodecs.a
-LIBNAME2 = libmpencoders.a
-
-LIBS =$(LIBNAME)
 ifeq ($(MENCODER),yes)
-LIBS+=$(LIBNAME2)
+LIBNAME2 = libmpencoders.a
 endif
 
 SRCS = native/minilzo.c \
@@ -176,12 +173,6 @@
 
 include ../mpcommon.mak
 
-all:    $(LIBS)
-
-$(LIBNAME2): $(OBJS2)
-	$(AR) r $@ $^
-	$(RANLIB) $@
-
 clean::
 	rm -f native/*.o native/*.a native/*~
 

Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile	(original)
+++ trunk/libvo/Makefile	Mon Nov 27 02:40:39 2006
@@ -1,12 +1,9 @@
 
 include ../config.mak
 
-LIBNAME = libvo.a
 LIBNAME2 = libosd.a
-
-LIBS =$(LIBNAME2)
 ifeq ($(MPLAYER),yes)
-LIBS+=$(LIBNAME)
+LIBNAME = libvo.a
 endif
 
 SRCS=aspect.c \
@@ -45,9 +42,3 @@
 
 .m.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
-
-all:    $(LIBS)
-
-$(LIBNAME2): $(OBJS2)
-	$(AR) r $@ $^
-	$(RANLIB) $@

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Mon Nov 27 02:40:39 2006
@@ -10,12 +10,18 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-all:    $(LIBNAME)
+LIBS = $(LIBNAME) $(LIBNAME2)
+
+all:    $(LIBS)
 
 $(LIBNAME): $(OBJS)
 	$(AR) r $@ $^
 	$(RANLIB) $@
 
+$(LIBNAME2): $(OBJS2)
+	$(AR) r $@ $^
+	$(RANLIB) $@
+
 clean::
 	rm -f *.o *.a *~