3 files changed, 57 insertions, 81 deletions
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 16eece779..873f1d54a 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -1,24 +1,17 @@
 include $(top_srcdir)/misc/Makefile.common
 
-SUBDIRS = libcdio libvcd
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
 
-vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
+SUBDIRS =
+if !WITH_EXTERNAL_VCDLIBS
+SUBDIRS += libcdio libvcd
+endif
 
-EXTRA_DIST = $(vcd_SRCS)
+noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
 
-if ENABLE_VCD
 xineplug_LTLIBRARIES = xineplug_inp_vcd.la
 
-AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
-
-xineplug_inp_vcd_la_SOURCES = $(vcd_SRCS)
-xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module
-if HAVE_VCDNAV
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS)
-else
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm
-endif
-
-endif
-
-noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
+xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
+xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm
+xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am
index c7415e787..a79525c8f 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/src/input/vcd/libcdio/Makefile.am
@@ -1,10 +1,24 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
+
 SUBDIRS = cdio MSWindows image
 
-INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
+INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
+
+noinst_HEADERS = \
+	cdio_assert.h \
+	_cdio_stdio.h \
+	scsi_mmc.h \
+	cdio_private.h \
+	_cdio_stream.h \
+	iso9660_private.h \
+	portable.h
+
+noinst_LTLIBRARIES = libcdio.la libiso9660.la
 
-libcdio_SRCS = \
+libcdio_la_SOURCES = \
 	_cdio_bsdi.c \
 	_cdio_generic.c \
 	_cdio_linux.c \
@@ -41,30 +55,8 @@ libcdio_SRCS = \
 	sector.c \
 	util.c
 
-libiso9660_SRCS = \
+libiso9660_la_SOURCES = \
 	iso9660.c \
 	iso9660_private.h \
 	iso9660_fs.c \
 	xa.c
-
-EXTRA_DIST = $(libcdio_SRCS) $(libiso9660_SRCS)
-
-if ENABLE_VCD
-if HAVE_VCDNAV
-else
-noinst_LTLIBRARIES = libcdio.la libiso9660.la
-libcdio_la_SOURCES = $(libcdio_SRCS)
-libcdio_la_LDFLAGS = -avoid-version -module
-libiso9660_la_SOURCES = $(libiso9660_SRCS)
-libiso9660_la_LDFLAGS = -avoid-version -module
-endif
-endif
-
-noinst_HEADERS = \
-	cdio_assert.h \
-	_cdio_stdio.h \
-	scsi_mmc.h \
-	cdio_private.h \
-	_cdio_stream.h \
-	iso9660_private.h \
-	portable.h
diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am
index 01b100aa4..c922685e3 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/Makefile.am
@@ -1,10 +1,35 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
+
 SUBDIRS = libvcd
 
-INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
+noinst_HEADERS = \
+	vcd_assert.h \
+	data_structures.h \
+	info_private.h \
+	pbc.h \
+	stream_stdio.h \
+	bitvec.h \
+	dict.h \
+	mpeg.h \
+	salloc.h \
+	util.h \
+	bytesex_asm.h \
+	directory.h \
+	mpeg_stream.h \
+	sector_private.h \
+	vcd.h \
+	bytesex.h \
+	image_sink.h \
+	obj.h \
+	stream.h \
+	vcd_read.h
 
-libvcd_SRCS = \
+noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
+libvcd_la_SOURCES = \
 	vcd.c \
 	data_structures.c \
 	directory.c \
@@ -22,45 +47,11 @@ libvcd_SRCS = \
 	stream.c \
 	stream_stdio.c \
 	util.c 
+libvcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS)
 
-libvcdinfo_SRCS = \
+libvcdinfo_la_SOURCES = \
 	info.c \
 	inf.c \
 	info_private.c \
 	vcd_read.c
-
-EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS)
-
-if ENABLE_VCD
-if HAVE_VCDNAV
-else
-noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
-libvcd_la_SOURCES = $(libvcd_SRCS)
-libvcd_la_LDFLAGS = -avoid-version -module
-libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
-libvcdinfo_la_SOURCES = $(libvcdinfo_SRCS)
-libvcdinfo_la_LDFLAGS = -avoid-version -module
-endif
-endif
-
-noinst_HEADERS = \
-	vcd_assert.h \
-	data_structures.h \
-	info_private.h \
-	pbc.h \
-	stream_stdio.h \
-	bitvec.h \
-	dict.h \
-	mpeg.h \
-	salloc.h \
-	util.h \
-	bytesex_asm.h \
-	directory.h \
-	mpeg_stream.h \
-	sector_private.h \
-	vcd.h \
-	bytesex.h \
-	image_sink.h \
-	obj.h \
-	stream.h \
-	vcd_read.h
+libvcdinfo_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS)