4 files changed, 64 insertions, 92 deletions
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index a74c65815..02eddc00a 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -1,26 +1,9 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
-	-Wmissing-prototypes -Wimplicit-function-declaration \
-	-DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \
+AM_CFLAGS   = $(X_CFLAGS) -fno-omit-frame-pointer
+AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS \
 	-I$(srcdir)/.. -I$(srcdir)/../wine
 
-if HAVE_W32DLL
-ds_filter_lib = libds_filter.la
-endif
-
-noinst_LTLIBRARIES = $(ds_filter_lib)
-
-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 \
@@ -32,3 +15,15 @@ noinst_HEADERS = \
 	DS_AudioDecoder.h \
 	DS_Filter.h \
 	DS_VideoDecoder.h
+
+noinst_LTLIBRARIES = libds_filter.la
+
+libds_filter_la_SOURCES = \
+	allocator.c \
+	cmediasample.c \
+	guids.c \
+	inputpin.c \
+	outputpin.c \
+	DS_Filter.c \
+	DS_AudioDecoder.c \
+	DS_VideoDecoder.c
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 367dc3bda..7d11bb2dc 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -1,39 +1,32 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\" $(VISIBILITY_FLAG)
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"$(w32_path)\"
+AM_LDFLAGS  = $(xineplug_ldflags)
 
-SUBDIRS = wine DirectShow dmo qtx
-
-if HAVE_W32DLL
-w32dll_codec = xineplug_decode_w32dll.la
-qt_codec = xineplug_decode_qt.la
+SUBDIRS = 
+if ENABLE_W32DLL
+SUBDIRS += wine DirectShow dmo qtx
 endif
 
-xineplug_LTLIBRARIES = $(w32dll_codec) $(qt_codec)
-
 EXTRA_DIST = common.c
 
+noinst_HEADERS = libwin32.h w32codec.h
+
+if ENABLE_W32DLL
+xineplug_LTLIBRARIES = xineplug_decode_w32dll.la xineplug_decode_qt.la
+endif
+
 xineplug_decode_w32dll_la_SOURCES = w32codec.c
-xineplug_decode_w32dll_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS)
-xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module
 xineplug_decode_w32dll_la_DEPS = $(XDG_BASEDIR_DEPS)
 xineplug_decode_w32dll_la_LIBADD = \
 	$(top_builddir)/src/libw32dll/wine/libwine.la \
-	$(XINE_LIB) \
-	$(PTHREAD_LIBS) \
-	-lm \
 	$(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \
 	$(top_builddir)/src/libw32dll/dmo/libdmo_filter.la \
-	@KSTAT_LIBS@ \
-	$(XDG_BASEDIR_LIBS)
+	$(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS) $(XDG_BASEDIR_LIBS)
+xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
 
 xineplug_decode_qt_la_SOURCES = qt_decoder.c
-xineplug_decode_qt_la_LDFLAGS = -avoid-version -module
 xineplug_decode_qt_la_LIBADD = \
 	$(top_builddir)/src/libw32dll/wine/libwine.la \
-	$(XINE_LIB) \
-	$(PTHREAD_LIBS) \
-	-lm \
-	@KSTAT_LIBS@
-
-noinst_HEADERS = libwin32.h w32codec.h
+	$(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS)
diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am
index 2b7cd3e37..531a4559a 100644
--- a/src/libw32dll/dmo/Makefile.am
+++ b/src/libw32dll/dmo/Makefile.am
@@ -1,22 +1,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
-	-Wmissing-prototypes -Wimplicit-function-declaration \
-	-DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \
-	-I$(srcdir)/.. -I$(srcdir)/../wine
-
-if HAVE_W32DLL
-dmo_filter_lib = libdmo_filter.la
-endif
-
-noinst_LTLIBRARIES = $(dmo_filter_lib)
-
-libdmo_filter_la_SOURCES = \
-	buffer.c \
-	DMO_AudioDecoder.c \
-	dmo.c \
-	dmo_guids.c \
-	DMO_VideoDecoder.c
+AM_CFLAGS   = $(X_CFLAGS) -fno-omit-frame-pointer
+AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS -I$(srcdir)/.. -I$(srcdir)/../wine
  
 noinst_HEADERS = \
 	DMO_AudioDecoder.h \
@@ -25,3 +10,12 @@ noinst_HEADERS = \
 	DMO_Filter.h \
 	dmo.h \
 	DMO_VideoDecoder.h
+
+noinst_LTLIBRARIES = libdmo_filter.la
+
+libdmo_filter_la_SOURCES = \
+	buffer.c \
+	DMO_AudioDecoder.c \
+	dmo.c \
+	dmo_guids.c \
+	DMO_VideoDecoder.c
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index b53d2c078..1756e3262 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -1,41 +1,13 @@
 include $(top_srcdir)/misc/Makefile.common
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-
-EXTRA_DIST = stubs.s wrapper.S
-
-noinst_LTLIBRARIES = $(wine_lib)
-
-AM_CFLAGS = $(X_CFLAGS) @W32_NO_OPTIMIZE@ \
-	-Wmissing-prototypes -Wimplicit-function-declaration \
-	-DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
+# disable -fomit-frame-pointer, -finline-functions, and -frename-registers
+# because they cause bad behavior of wine
+AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \
+        -fno-omit-frame-pointer -fno-inline-functions -fno-rename-registers
+AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -I$(srcdir)/.. -D__WINE__ \
 	-Ddbg_printf=__vprintf -DTRACE=__vprintf
 
-# CFLAGS is here to filter out -fomit-frame-pointer,
-# -finline-functions and -frename-registers because they cause bad
-# behavior of wine
-CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'`
-
-if HAVE_W32DLL
-wine_lib = libwine.la
-endif
-
-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 \
-	stubs.s \
-	wrapper.S 
-libwine_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS)
+EXTRA_DIST = stubs.s wrapper.S
 
 noinst_HEADERS = \
 	avifmt.h \
@@ -75,3 +47,21 @@ noinst_HEADERS = \
 	winuser.h \
 	wrapper.h
 
+noinst_LTLIBRARIES = libwine.la
+
+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 \
+	stubs.s \
+	wrapper.S 
+libwine_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)