Mercurial > mplayer.hg
changeset 21307:5fdf546b4e57
Move common code to mpcommon.mak.
| author | diego |
|---|---|
| date | Mon, 27 Nov 2006 13:32:24 +0000 |
| parents | df74299363e8 |
| children | 22a33d822400 |
| files | libmpcodecs/Makefile libmpdemux/Makefile libvo/Makefile mpcommon.mak |
| diffstat | 4 files changed, 5 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/Makefile Mon Nov 27 13:19:34 2006 +0000 +++ b/libmpcodecs/Makefile Mon Nov 27 13:32:24 2006 +0000 @@ -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 \
--- a/libmpdemux/Makefile Mon Nov 27 13:19:34 2006 +0000 +++ b/libmpdemux/Makefile Mon Nov 27 13:32:24 2006 +0000 @@ -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
--- a/libvo/Makefile Mon Nov 27 13:19:34 2006 +0000 +++ b/libvo/Makefile Mon Nov 27 13:32:24 2006 +0000 @@ -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
--- a/mpcommon.mak Mon Nov 27 13:19:34 2006 +0000 +++ b/mpcommon.mak Mon Nov 27 13:32:24 2006 +0000 @@ -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)