diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 19:37:41 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 19:37:41 +0000 |
| commit | f653e526633917973e7351b82db4a130c5ecdc18 (patch) | |
| tree | a48780ac6112a421b2bf63392f75fcb0874e683b | |
| parent | b355c3aa6703c23712ad5879ce51ddc8768b9e0f (diff) | |
| download | mpv-f653e526633917973e7351b82db4a130c5ecdc18.tar.bz2 mpv-f653e526633917973e7351b82db4a130c5ecdc18.tar.xz | |
Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS.
Thus there is no need to use it everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26153 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/Makefile | 2 | ||||
| -rw-r--r-- | mpcommon.mak | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 9e565c122a..e17e0d8933 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -66,4 +66,6 @@ SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c include ../mpcommon.mak +demux_lavf.o: CFLAGS += -I../libavcodec + dep depend: CFLAGS += $(EXTRAXX_INC) diff --git a/mpcommon.mak b/mpcommon.mak index fa2d81aa5c..06ea052a74 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -6,7 +6,6 @@ OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) ) OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) ) OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) -CFLAGS-$(LIBAVCODEC) += -I../libavcodec CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER) |