diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 16:07:42 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 16:07:42 +0100 |
| commit | b5f4ef58160be1126dd5226f89fd704b24006760 (patch) | |
| tree | c231525c564ef917658f21e40f0b0a452f3fb3d8 /src | |
| parent | 8734346142f2e1bb36b28c59d380aa20c2fe29dc (diff) | |
| download | xine-lib-b5f4ef58160be1126dd5226f89fd704b24006760.tar.gz xine-lib-b5f4ef58160be1126dd5226f89fd704b24006760.tar.bz2 | |
Remove another recursive make invocation, build the vcd plugin inside src/input even if the source files are in src/input/vcd.
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/Makefile.am | 17 | ||||
| -rw-r--r-- | src/input/vcd/Makefile.am | 13 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index ca7e6dabd..64ba0ce54 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -11,9 +11,6 @@ AM_LDFLAGS = $(xineplug_ldflags) # SUBDIRS = libreal librtsp -if ENABLE_VCD -SUBDIRS += vcd -endif if !WITH_EXTERNAL_DVDNAV SUBDIRS += libdvdnav endif @@ -21,13 +18,16 @@ 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_vcd = xineplug_inp_vcdo.la +in_vcdo = xineplug_inp_vcdo.la endif if ENABLE_V4L @@ -62,6 +62,7 @@ xineplug_LTLIBRARIES = \ xineplug_inp_http.la \ xineplug_inp_dvd.la \ $(in_vcd) \ + $(in_vcdo) \ $(in_v4l) \ $(in_gnome_vfs) \ $(in_smb) \ @@ -92,6 +93,12 @@ 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 deleted file mode 100644 index 2b47415fd..000000000 --- a/src/input/vcd/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -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) |