Mercurial > mplayer.hg
changeset 21390:fd1495e1538d
Add libav include paths to CFLAGS without indirection.
| author | diego |
|---|---|
| date | Fri, 01 Dec 2006 01:11:42 +0000 |
| parents | deac3aacf67e |
| children | f57a5ef9b3c1 |
| files | Makefile libaf/Makefile libmpcodecs/Makefile libmpdemux/Makefile mpcommon.mak |
| diffstat | 5 files changed, 15 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Nov 30 21:59:55 2006 +0000 +++ b/Makefile Fri Dec 01 01:11:42 2006 +0000 @@ -6,11 +6,11 @@ include config.mak -LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I./libavutil -LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I./libavcodec -LIBAV_INC += $(LIBAV_INC-yes) +CFLAGS = $(OPTFLAGS) -I. -CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC) +CFLAGS-$(CONFIG_LIBAVUTIL) += -I./libavutil +CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec +CFLAGS += $(CFLAGS-yes) #CFLAGS += -Wall
--- a/libaf/Makefile Thu Nov 30 21:59:55 2006 +0000 +++ b/libaf/Makefile Fri Dec 01 01:11:42 2006 +0000 @@ -32,10 +32,10 @@ SRCS-$(CONFIG_LIBAVCODEC) += af_lavcresample.c SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c -LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil -LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec +CFLAGS = -D_GNU_SOURCE -CFLAGS = $(LIBAV_INC) -D_GNU_SOURCE +CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil +CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec ifeq ($(TARGET_OS),MINGW32) CFLAGS += -D_IO_H_
--- a/libmpcodecs/Makefile Thu Nov 30 21:59:55 2006 +0000 +++ b/libmpcodecs/Makefile Fri Dec 01 01:11:42 2006 +0000 @@ -151,18 +151,17 @@ SRCS2-$(MP3LAME) += ae_lame.c -LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil -LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec - # -I.. to include ../liba52 before ../libavcodec/liba52. CFLAGS = -I.. \ -Inative \ -I../libmpdemux \ -I../stream \ -I../loader \ - $(LIBAV_INC) \ -D_GNU_SOURCE \ +CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil +CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec + include ../mpcommon.mak clean::
--- a/libmpdemux/Makefile Thu Nov 30 21:59:55 2006 +0000 +++ b/libmpdemux/Makefile Fri Dec 01 01:11:42 2006 +0000 @@ -68,11 +68,11 @@ SRCS2-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c SRCS2-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c -LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil -LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec -LIBAV_INC-$(CONFIG_LIBAVFORMAT) += -I../libavformat +CFLAGS = -I../stream -I../loader -CFLAGS = -I../stream -I../loader $(LIBAV_INC) +CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil +CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec +CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS
--- a/mpcommon.mak Thu Nov 30 21:59:55 2006 +0000 +++ b/mpcommon.mak Fri Dec 01 01:11:42 2006 +0000 @@ -1,6 +1,6 @@ SRCS += $(SRCS-yes) SRCS2 += $(SRCS2-yes) -LIBAV_INC += $(LIBAV_INC-yes) +CFLAGS += $(CFLAGS-yes) OBJS = $(addsuffix .o, $(basename $(SRCS)) ) OBJS2 = $(addsuffix .o, $(basename $(SRCS2)) )