--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -1,23 +1,26 @@
 include $(top_srcdir)/misc/Makefile.common
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-noinst_LTLIBRARIES = libxineutils.la
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -DXINE_LIBRARY_COMPILE
 
 EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl
 
-if PPC_ARCH
+noinst_HEADERS = ppcasm_string.h xine_check.h
+
+noinst_LTLIBRARIES = libxineutils.la
+
+if ARCH_PPC
 if !HOST_OS_DARWIN
 pppc_files = ppcasm_string.S
 endif
 endif
 
-AM_CFLAGS = $(X_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS=-DXINE_LIBRARY_COMPILE
-
 libxineutils_la_SOURCES = $(pppc_files) \
+	base64.c \
 	cpu_accel.c \
 	color.c \
 	copy.c \
+	crc.c \
 	list.c \
 	memcpy.c \
 	monitor.c \
@@ -30,23 +33,4 @@
 	array.c \
 	sorted_array.c \
 	pool.c \
-	ring_buffer.c \
-	base64.c
-
-xineinclude_HEADERS = \
-	attributes.h \
-	compat.h \
-	xine_buffer.h \
-	xineutils.h \
-	xmllexer.h \
-	xmlparser.h \
-	list.h \
-	array.h \
-	sorted_array.h \
-	pool.h \
-	ring_buffer.h \
-	base64.h
-
-
-noinst_HEADERS = ppcasm_string.h xine_check.h
-
+	ring_buffer.c