2 files changed, 6 insertions, 33 deletions
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