diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-27 13:32:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-27 13:32:24 +0000 |
| commit | f415c639b94280b731106991573de53a807f6ef4 (patch) | |
| tree | f0da74c976ecc49e08a7260f85895f8417827aae | |
| parent | 57d5e4eb12afbb2557414e7b734fccf06b1a6334 (diff) | |
| download | mpv-f415c639b94280b731106991573de53a807f6ef4.tar.bz2 mpv-f415c639b94280b731106991573de53a807f6ef4.tar.xz | |
Move common code to mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/Makefile | 8 | ||||
| -rw-r--r-- | libmpdemux/Makefile | 4 | ||||
| -rw-r--r-- | libvo/Makefile | 9 | ||||
| -rw-r--r-- | mpcommon.mak | 5 |
4 files changed, 5 insertions, 21 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index c43381048b..1aa84f7f24 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -154,14 +154,6 @@ LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil 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 \ diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index cb39ef5329..81f355120b 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -76,14 +76,10 @@ MUXERS-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c 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 diff --git a/libvo/Makefile b/libvo/Makefile index b07c0ab62f..6eb8bbc580 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -25,17 +25,8 @@ SRCS2 = aclib.c \ 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 diff --git a/mpcommon.mak b/mpcommon.mak index 9c1bf2234f..72a3f3de11 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -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) |