diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
| commit | f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d (patch) | |
| tree | 3889c94ee31c8c7a6f8a3bf97f70617476284e95 /src/input | |
| parent | 9285ce63facf833394d79d4e5be6adfa4c70eac6 (diff) | |
| parent | 284db4a4fc4941b7a3b903d3ab23b04840517fd1 (diff) | |
| download | xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.gz xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.bz2 | |
Merge (with adjustment) from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : include/xine.h.in => include/xine.h
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 8330b6d43..37ba30a0e 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -118,15 +118,15 @@ xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(XDG_BASEDIR_LIBS) xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_inp_v4l_la_SOURCES = input_v4l.c -xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) $(LTLIBINTL) +xineplug_inp_v4l_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(LTLIBINTL) xineplug_inp_v4l_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS) xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c -xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) +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) xineplug_inp_smb_la_SOURCES = input_smb.c -xineplug_inp_smb_la_LIBADD = $(LIBSMBCLIENT_LIBS) $(XINE_LIB) $(LTLIBINTL) +xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL) xineplug_inp_pvr_la_SOURCES = input_pvr.c xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) |