From db77cc621ac71f2a18aba0c2072c3d379e871e85 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <mringwal@inf.ethz.ch>
Date: Tue, 8 Jul 2008 22:49:00 +0200
Subject: Fix compilation for pthread support provided by PTHREAD_{CFLAGS+LIBS}

<xine-internals.h> includes <xine-utils/refcounter.h> which includes
<pthread.h>. As all xine sources include <xine-internal.h>, the
PTHREAD_CFLAGS are always needed. This patch removed it from two Makefile.am
and adds them to CPPFLAGS
---
 src/xine-engine/Makefile.am | 4 ++--
 src/xine-utils/Makefile.am  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 03176fb80..17dd96b10 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/misc/Makefile.common
 include $(top_srcdir)/lib/Makefile.common
 
-AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(PTHREAD_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = $(ZLIB_CPPFLAGS) $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE
+AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 lib_LTLIBRARIES = libxine.la
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index a599f9b12..8a3d88ddd 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -12,7 +12,7 @@ endif
 endif
 
 AM_CFLAGS = $(X_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS= $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE
+AM_CPPFLAGS= -DXINE_LIBRARY_COMPILE
 
 libxineutils_la_SOURCES = $(pppc_files) \
 	cpu_accel.c \
-- 
cgit v1.2.3