diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2007-01-25 18:44:55 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2007-01-25 18:44:55 +0000 |
| commit | 03efcdd7e7e3c10cc76a42f9caabd837d8e15fb8 (patch) | |
| tree | 488e0a73c5f1ebdfd30b97e0c7316a9cdb41f3e4 /src | |
| parent | fc897e74d6d2a6ba8abd62af85dc9d00fb0b607f (diff) | |
| download | xine-lib-03efcdd7e7e3c10cc76a42f9caabd837d8e15fb8.tar.gz xine-lib-03efcdd7e7e3c10cc76a42f9caabd837d8e15fb8.tar.bz2 | |
Fixed build for srcdir != builddir.
CVS patchset: 8562
CVS date: 2007/01/25 18:44:55
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/libavcodec/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/i386/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/libavutil/Makefile.am | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index cae72eeff..a5e6cd650 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -12,7 +12,8 @@ EXTRA_DIST = motion_est_template.c \ #AM_CFLAGS = `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS` -fno-strict-aliasing AM_CFLAGS = `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)"` -fno-strict-aliasing AM_CPPFLAGS = $(ZLIB_CPPFLAGS) $(LIBFFMPEG_CPPFLAGS) \ - -I$(top_srcdir)/src/libffmpeg/libavutil -I$(top_srcdir)/src/libffmpeg + -I$(top_srcdir)/src/libffmpeg/libavutil -I$(top_srcdir)/src/libffmpeg \ + -I$(top_builddir)/src/libffmpeg ASFLAGS = noinst_LTLIBRARIES = libavcodec.la diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am index ee170efd5..e3285d9cd 100644 --- a/src/libffmpeg/libavcodec/i386/Makefile.am +++ b/src/libffmpeg/libavcodec/i386/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing # CFLAGS is here to filter out -funroll-loops because it causes bad # behavior of libavcodec CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` -AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil -I$(top_srcdir)/src/libffmpeg +AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil -I$(top_srcdir)/src/libffmpeg -I$(top_builddir)/src/libffmpeg # Avoid "can't find register" failures with -O1 and higher dsputil_mmx.o dsputil_mmx.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/-funroll-loops//g; s/$$/ -Os/') diff --git a/src/libffmpeg/libavutil/Makefile.am b/src/libffmpeg/libavutil/Makefile.am index 6e507cb67..6010a8134 100644 --- a/src/libffmpeg/libavutil/Makefile.am +++ b/src/libffmpeg/libavutil/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/misc/Makefile.common -AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg +AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg \ + -I$(top_builddir)/src/libffmpeg AM_CFLAGS = -fno-strict-aliasing ASFLAGS = |