summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 22:20:44 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 22:20:44 +0100
commit42d23a86ff422f650b16ec786f5e96b126ec680a (patch)
tree991158f109e0ac97adbe7510529e535fc06234f4 /contrib
parent44234828cf17a0a302975dc3f5f8b671f86a8ac2 (diff)
parentfc2fa145300536b0a19f878212912e9b2d5b57a1 (diff)
downloadxine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.gz
xine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.bz2
Merge changes from 1.2 main.last-internal-ffmpeg
Diffstat (limited to 'contrib')
-rw-r--r--contrib/vidix/drivers/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/vidix/drivers/Makefile.am b/contrib/vidix/drivers/Makefile.am
index 5894d4dba..17ab3aec9 100644
--- a/contrib/vidix/drivers/Makefile.am
+++ b/contrib/vidix/drivers/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(DEFAULT_OCFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/contrib/vidix \
-I$(top_srcdir)/contrib/libdha -I$(top_builddir)/contrib/libdha
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_LDFLAGS = -avoid-version -module
EXTRA_DIST = genfb_vid.c