3 files changed, 76 insertions, 19 deletions
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index 8af1aa4fb..6a6526639 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -15,12 +15,27 @@ endif
 
 noinst_LTLIBRARIES = $(ds_filter_lib)
 
-libds_filter_la_SOURCES = guids.c inputpin.c outputpin.c allocator.c \
-	cmediasample.c DS_Filter.c DS_AudioDecoder.c DS_VideoDecoder.c
-
-noinst_HEADERS = DS_Filter.h allocator.h cmediasample.h \
-	guids.h inputpin.h interfaces.h iunk.h outputpin.h \
-	DS_AudioDecoder.h DS_VideoDecoder.h
+libds_filter_la_SOURCES = \
+	allocator.c \
+	cmediasample.c \
+	guids.c \
+	inputpin.c \
+	outputpin.c \
+	DS_Filter.c \
+	DS_AudioDecoder.c \
+	DS_VideoDecoder.c
+
+noinst_HEADERS = \
+	allocator.h \
+	cmediasample.h \
+	guids.h \
+	inputpin.h \
+	interfaces.h \
+	iunk.h \
+	outputpin.h \
+	DS_AudioDecoder.h \
+	DS_Filter.h \
+	DS_VideoDecoder.h
 
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index e4d54930f..10cfcd4a7 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -21,11 +21,13 @@ lib_LTLIBRARIES = $(w32dll_codec)
 
 xineplug_decode_w32dll_la_SOURCES = w32codec.c
 xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module
-xineplug_decode_w32dll_la_LIBADD = $(top_builddir)/src/libw32dll/wine/libwine.la \
+xineplug_decode_w32dll_la_LIBADD = \
+	$(top_builddir)/src/libw32dll/wine/libwine.la \
         $(top_builddir)/src/xine-engine/libxine.la \
-	$(top_builddir)/src/libw32dll/DirectShow/libds_filter.la @KSTAT_LIBS@
+	$(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \
+	@KSTAT_LIBS@
 
-noinst_HEADERS = w32codec.h libwin32.h
+noinst_HEADERS = libwin32.h w32codec.h
 
 debug:
 	@list='$(SUBDIRS)'; for subdir in $$list; do \
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index 9cb51a5a2..8ea1cf55c 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -19,18 +19,58 @@ if HAVE_W32DLL
 wine_lib = libwine.la
 endif
 
-libwine_la_SOURCES = afl.c       elfdll.c    module.c    pe_resource.c  \
-		     resource.c  win32.c     driver.c    ext.c          \
-		     pe_image.c  registry.c  vfl.c       ldt_keeper.c     
+libwine_la_SOURCES = \
+	afl.c \
+	driver.c \
+	elfdll.c \
+	ext.c \
+	ldt_keeper.c \
+	module.c \
+	pe_image.c  
+	pe_resource.c \
+	resource.c \
+	registry.c \
+	vfl.c \
+	win32.c 
+	
 libwine_la_LIBADD = stubs.lo
 
-noinst_HEADERS = avifmt.h      elfdll.h    msacm.h     pshpack1.h   winbase.h \
-		 winnt.h       basetsd.h   heap.h      msacmdrv.h   pshpack2.h\
-		 windef.h      winreg.h    ldt.h       ntdef.h      ext.h     \
-		 pshpack4.h    windows.h   winuser.h   debugtools.h mmreg.h   \
-		 pe_image.h    pshpack8.h  winerror.h  driver.h     module.h  \
-		 poppack.h     vfw.h       loader.h    registry.h   win32.h   \
-		 wineacm.h     winestring.h resource.h ldt_keeper.h com.h
+noinst_HEADERS = \
+	avifmt.h \
+	basetsd.h \
+	com.h \
+	debugtools.h \
+	driver.h \
+	elfdll.h \
+	ext.h \
+	heap.h \
+	ldt.h \
+	ldt_keeper.h \
+	loader.h \
+	mmreg.h \
+	module.h \
+	msacm.h \
+	msacmdrv.h \
+	ntdef.h \
+	pe_image.h \
+	poppack.h \
+	pshpack1.h \
+	pshpack2.h \
+	pshpack4.h \
+	pshpack8.h \
+	registry.h \
+	resource.h \
+	vfw.h \
+	win32.h\
+	wineacm.h \
+	winbase.h \
+	windef.h \
+	windows.h \
+	winerror.h \
+	winestring.h \
+	winnt.h \
+	winreg.h \
+	winuser.h
 
 stubs.lo: stubs.s
 	$(CC) -c $(srcdir)/stubs.s -o stubs.lo