diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 00:01:12 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 00:01:12 +0000 |
| commit | 72abc5e53ea918cdf2813a722e14760d8e797b3d (patch) | |
| tree | 65c79eb98606ddda0b4aa2c9c7a5cf2ab7c488b1 /src/input/Makefile.am | |
| parent | b5f4ef58160be1126dd5226f89fd704b24006760 (diff) | |
| download | xine-lib-72abc5e53ea918cdf2813a722e14760d8e797b3d.tar.gz xine-lib-72abc5e53ea918cdf2813a722e14760d8e797b3d.tar.bz2 | |
Back out vcd build changes: separate unit (though used only once).
Also, built files don't end up in the vcd directory.
Diffstat (limited to 'src/input/Makefile.am')
| -rw-r--r-- | src/input/Makefile.am | 17 |
1 files changed, 5 insertions, 12 deletions
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) |