summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-17 14:30:50 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-17 14:30:50 +0000
commitd462ef0ce04d5ca91cd008efecc37c2c1fa39bbb (patch)
treed766c158ebc61f6d6e1ba349461365a70ee28a4d /src/combined
parent6f90955bba9d996b0fe9080cc4c13d657562af3c (diff)
downloadxine-lib-d462ef0ce04d5ca91cd008efecc37c2c1fa39bbb.tar.gz
xine-lib-d462ef0ce04d5ca91cd008efecc37c2c1fa39bbb.tar.bz2
Avoid libtool running ldconfig (where not needed) at install time.
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/Makefile.am1
-rw-r--r--src/combined/ffmpeg/Makefile.am1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 03250ef67..6a43fed47 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
include $(top_srcdir)/misc/Makefile.common
SUBDIRS = ffmpeg
diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am
index a210d8f05..daae18509 100644
--- a/src/combined/ffmpeg/Makefile.am
+++ b/src/combined/ffmpeg/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
include $(top_srcdir)/misc/Makefile.common
DEFAULT_INCLUDES = -I.