6 files changed, 10 insertions, 102 deletions
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index 688060d88..a74c65815 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -1,14 +1,10 @@
+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
 
-#DEBUG_CFLAGS = @DEBUG_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
 ds_filter_lib = libds_filter.la
 endif
@@ -36,14 +32,3 @@ noinst_HEADERS = \
 	DS_AudioDecoder.h \
 	DS_Filter.h \
 	DS_VideoDecoder.h
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#*
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 2362a0dff..aaaaea49b 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -1,6 +1,6 @@
-AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\"
+include $(top_srcdir)/misc/Makefile.common
 
-#DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine
+AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\"
 
 SUBDIRS = wine DirectShow dmo qtx
 
@@ -9,15 +9,8 @@ w32dll_codec = xineplug_decode_w32dll.la
 qt_codec = xineplug_decode_qt.la
 endif
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
 libdir = $(XINE_PLUGINDIR)
 
-##
-# IMPORTANT:
-# ---------
-# All of xine codecs should be named like the scheme "xineplug_decode_"
-#
 lib_LTLIBRARIES = $(w32dll_codec) $(qt_codec)
 
 xineplug_decode_w32dll_la_SOURCES = w32codec.c
@@ -37,23 +30,3 @@ xineplug_decode_qt_la_LIBADD = \
 	@KSTAT_LIBS@
 
 noinst_HEADERS = libwin32.h w32codec.h
-
-$(XINE_LIB):
-	@cd $(top_builddir)/src/xine-engine && $(MAKE)
-
-debug:
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-install-debug: debug
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#*
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am
index a5aa17323..2b7cd3e37 100644
--- a/src/libw32dll/dmo/Makefile.am
+++ b/src/libw32dll/dmo/Makefile.am
@@ -1,14 +1,10 @@
+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
 
-#DEBUG_CFLAGS = @DEBUG_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
@@ -29,14 +25,3 @@ noinst_HEADERS = \
 	DMO_Filter.h \
 	dmo.h \
 	DMO_VideoDecoder.h
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#*
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
diff --git a/src/libw32dll/qtx/Makefile.am b/src/libw32dll/qtx/Makefile.am
index 96dc8d4e4..060aa6acd 100644
--- a/src/libw32dll/qtx/Makefile.am
+++ b/src/libw32dll/qtx/Makefile.am
@@ -1,13 +1,3 @@
-SUBDIRS = qtxsdk
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#*
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
+include $(top_srcdir)/misc/Makefile.common
 
+SUBDIRS = qtxsdk
diff --git a/src/libw32dll/qtx/qtxsdk/Makefile.am b/src/libw32dll/qtx/qtxsdk/Makefile.am
index 87991c24f..30aeab5e9 100644
--- a/src/libw32dll/qtx/qtxsdk/Makefile.am
+++ b/src/libw32dll/qtx/qtxsdk/Makefile.am
@@ -1,18 +1,3 @@
-noinst_HEADERS = components.h  select.h
-
-debug:
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-install-debug: debug
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+include $(top_srcdir)/misc/Makefile.common
 
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#*
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
+noinst_HEADERS = components.h  select.h
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index 6960ce3b7..2e9893207 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/Makefile.common
+
 EXTRA_DIST = stubs.s wrapper.S
 
 noinst_LTLIBRARIES = $(wine_lib)
@@ -77,15 +79,3 @@ stubs.lo: stubs.s
 
 wrapper.lo: wrapper.S
 	$(CC) -c $(srcdir)/wrapper.S -o wrapper.lo
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#*
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
-