From 72abc5e53ea918cdf2813a722e14760d8e797b3d Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Fri, 1 Feb 2008 00:01:12 +0000
Subject: Back out vcd build changes: separate unit (though used only once).
 Also, built files don't end up in the vcd directory.

---
 configure.ac              |  1 +
 src/input/Makefile.am     | 17 +++++------------
 src/input/vcd/Makefile.am | 13 +++++++++++++
 3 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 src/input/vcd/Makefile.am

diff --git a/configure.ac b/configure.ac
index 77190b58a..aa9294780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1181,6 +1181,7 @@ src/input/Makefile
 src/input/libdvdnav/Makefile
 src/input/librtsp/Makefile
 src/input/libreal/Makefile
+src/input/vcd/Makefile
 src/libw32dll/Makefile
 src/libw32dll/wine/Makefile
 src/libw32dll/DirectShow/Makefile
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 64ba0ce54..ca7e6dabd 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -11,6 +11,9 @@ AM_LDFLAGS = $(xineplug_ldflags)
 #
 
 SUBDIRS = libreal librtsp
+if ENABLE_VCD
+SUBDIRS += vcd
+endif
 if !WITH_EXTERNAL_DVDNAV
 SUBDIRS += libdvdnav
 endif
@@ -18,16 +21,13 @@ endif
 
 noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h
 
+
 if ENABLE_DVB
 in_dvb = xineplug_inp_dvb.la
 endif
 
-if ENABLE_VCD
-in_vcd = xineplug_inp_vcd.la
-endif
-
 if ENABLE_VCDO
-in_vcdo = xineplug_inp_vcdo.la
+in_vcd = xineplug_inp_vcdo.la
 endif
 
 if ENABLE_V4L
@@ -62,7 +62,6 @@ xineplug_LTLIBRARIES = \
 	xineplug_inp_http.la \
 	xineplug_inp_dvd.la \
 	$(in_vcd) \
-	$(in_vcdo) \
 	$(in_v4l) \
 	$(in_gnome_vfs) \
 	$(in_smb) \
@@ -93,12 +92,6 @@ xineplug_inp_mms_la_LIBADD = $(XINE_LIB) $(LTLIBICONV) $(PTHREAD_LIBS) $(LTLIBIN
 xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
 xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
 
-xineplug_inp_vcd_la_SOURCES = vcd/xineplug_inp_vcd.c vcd/vcdplayer.c	\
-	                      vcd/vcdio.c vcd/xine-extra.c vcd/vcdio.h	\
-	                      vcd/vcdplayer.h vcd/xine-extra.h
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
-xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
-
 xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
 xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
 
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
new file mode 100644
index 000000000..2b47415fd
--- /dev/null
+++ b/src/input/vcd/Makefile.am
@@ -0,0 +1,13 @@
+include $(top_srcdir)/misc/Makefile.common
+
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
+
+noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
+
+xineplug_LTLIBRARIES = xineplug_inp_vcd.la
+
+xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
+xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
+xineplug_inp_vcd_la_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBVCD_DEPS) $(LIBVCDINFO_DEPS) $(LIBISO9660_DEPS)
+xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
-- 
cgit v1.2.3