From 913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e Mon Sep 17 00:00:00 2001
From: Matt Messier <mmessier@grapetv.org>
Date: Fri, 11 May 2007 18:24:25 -0400
Subject: Another pass at cleaning up Makefile.am files.  More to come.

---
 src/audio_out/Makefile.am                     | 41 +++++++++--------
 src/combined/Makefile.am                      |  8 ++--
 src/demuxers/Makefile.am                      | 31 +++++++------
 src/dxr3/Makefile.am                          | 32 ++++++-------
 src/input/Makefile.am                         | 44 +++++++++---------
 src/input/libreal/Makefile.am                 | 18 ++------
 src/input/librtsp/Makefile.am                 | 15 ++----
 src/input/vcd/Makefile.am                     | 19 +++-----
 src/input/vcd/libcdio/Makefile.am             | 37 ++++++---------
 src/input/vcd/libvcd/Makefile.am              | 66 ++++++++++++---------------
 src/post/Makefile.am                          |  3 +-
 src/post/audio/Makefile.am                    |  2 +-
 src/post/deinterlace/Makefile.am              |  4 +-
 src/post/deinterlace/plugins/Makefile.am      | 10 ++--
 src/post/mosaico/Makefile.am                  |  2 +-
 src/post/planar/Makefile.am                   | 22 ++++-----
 src/post/visualizations/Makefile.am           |  6 +--
 src/video_out/Makefile.am                     | 34 ++++++++++----
 src/video_out/libdha/Makefile.am              | 22 +++++----
 src/video_out/libdha/kernelhelper/Makefile.am | 43 ++++++++---------
 src/video_out/macosx/Makefile.am              | 17 ++-----
 src/video_out/vidix/Makefile.am               | 17 +++----
 src/video_out/vidix/drivers/Makefile.am       | 48 +++++++++----------
 src/xine-engine/Makefile.am                   | 41 ++++++++---------
 src/xine-utils/Makefile.am                    | 35 +++++++-------
 25 files changed, 286 insertions(+), 331 deletions(-)

(limited to 'src')

diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index d9b44557e..a9d88ad8e 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,8 +1,15 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
+##
+# IMPORTANT:
+# ---------
+# all xine audio out plugins should be named like the 
+# scheme "xineplug_ao_out_"
+#
+
 EXTRA_DIST = audio_irixal_out.c
 
 if HAVE_OSS
@@ -50,23 +57,19 @@ if HAVE_JACK
 jack_module = xineplug_ao_out_jack.la
 endif
 
-##
-# IMPORTANT:
-# ---------
-# all xine audio out plugins should be named like the 
-# scheme "xineplug_ao_out_"
-#
-xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplug_ao_out_file.la \
-	$(oss_module) \
-	$(alsa_module) \
-	$(sun_module) \
-	$(arts_module) \
-	$(esd_module) \
-	$(directx_module) \
-	$(coreaudio_module) \
-	$(pulseaudio_module) \
+xineplug_LTLIBRARIES =		\
+	xineplug_ao_out_none.la	\
+	xineplug_ao_out_file.la	\
+	$(oss_module)		\
+	$(alsa_module)		\
+	$(sun_module)		\
+	$(arts_module)		\
+	$(esd_module)		\
+	$(directx_module)	\
+	$(coreaudio_module)	\
+	$(pulseaudio_module)	\
 	$(directx2_module)	\
-	$(fusionsound_module) \
+	$(fusionsound_module)	\
 	$(jack_module)
 
 xineplug_ao_out_none_la_SOURCES = audio_none_out.c
@@ -98,8 +101,8 @@ xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS) $(XINE_LIB)
 xineplug_ao_out_arts_la_CFLAGS = $(AM_CFLAGS) $(ARTS_CFLAGS)
 
 xineplug_ao_out_directx_la_SOURCES = audio_directx_out.c
-xineplug_ao_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
 xineplug_ao_out_directx_la_LIBADD = $(DIRECTX_AUDIO_LIBS) $(XINE_LIB)
+xineplug_ao_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS)
 
 xineplug_ao_out_coreaudio_la_SOURCES = audio_coreaudio_out.c
 xineplug_ao_out_coreaudio_la_LIBADD = $(XINE_LIB)
@@ -110,7 +113,7 @@ xineplug_ao_out_pulseaudio_la_LIBADD = $(PULSEAUDIO_LIBS) $(XINE_LIB)
 xineplug_ao_out_pulseaudio_la_CFLAGS = $(AM_CFLAGS) $(PULSEAUDIO_CFLAGS)
 
 xineplug_ao_out_directx2_la_SOURCES = audio_directx2_out.c
-xineplug_ao_out_directx2_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
+xineplug_ao_out_directx2_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS)
 xineplug_ao_out_directx2_la_LIBADD = $(XINE_LIB) $(DIRECTX_AUDIO_LIBS) $(PTHREAD_LIBS)
 
 xineplug_ao_out_fusionsound_la_SOURCES = audio_fusionsound_out.c
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 64655c1eb..26277f99b 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 if HAVE_WAVPACK
@@ -14,10 +14,10 @@ endif
 xineplug_LTLIBRARIES = $(xineplug_wavpack) $(xineplug_flac)
 
 xineplug_wavpack_la_SOURCES = demux_wavpack.c decoder_wavpack.c combined_wavpack.c combined_wavpack.h
-xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS)
-xineplug_wavpack_la_CPPFLAGS = -I$(srcdir)/../demuxers
 xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS)
+xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS)
+xineplug_wavpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers
 
 xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c demux_flac.h
-xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS)
 xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS)
+xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS)
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 4722a982d..9d8fc5ff1 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -1,8 +1,17 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
+##
+# IMPORTANT:
+# ---------
+# All of xine demuxer plugins should be named like the scheme "xineplug_dmx_"
+
+xineinclude_HEADERS = demux.h
+
+noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h
+
 if HAVE_VORBIS
 ogg_module = xineplug_dmx_ogg.la
 endif
@@ -19,12 +28,11 @@ if BUILD_DMX_IMAGE
 image_module = xineplug_dmx_image.la
 endif
 
-##
-# IMPORTANT:
-# ---------
-# All of xine demuxer plugins should be named like the scheme "xineplug_dmx_"
-
-xineplug_LTLIBRARIES = $(ogg_module) $(asf_module) $(mng_module) $(image_module) \
+xineplug_LTLIBRARIES = \
+	$(ogg_module) \
+	$(asf_module) \
+	$(mng_module) \
+	$(image_module) \
 	xineplug_dmx_games.la \
 	xineplug_dmx_audio.la \
 	xineplug_dmx_mpeg_ts.la \
@@ -70,7 +78,7 @@ xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB)
 
 xineplug_dmx_qt_la_SOURCES = demux_qt.c
 xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
-xineplug_dmx_qt_la_CPPFLAGS = $(ZLIB_CPPFLAGS)
+xineplug_dmx_qt_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
 
 xineplug_dmx_asf_la_SOURCES = demux_asf.c asfheader.c
 xineplug_dmx_asf_la_LIBADD = $(XINE_LIB)
@@ -90,7 +98,7 @@ xineplug_dmx_rawdv_la_LIBADD = $(XINE_LIB)
 
 xineplug_dmx_mng_la_SOURCES = demux_mng.c
 xineplug_dmx_mng_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS) $(MNG_LIBS)
-xineplug_dmx_mng_la_CPPFLAGS = $(ZLIB_CPPFLAGS)
+xineplug_dmx_mng_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
 
 xineplug_dmx_pva_la_SOURCES = demux_pva.c
 xineplug_dmx_pva_la_LIBADD = $(XINE_LIB)
@@ -126,14 +134,11 @@ xineplug_dmx_nsv_la_LIBADD = $(XINE_LIB)
 
 xineplug_dmx_matroska_la_SOURCES = demux_matroska.c ebml.c
 xineplug_dmx_matroska_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
-xineplug_dmx_matroska_la_CPPFLAGS = $(ZLIB_CPPFLAGS)
 xineplug_dmx_matroska_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+xineplug_dmx_matroska_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
 
 xineplug_dmx_iff_la_SOURCES = demux_iff.c
 xineplug_dmx_iff_la_LIBADD = $(XINE_LIB)
 
 xineplug_dmx_flv_la_SOURCES = demux_flv.c
 xineplug_dmx_flv_la_LIBADD = $(XINE_LIB)
-
-xineinclude_HEADERS = demux.h
-noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 836f57e6e..dc1f26743 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,36 +1,40 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) $(X_CFLAGS) $(LIBFAME_CFLAGS)
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = 
+AM_LDFLAGS  = $(xineplug_ldflags)
 
-if HAVE_DXR3
-dxr3_modules = xineplug_decode_dxr3_video.la \
-	xineplug_decode_dxr3_spu.la \
-	xineplug_vo_out_dxr3.la 
-endif
 if HAVE_X11
+AM_CFLAGS  += $(X_CFLAGS)
 link_x_libs = $(X_LIBS) -lXext
 endif
 if HAVE_LIBFAME
-link_fame = $(LIBFAME_LIBS)
+AM_CFLAGS += $(LIBFAME_CFLAGS)
+link_fame  = $(LIBFAME_LIBS)
 endif
 if HAVE_LIBRTE
 link_rte = -lrte
 endif
 
-xineplug_LTLIBRARIES = $(dxr3_modules) 
+noinst_HEADERS = em8300.h dxr3.h dxr3_scr.h video_out_dxr3.h
+
+if HAVE_DXR3
+xineplug_LTLIBRARIES =	xineplug_decode_dxr3_video.la \
+			xineplug_decode_dxr3_spu.la \
+			xineplug_vo_out_dxr3.la
+endif
 
 xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c
 xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) 
 
 if HAVE_DVDNAV
-AM_CPPFLAGS = $(DVDNAV_CFLAGS)
 xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c
 xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
+xineplug_decode_dxr3_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
 else
-AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
 xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c
 xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB)
+xineplug_decode_dxr3_spu_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/input/libdvdnav
 endif
 
 xineplug_vo_out_dxr3_la_SOURCES = \
@@ -40,9 +44,3 @@ xineplug_vo_out_dxr3_la_SOURCES = \
 	video_out_dxr3.c 
 
 xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm
-
-noinst_HEADERS = \
-	em8300.h \
-	dxr3.h \
-	dxr3_scr.h \
-	video_out_dxr3.h
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index e4b46637e..b5aa3f902 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -1,25 +1,29 @@
 include $(top_srcdir)/misc/Makefile.common
 
 # REVISIT: This second line here bothers me more than just a little bit
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) \
-            $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c
-
-if HAVE_DVDNAV
-SUBDIRS = vcd dvb libreal librtsp
-else
-SUBDIRS = vcd dvb libreal librtsp libdvdnav
-endif
-
 ##
 # IMPORTANT:
 # ---------
 # All of xine input plugins should be named like the scheme "xineplug_inp_"
 #
 
-if HAVE_CDROM_IOCTLS
+SUBDIRS = dvb libreal librtsp
+if ENABLE_VCD
+SUBDIRS += vcd
+endif
+if !HAVE_DVDNAV
+SUBDIRS += libdvdnav
+endif
+
+
+xineinclude_HEADERS = input_plugin.h
+noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h
+
+
+if ENABLE_VCD
 in_vcd = xineplug_inp_vcdo.la
 endif
 
@@ -36,19 +40,16 @@ if HAVE_LIBSMBCLIENT
 in_smb = xineplug_inp_smb.la
 endif
 
-# For DVD
-in_dvd = xineplug_inp_dvd.la
 if HAVE_DVDNAV
-DVD_CFLAGS = $(DVDNAV_CFLAGS)
+DVD_CFLAGS  = $(DVDNAV_CFLAGS)
 link_dvdnav = $(DVDNAV_LIBS)
 else
-DVD_CFLAGS = -I$(top_srcdir)/src/input/libdvdnav/
+DVD_CFLAGS  = -I$(top_srcdir)/src/input/libdvdnav
 link_dvdnav = libdvdnav/libdvdnav.la
 endif
 
 # not ported to native Windows
-if WIN32
-else
+if !WIN32
 in_rtp = xineplug_inp_rtp.la
 in_dvb = xineplug_inp_dvb.la 
 endif
@@ -57,7 +58,7 @@ endif
 xineplug_LTLIBRARIES = \
 	xineplug_inp_file.la \
 	xineplug_inp_http.la \
-	$(in_dvd) \
+	xineplug_inp_dvd.la \
 	$(in_vcd) \
 	$(in_v4l) \
 	$(in_gnome_vfs) \
@@ -78,6 +79,7 @@ xineplug_inp_file_la_LIBADD = $(XINE_LIB)
 
 xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c
 xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS)
+xineplug_inp_dvd_la_CFLAGS = $(AM_CFLAGS) $(DVD_CFLAGS)
 
 xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
 xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS)
@@ -115,16 +117,14 @@ xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
 
 xineplug_inp_v4l_la_SOURCES = input_v4l.c
 xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
+xineplug_inp_v4l_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
 
 xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c
 xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_inp_gnome_vfs_la_CFLAGS = $(AM_CFLAGS) $(GNOME_VFS_CFLAGS)
 
 xineplug_inp_smb_la_SOURCES = input_smb.c
 xineplug_inp_smb_la_LIBADD = $(LIBSMBCLIENT_LIBS) $(XINE_LIB)
 
 xineplug_inp_pvr_la_SOURCES = input_pvr.c
 xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
-
-xineinclude_HEADERS = input_plugin.h
-noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h
-
diff --git a/src/input/libreal/Makefile.am b/src/input/libreal/Makefile.am
index 5fb056195..bd97a7548 100644
--- a/src/input/libreal/Makefile.am
+++ b/src/input/libreal/Makefile.am
@@ -1,18 +1,10 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = -I$(srcdir)/../librtsp
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -I$(top_srcdir)/src/input/librtsp
 
-noinst_LTLIBRARIES = libreal.la
+noinst_HEADERS = real.h asmrp.h rmff.h sdpplin.h
 
-libreal_la_SOURCES = \
-  real.c \
-  asmrp.c \
-  rmff.c \
-  sdpplin.c
+noinst_LTLIBRARIES = libreal.la
 
-noinst_HEADERS = \
-  real.h \
-  asmrp.h \
-  rmff.h \
-  sdpplin.h
+libreal_la_SOURCES = real.c asmrp.c rmff.c sdpplin.c
diff --git a/src/input/librtsp/Makefile.am b/src/input/librtsp/Makefile.am
index 0df52d3aa..68d554c2c 100644
--- a/src/input/librtsp/Makefile.am
+++ b/src/input/librtsp/Makefile.am
@@ -1,15 +1,10 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = -I$(srcdir)/../libreal
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -I$(top_srcdir)/src/input/libreal
 
-noinst_LTLIBRARIES = librtsp.la
+noinst_HEADERS = rtsp.h rtsp_session.h
 
-librtsp_la_SOURCES = \
-  rtsp.c \
-  rtsp_session.c
+noinst_LTLIBRARIES = librtsp.la
 
-noinst_HEADERS = \
-  rtsp.h \
-  rtsp_session.h
+librtsp_la_SOURCES = rtsp.c rtsp_session.c
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 014d28679..28f6290fd 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -1,26 +1,21 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-SUBDIRS = libcdio libvcd
-
-vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
+SUBDIRS =
+if !HAVE_VCDNAV
+SUBDIRS += libcdio libvcd
+endif
 
-EXTRA_DIST = $(vcd_SRCS)
+noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
 
-if ENABLE_VCD
 xineplug_LTLIBRARIES = xineplug_inp_vcd.la
 
-AM_CFLAGS += $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
+xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
 
-xineplug_inp_vcd_la_SOURCES = $(vcd_SRCS)
 if HAVE_VCDNAV
 xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS)
 else
 xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm
 endif
-
-endif
-
-noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am
index 0c6b26dac..6414d8230 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/src/input/vcd/libcdio/Makefile.am
@@ -1,13 +1,24 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 SUBDIRS = cdio MSWindows image
 
 INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
-libcdio_SRCS = \
+noinst_HEADERS = \
+	cdio_assert.h \
+	_cdio_stdio.h \
+	scsi_mmc.h \
+	cdio_private.h \
+	_cdio_stream.h \
+	iso9660_private.h \
+	portable.h
+
+noinst_LTLIBRARIES = libcdio.la libiso9660.la
+
+libcdio_la_SOURCES = \
 	_cdio_bsdi.c \
 	_cdio_generic.c \
 	_cdio_linux.c \
@@ -44,28 +55,8 @@ libcdio_SRCS = \
 	sector.c \
 	util.c
 
-libiso9660_SRCS = \
+libiso9660_la_SOURCES = \
 	iso9660.c \
 	iso9660_private.h \
 	iso9660_fs.c \
 	xa.c
-
-EXTRA_DIST = $(libcdio_SRCS) $(libiso9660_SRCS)
-
-if ENABLE_VCD
-if HAVE_VCDNAV
-else
-noinst_LTLIBRARIES = libcdio.la libiso9660.la
-libcdio_la_SOURCES = $(libcdio_SRCS)
-libiso9660_la_SOURCES = $(libiso9660_SRCS)
-endif
-endif
-
-noinst_HEADERS = \
-	cdio_assert.h \
-	_cdio_stdio.h \
-	scsi_mmc.h \
-	cdio_private.h \
-	_cdio_stream.h \
-	iso9660_private.h \
-	portable.h
diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am
index cba784d26..65ffc6255 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/Makefile.am
@@ -1,13 +1,35 @@
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS = $(DEFAULT_OCFLAGS)
-AM_LDFLAGS = $(xineplug_ldflags)
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 SUBDIRS = libvcd
 
-INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
+noinst_HEADERS = \
+	vcd_assert.h \
+	data_structures.h \
+	info_private.h \
+	pbc.h \
+	stream_stdio.h \
+	bitvec.h \
+	dict.h \
+	mpeg.h \
+	salloc.h \
+	util.h \
+	bytesex_asm.h \
+	directory.h \
+	mpeg_stream.h \
+	sector_private.h \
+	vcd.h \
+	bytesex.h \
+	image_sink.h \
+	obj.h \
+	stream.h \
+	vcd_read.h
 
-libvcd_SRCS = \
+noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
+libvcd_la_SOURCES = \
 	vcd.c \
 	data_structures.c \
 	directory.c \
@@ -25,43 +47,11 @@ libvcd_SRCS = \
 	stream.c \
 	stream_stdio.c \
 	util.c 
+libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
+libvcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS)
 
-libvcdinfo_SRCS = \
+libvcdinfo_la_SOURCES = \
 	info.c \
 	inf.c \
 	info_private.c \
 	vcd_read.c
-
-EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS)
-
-if ENABLE_VCD
-if HAVE_VCDNAV
-else
-noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
-libvcd_la_SOURCES = $(libvcd_SRCS)
-libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
-libvcdinfo_la_SOURCES = $(libvcdinfo_SRCS)
-endif
-endif
-
-noinst_HEADERS = \
-	vcd_assert.h \
-	data_structures.h \
-	info_private.h \
-	pbc.h \
-	stream_stdio.h \
-	bitvec.h \
-	dict.h \
-	mpeg.h \
-	salloc.h \
-	util.h \
-	bytesex_asm.h \
-	directory.h \
-	mpeg_stream.h \
-	sector_private.h \
-	vcd.h \
-	bytesex.h \
-	image_sink.h \
-	obj.h \
-	stream.h \
-	vcd_read.h
diff --git a/src/post/Makefile.am b/src/post/Makefile.am
index 8408c3f3a..6c28b41f7 100644
--- a/src/post/Makefile.am
+++ b/src/post/Makefile.am
@@ -1,4 +1,3 @@
 include $(top_srcdir)/misc/Makefile.common
 
-SUBDIRS = \
-	planar goom visualizations mosaico deinterlace audio
+SUBDIRS = planar goom visualizations mosaico deinterlace audio
diff --git a/src/post/audio/Makefile.am b/src/post/audio/Makefile.am
index 3fae4f92c..7ede380da 100644
--- a/src/post/audio/Makefile.am
+++ b/src/post/audio/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 noinst_HEADERS = dsp.h filter.h window.h audio_filters.h
diff --git a/src/post/deinterlace/Makefile.am b/src/post/deinterlace/Makefile.am
index 4296b637c..ef030b22d 100644
--- a/src/post/deinterlace/Makefile.am
+++ b/src/post/deinterlace/Makefile.am
@@ -1,12 +1,10 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS)
 
 SUBDIRS = plugins
 
-EXTRA_DIST = 
-
 xinepost_LTLIBRARIES = xineplug_post_tvtime.la
 
 xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
diff --git a/src/post/deinterlace/plugins/Makefile.am b/src/post/deinterlace/plugins/Makefile.am
index 33cff9d7f..c04c3b7b2 100644
--- a/src/post/deinterlace/plugins/Makefile.am
+++ b/src/post/deinterlace/plugins/Makefile.am
@@ -28,10 +28,12 @@ EXTRA_DIST = greedy2frame_template.c greedyh.asm \
 	tomsmocomp/TomsMoCompAll2.inc tomsmocomp/WierdBob.inc \
 	tomsmocomp/tomsmocompmacros.h x86-64_macros.inc
 
+noinst_HEADERS = plugins.h greedyhmacros.h
+
 # libpostproc is here so we can use their nice mangle.h
-AM_CFLAGS = $(VISIBILITY_FLAG)
+AM_CFLAGS   = $(VISIBILITY_FLAG)
 AM_CPPFLAGS = -I$(top_srcdir)/src/post/deinterlace \
-	-I$(top_srcdir)/contrib/ffmpeg/libpostproc
+	      -I$(top_srcdir)/contrib/ffmpeg/libpostproc
 
 # per-object CFLAGS -- drop optimization on kdetv_greedyh.c so that gcc
 # doesn't run out of general registers trying to compile it.
@@ -53,6 +55,4 @@ libdeinterlaceplugins_la_SOURCES = \
 	kdetv_tomsmocomp.c
 libdeinterlaceplugins_la_LIBADD = libdeinterlacepluginsO1.la $(XINE_LIB)
 libdeinterlaceplugins_la_CFLAGS = $(AM_CFLAGS) $(DEFAULT_OCFLAGS)
-libdeinterlaceplugins_la_LDFLAGS = $(xineplug_ldflags)
-
-noinst_HEADERS = plugins.h greedyhmacros.h
+libdeinterlaceplugins_la_LDFLAGS = $(AM_LDFLAGS) $(xineplug_ldflags)
diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am
index 2fa3fc7a5..6f9cca937 100644
--- a/src/post/mosaico/Makefile.am
+++ b/src/post/mosaico/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 xinepost_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index a051ea14f..609fd7f0f 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -1,25 +1,26 @@
 include $(top_srcdir)/misc/Makefile.common
 
-POSTPROC_INT_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+# -fomit-frame-pointer is always needed. it might cause debug to not
+# work, but at least it compiles.
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) $(ff_cflags) -fomit-frame-pointer
+AM_CPPFLAGS = 
+AM_LDFLAGS  = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS)
 
 if HAVE_FFMPEG
 postproc_lib = $(FFMPEG_POSTPROC_LIBS)
 ff_cflags = $(FFMPEG_POSTPROC_CFLAGS)
 else
-ff_cflags = -I$(top_srcdir)/contrib/ffmpeg/libpostproc
-postproc_lib = $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a \
-	       $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a
+AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg/libpostproc
+postproc_lib =  $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a \
+                $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a
+
 $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a:
 	$(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a
+
 $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a:
 	$(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a
 endif
 
-# -fomit-frame-pointer is always needed. it might cause debug to not
-# work, but at least it compiles.
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) $(ff_cflags) -fomit-frame-pointer
-AM_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS)
-
 # Avoid errors with -O0
 #xineplug_post_planar_la-eq.o xineplug_post_planar_la-eq.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'`
 #xineplug_post_planar_la-eq2.o xineplug_post_planar_la-eq2.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'`
@@ -30,6 +31,3 @@ xinepost_LTLIBRARIES = xineplug_post_planar.la
 xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \
                                   denoise3d.c eq.c eq2.c unsharp.c pp.c noise.c
 xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(PTHREAD_LIBS)
-
-$(POSTPROC_INT_LIB):
-	cd $(top_builddir)/src/libffmpeg/libavcodec/libpostproc && $(MAKE) libpostprocess.la
diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am
index a02a74f77..bea89ac49 100644
--- a/src/post/visualizations/Makefile.am
+++ b/src/post/visualizations/Makefile.am
@@ -1,14 +1,14 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 EXTRA_DIST = fooviz.c
 
+noinst_HEADERS = fft.h visualizations.h
+
 xinepost_LTLIBRARIES = xineplug_post_visualizations.la
 
 xineplug_post_visualizations_la_SOURCES = \
         visualizations.c fft.c fftscope.c oscope.c fftgraph.c
 xineplug_post_visualizations_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -lm
-
-noinst_HEADERS = fft.h visualizations.h
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 3e080f84e..efea3f3b7 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,15 +1,30 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_CFLAGS    = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS   = $(xineplug_ldflags)
 AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
-SUBDIRS = libdha vidix macosx
+SUBDIRS = 
+
+if BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+
+# vidix depends on portions of dha
+if HAVE_VIDIX
+if !BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+SUBDIRS += vidix
+endif
+
+if HAVE_MACOSX_VIDEO
+SUBDIRS += macosx
+endif
 
 EXTRA_DIST = video_out_directfb.c video_out_directfb_fb.c video_out_directfb_x.c video_out_directx.c video_out_macosx.m
 
-VIDIX_CPPFLAGS = -I$(top_builddir)/src/video_out/vidix \
-	-I$(top_srcdir)/src/video_out/vidix
+noinst_HEADERS = deinterlace.h video_out_syncfb.h yuv2rgb.h x11osd.h xcbosd.h
 
 if HAVE_X11
 X11OSD = x11osd.c
@@ -152,7 +167,9 @@ xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD)
 xineplug_vo_out_vidix_la_LIBADD =  $(XINE_LIB) $(X_LIBS) \
 	$(top_builddir)/src/video_out/vidix/libvidix.la $(PTHREAD_LIBS)
 xineplug_vo_out_vidix_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing
-xineplug_vo_out_vidix_la_CPPFLAGS = $(VIDIX_CPPFLAGS)
+xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/video_out/vidix \
+	-I$(top_srcdir)/src/video_out/vidix
+
 
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
 xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
@@ -185,8 +202,8 @@ xineplug_vo_out_stk_la_LIBADD = $(XINE_LIB) $(LIBSTK_LIBS) $(PTHREAD_LIBS)
 xineplug_vo_out_stk_la_CFLAGS = $(AM_CFLAGS) $(LIBSTK_CFLAGS)
 
 xineplug_vo_out_directx_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c 
-xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
 xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS)
 
 xineplug_vo_out_none_la_SOURCES =  video_out_none.c
 xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
@@ -194,6 +211,3 @@ xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
 xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL
-
-noinst_HEADERS = deinterlace.h video_out_syncfb.h \
-	yuv2rgb.h x11osd.h xcbosd.h
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index 553907fc9..de63444c0 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/src/video_out/libdha/Makefile.am
@@ -1,19 +1,23 @@
 include $(top_srcdir)/misc/Makefile.common
 
-EXTRA_DIST = README pci_db2c.awk
+SUBDIRS = bin oth sysdep
 
-SUBDIRS = bin kernelhelper oth sysdep
+if BUILD_DHA_KMOD
+SUBDIRS += kernelhelper
+endif
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(STATIC)
+AM_CFLAGS = $(DEFAULT_OCFLAGS)
 
-if HAVE_VIDIX
-dha_lib = libdha.la
-endif
+EXTRA_DIST = README pci_db2c.awk
 
 awk_generated = pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h
 CLEANFILES = $(awk_generated)
 
-noinst_LTLIBRARIES = $(dha_lib)
+noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
+
+if HAVE_VIDIX
+noinst_LTLIBRARIES = libdha.la
+endif
 
 libdha_la_SOURCES = libdha.c mtrr.c pci.c mmi.c ports.c irq.c cpu_flush.c
 nodist_libdha_la_SOURCES = pci_names.c 
@@ -23,8 +27,6 @@ EXTRA_PROGRAMS = test
 test_SOURCES = test.c
 test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la
 
-noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
-
 ## for OpenBSD LIBS += -li386
 
 ## We have to create some files, on the fly, this is why this rule is needed.
@@ -33,7 +35,7 @@ oth/pci.db:
 
 $(awk_generated): pci_db2c.awk oth/pci.db
 	LC_ALL=C $(AWK) -f $(top_srcdir)/src/video_out/libdha/pci_db2c.awk \
-	  $(top_srcdir)/src/video_out/libdha/oth/pci.db
+		$(top_srcdir)/src/video_out/libdha/oth/pci.db
 
 pci_names.lo: $(awk_generated)
 	source='$*.c' object='$@' libtool=yes \
diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/src/video_out/libdha/kernelhelper/Makefile.am
index 82a37eae3..fffaab433 100644
--- a/src/video_out/libdha/kernelhelper/Makefile.am
+++ b/src/video_out/libdha/kernelhelper/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = README dhahelper.c
 
-KCFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -include `echo @LINUX_INCLUDE@ | sed -e 's/\-I//g'`/linux/modversions.h
+KCFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -include `echo $(LINUX_INCLUDE) | sed -e 's/\-I//g'`/linux/modversions.h
 
 KVERSION = $(shell $(SHELL) -c 'uname -r')
 moddir = /lib/modules/$(KVERSION)/misc
@@ -10,10 +10,8 @@ moddir = /lib/modules/$(KVERSION)/misc
 KCOMPILE = $(CC) $(CFLAGS) $(KCFLAGS) $(INCLUDES) $(LINUX_INCLUDE)
 
 if HAVE_LINUX
-if BUILD_DHA_KMOD
 KERNEL_MODULE = dhahelper.o
 endif
-endif
 
 noinst_HEADERS = dhahelper.h
 
@@ -29,25 +27,24 @@ nodes:
 all: $(KERNEL_MODULE)
 
 install-exec-local: $(KERNEL_MODULE)
-@BUILD_DHA_KMOD_TRUE@	@$(NORMAL_INSTALL)
-@BUILD_DHA_KMOD_TRUE@	$(mkinstalldirs) $(DESTDIR)$(moddir)
-@BUILD_DHA_KMOD_TRUE@	@list='$(KERNEL_MODULE)'; \
-@BUILD_DHA_KMOD_TRUE@	for p in $$list; do \
-@BUILD_DHA_KMOD_TRUE@	  if test -f $$p; then \
-@BUILD_DHA_KMOD_TRUE@	    echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \
-@BUILD_DHA_KMOD_TRUE@	    $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \
-@BUILD_DHA_KMOD_TRUE@	  else :; fi; \
-@BUILD_DHA_KMOD_TRUE@	done; \
-@BUILD_DHA_KMOD_TRUE@	$(DEPMOD) -a
-@BUILD_DHA_KMOD_TRUE@	if test ! -c /dev/dhahelper; then \
-@BUILD_DHA_KMOD_TRUE@	  $(MAKE) nodes; \
-@BUILD_DHA_KMOD_TRUE@	fi
-
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(moddir)
+	@list='$(KERNEL_MODULE)'; \
+	for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \
+	    $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \
+	  else :; fi; \
+	done; \
+	$(DEPMOD) -a
+	if test ! -c /dev/dhahelper; then \
+	  $(MAKE) nodes; \
+	fi
 
 uninstall-local:
-@BUILD_DHA_KMOD_TRUE@	@$(NORMAL_UNINSTALL)
-@BUILD_DHA_KMOD_TRUE@	@list='$(KERNEL_MODULE)'; \
-@BUILD_DHA_KMOD_TRUE@	for p in $$list; do \
-@BUILD_DHA_KMOD_TRUE@	  echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-@BUILD_DHA_KMOD_TRUE@	  rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-@BUILD_DHA_KMOD_TRUE@	done
+	@$(NORMAL_UNINSTALL)
+	@list='$(KERNEL_MODULE)'; \
+	for p in $$list; do \
+	  echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	  rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	done
diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am
index d649dfe1d..ae6a5acc8 100644
--- a/src/video_out/macosx/Makefile.am
+++ b/src/video_out/macosx/Makefile.am
@@ -1,23 +1,12 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS    = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
-EXTRA_DIST = \
-             video_window.h \
-             XineOpenGLView.m \
-             XineOpenGLView.h \
-             XineVideoWindow.m \
-             XineVideoWindow.h
-
-if HAVE_MACOSX_VIDEO
+xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h
 
 lib_LTLIBRARIES = libxineMacOSXVideo.la
 
 libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m
-libxineMacOSXVideo_la_LDFLAGS = -framework Cocoa -framework OpenGL \
+libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL \
 				-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
-
-xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h
-
-endif
-
diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am
index e002c56f0..7f19e7ce8 100644
--- a/src/video_out/vidix/Makefile.am
+++ b/src/video_out/vidix/Makefile.am
@@ -1,21 +1,16 @@
 include $(top_srcdir)/misc/Makefile.common
 
-EXTRA_DIST = README vidix.txt
-
 SUBDIRS = drivers
 
-AM_CFLAGS = $(STATIC)
-AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
-	      -I$(top_builddir)/src/video_out/libdha
+AM_CFLAGS   = $(DEFAULT_OCFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix -I$(top_builddir)/src/video_out/libdha
 
-if HAVE_VIDIX
-vidix_lib = libvidix.la
-endif
+EXTRA_DIST = README vidix.txt
 
-noinst_LTLIBRARIES = $(vidix_lib)
+noinst_HEADERS = fourcc.h vidix.h vidixlib.h
+
+noinst_LTLIBRARIES = libvidix.la
 
 libvidix_la_SOURCES = vidixlib.c
 libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) $(top_builddir)/src/video_out/libdha/libdha.la
 
-noinst_HEADERS = fourcc.h vidix.h vidixlib.h
-
diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am
index 23272e4c9..1ad68da26 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/src/video_out/vidix/drivers/Makefile.am
@@ -1,15 +1,17 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS)
+AM_CFLAGS   = $(DEFAULT_OCFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
-	-I$(top_srcdir)/src/video_out/libdha \
-	-I$(top_builddir)/src/video_out/libdha
-AM_LDFLAGS = $(xineplug_ldflags)
+              -I$(top_srcdir)/src/video_out/libdha -I$(top_builddir)/src/video_out/libdha
+AM_LDFLAGS  = $(xineplug_ldflags)
 
 EXTRA_DIST = genfb_vid.c
 
+noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \
+                 cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h
+
 if HAVE_VIDIX
-vidix_drivers = \
+vidix_LTLIBRARIES = \
 	mach64_vid.la \
 	mga_crtc2_vid.la \
 	mga_vid.la \
@@ -24,39 +26,33 @@ vidix_drivers = \
 	savage_vid.la 
 endif
 
-vidix_LTLIBRARIES = $(vidix_drivers)
-
-radeon_vid_la_SOURCES = radeon_vid.c
-radeon_vid_la_LIBADD = -lm
-
-rage128_vid_la_SOURCES = radeon_vid.c
-rage128_vid_la_LIBADD = -lm
-rage128_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DRAGE128
-
-pm2_vid_la_SOURCES = pm2_vid.c
-
-pm3_vid_la_SOURCES = pm3_vid.c
+cyberblade_vid_la_SOURCES = cyberblade_vid.c
 
 mach64_vid_la_SOURCES = mach64_vid.c
 
-mga_vid_la_SOURCES = mga_vid.c
-mga_vid_la_LIBADD = -lm
-
 mga_crtc2_vid_la_SOURCES = mga_vid.c
 mga_crtc2_vid_la_LIBADD = -lm
 mga_crtc2_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DCRTC2
 
-cyberblade_vid_la_SOURCES = cyberblade_vid.c
-
-unichrome_vid_la_SOURCES = unichrome_vid.c
+mga_vid_la_SOURCES = mga_vid.c
+mga_vid_la_LIBADD = -lm
 
 nvidia_vid_la_SOURCES = nvidia_vid.c
 
-sis_vid_la_SOURCES = sis_vid.c sis_bridge.c
+pm2_vid_la_SOURCES = pm2_vid.c
+
+pm3_vid_la_SOURCES = pm3_vid.c
+
+radeon_vid_la_SOURCES = radeon_vid.c
+radeon_vid_la_LIBADD = -lm
+
+rage128_vid_la_SOURCES = radeon_vid.c
+rage128_vid_la_LIBADD = -lm
+rage128_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DRAGE128
 
 savage_vid_la_SOURCES = savage_vid.c
 savage_vid_la_LIBADD = -lm
 
-noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \
-	cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h
+sis_vid_la_SOURCES = sis_vid.c sis_bridge.c
 
+unichrome_vid_la_SOURCES = unichrome_vid.c
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index e5a9a6cdd..8e4a9777a 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -1,17 +1,29 @@
 include $(top_srcdir)/misc/Makefile.common
 include $(top_srcdir)/lib/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG)
 AM_CPPFLAGS = $(XDG_BASEDIR_CPPFLAGS) $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
 
-lib_LTLIBRARIES = libxine.la
+XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
+
+# FIXME: these are currently unused:
+EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
 
-XINEUTILS_LIB  = $(top_builddir)/src/xine-utils/libxineutils.la
-DEF_FILE = libxine-$(XINE_MAJOR).def
 if WIN32
+DEF_FILE = libxine-$(XINE_MAJOR).def
 def_ldflags="-Wl,--output-def,$(DEF_FILE)"
 endif
 
+noinst_HEADERS = bswap.h ffmpeg_bswap.h
+
+xineinclude_HEADERS  = buffer.h metronom.h configfile.h vo_scale.h \
+	audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
+	video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h  \
+	plugin_catalog.h audio_decoder.h video_decoder.h post.h \
+	io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h
+
+lib_LTLIBRARIES = libxine.la
+
 libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 	load_plugins.c video_decoder.c buffer_types.c \
 	audio_decoder.c video_out.c audio_out.c resample.c events.c \
@@ -20,27 +32,17 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 	input_rip.c input_cache.c info_helper.c refcounter.c \
 	alphablend.c
 
-# FIXME: these are currently unused:
-EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
-
 libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \
                           $(pthread_dep) $(LIBXINEPOSIX)
 libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \
 		    -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \
                     $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(XDG_BASEDIR_LIBS)
 
-libxine_la_LDFLAGS =  \
-	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \
-	$(def_ldflags)
-
+libxine_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) \
+	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
 
-xineinclude_HEADERS  = buffer.h metronom.h configfile.h vo_scale.h \
-        audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
-	video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h  \
-	plugin_catalog.h audio_decoder.h video_decoder.h post.h \
-	io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h
-
-noinst_HEADERS = bswap.h ffmpeg_bswap.h
+$(XINEUTILS_LIB):
+	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
 
 if WIN32
 install-exec-local:
@@ -49,6 +51,3 @@ install-exec-local:
 uninstall-local:
 	rm -f $(DEF_FILE)
 endif
-
-$(XINEUTILS_LIB):
-	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 484830cf9..a9c37465a 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -3,10 +3,25 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG)
 AM_CPPFLAGS = -DXINE_LIBRARY_COMPILE
 
-noinst_LTLIBRARIES = libxineutils.la
-
 EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl
 
+noinst_HEADERS = ppcasm_string.h xine_check.h
+
+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
+
+noinst_LTLIBRARIES = libxineutils.la
+
 if ARCH_PPC
 if !HOST_OS_DARWIN
 pppc_files = ppcasm_string.S
@@ -31,19 +46,3 @@ libxineutils_la_SOURCES = $(pppc_files) \
 	pool.c \
 	ring_buffer.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
-
-
-noinst_HEADERS = ppcasm_string.h xine_check.h
-
-- 
cgit v1.2.3