summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-03 16:56:44 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-03 16:56:44 +0100
commitb70e34352e304cf03da32b688d84eec3c3ffacec (patch)
tree711ec8d7abc0dd6075d09085634e5a5432e40ee3 /src/xine-engine
parent08ad733e0103834bc61831ddce5a75c3f62e0173 (diff)
parent2b0e330c2642081066316ca5ec9965912cd248de (diff)
downloadxine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.gz
xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.bz2
Merge from 1.1.
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index e32f2d2f4..9c498ff84 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/misc/Makefile.common
include $(top_srcdir)/lib/Makefile.common
AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) \
- $(AVUTIL_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = $(XDG_BASEDIR_CPPFLAGS) $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
+ $(AVUTIL_CFLAGS) $(PTHREAD_CFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = $(XDG_BASEDIR_CPPFLAGS) $(ZLIB_CPPFLAGS) $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE
XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la