diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-12 14:18:38 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-12 14:18:38 -0400 |
| commit | aa6b402b7a240b6f55c063b021c5c211f46ec8bd (patch) | |
| tree | a4c14e2633b549f8d2ffe3d1bef9363a4c771cb3 /src/input | |
| parent | 67b0ebb21185cb8ea2972dead6870bab8306724e (diff) | |
| download | xine-lib-aa6b402b7a240b6f55c063b021c5c211f46ec8bd.tar.gz xine-lib-aa6b402b7a240b6f55c063b021c5c211f46ec8bd.tar.bz2 | |
More configure/Makefile cleanups
-- Make a pass at cleaning up contrib/ Makefile.am files
-- Rename many AM_CONDITIONALS for consistency and give them better names to
better indicate what they mean
-- Remove some dead input plugin tests
-- Clean up AM_PATH_DVDNAV
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Makefile.am | 10 | ||||
| -rw-r--r-- | src/input/vcd/Makefile.am | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index b5aa3f902..a5c98c85f 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -14,7 +14,7 @@ SUBDIRS = dvb libreal librtsp if ENABLE_VCD SUBDIRS += vcd endif -if !HAVE_DVDNAV +if !WITH_EXTERNAL_DVDNAV SUBDIRS += libdvdnav endif @@ -27,20 +27,20 @@ if ENABLE_VCD in_vcd = xineplug_inp_vcdo.la endif -if HAVE_V4L +if ENABLE_V4L in_v4l = xineplug_inp_v4l.la in_pvr = xineplug_inp_pvr.la endif -if HAVE_GNOME_VFS +if ENABLE_GNOME_VFS in_gnome_vfs = xineplug_inp_gnome_vfs.la endif -if HAVE_LIBSMBCLIENT +if ENABLE_LIBSMBCLIENT in_smb = xineplug_inp_smb.la endif -if HAVE_DVDNAV +if WITH_EXTERNAL_DVDNAV DVD_CFLAGS = $(DVDNAV_CFLAGS) link_dvdnav = $(DVDNAV_LIBS) else diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 28f6290fd..0ff664605 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = -if !HAVE_VCDNAV +if !WITH_EXTERNAL_VCDLIBS SUBDIRS += libcdio libvcd endif @@ -14,7 +14,7 @@ xineplug_LTLIBRARIES = xineplug_inp_vcd.la xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c -if HAVE_VCDNAV +if WITH_EXTERNAL_VCDLIBS xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS) else xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm |