Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 44 insertions, 8 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 1493a33f8..7f569f498 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,17 +1,53 @@
-SUBDIRS = xine
-#EXTRA_DIST = xine.h.in
+EXTRA_DIST = xine/version.h.in
 
 if GENERATED_INTTYPES_H
 inttypes_h = inttypes.h
 endif
 
-include_HEADERS = xine.h
+nobase_include_HEADERS = xine.h \
+	xine/alphablend.h	\
+	xine/array.h		\
+	xine/attributes.h	\
+	xine/audio_decoder.h	\
+	xine/audio_out.h	\
+	xine/broadcaster.h	\
+	xine/buffer.h		\
+	xine/compat.h		\
+	xine/configfile.h	\
+	xine/demux.h		\
+	xine/info_helper.h	\
+	xine/input_plugin.h	\
+	xine/io_helper.h	\
+	xine/list.h		\
+	xine/metronom.h		\
+	xine/os_types.h		\
+	xine/osd.h		\
+	xine/plugin_catalog.h	\
+	xine/pool.h		\
+	xine/post.h		\
+	xine/refcounter.h	\
+	xine/resample.h		\
+	xine/ring_buffer.h	\
+	xine/scratch.h		\
+	xine/sorted_array.h	\
+	xine/spu.h		\
+	xine/spu_decoder.h	\
+	xine/vdr.h		\
+	xine/version.h		\
+	xine/video_decoder.h	\
+	xine/video_out.h	\
+	xine/video_overlay.h	\
+	xine/vo_scale.h		\
+	xine/xine_buffer.h	\
+	xine/xine_internal.h	\
+	xine/xine_plugin.h	\
+	xine/xineintl.h		\
+	xine/xineutils.h	\
+	xine/xmllexer.h		\
+	xine/xmlparser.h
 
 noinst_HEADERS = config.h configure.h
 
-CONFIG_CLEAN_FILES = $(inttypes_h)
+nodist_include_HEADERS = $(inttypes_h)
 
-install-data-local: install-includeHEADERS
-if GENERATED_INTTYPES_H
-	$(INSTALL) inttypes.h $(DESTDIR)$(includedir)
-endif
+CONFIG_CLEAN_FILES = $(inttypes_h)