diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 5 | ||||
| -rw-r--r-- | src/input/input_smb.c | 4 | ||||
| -rw-r--r-- | src/libxinevdec/Makefile.am | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 3f4593999..5ed32fee5 100644 --- a/configure.ac +++ b/configure.ac @@ -1764,6 +1764,7 @@ int has_timeout=sizeof(test.timeout);], fi fi +AC_DEFINE([LIBCDIO_CONFIG_H], 1, [This defined to get of rid system libcdio build configuration]) AC_SUBST(LIBCDIO_CFLAGS) AC_SUBST(LIBCDIO_LIBS) AC_SUBST(LIBISO9660_LIBS) diff --git a/lib/Makefile.am b/lib/Makefile.am index 37559c298..d2295c9db 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,12 +4,11 @@ if GENERATED_INTTYPES_H inttypes_h = inttypes.h endif -EXTRA_DIST = Makefile.common -CONFIG_CLEAN_FILES = $(inttypes_h) +EXTRA_DIST = Makefile.common $(inttypes_h) noinst_LTLIBRARIES = libxineposix.la noinst_HEADERS = os_internal.h -include_HEADERS = os_types.h $(inttypes_h) +include_HEADERS = os_types.h libxineposix_la_SOURCES = libxineposix_la_LIBADD = @LTLIBOBJS@ diff --git a/src/input/input_smb.c b/src/input/input_smb.c index 42bd7faf4..e41e7ddb9 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_smb.c,v 1.9 2006/03/18 09:25:02 tmattern Exp $ + * $Id: input_smb.c,v 1.10 2006/05/01 21:35:30 valtri Exp $ */ @@ -240,6 +240,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen, smb_input_class_t *this = (smb_input_class_t *) this_gen; int (*func) () = _sortfiles_default; unsigned int dir; + int i; struct smbc_dirent *pdirent; char current_path [XINE_PATH_MAX + 1]; char current_path_smb [XINE_PATH_MAX + 1]; @@ -351,7 +352,6 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen, /* * Add directories entries */ - int i; for(i = 0; i < num_dir_files; i++) { if (num_files >= this->mrls_allocated_entries) { ++this->mrls_allocated_entries; diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index 084b2be93..0e6a16609 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -39,5 +39,5 @@ xineplug_decode_image_la_LDFLAGS = $(WAND_LDFLAGS) -avoid-version -module @XINE_ xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c xineplug_decode_gdk_pixbuf_la_CFLAGS = $(GDK_PIXBUF_CFLAGS) xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS) -xineplug_decode_gdk_pixbuf_la_LDFLAGS = $(GDK_PIXBUF_LDFLAGS) -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ +xineplug_decode_gdk_pixbuf_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ |