Mercurial > mplayer.hg
changeset 22717:435648b07244
Move libav* include CFLAGS to mpcommon.mak instead of duplicating them.
| author | diego |
|---|---|
| date | Sun, 18 Mar 2007 22:49:37 +0000 |
| parents | ee8d699ab8d1 |
| children | 6ddfa5da1286 |
| files | Gui/Makefile libaf/Makefile libmpcodecs/Makefile libmpdemux/Makefile libvo/Makefile mpcommon.mak |
| diffstat | 6 files changed, 3 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/Makefile Sun Mar 18 22:49:05 2007 +0000 +++ b/Gui/Makefile Sun Mar 18 22:49:37 2007 +0000 @@ -4,8 +4,6 @@ #CFLAGS += -DDEBUG -CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil - ifeq ($(TARGET_WIN32),yes) SRCS_MPLAYER = win32/dialogs.c \ win32/gui.c \
--- a/libaf/Makefile Sun Mar 18 22:49:05 2007 +0000 +++ b/libaf/Makefile Sun Mar 18 22:49:37 2007 +0000 @@ -32,9 +32,6 @@ SRCS_COMMON-$(CONFIG_LIBAVCODEC) += af_lavcresample.c SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c -CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil -CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec - ifeq ($(TARGET_OS),MINGW32) CFLAGS += -D_IO_H_ endif
--- a/libmpcodecs/Makefile Sun Mar 18 22:49:05 2007 +0000 +++ b/libmpcodecs/Makefile Sun Mar 18 22:49:37 2007 +0000 @@ -147,9 +147,6 @@ SRCS_MENCODER-$(MP3LAME) += ae_lame.c -CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil -CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec - include ../mpcommon.mak clean::
--- a/libmpdemux/Makefile Sun Mar 18 22:49:05 2007 +0000 +++ b/libmpdemux/Makefile Sun Mar 18 22:49:37 2007 +0000 @@ -65,8 +65,4 @@ SRCS_MENCODER-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c -CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil -CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec -CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat - include ../mpcommon.mak
--- a/libvo/Makefile Sun Mar 18 22:49:05 2007 +0000 +++ b/libvo/Makefile Sun Mar 18 22:49:37 2007 +0000 @@ -22,6 +22,4 @@ SRCS_COMMON-$(BITMAP_FONT) += font_load.c SRCS_COMMON-$(FREETYPE) += font_load_ft.c -CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil - include ../mpcommon.mak
--- a/mpcommon.mak Sun Mar 18 22:49:05 2007 +0000 +++ b/mpcommon.mak Sun Mar 18 22:49:37 2007 +0000 @@ -6,6 +6,9 @@ OBJS_MPLAYER = $(addsuffix .o, $(basename $(SRCS_MPLAYER)) ) OBJS_MENCODER = $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) +CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil +CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec +CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat CFLAGS += $(CFLAGS-yes) -I. -I.. $(OPTFLAGS) LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER)