diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/Makefile.am | 10 | ||||
| -rw-r--r-- | src/xine-engine/input_rip.c | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 76317fd10..61f4163c4 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/misc/Makefile.common +include $(top_srcdir)/lib/Makefile.common AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) @@ -9,7 +10,6 @@ XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la -TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la DEF_FILE = libxine-$(XINE_MAJOR).def if !HAVE_ZLIB zlib_dep = $(INTERNAL_ZLIB_LIB) @@ -17,7 +17,6 @@ endif if WIN32 dirent_lib = $(DIRENT_LIB) pthread_dep = $(INTERNAL_PTHREAD_LIB) -timer_lib = $(TIMER_LIB) def_ldflags="-Wl,--output-def,$(DEF_FILE)" endif @@ -32,10 +31,10 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ EXTRA_DIST = lrb.c lrb.h libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_dep) \ - $(dirent_lib) $(pthread_dep) $(timer_lib) + $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ - $(dirent_lib) $(timer_lib) + $(dirent_lib) $(LIBXINEPOSIX) libxine_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags) @@ -71,6 +70,3 @@ $(INTERNAL_ZLIB_LIB): $(DIRENT_LIB): $(MAKE) -C $(top_builddir)/win32/contrib libdirent.la - -$(TIMER_LIB): - $(MAKE) -C $(top_builddir)/win32/contrib libtimer.la diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c index 495658d11..d09b64c3d 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.c @@ -29,7 +29,7 @@ * - it's possible speeder saving streams in the xine without playing: * xine stream_mrl#save:file.raw\;noaudio\;novideo * - * $Id: input_rip.c,v 1.23 2004/09/17 19:21:46 valtri Exp $ + * $Id: input_rip.c,v 1.24 2004/09/20 19:30:05 valtri Exp $ */ /* TODO: @@ -44,6 +44,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#ifdef HAVE_LIBGEN_H +#include <libgen.h> +#endif #include <stdio.h> #include <string.h> @@ -569,7 +572,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *f this->savepos = 0; fnc = strdup(filename); - target_basename = xine_basename(fnc); + target_basename = basename(fnc); dir_file_concat(target, MAX_TARGET_LEN, stream->xine->save_path, target_basename); strcpy(target_no, target); |