diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
| commit | 2839776b4fe1c282f3f2938d52408a51ca6def96 (patch) | |
| tree | c3fb4489f4b8f5c8c650f772e864984d8c32e50c /src/input | |
| parent | a800128f70a60ab7544d4ed4d3bf101c3d1839d2 (diff) | |
| parent | 6ca146bc0ffc2825402a8fb39b156394a614c1f0 (diff) | |
| download | xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.gz xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.bz2 | |
Merge changes from main repository.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Makefile.am | 4 | ||||
| -rw-r--r-- | src/input/vcd/Makefile.am | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 68adf84be..a2a1ea3a4 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -8,8 +8,6 @@ else SUBDIRS = vcd dvb libreal librtsp libdvdnav endif -libdir = $(XINE_PLUGINDIR) - ## # IMPORTANT: # --------- @@ -52,7 +50,7 @@ endif AM_CFLAGS = -D_LARGEFILE64_SOURCE $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS) -lib_LTLIBRARIES = \ +xineplug_LTLIBRARIES = \ xineplug_inp_file.la \ xineplug_inp_http.la \ $(in_dvd) \ diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 98903aac8..16eece779 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -2,14 +2,12 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = libcdio libvcd -libdir = $(XINE_PLUGINDIR) - vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c EXTRA_DIST = $(vcd_SRCS) if ENABLE_VCD -lib_LTLIBRARIES = xineplug_inp_vcd.la +xineplug_LTLIBRARIES = xineplug_inp_vcd.la AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) |