Move libav* include CFLAGS to mpcommon.mak instead of duplicating them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22735 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-03-18 22:49:37 +00:00
parent e2c0f539f6
commit 5f6965df5d
6 changed files with 3 additions and 14 deletions

View File

@ -4,8 +4,6 @@ LIBNAME_MPLAYER = libgui.a
#CFLAGS += -DDEBUG
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
ifeq ($(TARGET_WIN32),yes)
SRCS_MPLAYER = win32/dialogs.c \
win32/gui.c \

View File

@ -32,9 +32,6 @@ SRCS_COMMON = af.c \
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

View File

@ -147,9 +147,6 @@ SRCS_MENCODER-$(TWOLAME) += ae_twolame.c
SRCS_MENCODER-$(MP3LAME) += ae_lame.c
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
include ../mpcommon.mak
clean::

View File

@ -65,8 +65,4 @@ SRCS_MENCODER = muxer.c \
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

View File

@ -22,6 +22,4 @@ SRCS_COMMON = aclib.c \
SRCS_COMMON-$(BITMAP_FONT) += font_load.c
SRCS_COMMON-$(FREETYPE) += font_load_ft.c
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
include ../mpcommon.mak

View File

@ -6,6 +6,9 @@ OBJS_COMMON = $(addsuffix .o, $(basename $(SRCS_COMMON)) )
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)