6 files changed, 14 insertions, 102 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 9151b269a..20f76e65c 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -63,18 +63,6 @@ lib_LTLIBRARIES = \
 	xineplug_inp_cdda.la
 
 
-#lib_LTLIBRARIES = \
-#	$(in_cda) \
-#	$(in_dvd) \
-#	$(in_vcd) \
-#	xineplug_inp_file.la \
-#	xineplug_inp_http.la \
-#	xineplug_inp_mms.la \
-#	xineplug_inp_net.la \
-#	xineplug_inp_rtp.la \
-#	xineplug_inp_stdin_fifo.la
-
-
 xineplug_inp_file_la_SOURCES = input_file.c
 xineplug_inp_file_la_LIBADD = $(XINE_LIB)
 xineplug_inp_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 027c9621f..70ddcda1f 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -1,10 +1,9 @@
+include $(top_srcdir)/misc/Makefile.common
+
 SUBDIRS = libcdio libvcd
 
 libdir = $(XINE_PLUGINDIR)
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
-
 vcdx_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
 
 EXTRA_DIST = $(vcdx_SRCS)
@@ -25,23 +24,3 @@ endif
 endif
 
 noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
-
-debug:
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)"
-
-install-debug: debug
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(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/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am
index eef45b69f..ee975a0c3 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/src/input/vcd/libcdio/Makefile.am
@@ -1,6 +1,7 @@
+include $(top_srcdir)/misc/Makefile.common
+
 SUBDIRS = cdio
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 INCLUDES = $(LIBCDIO_CFLAGS)
 
 libcdio_SRCS = \
@@ -26,9 +27,10 @@ libiso9660_SRCS = \
 	iso9660_fs.c \
 	xa.c
 
+EXTRA_DIST = $(libcdio_SRCS) $(libiso9660_SRCS)
+
 if ENABLE_VCDX
 if HAVE_VCDNAV
-EXTRA_DIST = $(libcdio_SRCS) $(libio9660_SRCS)
 else
 noinst_LTLIBRARIES = libcdio.la libiso9660.la
 libcdio_la_SOURCES = $(libcdio_SRCS)
@@ -48,24 +50,3 @@ noinst_HEADERS = \
 	cdio_private.h \
 	_cdio_stream.h \
 	iso9660_private.h
-
-
-debug:
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-install-debug: debug
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(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/input/vcd/libcdio/cdio/Makefile.am b/src/input/vcd/libcdio/cdio/Makefile.am
index e2564e9bd..8381d9c31 100644
--- a/src/input/vcd/libcdio/cdio/Makefile.am
+++ b/src/input/vcd/libcdio/cdio/Makefile.am
@@ -1,12 +1,3 @@
-noinst_HEADERS = cdio.h	cd_types.h iso9660.h logging.h sector.h types.h util.h version.h xa.h
-
-debug:
-install-debug: install
+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 = cdio.h	cd_types.h iso9660.h logging.h sector.h types.h util.h version.h xa.h
diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am
index 8703aadcf..84af44a7a 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/Makefile.am
@@ -1,6 +1,7 @@
+include $(top_srcdir)/misc/Makefile.common
+
 SUBDIR = libvcd
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 INCLUDES = $(LIBCDIO_CFLAGS)
 
 libvcd_SRCS = \
@@ -28,9 +29,10 @@ libvcdinfo_SRCS = \
 	info_private.c \
 	vcd_read.c
 
+EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS)
+
 if ENABLE_VCDX
 if HAVE_VCDNAV
-EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS)
 else
 noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
 libvcd_la_SOURCES = $(libvcd_SRCS)
@@ -62,23 +64,3 @@ noinst_HEADERS = \
 	obj.h \
 	stream.h \
 	vcd_read.h
-
-debug:
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
-
-install-debug: debug
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(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/input/vcd/libvcd/libvcd/Makefile.am b/src/input/vcd/libvcd/libvcd/Makefile.am
index 5474bcbe4..ea29859f6 100644
--- a/src/input/vcd/libvcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/libvcd/Makefile.am
@@ -1,12 +1,3 @@
-noinst_HEADERS = files.h inf.h logging.h types.h files_private.h info.h sector.h version.h
-
-debug:
-install-debug: install
+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 = files.h inf.h logging.h types.h files_private.h info.h sector.h version.h