diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-26 02:05:39 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-26 02:05:39 +0000 |
| commit | aba6adc0529ceed3406faabdc682efab035ef5ca (patch) | |
| tree | 7d9ab537c721cc0f8d218a08e91cf7a3b9bb7f01 /src/input/Makefile.am | |
| parent | dcc02769693d66bbb703b082c3cde9174ade4a37 (diff) | |
| parent | 7a6f9b2927283b12d3438ad4fc60054650ac1554 (diff) | |
| download | xine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.gz xine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/input/Makefile.am')
| -rw-r--r-- | src/input/Makefile.am | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index ddeb61a06..c740351d6 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -33,6 +33,7 @@ endif if ENABLE_V4L in_v4l = xineplug_inp_v4l.la +in_v4l2 = xineplug_inp_v4l2.la in_pvr = xineplug_inp_pvr.la endif @@ -64,6 +65,7 @@ xineplug_LTLIBRARIES = \ xineplug_inp_dvd.la \ $(in_vcd) \ $(in_v4l) \ + $(in_v4l2) \ $(in_gnome_vfs) \ $(in_smb) \ xineplug_inp_mms.la \ @@ -123,6 +125,11 @@ xineplug_inp_v4l_la_SOURCES = input_v4l.c xineplug_inp_v4l_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(LTLIBINTL) xineplug_inp_v4l_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS) +xineplug_inp_v4l2_la_SOURCES = input_v4l2.c +xineplug_inp_v4l2_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) +xineplug_inp_v4l2_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) +xineplug_inp_v4l2_la_LDFLAGS = -avoid-version -module + xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c xineplug_inp_gnome_vfs_la_LIBADD = $(XINE_LIB) $(GNOME_VFS_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) xineplug_inp_gnome_vfs_la_CFLAGS = $(AM_CFLAGS) $(GNOME_VFS_CFLAGS) |