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

[diego]

Author: diego
Date: Mon Nov 27 14:32:24 2006
New Revision: 21323

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

Log:
Move common code to mpcommon.mak.


Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Mon Nov 27 14:32:24 2006
@@ -154,14 +154,6 @@
 LIBAV_INC-$(CONFIG_LIBAVCODEC) +=  -I../libavcodec
 
 
-SRCS         += $(SRCS-yes)
-SRCS2        += $(SRCS2-yes)
-LIBAV_INC    += $(LIBAV_INC-yes)
-
-
-OBJS=$(SRCS:.c=.o)
-OBJS2=$(SRCS2:.c=.o)
-
 CFLAGS  = -I.. \
           -Inative \
           -I../libmpdemux \

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Mon Nov 27 14:32:24 2006
@@ -76,14 +76,10 @@
 SRCS-$(MENCODER) += $(MUXERS)
 SRCS-$(MENCODER) += $(MUXERS-yes)
 
-SRCS             += $(SRCS-yes)
-
 LIBAV_INC-$(CONFIG_LIBAVUTIL)   += -I../libavutil
 LIBAV_INC-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
 LIBAV_INC-$(CONFIG_LIBAVFORMAT) += -I../libavformat
 
-LIBAV_INC += $(LIBAV_INC-yes)
-
 CFLAGS = -I.. -I../stream -I../loader $(LIBAV_INC)
 
 CPLUSPLUSFLAGS  = $(CFLAGS) -D__STDC_LIMIT_MACROS

Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile	(original)
+++ trunk/libvo/Makefile	Mon Nov 27 14:32:24 2006
@@ -25,17 +25,8 @@
 SRCS2-$(BITMAP_FONT) +=  font_load.c
 SRCS2-$(FREETYPE)    +=  font_load_ft.c
 
-OBJS_TEMP=$(basename $(SRCS))
-OBJS=$(OBJS_TEMP:%=%.o)
-
-OBJS2=$(SRCS2:.c=.o)
-
 LIBAV_INC-$(CONFIG_LIBAVUTIL) +=  -I../libavutil
 
-SRCS         += $(SRCS-yes)
-SRCS2        += $(SRCS2-yes)
-LIBAV_INC    += $(LIBAV_INC-yes)
-
 CFLAGS = -I.. -I../osdep $(LIBAV_INC)
 
 include ../mpcommon.mak

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Mon Nov 27 14:32:24 2006
@@ -1,7 +1,12 @@
+SRCS         += $(SRCS-yes)
+SRCS2        += $(SRCS2-yes)
+LIBAV_INC    += $(LIBAV_INC-yes)
+
 OBJS  = $(SRCS:.c=.o)
 OBJS := $(OBJS:.S=.o)
 OBJS := $(OBJS:.cpp=.o)
 OBJS := $(OBJS:.m=.o)
+OBJS2 = $(SRCS2:.c=.o)
 
 CFLAGS += -I. -I.. $(OPTFLAGS)