diff -urN player-2.1.1/aclocal.m4 player-2.1.1.norpath_am/aclocal.m4
--- player-2.1.1/aclocal.m4 2008-06-16 01:39:27.000000000 +0200
+++ player-2.1.1.norpath_am/aclocal.m4 2008-09-01 00:18:39.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,17 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -109,6 +106,7 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
+
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -210,8 +208,6 @@
;;
esac
-_LT_REQUIRED_DARWIN_CHECKS
-
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -291,80 +287,9 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
])# _LT_LINKER_BOILERPLATE
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
- [lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- echo "int foo(void){return 1;}" > conftest.c
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib ${wl}-single_module conftest.c
- if test -f libconftest.dylib; then
- lt_cv_apple_cc_single_mod=yes
- rm -rf libconftest.dylib*
- fi
- rm conftest.c
- fi])
- AC_CACHE_CHECK([for -exported_symbols_list linker flag],
- [lt_cv_ld_exported_symbols_list],
- [lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [lt_cv_ld_exported_symbols_list=yes],
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
- ])
- case $host_os in
- rhapsody* | darwin1.[[0123]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*)
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
- fi
- if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil="~$DSYMUTIL \$lib || :"
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -645,6 +570,7 @@
esac
;;
*64-bit*)
+ libsuff=64
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -689,11 +615,7 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *)
- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- LD="${LD-ld} -64"
- fi
- ;;
+ *) LD="${LD-ld} -64" ;;
esac
;;
esac
@@ -786,7 +708,7 @@
$2=yes
fi
fi
- $rm -r conftest*
+ $rm conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -1057,7 +979,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -1065,7 +987,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
])
])
])
@@ -1382,7 +1304,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix[[4-9]]*)
+aix4* | aix5*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1707,11 +1629,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1723,18 +1647,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -1915,13 +1827,6 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2421,7 +2326,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix[[4-9]]*)
+aix4* | aix5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2516,7 +2421,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -2857,7 +2762,7 @@
fi
;;
-aix[[4-9]]*)
+aix4* | aix5*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -2914,7 +2819,6 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -3024,7 +2928,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aix[[4-9]]*)
+ aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -3037,7 +2941,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -3183,23 +3087,51 @@
fi
;;
darwin* | rhapsody*)
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
+ esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
- if test "$GXX" = yes ; then
+
+ if test "$GXX" = yes ; then
+ lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+ lt_int_apple_cc_single_mod=yes
fi
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -3450,7 +3382,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC* | pgcpp*)
+ pgCC*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3523,7 +3455,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -3885,8 +3817,7 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@ -4011,11 +3942,6 @@
$rm -f confest.$objext
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -4072,6 +3998,7 @@
;;
esac
])
+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -4156,7 +4083,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix[[4-9]]*)
+aix4* | aix5*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -4333,7 +4260,6 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
- _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4396,7 +4322,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -4633,10 +4559,6 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4986,7 +4908,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
- rm -rf conftest* conftst*
+ rm -f conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -5043,8 +4965,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -5081,7 +5002,7 @@
esac
else
case $host_os in
- aix[[4-9]]*)
+ aix4* | aix5*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -5177,7 +5098,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- pgCC* | pgcpp*)
+ pgCC*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5215,7 +5136,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5328,8 +5249,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -5399,8 +5319,7 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
hpux9* | hpux10* | hpux11*)
@@ -5537,7 +5456,7 @@
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
@@ -5561,7 +5480,7 @@
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5577,7 +5496,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix[[4-9]]*)
+ aix4* | aix5*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5592,14 +5511,10 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5630,14 +5545,12 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
@@ -5687,7 +5600,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix[[3-9]]*)
+ aix3* | aix4* | aix5*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5803,13 +5716,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5907,7 +5819,7 @@
fi
;;
- aix[[4-9]]*)
+ aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -5927,7 +5839,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -6087,10 +5999,11 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -6240,7 +6153,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6829,7 +6742,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -6844,7 +6757,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -6860,10 +6773,8 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7135,7 +7046,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -7183,13 +7094,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 13
+# serial 12
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -7294,17 +7205,16 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
-_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -7593,7 +7503,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urN player-2.1.1/client_libs/libplayerc/bindings/Makefile.in player-2.1.1.norpath_am/client_libs/libplayerc/bindings/Makefile.in
--- player-2.1.1/client_libs/libplayerc/bindings/Makefile.in 2008-06-16 01:39:45.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc/bindings/Makefile.in 2008-09-01 00:18:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/client_libs/libplayerc/bindings/python/Makefile.in player-2.1.1.norpath_am/client_libs/libplayerc/bindings/python/Makefile.in
--- player-2.1.1/client_libs/libplayerc/bindings/python/Makefile.in 2008-06-16 01:39:45.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc/bindings/python/Makefile.in 2008-09-01 00:18:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -120,7 +120,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -249,7 +248,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
diff -urN player-2.1.1/client_libs/libplayerc/doc/Makefile.in player-2.1.1.norpath_am/client_libs/libplayerc/doc/Makefile.in
--- player-2.1.1/client_libs/libplayerc/doc/Makefile.in 2008-06-16 01:39:45.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc/doc/Makefile.in 2008-09-01 00:18:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -113,7 +113,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -242,7 +241,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
diff -urN player-2.1.1/client_libs/libplayerc/Makefile.in player-2.1.1.norpath_am/client_libs/libplayerc/Makefile.in
--- player-2.1.1/client_libs/libplayerc/Makefile.in 2008-06-16 01:39:45.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc/Makefile.in 2008-09-01 00:18:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -80,7 +80,7 @@
libplayerc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libplayerc_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -176,7 +176,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -305,7 +304,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -620,8 +618,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -629,8 +627,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -831,8 +829,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -857,8 +855,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -868,12 +866,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) playercconfig.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) playercconfig.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/client_libs/libplayerc/test/Makefile.in player-2.1.1.norpath_am/client_libs/libplayerc/test/Makefile.in
--- player-2.1.1/client_libs/libplayerc/test/Makefile.in 2008-06-16 01:39:46.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc/test/Makefile.in 2008-09-01 00:18:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -61,7 +61,7 @@
test_speech.$(OBJEXT)
test_OBJECTS = $(am_test_OBJECTS)
test_DEPENDENCIES =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -593,8 +591,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -606,8 +604,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -617,12 +615,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/client_libs/libplayerc++/Makefile.in player-2.1.1.norpath_am/client_libs/libplayerc++/Makefile.in
--- player-2.1.1/client_libs/libplayerc++/Makefile.in 2008-06-16 01:39:44.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc++/Makefile.in 2008-09-01 00:18:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -79,7 +79,7 @@
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libplayerc___la_LDFLAGS) $(LDFLAGS) -o $@
@INCLUDE_PLAYERCC_TRUE@am_libplayerc___la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -184,7 +184,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -313,7 +312,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -637,8 +635,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -646,8 +644,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -846,8 +844,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -872,8 +870,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -883,12 +881,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) playerc++config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) playerc++config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/client_libs/libplayerc++/test/Makefile.am player-2.1.1.norpath_am/client_libs/libplayerc++/test/Makefile.am
--- player-2.1.1/client_libs/libplayerc++/test/Makefile.am 2008-04-13 00:16:39.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc++/test/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -14,7 +14,7 @@
-L${top_builddir}/client_libs/libplayerc \
-L${top_builddir}/client_libs/libplayerc++
-test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr
+test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr $(top_builddir)/libplayercore/libplayerutils.la
noinst_PROGRAMS =
diff -urN player-2.1.1/client_libs/libplayerc++/test/Makefile.in player-2.1.1.norpath_am/client_libs/libplayerc++/test/Makefile.in
--- player-2.1.1/client_libs/libplayerc++/test/Makefile.in 2008-06-16 01:39:44.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc++/test/Makefile.in 2008-09-01 00:18:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -60,7 +60,7 @@
test_aio.$(OBJEXT) test_speech.$(OBJEXT) test_ranger.$(OBJEXT)
test_OBJECTS = $(am_test_OBJECTS)
am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -151,7 +151,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -280,7 +279,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -480,7 +478,7 @@
-L${top_builddir}/client_libs/libplayerc \
-L${top_builddir}/client_libs/libplayerc++
-test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr
+test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr $(top_builddir)/libplayercore/libplayerutils.la
test_SOURCES = test.cc \
test.h \
test_camera.cc \
@@ -602,8 +600,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -615,8 +613,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -626,12 +624,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/client_libs/Makefile.in player-2.1.1.norpath_am/client_libs/Makefile.in
--- player-2.1.1/client_libs/Makefile.in 2008-06-16 01:39:44.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/Makefile.in 2008-09-01 00:18:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/config/Makefile.in player-2.1.1.norpath_am/config/Makefile.in
--- player-2.1.1/config/Makefile.in 2008-06-16 01:39:46.000000000 +0200
+++ player-2.1.1.norpath_am/config/Makefile.in 2008-09-01 00:18:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -123,7 +123,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -252,7 +251,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
diff -urN player-2.1.1/configure player-2.1.1.norpath_am/configure
--- player-2.1.1/configure 2008-06-16 01:39:41.000000000 +0200
+++ player-2.1.1.norpath_am/configure 2008-09-01 00:18:46.000000000 +0200
@@ -876,8 +876,6 @@
ECHO
AR
RANLIB
-DSYMUTIL
-NMEDIT
DLLTOOL
AS
OBJDUMP
@@ -6320,7 +6318,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix[4-9]*)
+aix4* | aix5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -6415,7 +6413,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -6504,7 +6502,6 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
enableval=$enable_libtool_lock;
@@ -6536,7 +6533,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6539 "configure"' > conftest.$ac_ext
+ echo '#line 6536 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6601,6 +6598,7 @@
esac
;;
*64-bit*)
+ libsuff=64
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -6708,11 +6706,7 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *)
- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- LD="${LD-ld} -64"
- fi
- ;;
+ *) LD="${LD-ld} -64" ;;
esac
;;
esac
@@ -7389,6 +7383,7 @@
fi
+
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -7652,6 +7647,7 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
@@ -7966,7 +7962,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -rf conftest* conftst*
+ rm -f conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -8526,318 +8522,6 @@
;;
esac
-
- case $host_os in
- rhapsody* | darwin*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$DSYMUTIL"; then
- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
- ac_ct_DSYMUTIL=$DSYMUTIL
- # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_DSYMUTIL"; then
- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_DSYMUTIL" = x; then
- DSYMUTIL=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- DSYMUTIL=$ac_ct_DSYMUTIL
- fi
-else
- DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$NMEDIT"; then
- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
- { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
- ac_ct_NMEDIT=$NMEDIT
- # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_NMEDIT"; then
- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_NMEDIT="nmedit"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_NMEDIT" = x; then
- NMEDIT=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- NMEDIT=$ac_ct_NMEDIT
- fi
-else
- NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-
- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- echo "int foo(void){return 1;}" > conftest.c
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib ${wl}-single_module conftest.c
- if test -f libconftest.dylib; then
- lt_cv_apple_cc_single_mod=yes
- rm -rf libconftest.dylib*
- fi
- rm conftest.c
- fi
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- lt_cv_ld_exported_symbols_list=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[0123])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*)
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
- fi
- if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil="~$DSYMUTIL \$lib || :"
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-
-
enable_dlopen=yes
enable_win32_dll=yes
@@ -8903,7 +8587,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
@@ -8931,11 +8615,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8934: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8618: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8938: \$? = $ac_status" >&5
+ echo "$as_me:8622: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9205,10 +8889,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_pic_works=no
+ lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -9221,27 +8905,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9224: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8908: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9228: \$? = $ac_status" >&5
+ echo "$as_me:8912: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_pic_works=yes
+ lt_prog_compiler_pic_works=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -9268,10 +8952,10 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_static_works=no
+ lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -9284,20 +8968,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_static_works=yes
+ lt_prog_compiler_static_works=yes
fi
else
- lt_cv_prog_compiler_static_works=yes
+ lt_prog_compiler_static_works=yes
fi
fi
- $rm -r conftest*
+ $rm conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test x"$lt_prog_compiler_static_works" = xyes; then
:
else
lt_prog_compiler_static=
@@ -9325,11 +9009,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9328: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9012: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9332: \$? = $ac_status" >&5
+ echo "$as_me:9016: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9409,13 +9093,12 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -9474,7 +9157,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix[3-9]*)
+ aix3* | aix4* | aix5*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@@ -9590,13 +9273,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs=no
else
ld_shlibs=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -9694,7 +9376,7 @@
fi
;;
- aix[4-9]*)
+ aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -9714,7 +9396,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -9986,10 +9668,11 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -10139,7 +9822,7 @@
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -10509,7 +10192,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix[4-9]*)
+aix4* | aix5*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -10834,11 +10517,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10850,18 +10535,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11043,21 +10716,6 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -11377,7 +11035,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -11653,7 +11311,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
@@ -11702,7 +11360,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11705 "configure"
+#line 11363 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11802,7 +11460,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11805 "configure"
+#line 11463 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11929,7 +11587,7 @@
fi
;;
-aix[4-9]*)
+aix4* | aix5*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -11985,7 +11643,6 @@
predeps \
postdeps \
compiler_lib_search_path \
- compiler_lib_search_dirs \
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
@@ -12046,7 +11703,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -12282,10 +11939,6 @@
# shared library.
postdeps=$lt_postdeps
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -12534,7 +12187,6 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
-compiler_lib_search_dirs_CXX=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -12572,7 +12224,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
# Allow CC to be a program name with arguments.
@@ -12779,7 +12431,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aix[4-9]*)
+ aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -12792,7 +12444,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -13050,23 +12702,51 @@
fi
;;
darwin* | rhapsody*)
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[012])
+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
+ esac
archive_cmds_need_lc_CXX=no
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
whole_archive_flag_spec_CXX=''
link_all_deplibs_CXX=yes
- allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
- if test "$GXX" = yes ; then
+
+ if test "$GXX" = yes ; then
+ lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+ lt_int_apple_cc_single_mod=yes
fi
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -13317,7 +12997,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC* | pgcpp*)
+ pgCC*)
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -13390,7 +13070,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -13724,6 +13404,7 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
+
cat > conftest.$ac_ext <<EOF
class Foo
{
@@ -13825,11 +13506,6 @@
$rm -f confest.$objext
-compiler_lib_search_dirs_CXX=
-if test -n "$compiler_lib_search_path_CXX"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
@@ -13885,6 +13561,7 @@
;;
esac
+
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
@@ -13960,7 +13637,7 @@
esac
else
case $host_os in
- aix[4-9]*)
+ aix4* | aix5*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -14056,7 +13733,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
- pgCC* | pgcpp*)
+ pgCC*)
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
@@ -14094,7 +13771,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -14187,10 +13864,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_pic_works_CXX=no
+ lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -14203,27 +13880,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14206: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13883: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14210: \$? = $ac_status" >&5
+ echo "$as_me:13887: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_pic_works_CXX=yes
+ lt_prog_compiler_pic_works_CXX=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -14250,10 +13927,10 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_static_works_CXX=no
+ lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -14266,20 +13943,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_static_works_CXX=yes
+ lt_prog_compiler_static_works_CXX=yes
fi
else
- lt_cv_prog_compiler_static_works_CXX=yes
+ lt_prog_compiler_static_works_CXX=yes
fi
fi
- $rm -r conftest*
+ $rm conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
:
else
lt_prog_compiler_static_CXX=
@@ -14307,11 +13984,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14310: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13987: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14314: \$? = $ac_status" >&5
+ echo "$as_me:13991: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14364,7 +14041,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix[4-9]*)
+ aix4* | aix5*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -14379,14 +14056,10 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
- ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
@@ -14488,7 +14161,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix[4-9]*)
+aix4* | aix5*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -14812,11 +14485,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -14828,18 +14503,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -15021,21 +14684,6 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -15119,7 +14767,6 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
- compiler_lib_search_dirs_CXX \
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
@@ -15368,10 +15015,6 @@
# shared library.
postdeps=$lt_postdeps_CXX
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -15586,7 +15229,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
# Allow CC to be a program name with arguments.
@@ -15624,7 +15267,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix[4-9]*)
+aix4* | aix5*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -15889,10 +15532,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_pic_works_F77=no
+ lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
@@ -15905,27 +15548,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15908: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15551: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15912: \$? = $ac_status" >&5
+ echo "$as_me:15555: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_pic_works_F77=yes
+ lt_prog_compiler_pic_works_F77=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -15952,10 +15595,10 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_static_works_F77=no
+ lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -15968,20 +15611,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_static_works_F77=yes
+ lt_prog_compiler_static_works_F77=yes
fi
else
- lt_cv_prog_compiler_static_works_F77=yes
+ lt_prog_compiler_static_works_F77=yes
fi
fi
- $rm -r conftest*
+ $rm conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
:
else
lt_prog_compiler_static_F77=
@@ -16009,11 +15652,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16012: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15655: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16016: \$? = $ac_status" >&5
+ echo "$as_me:15659: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16093,13 +15736,12 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -16158,7 +15800,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix[3-9]*)
+ aix3* | aix4* | aix5*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
@@ -16274,13 +15916,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_F77=no
else
ld_shlibs_F77=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -16378,7 +16019,7 @@
fi
;;
- aix[4-9]*)
+ aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -16398,7 +16039,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -16650,10 +16291,11 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -16803,7 +16445,7 @@
link_all_deplibs_F77=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -17122,7 +16764,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix[4-9]*)
+aix4* | aix5*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -17446,11 +17088,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17462,18 +17106,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -17655,21 +17287,6 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -17753,7 +17370,6 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
- compiler_lib_search_dirs_F77 \
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
@@ -18002,10 +17618,6 @@
# shared library.
postdeps=$lt_postdeps_F77
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
-
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -18180,7 +17792,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
# Allow CC to be a program name with arguments.
@@ -18229,11 +17841,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18232: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17844: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18236: \$? = $ac_status" >&5
+ echo "$as_me:17848: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18293,7 +17905,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
-
+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -18363,7 +17975,7 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
-
+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
hpux9* | hpux10* | hpux11*)
@@ -18503,10 +18115,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_pic_works_GCJ=no
+ lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
@@ -18519,27 +18131,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18522: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18134: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18526: \$? = $ac_status" >&5
+ echo "$as_me:18138: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_pic_works_GCJ=yes
+ lt_prog_compiler_pic_works_GCJ=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -18566,10 +18178,10 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_static_works_GCJ=no
+ lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -18582,20 +18194,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_static_works_GCJ=yes
+ lt_prog_compiler_static_works_GCJ=yes
fi
else
- lt_cv_prog_compiler_static_works_GCJ=yes
+ lt_prog_compiler_static_works_GCJ=yes
fi
fi
- $rm -r conftest*
+ $rm conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
:
else
lt_prog_compiler_static_GCJ=
@@ -18623,11 +18235,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18626: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18238: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18630: \$? = $ac_status" >&5
+ echo "$as_me:18242: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18707,13 +18319,12 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -18772,7 +18383,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix[3-9]*)
+ aix3* | aix4* | aix5*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
@@ -18888,13 +18499,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_GCJ=no
else
ld_shlibs_GCJ=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -18992,7 +18602,7 @@
fi
;;
- aix[4-9]*)
+ aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -19012,7 +18622,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -19284,10 +18894,11 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
@@ -19437,7 +19048,7 @@
link_all_deplibs_GCJ=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -19756,7 +19367,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix[4-9]*)
+aix4* | aix5*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -20080,11 +19691,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -20096,18 +19709,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -20289,21 +19890,6 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -20387,7 +19973,6 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
- compiler_lib_search_dirs_GCJ \
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
@@ -20636,10 +20221,6 @@
# shared library.
postdeps=$lt_postdeps_GCJ
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
-
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -20813,7 +20394,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
# Allow CC to be a program name with arguments.
@@ -20873,7 +20454,6 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
- compiler_lib_search_dirs_RC \
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
@@ -21122,10 +20702,6 @@
# shared library.
postdeps=$lt_postdeps_RC
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
-
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -59204,8 +58780,6 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
DLLTOOL!$DLLTOOL$ac_delim
AS!$AS$ac_delim
OBJDUMP!$OBJDUMP$ac_delim
@@ -59289,6 +58863,8 @@
CAMERAUVC_EXTRA_CPPFLAGS!$CAMERAUVC_EXTRA_CPPFLAGS$ac_delim
CAMERAV4L_LIB!$CAMERAV4L_LIB$ac_delim
INCLUDE_CAMERAV4L_TRUE!$INCLUDE_CAMERAV4L_TRUE$ac_delim
+INCLUDE_CAMERAV4L_FALSE!$INCLUDE_CAMERAV4L_FALSE$ac_delim
+CAMERAV4L_EXTRA_CPPFLAGS!$CAMERAV4L_EXTRA_CPPFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -59330,8 +58906,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-INCLUDE_CAMERAV4L_FALSE!$INCLUDE_CAMERAV4L_FALSE$ac_delim
-CAMERAV4L_EXTRA_CPPFLAGS!$CAMERAV4L_EXTRA_CPPFLAGS$ac_delim
CANONVCC4_LIB!$CANONVCC4_LIB$ac_delim
INCLUDE_CANONVCC4_TRUE!$INCLUDE_CANONVCC4_TRUE$ac_delim
INCLUDE_CANONVCC4_FALSE!$INCLUDE_CANONVCC4_FALSE$ac_delim
@@ -59427,6 +59001,8 @@
INCLUDE_LASERBAR_FALSE!$INCLUDE_LASERBAR_FALSE$ac_delim
LASERBAR_EXTRA_CPPFLAGS!$LASERBAR_EXTRA_CPPFLAGS$ac_delim
LASERBARCODE_LIB!$LASERBARCODE_LIB$ac_delim
+INCLUDE_LASERBARCODE_TRUE!$INCLUDE_LASERBARCODE_TRUE$ac_delim
+INCLUDE_LASERBARCODE_FALSE!$INCLUDE_LASERBARCODE_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -59468,8 +59044,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-INCLUDE_LASERBARCODE_TRUE!$INCLUDE_LASERBARCODE_TRUE$ac_delim
-INCLUDE_LASERBARCODE_FALSE!$INCLUDE_LASERBARCODE_FALSE$ac_delim
LASERBARCODE_EXTRA_CPPFLAGS!$LASERBARCODE_EXTRA_CPPFLAGS$ac_delim
LASERCSPACE_LIB!$LASERCSPACE_LIB$ac_delim
INCLUDE_LASERCSPACE_TRUE!$INCLUDE_LASERCSPACE_TRUE$ac_delim
@@ -59565,6 +59139,8 @@
MRICP_EXTRA_CPPFLAGS!$MRICP_EXTRA_CPPFLAGS$ac_delim
ND_LIB!$ND_LIB$ac_delim
INCLUDE_ND_TRUE!$INCLUDE_ND_TRUE$ac_delim
+INCLUDE_ND_FALSE!$INCLUDE_ND_FALSE$ac_delim
+ND_EXTRA_CPPFLAGS!$ND_EXTRA_CPPFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -59606,8 +59182,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-INCLUDE_ND_FALSE!$INCLUDE_ND_FALSE$ac_delim
-ND_EXTRA_CPPFLAGS!$ND_EXTRA_CPPFLAGS$ac_delim
NIMU_LIB!$NIMU_LIB$ac_delim
INCLUDE_NIMU_TRUE!$INCLUDE_NIMU_TRUE$ac_delim
INCLUDE_NIMU_FALSE!$INCLUDE_NIMU_FALSE$ac_delim
@@ -59703,6 +59277,8 @@
SICKLMS200_LIB!$SICKLMS200_LIB$ac_delim
INCLUDE_SICKLMS200_TRUE!$INCLUDE_SICKLMS200_TRUE$ac_delim
INCLUDE_SICKLMS200_FALSE!$INCLUDE_SICKLMS200_FALSE$ac_delim
+SICKLMS200_EXTRA_CPPFLAGS!$SICKLMS200_EXTRA_CPPFLAGS$ac_delim
+SICKLMS400_LIB!$SICKLMS400_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -59744,8 +59320,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-SICKLMS200_EXTRA_CPPFLAGS!$SICKLMS200_EXTRA_CPPFLAGS$ac_delim
-SICKLMS400_LIB!$SICKLMS400_LIB$ac_delim
INCLUDE_SICKLMS400_TRUE!$INCLUDE_SICKLMS400_TRUE$ac_delim
INCLUDE_SICKLMS400_FALSE!$INCLUDE_SICKLMS400_FALSE$ac_delim
SICKLMS400_EXTRA_CPPFLAGS!$SICKLMS400_EXTRA_CPPFLAGS$ac_delim
@@ -59841,6 +59415,8 @@
INCLUDE_XSENSMT_TRUE!$INCLUDE_XSENSMT_TRUE$ac_delim
INCLUDE_XSENSMT_FALSE!$INCLUDE_XSENSMT_FALSE$ac_delim
XSENSMT_EXTRA_CPPFLAGS!$XSENSMT_EXTRA_CPPFLAGS$ac_delim
+YARPIMAGE_LIB!$YARPIMAGE_LIB$ac_delim
+INCLUDE_YARPIMAGE_TRUE!$INCLUDE_YARPIMAGE_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -59882,8 +59458,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-YARPIMAGE_LIB!$YARPIMAGE_LIB$ac_delim
-INCLUDE_YARPIMAGE_TRUE!$INCLUDE_YARPIMAGE_TRUE$ac_delim
INCLUDE_YARPIMAGE_FALSE!$INCLUDE_YARPIMAGE_FALSE$ac_delim
YARPIMAGE_EXTRA_CPPFLAGS!$YARPIMAGE_EXTRA_CPPFLAGS$ac_delim
BOOST_SIGNALS_LIB!$BOOST_SIGNALS_LIB$ac_delim
@@ -59949,7 +59523,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -60350,22 +59924,21 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $ac_file | $ac_file:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -60402,7 +59975,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff -urN player-2.1.1/configure.ac player-2.1.1.norpath_am/configure.ac
--- player-2.1.1/configure.ac 2008-06-16 01:38:40.000000000 +0200
+++ player-2.1.1.norpath_am/configure.ac 2008-09-01 00:18:28.000000000 +0200
@@ -2,7 +2,7 @@
dnl Initialize autoconf with name and version of package to be built.
dnl PACKAGE and VERSION will be so defined in <config.h>.
-AC_INIT(player,2.1.1)
+AC_INIT([player],[2.1.1])
dnl Player version information. In an ideal world, we would just declare
dnl the following 3 values, then reuse them throughout. Unfortunately,
@@ -21,10 +21,10 @@
AC_CONFIG_SRCDIR(server/server.cc)
-AC_PREREQ(2.53)
+AC_PREREQ(2.61)
dnl figure out build system (uname-style info)
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
m4_pattern_allow(_PKG_ERRORS)
@@ -404,12 +404,8 @@
dnl Note that we can't simply use AC_CHECK_TYPE because socklen_t
dnl isn't in the standard headers (autoconf-2.5 has better methods for this)
AC_MSG_CHECKING(if socklen_t is defined)
-AC_TRY_COMPILE(
- [#include <sys/types.h>
- #include <sys/socket.h>],
- [socklen_t len = 42; return len;],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+ #include <sys/socket.h>]], [[socklen_t len = 42; return len;]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
AC_DEFINE(socklen_t, int, must define this on BSD-based platforms)])
dnl Test for O_SYNC and define it to 0 if it's not there (it gets ORed with
@@ -417,13 +413,9 @@
dnl Note that we can't simply use AC_CHECK_TYPE because O_SYNC
dnl isn't in the standard headers (autoconf-2.5 has better methods for this)
AC_MSG_CHECKING(if O_SYNC is defined)
-AC_TRY_COMPILE(
- [#include <sys/types.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <sys/stat.h>
- #include <fcntl.h>],
- [int fd = open("foo",O_SYNC); return fd;],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)
+ #include <fcntl.h>]], [[int fd = open("foo",O_SYNC); return fd;]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
AC_DEFINE(O_SYNC, 0, must define this on some non-Linux platforms)])
dnl Checks for library functions.
@@ -532,7 +524,7 @@
AM_CONDITIONAL(INCLUDE_LIBPLAYERC_PY, test "x$enable_libplayerc_py" = "xyes")
dnl Create the following Makefiles (from the Makefile.ams)
-AC_OUTPUT(Makefile
+AC_CONFIG_FILES([Makefile
rtk2/Makefile
replace/Makefile
doc/Makefile
@@ -669,7 +661,8 @@
utils/xmms-plugin/Makefile
utils/logsplitter/Makefile
utils/playerprop/Makefile
- config/Makefile)
+ config/Makefile])
+AC_OUTPUT
dnl should use AC_MSG_NOTICE(), but that's apparently not defined in
dnl autoconf 2.13.
diff -urN player-2.1.1/configure.ac~ player-2.1.1.norpath_am/configure.ac~
--- player-2.1.1/configure.ac~ 1970-01-01 01:00:00.000000000 +0100
+++ player-2.1.1.norpath_am/configure.ac~ 2008-06-16 01:38:40.000000000 +0200
@@ -0,0 +1,763 @@
+dnl Process this file with autoconf to produce a configure script.
+
+dnl Initialize autoconf with name and version of package to be built.
+dnl PACKAGE and VERSION will be so defined in <config.h>.
+AC_INIT(player,2.1.1)
+
+dnl Player version information. In an ideal world, we would just declare
+dnl the following 3 values, then reuse them throughout. Unfortunately,
+dnl the substitution gets ugly if we use these in AC_INIT or
+dnl PLAYER_VERSION_INFO. So, just be damned sure that they all agree!
+PLAYER_MAJOR_VERSION="2"
+PLAYER_MINOR_VERSION="1"
+PLAYER_MICRO_VERSION="1"
+AC_SUBST(PLAYER_MAJOR_VERSION)
+AC_SUBST(PLAYER_MINOR_VERSION)
+AC_SUBST(PLAYER_MICRO_VERSION)
+
+dnl this is used by libtool to assign version numbers
+PLAYER_VERSION_INFO="-version-number 2:1:1"
+AC_SUBST(PLAYER_VERSION_INFO)
+
+AC_CONFIG_SRCDIR(server/server.cc)
+
+AC_PREREQ(2.53)
+
+dnl figure out build system (uname-style info)
+AC_CANONICAL_SYSTEM
+
+m4_pattern_allow(_PKG_ERRORS)
+
+dnl Some parts of the build need to know that we're running on Darwin.
+darwin=no
+case $host in
+ *-darwin*)
+ darwin=yes ;;
+esac
+AM_CONDITIONAL(DARWIN, test "x$darwin" = "xyes")
+
+dnl Initialize automake, specifying that the newer "pax" format should be
+dnl used for making tarballs (it doesn't have the 99-character pathname
+dnl limit present in older archive formats)
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2])
+
+dnl Need AC_PROG_MAKE_SET for recursive building
+AC_PROG_MAKE_SET
+
+dnl Generate a configuration header called <config.h> and put all the C
+dnl preprocessor defines in there.
+dnl
+dnl Also create playerconfig.h, replacing a couple of C defines with the right
+dnl values. This will be included by player.h
+dnl
+AC_CONFIG_HEADERS(config.h libplayercore/playerconfig.h client_libs/libplayerc++/playerc++config.h client_libs/libplayerc/playercconfig.h)
+
+dnl Find basic tools
+AC_PROG_CC
+AC_PROG_CXX
+if test ! $GCC = yes -o ! $GXX = yes; then
+ AC_MSG_ERROR([Player *requires* gcc and g++ to build.])
+fi
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_C_BIGENDIAN
+
+AC_LANG(C++)
+
+AC_ENABLE_SHARED
+AC_LIBTOOL_DLOPEN
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+dnl by default, don't build any shared libs
+dnl AC_DISABLE_SHARED
+dnl AM_PROG_LIBTOOL
+
+dnl if the user doesn't supply a prefix, we're headed for /usr/local
+if test "x$prefix" != "xNONE"; then
+ PREFIX=$prefix
+else
+ PREFIX=/usr/local
+fi
+AC_SUBST(PREFIX)
+
+dnl Do we have pkg-config?
+dnl If we're cross-compiling, pretend we don't have pkg-config, because it
+dnl will do the wrong thing (i.e., identify packages on the build systems
+dnl instead of the host system).
+if test "$host" = "$build"; then
+ AC_CHECK_PROG(have_pkg_config,pkg-config,yes,no)
+else
+ have_pkg_config=no
+fi
+if test "x$have_pkg_config" = "xno"; then
+ AC_MSG_WARN([You should really install pkg-config])
+ AC_MSG_WARN([Some components of Player will not be built])
+else
+ dnl Add prefix to the pkg-config path in case RTK or Gazebo was
+ dnl installed there and the user didn't add it manually .
+ dnl
+ dnl Also, add /usr/local/lib/pkgconfig, because on
+ dnl some platforms, pkg-config won't look there by default.
+ export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
+fi
+
+dnl Do we have SWIG (used for language bindings)?
+AC_CHECK_PROG(have_swig,swig,yes,no)
+
+dnl Do we have Python?
+AC_CHECK_PROG(have_python,python,yes,no)
+if test "x$have_python" = "xno"; then
+ AC_MSG_RESULT([Many parts of Player will not be built.])
+ AC_MSG_RESULT([You should really install Python.])
+fi
+AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
+
+dnl Check for python c header
+PYTHON_VERSION=`python -V 2>&1 | grep -o "[[0-9]][\.][[0-9]]"`
+PYTHON_HEADER="python"$PYTHON_VERSION"/Python.h"
+if test ! -f "/usr/include/$PYTHON_HEADER"; then
+ PYTHON_HEADER=python/Python.h
+fi
+
+AC_CHECK_HEADER($PYTHON_HEADER,
+dnl Do we have Python development tools?
+AC_MSG_CHECKING([for the distutils Python package])
+ ac_distutils_result=`python -c "import distutils" 2>&1 | grep ImportError`
+ if test -z "$ac_distutils_result"; then
+ AC_MSG_RESULT([yes])
+ have_pythondev=yes
+ else
+ AC_MSG_RESULT([Python extensions will not be built])
+ have_pythondev=no
+ fi
+, AC_MSG_RESULT([no; Python extensions will not be built])
+ have_pythondev=no)
+AM_CONDITIONAL(HAVE_PYTHONDEV, test "x$have_pythondev" = "xyes")
+
+dnl Where are the JNI headers?
+if test "x$darwin" = "xyes"; then
+ default_jnidir=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/
+ default_jni_mddir=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/
+else
+ default_jnidir=/usr/lib/j2sdk1.5-sun/include
+ default_jni_mddir=/usr/lib/j2sdk1.5-sun/include/linux
+fi
+
+AC_ARG_WITH(jnidir, [ --with-jnidir=<directory containing jni.h],,
+with_jnidir=$default_jnidir)
+AC_ARG_WITH(jni_mddir, [ --with-jni_mddir=<directory containing jni_md.h],,
+with_jni_mddir=$default_jni_mddir)
+
+dnl Look for the JNI headers. I'm using AC_CHECK_FILE, rather than
+dnl AC_CHECK_HEADER, because I can't figure out how to get the latter to
+dnl successfully compile a test program that #include's <jni.h>
+dnl Furthermore, AC_CHECK_FILE doesn't work when cross-compiling, so we'll
+dnl check for that here (is there a better way to see if we're
+dnl cross-compiling?)
+if test "$host" = "$build"; then
+ AC_CHECK_FILE($with_jnidir/jni.h, have_jni_h=yes, have_jni_h=no)
+ AC_CHECK_FILE($with_jni_mddir/jni_md.h, have_jni_md_h=yes, have_jni_md_h=no)
+else
+ have_jni_h=no
+ have_jni_md_h=no
+fi
+
+dnl Do we have a Java compiler?
+AC_CHECK_PROG(have_java,javac,yes,no)
+
+dnl Let the user disable building java wrappers
+AC_ARG_ENABLE(jplayer, [ --disable-jplayer Don't build Jplayer (the Java wrappers)],, enable_jplayer=yes)
+
+dnl Must have Java and JNI headers to compile Jplayer
+if test "x$have_java" = "xno" -o "x$have_jni_h" = "xno" -o "x$have_jni_md_h" = "xno"; then
+ enable_jplayer=no
+fi
+JNI_CFLAGS="-I$with_jnidir -I$with_jni_mddir"
+AC_SUBST(JNI_CFLAGS)
+
+dnl Must have python, swig, javac, jni.h, and jni_md.h to generate code
+dnl for Jplayer
+build_jplayer=$enable_jplayer
+if test "x$have_python" = "xno" -o "x$have_swig" = "xno" -o "x$have_java" = "xno" -o "x$have_jni_h" = "xno" -o "x$have_jni_md_h" = "xno"; then
+ build_jplayer=no
+fi
+AM_CONDITIONAL(BUILD_JPLAYER, test "x$build_jplayer" = "xyes")
+
+dnl A further test, only relevant to developers who have Java but not SWIG
+dnl installed
+if test "$host" = "$build" -a "x$build_jplayer" = "xno" -a "x$enable_jplayer" = "xyes"; then
+ AC_CHECK_FILE(libplayercore/bindings/java/playercore_java_wrap.cc,,
+ enable_jplayer=no)
+fi
+
+AM_CONDITIONAL(ENABLE_JPLAYER, test "x$enable_jplayer" = "xyes")
+
+dnl TCP_NODELAY (low-latency) is not used by default
+AC_ARG_ENABLE(tcpnodelay, [ --disable-tcpnodelay Turn on Nagel's buffering algorithm (may increase socket latency)],, enable_tcpnodelay=yes)
+if test "x$enable_tcpnodelay" = "xyes"; then
+ AC_DEFINE(ENABLE_TCP_NODELAY,1,[enable TCP_NODELAY])
+fi
+
+dnl client tests are compiled by default
+AC_ARG_ENABLE(tests, [ --disable-tests Don't build client tests],,
+enable_tests=yes)
+AM_CONDITIONAL(WITH_TESTS, test "x$enable_tests" = "xyes")
+AC_ARG_ENABLE(profile, [ --enable-profile Compile with profiling information (with the -pg and -fprofile-arcs compile flags)],
+ if test "x$enableval" = "xyes"; then
+ CXXFLAGS="$CXXFLAGS -pg -fprofile-arcs"
+ CFLAGS="$CFLAGS -pg -fprofile-arcs"
+ fi,
+)
+
+AC_ARG_ENABLE(optimize, [ --disable-optimize Compile without optimization (O2) ],
+ if test "x$enableval" = "xyes"; then
+ CXXFLAGS="$CXXFLAGS -O2"
+ CFLAGS="$CFLAGS -O2"
+ elif test "x$enableval" = "xno"; then
+ CXXFLAGS=`echo $CXXFLAGS | sed -e s/-O.//g`
+ CFLAGS=`echo $CFLAGS | sed -e s/-O.//g`
+ else
+ CXXFLAGS="$CXXFLAGS -$enableval"
+ CFLAGS="$CFLAGS -$enableval"
+ fi,
+)
+
+AC_ARG_ENABLE(debug, [ --disable-debug Compile without debugging information (-g)],
+ if test "x$enableval" = "xyes"; then
+ CXXFLAGS="$CXXFLAGS -g"
+ CFLAGS="$CFLAGS -g"
+ elif test "x$enableval" = "xno"; then
+ CXXFLAGS=`echo $CXXFLAGS | sed -e s/-g//g`
+ CFLAGS=`echo $CFLAGS | sed -e s/-g//g`
+ fi,
+)
+
+AC_ARG_ENABLE(debug-level,
+ [ --enable-debug-level[=[type]]
+ none : no debugging code compiled
+ low : some debugging code
+ medium : more debugging code
+ high : verbose logging to console and system log],
+ [ if test "x$enableval" = "xnone" ; then
+ AC_DEFINE(DEBUG_LEVEL, NONE, [no debugging code compiled])
+ elif test "x$enableval" = "xlow" ; then
+ AC_DEFINE(DEBUG_LEVEL, LOW, [some outputs])
+ elif test "x$enableval" = "xmedium" ; then
+ AC_DEFINE(DEBUG_LEVEL, MEDIUM, [more outputs])
+ elif test "x$enableval" = "xhigh" ; then
+ AC_DEFINE(DEBUG_LEVEL, HIGH, [verbose logging to console and system log])
+ else
+ echo
+ echo "Error!"
+ echo "Unknown debug level"
+ exit -1
+ fi
+ ])
+
+dnl use the old compiler
+AC_ARG_WITH(glibc21, [ --with-glibc21 Use the glibc 2.1 compilers],,
+with_glibc21=no)
+if test "x$with_glibc21" = "xyes"; then
+ CXX=i386-glibc21-linux-g++
+ CC=i386-glibc21-linux-gcc
+fi
+
+AC_ARG_ENABLE(alldrivers,
+ [ --disable-alldrivers Don't build any drivers],,
+ enable_alldrivers=yes)
+
+dnl ************************************************************************
+dnl Start of macros from acinclude.m4
+dnl ************************************************************************
+
+dnl Do the standard driver tests
+PLAYER_DRIVERTESTS
+
+dnl ************************************************************************
+dnl End of macros from acinclude.m4
+dnl ************************************************************************
+
+dnl Set up GTK/GNOME for the various GUIs
+dnl we do it before configuring drivers in case they have GUI bits
+dnl The logic is: only use pkg-config
+if test "x$have_pkg_config" = "xno"; then
+ AC_MSG_WARN([Can't locate GTK/GNOME without pkg-config.])
+ AC_MSG_WARN([No GTK/GNOME-based GUIs will be built.])
+ with_gtk=no
+ with_gnomecanvas=no
+ with_gdkpixbuf=no
+else
+ dnl pkg-config is available, so we use it.
+ dnl check for libgnomecanvas and gtk, which some utils
+ dnl (e.g., playernav, playervcr) need
+ PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0,
+ with_gnomecanvas=yes,
+ with_gnomecanvas=no)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0,
+ with_gtk=yes,
+ with_gtk=no)
+ PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0,
+ with_gdkpixbuf=yes,
+ with_gdkpixbuf=no)
+fi
+AM_CONDITIONAL(WITH_GNOMECANVAS, test "x$with_gnomecanvas" = "xyes")
+AM_CONDITIONAL(WITH_GTK, test "x$with_gtk" = "xyes")
+AM_CONDITIONAL(WITH_GDKPIXBUF, test "x$with_gdkpixbuf" = "xyes")
+
+dnl PlayerCc
+AC_ARG_WITH(playercc,
+ [ --with-playercc Compile the C++ library],,
+ with_playercc=yes)
+if test "x$with_playercc" = "xyes"; then
+ PLAYERCC_EXTRA_CFLAGS=""
+ PLAYERCC_LIB="-lm"
+ AC_CXX_NAMESPACES
+
+ AX_BOOST_SIGNALS
+ if test "x$ax_cv_boost_signal" = "xyes"; then
+ PLAYERCC_EXTRA_CFLAGS="$PLAYERCC_EXTRA_CFLAGS"
+ PLAYERCC_LIB="$PLAYERCC_LIB -l$BOOST_SIGNALS_LIB"
+ fi
+ AX_BOOST_THREAD
+ if test "x$ax_cv_boost_thread" = "xyes"; then
+ PLAYERCC_EXTRA_CFLAGS="$PLAYERCC_EXTRA_CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
+ PLAYERCC_LIB="$PLAYERCC_LIB -l$BOOST_THREAD_LIB"
+ fi
+ if test "x$ax_cv_boost_signal" = "xyes"; then
+ if test "x$ax_cv_boost_thread" = "xyes"; then
+ ax_playercc_boost=yes
+ fi
+ fi
+ AC_SUBST(PLAYERCC_EXTRA_CFLAGS)
+ AC_SUBST(PLAYERCC_LIB)
+fi
+AM_CONDITIONAL(INCLUDE_BOOST_THREAD, test "x$ax_cv_boost_thread" = "xyes")
+AM_CONDITIONAL(INCLUDE_BOOST_SIGNALS, test "x$ax_cv_boost_signal" = "xyes")
+AM_CONDITIONAL(INCLUDE_PLAYERCC_BOOST, test "x$ax_playercc_boost" = "xyes")
+AM_CONDITIONAL(INCLUDE_PLAYERCC, test "x$with_playercc" = "xyes")
+
+dnl Include RTK gui support (for debugging)
+AC_ARG_ENABLE(rtkgui,
+[ --enable-rtkgui Include RTK GUI in server (debugging)],, enable_rtkgui=no)
+if test "x$with_gtk" = "xyes"; then
+ if test "x$enable_rtkgui" = "xyes"; then
+ AC_DEFINE(INCLUDE_RTKGUI, 1, [[include the RTK GUI in server (debugging)]])
+ fi
+else
+ enable_rtkgui=no
+fi
+AM_CONDITIONAL(INCLUDE_RTKGUI, test "x$enable_rtkgui" = "xyes")
+
+dnl Checks for header files.
+AC_CHECK_HEADERS(stdint.h strings.h sys/soundcard.h sys/filio.h linux/joystick.h jpeglib.h zlib.h)
+
+dnl Look for compress2 and compressBound in libz
+AC_CHECK_LIB(z,compress2,
+ have_libz=yes
+ AC_DEFINE(HAVE_LIBZ, 1, [Define to 1 if you have the z library (-lz). ])
+ LIBS="$LIBS -lz",
+ have_libz=no)
+AM_CONDITIONAL(HAVE_LIBZ, test "x$have_libz" = "xyes")
+AC_CHECK_LIB(rpc,xdrmem_create,
+ have_librpc=yes
+ AC_DEFINE(HAVE_LIBRPC, 1, [Define to 1 if you have the rpc library (-lrpc). ])
+ LIBS="$LIBS -lrpc",
+ have_librpc=no)
+AM_CONDITIONAL(HAVE_LIBRPC, test "x$have_librpc" = "xyes")
+AC_CHECK_FUNC(compressBound, have_compressBound=yes, have_compressBound=no)
+if test "x$have_compressBound" = "xno"; then
+ AC_LIBOBJ(compressBound)
+ AC_DEFINE(NEED_COMPRESSBOUND, 1, [Define to 1 if you do NOT have the compressBound function in libz])
+fi
+
+dnl Look for the dns_sd header. If it's present, we conclude that we can
+dnl build dns_sd code.
+have_dnssd=no
+AC_ARG_ENABLE(playersd, [ --enable-playersd Build libplayersd (service discovery)],
+[ AC_CHECK_HEADER(dns_sd.h,
+ have_dnssd=yes
+ AC_DEFINE(HAVE_PLAYERSD, 1, [Define to 1 if libplayersd is being built. ]),
+ have_dnssd=no)
+dnl Also look for DNSServiceRefDeallocate in libdns_sd. Some systems
+dnl require linking against this lib, others don't
+AC_CHECK_LIB(dns_sd,DNSServiceRefDeallocate,
+ EXTRA_DNS_SD_LIBS="-ldns_sd"
+ AC_DEFINE(HAVE_LIBDNS_SD, 1, [Define to 1 if you have the dns_sd library (-ldns_sd). ])
+ LIBS="$LIBS -ldns_sd",
+ EXTRA_DNS_SD_LIBS="")
+AC_SUBST(EXTRA_DNS_SD_LIBS) ],
+enable_playersd=no)
+AM_CONDITIONAL(HAVE_DNS_SD_H, test "x$have_dnssd" = "xyes")
+AM_CONDITIONAL(HAVE_PLAYERSD, test "x$have_dnssd" = "xyes")
+
+
+dnl Look for compress2 and compressBound in libz
+AC_CHECK_LIB(geos_c,GEOSGeomFromWKB_buf,
+ have_libgeos=yes
+ AC_DEFINE(HAVE_GEOS, 1, [Define to 1 if you have the geos library (libgeos_c). ])
+ AC_SUBST(GEOS_LIBS, -lgeos_c),
+ have_libgeos=no)
+AM_CONDITIONAL(HAVE_GEOS, test "x$have_libgeos" = "xyes")
+
+dnl Test for socklen_t and define it to int if it's not there.
+dnl Note that we can't simply use AC_CHECK_TYPE because socklen_t
+dnl isn't in the standard headers (autoconf-2.5 has better methods for this)
+AC_MSG_CHECKING(if socklen_t is defined)
+AC_TRY_COMPILE(
+ [#include <sys/types.h>
+ #include <sys/socket.h>],
+ [socklen_t len = 42; return len;],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
+ AC_DEFINE(socklen_t, int, must define this on BSD-based platforms)])
+
+dnl Test for O_SYNC and define it to 0 if it's not there (it gets ORed with
+dnl flags, so 0 is harmless).
+dnl Note that we can't simply use AC_CHECK_TYPE because O_SYNC
+dnl isn't in the standard headers (autoconf-2.5 has better methods for this)
+AC_MSG_CHECKING(if O_SYNC is defined)
+AC_TRY_COMPILE(
+ [#include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>],
+ [int fd = open("foo",O_SYNC); return fd;],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
+ AC_DEFINE(O_SYNC, 0, must define this on some non-Linux platforms)])
+
+dnl Checks for library functions.
+AC_REPLACE_FUNCS(poll dirname cfmakeraw round)
+AC_CHECK_FUNCS(sigblock getaddrinfo)
+AC_CHECK_LIB(nsl, gethostbyname)
+AC_CHECK_LIB(socket, connect)
+
+dnl Look for nanosleep in librt (real time)
+dnl On some systems (Darwin) nanosleep is in libc instead
+AC_CHECK_LIB(rt, nanosleep)
+
+AC_CHECK_FUNC(clock_gettime, have_clock_gettime=yes, have_clock_gettime=no)
+if test "x$have_clock_gettime" = "xno"; then
+ AC_LIBOBJ(clock_gettime)
+ AC_DEFINE(NEED_CLOCK_GETTIME, 1, [Define to 1 if you do NOT have the clock_gettime function from librt])
+fi
+
+
+AC_CHECK_LIB(ltdl, lt_dlopenext,
+ have_libltdl=yes
+ LIBLTDL_FLAG=-lltdl
+ AC_DEFINE(HAVE_LIBLTDL, 1, [Define to 1 if you have the ltdl library (-lltdl). ])
+ LIBS="$LIBS -lltdl -ldl",
+ have_libltdl=no
+ LIBLTDL_FLAG=,
+ [-ldl])
+AC_SUBST(LIBLTDL_FLAG)
+AC_CHECK_LIB(c_r, pthread_create,
+ [LIBS="-lc_r -lpthread $LIBS"],[LIBS="-lpthread $LIBS"])
+AC_CHECK_LIB(jpeg,jpeg_read_header,
+ have_libjpeg=yes
+ AC_DEFINE(HAVE_LIBJPEG, 1, [Define to 1 if you have the jpeg library (-ljpeg). ])
+ LIBS="$LIBS -ljpeg",
+ have_libjpeg=no)
+AM_CONDITIONAL(INCLUDE_JPEG, test "x$have_libjpeg" = "xyes")
+AC_CHECK_LIB(GL,glBegin,
+ have_libGL=yes
+ AC_DEFINE(HAVE_LIBGL, 1, [Define to 1 if you have the GL library (-lGL). ])
+ LIBS="$LIBS -lGL",
+ have_libGL=no)
+AM_CONDITIONAL(INCLUDE_GL, test "x$have_libGL" = "xyes")
+AC_CHECK_LIB(GLU,main,
+ have_libGLU=yes
+ AC_DEFINE(HAVE_LIBGLU, 1, [Define to 1 if you have the GLU library (-lGLU). ])
+ LIBS="$LIBS -lGLU",
+ have_libGLU=no)
+AM_CONDITIONAL(INCLUDE_GLU, test "x$have_libGLU" = "xyes")
+AC_CHECK_LIB(glut,main,
+ have_libglut=yes
+ AC_DEFINE(HAVE_LIBGLUT, 1, [Define to 1 if you have the GLUT library (-lGglut). ])
+ LIBS="$LIBS -lglut",
+ have_libglut=no)
+AM_CONDITIONAL(INCLUDE_GLUT, test "x$have_libglut" = "xyes")
+
+
+dnl Check for OpenCV
+if test "x$have_pkg_config" = "xyes"; then
+ PKG_CHECK_MODULES(OPENCV, opencv, with_opencv=yes, with_opencv=no)
+ if test "x$with_opencv" = "xyes"; then
+ AC_DEFINE(HAVE_OPENCV, 1, [OpenCV library is present])
+ fi
+fi
+AM_CONDITIONAL(WITH_OPENCV, test "x$with_opencv" = "xyes")
+
+if test "x$have_pkg_config" = "xyes"; then
+ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++,
+ with_imagemagick=yes,
+ with_imagemagick=no)
+fi
+AM_CONDITIONAL(WITH_IMAGEMAGICK, test "x$with_imagemagick" = "xyes")
+
+dnl check for gsl
+if test "x$have_pkg_config" = "xyes"; then
+ PKG_CHECK_MODULES(GSL, gsl, with_gsl=yes, with_gsl=no)
+ if test "x$with_gsl" = "xyes"; then
+ AC_DEFINE(HAVE_GSL, 1, [GSL library is present])
+ fi
+fi
+AM_CONDITIONAL(WITH_GSL, test "x$with_gsl" = "xyes")
+
+dnl Do we have XMMS (used for xmms plugin)?
+AC_CHECK_PROG(have_xmms,xmms-config,yes,no)
+AM_CONDITIONAL(HAVE_XMMS, test "x$have_xmms" = "xyes")
+
+dnl Optionally build python bindings to libplayerc (libplayerc-py)
+AC_ARG_ENABLE(libplayerc-py,
+ [ --disable-libplayerc-py Don't compile python bindings for libplayerc],,
+ enable_libplayerc_py=yes)
+if test "x$enable_libplayerc_py" = "xno"; then
+ enable_libplayerc_py=no
+ reason_libplayerc_py="disabled by user"
+elif test "x$have_swig" = "xno"; then
+ enable_libplayerc_py=no
+ reason_libplayerc_py="could not find swig"
+elif test "x$have_python" = "xno"; then
+ enable_libplayerc_py=no
+ reason_libplayerc_py="could not find python"
+elif test "x$have_pythondev" = "xno"; then
+ enable_libplayerc_py=no
+ reason_libplayerc_py="could not find python distutils"
+elif test "x$have_libjpeg" = "xno"; then
+ enable_libplayerc_py=no
+ reason_libplayerc_py="could not find libjpeg"
+fi
+AM_CONDITIONAL(INCLUDE_LIBPLAYERC_PY, test "x$enable_libplayerc_py" = "xyes")
+
+dnl Create the following Makefiles (from the Makefile.ams)
+AC_OUTPUT(Makefile
+ rtk2/Makefile
+ replace/Makefile
+ doc/Makefile
+ doc/images/Makefile
+ libplayerjpeg/Makefile
+ libplayercore/Makefile
+ libplayercore/bindings/Makefile
+ libplayercore/bindings/java/Makefile
+ libplayercore/playercore.pc
+ libplayercore/playererror.pc
+ libplayercore/playerutils.pc
+ libplayerxdr/Makefile
+ libplayerxdr/playerxdr.pc
+ libplayertcp/Makefile
+ libplayertcp/bindings/Makefile
+ libplayertcp/bindings/java/Makefile
+ libplayertcp/playertcp.pc
+ libplayertcp/playerudp.pc
+ libplayersd/Makefile
+ libplayersd/playersd.pc
+ server/Makefile
+ server/libplayerdrivers/Makefile
+ server/libplayerdrivers/playerdrivers.pc
+ server/drivers/Makefile
+ server/drivers/base/Makefile
+ server/drivers/gps/Makefile
+ server/drivers/shell/Makefile
+ server/drivers/mixed/Makefile
+ server/drivers/mixed/phidgetIFK/Makefile
+ server/drivers/mixed/wbr/Makefile
+ server/drivers/mixed/wbr/914/Makefile
+ server/drivers/position/Makefile
+ server/drivers/actarray/Makefile
+ server/drivers/audio/Makefile
+ server/drivers/camera/Makefile
+ server/drivers/camera/v4l/Makefile
+ server/drivers/camera/1394/Makefile
+ server/drivers/camera/compress/Makefile
+ server/drivers/camera/imageseq/Makefile
+ server/drivers/camera/sphere/Makefile
+ server/drivers/camera/uvc/Makefile
+ server/drivers/camera/yarp/Makefile
+ server/drivers/fiducial/Makefile
+ server/drivers/ptz/Makefile
+ server/drivers/laser/Makefile
+ server/drivers/blobfinder/Makefile
+ server/drivers/blobfinder/artoolkitplus/Makefile
+ server/drivers/blobfinder/cmvision/Makefile
+ server/drivers/blobfinder/upcbarcode/Makefile
+ server/drivers/blobfinder/simpleshape/Makefile
+ server/drivers/blobfinder/acts/Makefile
+ server/drivers/blobfinder/shapetracker/Makefile
+ server/drivers/wifi/Makefile
+ server/drivers/speech/Makefile
+ server/drivers/speech/recognition/Makefile
+ server/drivers/mixed/chatterbox/Makefile
+ server/drivers/mixed/cmucam2/Makefile
+ server/drivers/mixed/mricp/Makefile
+ server/drivers/mixed/p2os/Makefile
+ server/drivers/mixed/erratic/Makefile
+ server/drivers/mixed/reb/Makefile
+ server/drivers/mixed/rflex/Makefile
+ server/drivers/mixed/robotino/Makefile
+ server/drivers/mixed/khepera/Makefile
+ server/drivers/mixed/rmp/Makefile
+ server/drivers/mixed/garcia/Makefile
+ server/drivers/mixed/nomad/Makefile
+ server/drivers/mixed/botrics/Makefile
+ server/drivers/mixed/clodbuster/Makefile
+ server/drivers/mixed/evolution/Makefile
+ server/drivers/mixed/evolution/er1/Makefile
+ server/drivers/mixed/irobot/Makefile
+ server/drivers/mixed/irobot/roomba/Makefile
+ server/drivers/mixed/irobot/create/Makefile
+ server/drivers/mixed/sr3000/Makefile
+ server/drivers/opaque/Makefile
+ server/drivers/health/Makefile
+ server/drivers/health/statgrab/Makefile
+ server/drivers/planner/Makefile
+ server/drivers/planner/wavefront/Makefile
+ server/drivers/position/microstrain/Makefile
+ server/drivers/position/ascension/Makefile
+ server/drivers/position/bumpersafe/Makefile
+ server/drivers/position/nd/Makefile
+ server/drivers/position/isense/Makefile
+ server/drivers/position/lasersafe/Makefile
+ server/drivers/position/nav200/Makefile
+ server/drivers/position/roboteq/Makefile
+ server/drivers/position/vfh/Makefile
+ server/drivers/position/mbicp/Makefile
+ server/drivers/mcom/Makefile
+ server/drivers/localization/Makefile
+ server/drivers/localization/amcl/Makefile
+ server/drivers/service_adv/Makefile
+ server/drivers/map/Makefile
+ server/drivers/joystick/Makefile
+ server/drivers/rfid/Makefile
+ server/drivers/wsn/Makefile
+ server/drivers/imu/Makefile
+ server/drivers/pointcloud3d/Makefile
+ server/drivers/ranger/Makefile
+ server/drivers/vectormap/Makefile
+ server/drivers/blackboard/Makefile
+ server/drivers/blackboard/localbb/Makefile
+ client_libs/Makefile
+ client_libs/libplayerc++/Makefile
+ client_libs/libplayerc++/playerc++.pc
+ client_libs/libplayerc++/test/Makefile
+ client_libs/libplayerc/Makefile
+ client_libs/libplayerc/doc/Makefile
+ client_libs/libplayerc/playerc.pc
+ client_libs/libplayerc/test/Makefile
+ client_libs/libplayerc/bindings/Makefile
+ client_libs/libplayerc/bindings/python/Makefile
+ examples/Makefile
+ examples/plugins/Makefile
+ examples/plugins/exampledriver/Makefile
+ examples/plugins/logplugin/Makefile
+ examples/plugins/exampleinterface/Makefile
+ examples/plugins/multidriver/Makefile
+ examples/plugins/opaquedriver/Makefile
+ examples/libplayerc/Makefile
+ examples/libplayerc++/Makefile
+ utils/Makefile
+ utils/playercam/Makefile
+ utils/playerwritemap/Makefile
+ utils/playerv/Makefile
+ utils/playerjoy/Makefile
+ utils/playernav/Makefile
+ utils/playerprint/Makefile
+ utils/playervcr/Makefile
+ utils/pmap/Makefile
+ utils/dgps_server/Makefile
+ utils/xmms-plugin/Makefile
+ utils/logsplitter/Makefile
+ utils/playerprop/Makefile
+ config/Makefile)
+
+dnl should use AC_MSG_NOTICE(), but that's apparently not defined in
+dnl autoconf 2.13.
+AC_MSG_RESULT([])
+AC_MSG_RESULT([*************************************************************])
+AC_MSG_RESULT([])
+AC_MSG_RESULT([Player will be built on a $build system to run])
+AC_MSG_RESULT([on a $host system, with the following tools:])
+AC_MSG_RESULT([ C compiler: $CC $CFLAGS])
+AC_MSG_RESULT([ C++ compiler: $CXX $CXXFLAGS])
+
+AC_MSG_RESULT([])
+if test "x$have_libltdl" = "xyes"; then
+ AC_MSG_RESULT([Support for plugin drivers will be included.])
+ AC_MSG_RESULT([ ])
+else
+ AC_MSG_RESULT([Support for plugin drivers will NOT be included.])
+ AC_MSG_RESULT([You need plugin support to use Stage.])
+ AC_MSG_RESULT([To add plugin support, install libltdl, which is ])
+ AC_MSG_RESULT([part of GNU libtool, then configure Player again.])
+ AC_MSG_RESULT([ ])
+fi
+
+if test "x$PYTHON_INTERP" != "xno"; then
+ AC_MSG_RESULT([To use the Python bindings, modify your PYTHONPATH variable to include])
+ AC_MSG_RESULT([ $PREFIX/lib/python/\$PYTHON_VERSION/site-packages])
+ AC_MSG_RESULT([For example:])
+ AC_MSG_RESULT([ export PYTHONPATH=\$PYTHONPATH:$PREFIX/lib/python/\$PYTHON_VERSION/site-packages])
+fi
+AC_MSG_RESULT([])
+
+dnl Expand this to include all client libs/bindings
+dnl libplayerc python bindings
+if test "x$enable_libplayerc_py" = "xyes"; then
+ AC_MSG_RESULT([Python bindings to libplayerc will be built])
+else
+ AC_MSG_RESULT([Python bindings to libplayerc will not be built -- $reason_libplayerc_py])
+fi
+AC_MSG_RESULT([])
+
+dnl show if libplayerc++ will or will not be built
+if test "x$with_playercc" = "xyes"; then
+ AC_MSG_RESULT([libplayerc++ will be built])
+ if test "x$ax_cv_boost_signal" = "xyes"; then
+ AC_MSG_RESULT([ signaling included])
+ else
+ AC_MSG_RESULT([ signaling NOT included])
+ fi
+ if test "x$ax_cv_boost_thread" = "xyes"; then
+ AC_MSG_RESULT([ multithreading included])
+ else
+ AC_MSG_RESULT([ multithreading NOT included])
+ fi
+ if test "x$ax_playercc_boost" != "xyes"; then
+ AC_MSG_RESULT([ Install BOOST (www.boost.org) libraries to enable multithreaded ])
+ AC_MSG_RESULT([ and/or signaling in libplayerc++.])
+ fi
+else
+ AC_MSG_RESULT([libplayerc++ will NOT be built])
+fi
+AC_MSG_RESULT([])
+
+AC_MSG_RESULT([The following device drivers will be included:])
+for player_lib in $PLAYER_DRIVERS; do
+ if test -n $player_lib; then
+ AC_MSG_RESULT([[+ $player_lib]])
+ fi
+done
+AC_MSG_RESULT([])
+AC_MSG_RESULT([The following device drivers will NOT be included:])
+dnl Change the internal field seperator (IFS) to be a colon, so that the
+dnl driver list will be parsed correctly.
+old_IFS=$IFS
+IFS=:
+for player_lib in $PLAYER_NODRIVERS; do
+ if test ! $player_lib = "" ; then
+ AC_MSG_RESULT([[- $player_lib]])
+ fi
+done
+dnl Change the IFS back to what it was.
+IFS=$old_IFS
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([Player will be installed in:])
+AC_MSG_RESULT([ $PREFIX/])
+AC_MSG_RESULT([])
+AC_MSG_RESULT([To see the configuration options, do:])
+AC_MSG_RESULT([ ./configure --help])
+AC_MSG_RESULT([])
+AC_MSG_RESULT([When you're satisfied with the configuration, type 'make install'. ])
+AC_MSG_RESULT([])
diff -urN player-2.1.1/doc/images/Makefile.in player-2.1.1.norpath_am/doc/images/Makefile.in
--- player-2.1.1/doc/images/Makefile.in 2008-06-16 01:39:46.000000000 +0200
+++ player-2.1.1.norpath_am/doc/images/Makefile.in 2008-09-01 00:18:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -113,7 +113,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -242,7 +241,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
diff -urN player-2.1.1/doc/Makefile.in player-2.1.1.norpath_am/doc/Makefile.in
--- player-2.1.1/doc/Makefile.in 2008-06-16 01:39:46.000000000 +0200
+++ player-2.1.1.norpath_am/doc/Makefile.in 2008-09-01 00:18:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -584,8 +582,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -610,8 +608,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -621,12 +619,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/libplayerc/Makefile.am player-2.1.1.norpath_am/examples/libplayerc/Makefile.am
--- player-2.1.1/examples/libplayerc/Makefile.am 2008-04-13 00:16:59.000000000 +0200
+++ player-2.1.1.norpath_am/examples/libplayerc/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -22,15 +22,15 @@
example_DATA = vmap.c simple.c speech_c_client.c service_discovery.c
vmap_SOURCES = vmap.c
-vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
vmap_DEPENDENCIES = $(PLAYERC_DEPS)
simple_SOURCES = simple.c
-simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
simple_DEPENDENCIES = $(PLAYERC_DEPS)
speech_c_client_SOURCES = speech_c_client.c
-speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
speech_c_client_DEPENDENCIES = $(PLAYERC_DEPS)
service_discovery_SOURCES = service_discovery.c
diff -urN player-2.1.1/examples/libplayerc/Makefile.in player-2.1.1.norpath_am/examples/libplayerc/Makefile.in
--- player-2.1.1/examples/libplayerc/Makefile.in 2008-06-16 01:39:47.000000000 +0200
+++ player-2.1.1.norpath_am/examples/libplayerc/Makefile.in 2008-09-01 00:18:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -63,7 +63,7 @@
speech_c_client_OBJECTS = $(am_speech_c_client_OBJECTS)
am_vmap_OBJECTS = vmap.$(OBJEXT)
vmap_OBJECTS = $(am_vmap_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -155,7 +155,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -284,7 +283,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -486,13 +484,13 @@
exampledir = $(prefix)/share/player/examples/libplayerc
example_DATA = vmap.c simple.c speech_c_client.c service_discovery.c
vmap_SOURCES = vmap.c
-vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
vmap_DEPENDENCIES = $(PLAYERC_DEPS)
simple_SOURCES = simple.c
-simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
simple_DEPENDENCIES = $(PLAYERC_DEPS)
speech_c_client_SOURCES = speech_c_client.c
-speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
+speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
speech_c_client_DEPENDENCIES = $(PLAYERC_DEPS)
service_discovery_SOURCES = service_discovery.c
service_discovery_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayersd -lplayerutils
@@ -539,8 +537,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
else :; fi; \
done
@@ -631,8 +629,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -644,8 +642,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -655,12 +653,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/libplayerc++/Makefile.am player-2.1.1.norpath_am/examples/libplayerc++/Makefile.am
--- player-2.1.1/examples/libplayerc++/Makefile.am 2008-04-13 00:17:00.000000000 +0200
+++ player-2.1.1.norpath_am/examples/libplayerc++/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -62,70 +62,70 @@
wallfollow.cc
camera_SOURCES = camera.cc args.h
-camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
camera_DEPENDENCIES = $(PLAYERCC_DEPS)
example0_SOURCES = example0.cc
-example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example0_DEPENDENCIES = $(PLAYERCC_DEPS)
example1_SOURCES = example1.cc args.h
-example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example1_DEPENDENCIES = $(PLAYERCC_DEPS)
example2_SOURCES = example2.cc
-example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example2_DEPENDENCIES = $(PLAYERCC_DEPS)
example3_SOURCES = example3.cc args.h
-example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example3_DEPENDENCIES = $(PLAYERCC_DEPS)
example4_SOURCES = example4.cc
-example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example4_DEPENDENCIES = $(PLAYERCC_DEPS)
goto_SOURCES = goto.cc
-goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
goto_DEPENDENCIES = $(PLAYERCC_DEPS)
grip_SOURCES = grip.cc args.h
-grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
grip_DEPENDENCIES = $(PLAYERCC_DEPS)
clientgraphics_SOURCES = clientgraphics.cc args.h
-clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
clientgraphics_DEPENDENCIES = $(PLAYERCC_DEPS)
clientgraphics3d_SOURCES = clientgraphics3d.cc args.h
-clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
clientgraphics3d_DEPENDENCIES = $(PLAYERCC_DEPS)
laserobstacleavoid_SOURCES = laserobstacleavoid.cc args.h
-laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
laserobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
ptz_SOURCES = ptz.cc args.h
-ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
ptz_DEPENDENCIES = $(PLAYERCC_DEPS)
randomwalk_SOURCES = randomwalk.cc args.h
-randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
randomwalk_DEPENDENCIES = $(PLAYERCC_DEPS)
sonarobstacleavoid_SOURCES = sonarobstacleavoid.cc args.h
-sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
sonarobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
speech_SOURCES = speech.cc args.h
-speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
speech_DEPENDENCIES = $(PLAYERCC_DEPS)
speech_cpp_client_SOURCES = speech_cpp_client.cc
-speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
speech_cpp_client_DEPENDENCIES = $(PLAYERCC_DEPS)
wallfollow_SOURCES = wallfollow.cc args.h
-wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
wallfollow_DEPENDENCIES = $(PLAYERCC_DEPS)
diff -urN player-2.1.1/examples/libplayerc++/Makefile.in player-2.1.1.norpath_am/examples/libplayerc++/Makefile.in
--- player-2.1.1/examples/libplayerc++/Makefile.in 2008-06-16 01:39:47.000000000 +0200
+++ player-2.1.1.norpath_am/examples/libplayerc++/Makefile.in 2008-09-01 00:18:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -114,7 +114,7 @@
speech_cpp_client_OBJECTS = $(am_speech_cpp_client_OBJECTS)
am_wallfollow_OBJECTS = wallfollow.$(OBJEXT)
wallfollow_OBJECTS = $(am_wallfollow_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -227,7 +227,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -356,7 +355,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -578,55 +576,55 @@
wallfollow.cc
camera_SOURCES = camera.cc args.h
-camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
camera_DEPENDENCIES = $(PLAYERCC_DEPS)
example0_SOURCES = example0.cc
-example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example0_DEPENDENCIES = $(PLAYERCC_DEPS)
example1_SOURCES = example1.cc args.h
-example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example1_DEPENDENCIES = $(PLAYERCC_DEPS)
example2_SOURCES = example2.cc
-example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example2_DEPENDENCIES = $(PLAYERCC_DEPS)
example3_SOURCES = example3.cc args.h
-example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example3_DEPENDENCIES = $(PLAYERCC_DEPS)
example4_SOURCES = example4.cc
-example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
example4_DEPENDENCIES = $(PLAYERCC_DEPS)
goto_SOURCES = goto.cc
-goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
goto_DEPENDENCIES = $(PLAYERCC_DEPS)
grip_SOURCES = grip.cc args.h
-grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
grip_DEPENDENCIES = $(PLAYERCC_DEPS)
clientgraphics_SOURCES = clientgraphics.cc args.h
-clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
clientgraphics_DEPENDENCIES = $(PLAYERCC_DEPS)
clientgraphics3d_SOURCES = clientgraphics3d.cc args.h
-clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
clientgraphics3d_DEPENDENCIES = $(PLAYERCC_DEPS)
laserobstacleavoid_SOURCES = laserobstacleavoid.cc args.h
-laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
laserobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
ptz_SOURCES = ptz.cc args.h
-ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
ptz_DEPENDENCIES = $(PLAYERCC_DEPS)
randomwalk_SOURCES = randomwalk.cc args.h
-randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
randomwalk_DEPENDENCIES = $(PLAYERCC_DEPS)
sonarobstacleavoid_SOURCES = sonarobstacleavoid.cc args.h
-sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
sonarobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
speech_SOURCES = speech.cc args.h
-speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
speech_DEPENDENCIES = $(PLAYERCC_DEPS)
speech_cpp_client_SOURCES = speech_cpp_client.cc
-speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
speech_cpp_client_DEPENDENCIES = $(PLAYERCC_DEPS)
wallfollow_SOURCES = wallfollow.cc args.h
-wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
+wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
wallfollow_DEPENDENCIES = $(PLAYERCC_DEPS)
all: all-am
@@ -670,8 +668,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
else :; fi; \
done
@@ -814,8 +812,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -827,8 +825,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -838,12 +836,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/Makefile.in player-2.1.1.norpath_am/examples/Makefile.in
--- player-2.1.1/examples/Makefile.in 2008-06-16 01:39:47.000000000 +0200
+++ player-2.1.1.norpath_am/examples/Makefile.in 2008-09-01 00:18:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/plugins/exampledriver/Makefile.in player-2.1.1.norpath_am/examples/plugins/exampledriver/Makefile.in
--- player-2.1.1/examples/plugins/exampledriver/Makefile.in 2008-06-16 01:39:48.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/exampledriver/Makefile.in 2008-09-01 00:18:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -59,7 +59,7 @@
libexampledriver_la_LIBADD =
am_libexampledriver_la_OBJECTS = exampledriver.lo
libexampledriver_la_OBJECTS = $(am_libexampledriver_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -502,8 +500,8 @@
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
else :; fi; \
done
@@ -511,8 +509,8 @@
@$(NORMAL_UNINSTALL)
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
done
clean-exampleLTLIBRARIES:
@@ -583,8 +581,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -596,8 +594,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -607,12 +605,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/plugins/exampleinterface/Makefile.am player-2.1.1.norpath_am/examples/plugins/exampleinterface/Makefile.am
--- player-2.1.1/examples/plugins/exampleinterface/Makefile.am 2008-04-13 00:16:59.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/exampleinterface/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -41,5 +41,5 @@
libeginterf_la_SOURCES = example_interface.h example_xdr.h eginterf_client.c example_functiontable.c example_xdr.c
example_client_SOURCES = example_client.c
-example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror libeginterf.la
+example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror -lplayerutils libeginterf.la
example_client_DEPENDENCIES = $(PLAYERC_DEPS) example_interface.h
diff -urN player-2.1.1/examples/plugins/exampleinterface/Makefile.in player-2.1.1.norpath_am/examples/plugins/exampleinterface/Makefile.in
--- player-2.1.1/examples/plugins/exampleinterface/Makefile.in 2008-06-16 01:39:48.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/exampleinterface/Makefile.in 2008-09-01 00:18:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -73,7 +73,7 @@
am_example_client_OBJECTS = example_client.$(OBJEXT)
example_client_OBJECTS = $(am_example_client_OBJECTS)
am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -170,7 +170,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -299,7 +298,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -507,7 +505,7 @@
libeginterfdriver_la_SOURCES = example_interface.h example_xdr.h eginterf_driver.cc
libeginterf_la_SOURCES = example_interface.h example_xdr.h eginterf_client.c example_functiontable.c example_xdr.c
example_client_SOURCES = example_client.c
-example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror libeginterf.la
+example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror -lplayerutils libeginterf.la
example_client_DEPENDENCIES = $(PLAYERC_DEPS) example_interface.h
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -549,8 +547,8 @@
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
else :; fi; \
done
@@ -558,8 +556,8 @@
@$(NORMAL_UNINSTALL)
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
done
clean-exampleLTLIBRARIES:
@@ -583,8 +581,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
else :; fi; \
done
@@ -705,8 +703,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -718,8 +716,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -729,12 +727,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/plugins/logplugin/Makefile.in player-2.1.1.norpath_am/examples/plugins/logplugin/Makefile.in
--- player-2.1.1/examples/plugins/logplugin/Makefile.in 2008-06-16 01:39:49.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/logplugin/Makefile.in 2008-09-01 00:18:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -59,7 +59,7 @@
liblogplugin_la_LIBADD =
am_liblogplugin_la_OBJECTS = logplugin.lo
liblogplugin_la_OBJECTS = $(am_liblogplugin_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -502,8 +500,8 @@
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
else :; fi; \
done
@@ -511,8 +509,8 @@
@$(NORMAL_UNINSTALL)
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
done
clean-exampleLTLIBRARIES:
@@ -583,8 +581,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -596,8 +594,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -607,12 +605,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/plugins/Makefile.in player-2.1.1.norpath_am/examples/plugins/Makefile.in
--- player-2.1.1/examples/plugins/Makefile.in 2008-06-16 01:39:48.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/Makefile.in 2008-09-01 00:18:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -556,8 +554,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -582,8 +580,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -593,12 +591,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/plugins/multidriver/Makefile.in player-2.1.1.norpath_am/examples/plugins/multidriver/Makefile.in
--- player-2.1.1/examples/plugins/multidriver/Makefile.in 2008-06-16 01:39:49.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/multidriver/Makefile.in 2008-09-01 00:18:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -59,7 +59,7 @@
libmultidriver_la_LIBADD =
am_libmultidriver_la_OBJECTS = multidriver.lo
libmultidriver_la_OBJECTS = $(am_libmultidriver_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -502,8 +500,8 @@
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
else :; fi; \
done
@@ -511,8 +509,8 @@
@$(NORMAL_UNINSTALL)
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
done
clean-exampleLTLIBRARIES:
@@ -583,8 +581,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -596,8 +594,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -607,12 +605,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/examples/plugins/opaquedriver/Makefile.am player-2.1.1.norpath_am/examples/plugins/opaquedriver/Makefile.am
--- player-2.1.1/examples/plugins/opaquedriver/Makefile.am 2008-04-13 00:16:58.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/opaquedriver/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -22,5 +22,5 @@
libopaquedriver_la_SOURCES = opaquedriver.cc sharedstruct.h
opaque_client_SOURCES = opaque.c sharedstruct.h
-opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror
+opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror -lplayerutils
opaque_client_DEPENDENCIES = $(PLAYERC_DEPS)
diff -urN player-2.1.1/examples/plugins/opaquedriver/Makefile.in player-2.1.1.norpath_am/examples/plugins/opaquedriver/Makefile.in
--- player-2.1.1/examples/plugins/opaquedriver/Makefile.in 2008-06-16 01:39:49.000000000 +0200
+++ player-2.1.1.norpath_am/examples/plugins/opaquedriver/Makefile.in 2008-09-01 00:18:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -67,7 +67,7 @@
am_opaque_client_OBJECTS = opaque.$(OBJEXT)
opaque_client_OBJECTS = $(am_opaque_client_OBJECTS)
am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -160,7 +160,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -289,7 +288,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -493,7 +491,7 @@
EXTRA_DIST = opaque.cfg
libopaquedriver_la_SOURCES = opaquedriver.cc sharedstruct.h
opaque_client_SOURCES = opaque.c sharedstruct.h
-opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror
+opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror -lplayerutils
opaque_client_DEPENDENCIES = $(PLAYERC_DEPS)
all: all-am
@@ -534,8 +532,8 @@
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(exampleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(exampledir)/$$f"; \
else :; fi; \
done
@@ -543,8 +541,8 @@
@$(NORMAL_UNINSTALL)
@list='$(example_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(exampledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(exampledir)/$$p"; \
done
clean-exampleLTLIBRARIES:
@@ -566,8 +564,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(examplePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(exampledir)/$$f" || exit 1; \
else :; fi; \
done
@@ -668,8 +666,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -681,8 +679,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -692,12 +690,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayercore/bindings/java/Makefile.in player-2.1.1.norpath_am/libplayercore/bindings/java/Makefile.in
--- player-2.1.1/libplayercore/bindings/java/Makefile.in 2008-06-16 01:39:50.000000000 +0200
+++ player-2.1.1.norpath_am/libplayercore/bindings/java/Makefile.in 2008-09-01 00:18:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -66,7 +66,7 @@
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libplayercore_java_la_LDFLAGS) $(LDFLAGS) -o $@
@ENABLE_JPLAYER_TRUE@am_libplayercore_java_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -159,7 +159,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -288,7 +287,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -526,8 +524,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -535,8 +533,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -607,8 +605,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -620,8 +618,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -631,12 +629,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayercore/bindings/Makefile.in player-2.1.1.norpath_am/libplayercore/bindings/Makefile.in
--- player-2.1.1/libplayercore/bindings/Makefile.in 2008-06-16 01:39:50.000000000 +0200
+++ player-2.1.1.norpath_am/libplayercore/bindings/Makefile.in 2008-09-01 00:18:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayercore/Makefile.in player-2.1.1.norpath_am/libplayercore/Makefile.in
--- player-2.1.1/libplayercore/Makefile.in 2008-06-16 01:39:49.000000000 +0200
+++ player-2.1.1.norpath_am/libplayercore/Makefile.in 2008-09-01 00:18:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -83,7 +83,7 @@
$(libplayerutils_la_LDFLAGS) $(LDFLAGS) -o $@
dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(dist_bin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -180,7 +180,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -309,7 +308,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -612,8 +610,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -621,8 +619,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -788,8 +786,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -801,8 +799,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -812,12 +810,13 @@
CTAGS: $(HEADERS) $(SOURCES) playerconfig.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) playerconfig.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayerjpeg/Makefile.in player-2.1.1.norpath_am/libplayerjpeg/Makefile.in
--- player-2.1.1/libplayerjpeg/Makefile.in 2008-06-16 01:39:50.000000000 +0200
+++ player-2.1.1.norpath_am/libplayerjpeg/Makefile.in 2008-09-01 00:18:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -65,7 +65,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libplayerjpeg_la_LDFLAGS) $(LDFLAGS) -o $@
@INCLUDE_JPEG_TRUE@am_libplayerjpeg_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -151,7 +151,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -280,7 +279,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -510,8 +508,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -519,8 +517,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -591,8 +589,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -604,8 +602,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -615,12 +613,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayersd/Makefile.in player-2.1.1.norpath_am/libplayersd/Makefile.in
--- player-2.1.1/libplayersd/Makefile.in 2008-06-16 01:39:51.000000000 +0200
+++ player-2.1.1.norpath_am/libplayersd/Makefile.in 2008-09-01 00:18:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,7 +68,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libplayersd_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_DNS_SD_H_TRUE@am_libplayersd_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -156,7 +156,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -285,7 +284,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -522,8 +520,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -531,8 +529,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -621,8 +619,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -634,8 +632,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -645,12 +643,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayertcp/bindings/java/Makefile.in player-2.1.1.norpath_am/libplayertcp/bindings/java/Makefile.in
--- player-2.1.1/libplayertcp/bindings/java/Makefile.in 2008-06-16 01:39:52.000000000 +0200
+++ player-2.1.1.norpath_am/libplayertcp/bindings/java/Makefile.in 2008-09-01 00:18:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -66,7 +66,7 @@
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libplayertcp_java_la_LDFLAGS) $(LDFLAGS) -o $@
@ENABLE_JPLAYER_TRUE@am_libplayertcp_java_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -150,7 +150,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -279,7 +278,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -514,8 +512,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -523,8 +521,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -595,8 +593,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -608,8 +606,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -619,12 +617,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayertcp/bindings/Makefile.in player-2.1.1.norpath_am/libplayertcp/bindings/Makefile.in
--- player-2.1.1/libplayertcp/bindings/Makefile.in 2008-06-16 01:39:51.000000000 +0200
+++ player-2.1.1.norpath_am/libplayertcp/bindings/Makefile.in 2008-09-01 00:18:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayertcp/Makefile.in player-2.1.1.norpath_am/libplayertcp/Makefile.in
--- player-2.1.1/libplayertcp/Makefile.in 2008-06-16 01:39:51.000000000 +0200
+++ player-2.1.1.norpath_am/libplayertcp/Makefile.in 2008-09-01 00:18:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,7 +70,7 @@
libplayerudp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libplayerudp_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -166,7 +166,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -295,7 +294,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -544,8 +542,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -553,8 +551,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -668,8 +666,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -681,8 +679,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -692,12 +690,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/libplayerxdr/Makefile.in player-2.1.1.norpath_am/libplayerxdr/Makefile.in
--- player-2.1.1/libplayerxdr/Makefile.in 2008-06-16 01:39:52.000000000 +0200
+++ player-2.1.1.norpath_am/libplayerxdr/Makefile.in 2008-09-01 00:18:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,7 +68,7 @@
$(libplayerxdr_la_LDFLAGS) $(LDFLAGS) -o $@
dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(dist_bin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -155,7 +155,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -284,7 +283,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -527,8 +525,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -536,8 +534,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -645,8 +643,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -658,8 +656,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -669,12 +667,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/Makefile.in player-2.1.1.norpath_am/Makefile.in
--- player-2.1.1/Makefile.in 2008-06-16 01:40:22.000000000 +0200
+++ player-2.1.1.norpath_am/Makefile.in 2008-09-01 00:19:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -140,7 +140,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -269,7 +268,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -595,8 +593,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -621,8 +619,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -632,12 +630,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -707,10 +706,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -738,8 +733,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -873,18 +866,18 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool clean-local ctags ctags-recursive dist dist-all \
- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am
+ dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
clean-local:
diff -urN player-2.1.1/replace/Makefile.in player-2.1.1.norpath_am/replace/Makefile.in
--- player-2.1.1/replace/Makefile.in 2008-06-16 01:39:52.000000000 +0200
+++ player-2.1.1.norpath_am/replace/Makefile.in 2008-09-01 00:18:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -51,7 +51,7 @@
libreplace_la_DEPENDENCIES = @LTLIBOBJS@
am_libreplace_la_OBJECTS = dummy.lo
libreplace_la_OBJECTS = $(am_libreplace_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -133,7 +133,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -262,7 +261,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -542,8 +540,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -555,8 +553,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -566,12 +564,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/rtk2/Makefile.in player-2.1.1.norpath_am/rtk2/Makefile.in
--- player-2.1.1/rtk2/Makefile.in 2008-06-16 01:39:53.000000000 +0200
+++ player-2.1.1.norpath_am/rtk2/Makefile.in 2008-09-01 00:18:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,7 +56,7 @@
rtk_canvas_movie.$(OBJEXT) rtk_fig.$(OBJEXT) \
rtk_region.$(OBJEXT) rtk_menu.$(OBJEXT) rtk_table.$(OBJEXT)
librtk_a_OBJECTS = $(am_librtk_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -139,7 +139,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -268,7 +267,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -552,8 +550,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -565,8 +563,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -576,12 +574,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/actarray/Makefile.in player-2.1.1.norpath_am/server/drivers/actarray/Makefile.in
--- player-2.1.1/server/drivers/actarray/Makefile.in 2008-06-16 01:39:53.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/actarray/Makefile.in 2008-09-01 00:18:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libamtecM5_la_OBJECTS = amtecM5.lo
libamtecM5_la_OBJECTS = $(am_libamtecM5_la_OBJECTS)
@INCLUDE_AMTECM5_TRUE@am_libamtecM5_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/audio/Makefile.in player-2.1.1.norpath_am/server/drivers/audio/Makefile.in
--- player-2.1.1/server/drivers/audio/Makefile.in 2008-06-16 01:39:54.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/audio/Makefile.in 2008-09-01 00:18:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libalsa_la_OBJECTS = alsa.lo audio_sample.lo
libalsa_la_OBJECTS = $(am_libalsa_la_OBJECTS)
@INCLUDE_ALSA_TRUE@am_libalsa_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -537,8 +535,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -550,8 +548,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -561,12 +559,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/base/Makefile.in player-2.1.1.norpath_am/server/drivers/base/Makefile.in
--- player-2.1.1/server/drivers/base/Makefile.in 2008-06-16 01:39:54.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/base/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -50,7 +50,7 @@
libbase_la_LIBADD =
am_libbase_la_OBJECTS = imagebase.lo
libbase_la_OBJECTS = $(am_libbase_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -141,7 +141,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -270,7 +269,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -543,8 +541,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -556,8 +554,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -567,12 +565,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blackboard/localbb/Makefile.in player-2.1.1.norpath_am/server/drivers/blackboard/localbb/Makefile.in
--- player-2.1.1/server/drivers/blackboard/localbb/Makefile.in 2008-06-16 01:39:55.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blackboard/localbb/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_liblocalbb_la_OBJECTS = localbb.lo
liblocalbb_la_OBJECTS = $(am_liblocalbb_la_OBJECTS)
@INCLUDE_LOCALBB_TRUE@am_liblocalbb_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blackboard/Makefile.in player-2.1.1.norpath_am/server/drivers/blackboard/Makefile.in
--- player-2.1.1/server/drivers/blackboard/Makefile.in 2008-06-16 01:39:54.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blackboard/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blobfinder/acts/Makefile.in player-2.1.1.norpath_am/server/drivers/blobfinder/acts/Makefile.in
--- player-2.1.1/server/drivers/blobfinder/acts/Makefile.in 2008-06-16 01:39:55.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blobfinder/acts/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libacts_la_OBJECTS = acts.lo
libacts_la_OBJECTS = $(am_libacts_la_OBJECTS)
@INCLUDE_ACTS_TRUE@am_libacts_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blobfinder/artoolkitplus/Makefile.in player-2.1.1.norpath_am/server/drivers/blobfinder/artoolkitplus/Makefile.in
--- player-2.1.1/server/drivers/blobfinder/artoolkitplus/Makefile.in 2008-06-16 01:39:55.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blobfinder/artoolkitplus/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libartoolkitplus_la_OBJECTS = artoolkitplus.lo
libartoolkitplus_la_OBJECTS = $(am_libartoolkitplus_la_OBJECTS)
@INCLUDE_ARTOOLKITPLUS_TRUE@am_libartoolkitplus_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -537,8 +535,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -550,8 +548,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -561,12 +559,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blobfinder/cmvision/Makefile.in player-2.1.1.norpath_am/server/drivers/blobfinder/cmvision/Makefile.in
--- player-2.1.1/server/drivers/blobfinder/cmvision/Makefile.in 2008-06-16 01:39:56.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blobfinder/cmvision/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
am_libcmvision_la_OBJECTS = cmvision.lo conversions.lo P2CMV.lo
libcmvision_la_OBJECTS = $(am_libcmvision_la_OBJECTS)
@INCLUDE_CMVISION_TRUE@am_libcmvision_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -146,7 +146,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -275,7 +274,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -572,8 +570,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -585,8 +583,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -596,12 +594,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blobfinder/Makefile.in player-2.1.1.norpath_am/server/drivers/blobfinder/Makefile.in
--- player-2.1.1/server/drivers/blobfinder/Makefile.in 2008-06-16 01:39:55.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blobfinder/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blobfinder/shapetracker/Makefile.in player-2.1.1.norpath_am/server/drivers/blobfinder/shapetracker/Makefile.in
--- player-2.1.1/server/drivers/blobfinder/shapetracker/Makefile.in 2008-06-16 01:39:56.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blobfinder/shapetracker/Makefile.in 2008-09-01 00:18:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libshapetracker_la_OBJECTS = shapetracker.lo
libshapetracker_la_OBJECTS = $(am_libshapetracker_la_OBJECTS)
@INCLUDE_SHAPETRACKER_TRUE@am_libshapetracker_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -537,8 +535,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -550,8 +548,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -561,12 +559,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blobfinder/simpleshape/Makefile.in player-2.1.1.norpath_am/server/drivers/blobfinder/simpleshape/Makefile.in
--- player-2.1.1/server/drivers/blobfinder/simpleshape/Makefile.in 2008-06-16 01:39:56.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blobfinder/simpleshape/Makefile.in 2008-09-01 00:18:54.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libsimpleshape_la_OBJECTS = simpleshape.lo
libsimpleshape_la_OBJECTS = $(am_libsimpleshape_la_OBJECTS)
@INCLUDE_SIMPLESHAPE_TRUE@am_libsimpleshape_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -538,8 +536,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -551,8 +549,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -562,12 +560,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/blobfinder/upcbarcode/Makefile.in player-2.1.1.norpath_am/server/drivers/blobfinder/upcbarcode/Makefile.in
--- player-2.1.1/server/drivers/blobfinder/upcbarcode/Makefile.in 2008-06-16 01:39:57.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/blobfinder/upcbarcode/Makefile.in 2008-09-01 00:18:54.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libupcbarcode_la_OBJECTS = upcbarcode.lo
libupcbarcode_la_OBJECTS = $(am_libupcbarcode_la_OBJECTS)
@INCLUDE_UPCBARCODE_TRUE@am_libupcbarcode_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -538,8 +536,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -551,8 +549,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -562,12 +560,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/1394/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/1394/Makefile.in
--- player-2.1.1/server/drivers/camera/1394/Makefile.in 2008-06-16 01:39:57.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/1394/Makefile.in 2008-09-01 00:18:54.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
@INCLUDE_CMVISION_TRUE@am_libcamera1394_la_OBJECTS = camera1394.lo
libcamera1394_la_OBJECTS = $(am_libcamera1394_la_OBJECTS)
@INCLUDE_CAMERA1394_TRUE@am_libcamera1394_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -148,7 +148,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -277,7 +276,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -593,8 +591,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -604,12 +602,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/compress/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/compress/Makefile.in
--- player-2.1.1/server/drivers/camera/compress/Makefile.in 2008-06-16 01:39:57.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/compress/Makefile.in 2008-09-01 00:18:54.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,7 +56,7 @@
am_libcamerauncompress_la_OBJECTS = camerauncompress.lo
libcamerauncompress_la_OBJECTS = $(am_libcamerauncompress_la_OBJECTS)
@INCLUDE_CAMERACOMPRESS_TRUE@am_libcamerauncompress_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -140,7 +140,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -269,7 +268,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -546,8 +544,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -559,8 +557,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -570,12 +568,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/imageseq/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/imageseq/Makefile.in
--- player-2.1.1/server/drivers/camera/imageseq/Makefile.in 2008-06-16 01:39:58.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/imageseq/Makefile.in 2008-09-01 00:18:54.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libimageseq_la_OBJECTS = imageseq.lo
libimageseq_la_OBJECTS = $(am_libimageseq_la_OBJECTS)
@INCLUDE_IMAGESEQ_TRUE@am_libimageseq_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -537,8 +535,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -550,8 +548,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -561,12 +559,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/Makefile.in
--- player-2.1.1/server/drivers/camera/Makefile.in 2008-06-16 01:39:57.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/Makefile.in 2008-09-01 00:18:54.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/sphere/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/sphere/Makefile.in
--- player-2.1.1/server/drivers/camera/sphere/Makefile.in 2008-06-16 01:39:58.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/sphere/Makefile.in 2008-09-01 00:18:54.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libsphere_la_OBJECTS = sphere_mixed.lo setpwc_api.lo
libsphere_la_OBJECTS = $(am_libsphere_la_OBJECTS)
@INCLUDE_SPHERE_TRUE@am_libsphere_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -567,8 +565,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/uvc/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/uvc/Makefile.in
--- player-2.1.1/server/drivers/camera/uvc/Makefile.in 2008-06-16 01:39:58.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/uvc/Makefile.in 2008-09-01 00:18:55.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libcamerauvc_la_OBJECTS = cameraUVC.lo UvcInterface.lo
libcamerauvc_la_OBJECTS = $(am_libcamerauvc_la_OBJECTS)
@INCLUDE_CAMERAUVC_TRUE@am_libcamerauvc_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -546,8 +544,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -559,8 +557,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -570,12 +568,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/v4l/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/v4l/Makefile.in
--- player-2.1.1/server/drivers/camera/v4l/Makefile.in 2008-06-16 01:39:59.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/v4l/Makefile.in 2008-09-01 00:18:55.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,7 +53,7 @@
ccvt_c1.lo
libcamerav4l_la_OBJECTS = $(am_libcamerav4l_la_OBJECTS)
@INCLUDE_CAMERAV4L_TRUE@am_libcamerav4l_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -570,8 +568,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -583,8 +581,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -594,12 +592,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/camera/yarp/Makefile.in player-2.1.1.norpath_am/server/drivers/camera/yarp/Makefile.in
--- player-2.1.1/server/drivers/camera/yarp/Makefile.in 2008-06-16 01:39:59.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/camera/yarp/Makefile.in 2008-09-01 00:18:55.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libYarpImage_la_OBJECTS = YarpImage.lo
libYarpImage_la_OBJECTS = $(am_libYarpImage_la_OBJECTS)
@INCLUDE_YARPIMAGE_TRUE@am_libYarpImage_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/fiducial/Makefile.in player-2.1.1.norpath_am/server/drivers/fiducial/Makefile.in
--- player-2.1.1/server/drivers/fiducial/Makefile.in 2008-06-16 01:39:59.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/fiducial/Makefile.in 2008-09-01 00:18:55.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,7 +68,7 @@
am_liblaservisualbw_la_OBJECTS = laservisualbw.lo
liblaservisualbw_la_OBJECTS = $(am_liblaservisualbw_la_OBJECTS)
@INCLUDE_LASERVISUALBW_TRUE@am_liblaservisualbw_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -154,7 +154,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -283,7 +282,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -570,8 +568,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -583,8 +581,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -594,12 +592,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/gps/Makefile.in player-2.1.1.norpath_am/server/drivers/gps/Makefile.in
--- player-2.1.1/server/drivers/gps/Makefile.in 2008-06-16 01:40:00.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/gps/Makefile.in 2008-09-01 00:18:55.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libgarminnmea_la_OBJECTS = garminnmea.lo
libgarminnmea_la_OBJECTS = $(am_libgarminnmea_la_OBJECTS)
@INCLUDE_GARMINNMEA_TRUE@am_libgarminnmea_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/health/Makefile.in player-2.1.1.norpath_am/server/drivers/health/Makefile.in
--- player-2.1.1/server/drivers/health/Makefile.in 2008-06-16 01:40:00.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/health/Makefile.in 2008-09-01 00:18:55.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/health/statgrab/Makefile.in player-2.1.1.norpath_am/server/drivers/health/statgrab/Makefile.in
--- player-2.1.1/server/drivers/health/statgrab/Makefile.in 2008-06-16 01:40:00.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/health/statgrab/Makefile.in 2008-09-01 00:18:55.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libstatgrab_la_OBJECTS = statgrab_health.lo
libstatgrab_la_OBJECTS = $(am_libstatgrab_la_OBJECTS)
@INCLUDE_STATGRAB_TRUE@am_libstatgrab_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -545,8 +543,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -558,8 +556,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -569,12 +567,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/imu/Makefile.in player-2.1.1.norpath_am/server/drivers/imu/Makefile.in
--- player-2.1.1/server/drivers/imu/Makefile.in 2008-06-16 01:40:00.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/imu/Makefile.in 2008-09-01 00:18:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
am_libnimu_la_OBJECTS = nimu.lo nimuplayer.lo
libnimu_la_OBJECTS = $(am_libnimu_la_OBJECTS)
@INCLUDE_NIMU_TRUE@am_libnimu_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -148,7 +148,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -277,7 +276,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -577,8 +575,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -590,8 +588,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -601,12 +599,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/joystick/Makefile.in player-2.1.1.norpath_am/server/drivers/joystick/Makefile.in
--- player-2.1.1/server/drivers/joystick/Makefile.in 2008-06-16 01:40:01.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/joystick/Makefile.in 2008-09-01 00:18:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_liblinuxjoystick_la_OBJECTS = linuxjoy.lo
liblinuxjoystick_la_OBJECTS = $(am_liblinuxjoystick_la_OBJECTS)
@INCLUDE_LINUXJOYSTICK_TRUE@am_liblinuxjoystick_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/laser/Makefile.in player-2.1.1.norpath_am/server/drivers/laser/Makefile.in
--- player-2.1.1/server/drivers/laser/Makefile.in 2008-06-16 01:40:01.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/laser/Makefile.in 2008-09-01 00:18:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -103,7 +103,7 @@
am_liburglaser_la_OBJECTS = urg_laser.lo urglaserdriver.lo
liburglaser_la_OBJECTS = $(am_liburglaser_la_OBJECTS)
@INCLUDE_URGLASER_TRUE@am_liburglaser_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -206,7 +206,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -335,7 +334,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -656,8 +654,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -669,8 +667,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -680,12 +678,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/localization/amcl/Makefile.in player-2.1.1.norpath_am/server/drivers/localization/amcl/Makefile.in
--- player-2.1.1/server/drivers/localization/amcl/Makefile.in 2008-06-16 01:40:02.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/localization/amcl/Makefile.in 2008-09-01 00:18:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,7 +56,7 @@
map.lo map_range.lo map_store.lo map_draw.lo
libamcl_la_OBJECTS = $(am_libamcl_la_OBJECTS)
@INCLUDE_AMCL_TRUE@am_libamcl_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -147,7 +147,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -276,7 +275,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -728,8 +726,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -741,8 +739,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -752,12 +750,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/localization/Makefile.in player-2.1.1.norpath_am/server/drivers/localization/Makefile.in
--- player-2.1.1/server/drivers/localization/Makefile.in 2008-06-16 01:40:01.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/localization/Makefile.in 2008-09-01 00:18:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libfakelocalize_la_OBJECTS = fakelocalize.lo
libfakelocalize_la_OBJECTS = $(am_libfakelocalize_la_OBJECTS)
@INCLUDE_FAKELOCALIZE_TRUE@am_libfakelocalize_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -617,8 +615,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -643,8 +641,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -654,12 +652,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/Makefile.in player-2.1.1.norpath_am/server/drivers/Makefile.in
--- player-2.1.1/server/drivers/Makefile.in 2008-06-16 01:39:53.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/Makefile.in 2008-09-01 00:18:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -584,8 +582,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -610,8 +608,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -621,12 +619,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/map/Makefile.in player-2.1.1.norpath_am/server/drivers/map/Makefile.in
--- player-2.1.1/server/drivers/map/Makefile.in 2008-06-16 01:40:02.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/map/Makefile.in 2008-09-01 00:18:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -67,7 +67,7 @@
am_libvmapfile_la_OBJECTS = vmapfile.lo
libvmapfile_la_OBJECTS = $(am_libvmapfile_la_OBJECTS)
@INCLUDE_VMAPFILE_TRUE@am_libvmapfile_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -160,7 +160,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -289,7 +288,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -576,8 +574,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -589,8 +587,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -600,12 +598,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mcom/Makefile.in player-2.1.1.norpath_am/server/drivers/mcom/Makefile.in
--- player-2.1.1/server/drivers/mcom/Makefile.in 2008-06-16 01:40:02.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mcom/Makefile.in 2008-09-01 00:18:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
liblifomcom_a_LIBADD =
am_liblifomcom_a_OBJECTS = lifomcom.$(OBJEXT)
liblifomcom_a_OBJECTS = $(am_liblifomcom_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -542,8 +540,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -555,8 +553,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -566,12 +564,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/botrics/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/botrics/Makefile.in
--- player-2.1.1/server/drivers/mixed/botrics/Makefile.in 2008-06-16 01:40:03.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/botrics/Makefile.in 2008-09-01 00:18:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libobot_la_OBJECTS = obot.lo
libobot_la_OBJECTS = $(am_libobot_la_OBJECTS)
@INCLUDE_OBOT_TRUE@am_libobot_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -545,8 +543,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -558,8 +556,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -569,12 +567,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/chatterbox/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/chatterbox/Makefile.in
--- player-2.1.1/server/drivers/mixed/chatterbox/Makefile.in 2008-06-16 01:40:03.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/chatterbox/Makefile.in 2008-09-01 00:18:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libchatterbox_la_OBJECTS = cb_driver.lo cb_i2c.lo
libchatterbox_la_OBJECTS = $(am_libchatterbox_la_OBJECTS)
@INCLUDE_CHATTERBOX_TRUE@am_libchatterbox_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -572,8 +570,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -585,8 +583,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -596,12 +594,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/clodbuster/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/clodbuster/Makefile.in
--- player-2.1.1/server/drivers/mixed/clodbuster/Makefile.in 2008-06-16 01:40:04.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/clodbuster/Makefile.in 2008-09-01 00:18:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libclodbuster_la_OBJECTS = clodbuster.lo packet.lo
libclodbuster_la_OBJECTS = $(am_libclodbuster_la_OBJECTS)
@INCLUDE_CLODBUSTER_TRUE@am_libclodbuster_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -546,8 +544,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -559,8 +557,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -570,12 +568,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/cmucam2/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/cmucam2/Makefile.in
--- player-2.1.1/server/drivers/mixed/cmucam2/Makefile.in 2008-06-16 01:40:04.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/cmucam2/Makefile.in 2008-09-01 00:18:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libcmucam2_la_OBJECTS = cmucam2.lo camera.lo
libcmucam2_la_OBJECTS = $(am_libcmucam2_la_OBJECTS)
@INCLUDE_CMUCAM2_TRUE@am_libcmucam2_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -567,8 +565,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/erratic/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/erratic/Makefile.in
--- player-2.1.1/server/drivers/mixed/erratic/Makefile.in 2008-06-16 01:40:04.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/erratic/Makefile.in 2008-09-01 00:18:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,7 +53,7 @@
robot_params.lo sip.lo
liberratic_la_OBJECTS = $(am_liberratic_la_OBJECTS)
@INCLUDE_ERRATIC_TRUE@am_liberratic_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -555,8 +553,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -568,8 +566,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -579,12 +577,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/evolution/er1/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/evolution/er1/Makefile.in
--- player-2.1.1/server/drivers/mixed/evolution/er1/Makefile.in 2008-06-16 01:40:05.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/evolution/er1/Makefile.in 2008-09-01 00:18:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_liber1_la_OBJECTS = er.lo
liber1_la_OBJECTS = $(am_liber1_la_OBJECTS)
@INCLUDE_ER1_TRUE@am_liber1_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -545,8 +543,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -558,8 +556,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -569,12 +567,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/evolution/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/evolution/Makefile.in
--- player-2.1.1/server/drivers/mixed/evolution/Makefile.in 2008-06-16 01:40:04.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/evolution/Makefile.in 2008-09-01 00:18:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/garcia/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/garcia/Makefile.in
--- player-2.1.1/server/drivers/mixed/garcia/Makefile.in 2008-06-16 01:40:05.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/garcia/Makefile.in 2008-09-01 00:18:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libgarcia_la_OBJECTS = garcia_mixed.lo
libgarcia_la_OBJECTS = $(am_libgarcia_la_OBJECTS)
@INCLUDE_GARCIA_TRUE@am_libgarcia_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -546,8 +544,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -559,8 +557,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -570,12 +568,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/irobot/create/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/irobot/create/Makefile.in
--- player-2.1.1/server/drivers/mixed/irobot/create/Makefile.in 2008-06-16 01:40:06.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/irobot/create/Makefile.in 2008-09-01 00:18:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libcreate_la_OBJECTS = create_comms.lo create_driver.lo
libcreate_la_OBJECTS = $(am_libcreate_la_OBJECTS)
@INCLUDE_CREATE_TRUE@am_libcreate_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -567,8 +565,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/irobot/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/irobot/Makefile.in
--- player-2.1.1/server/drivers/mixed/irobot/Makefile.in 2008-06-16 01:40:05.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/irobot/Makefile.in 2008-09-01 00:18:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/irobot/roomba/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/irobot/roomba/Makefile.in
--- player-2.1.1/server/drivers/mixed/irobot/roomba/Makefile.in 2008-06-16 01:40:06.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/irobot/roomba/Makefile.in 2008-09-01 00:18:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libroomba_la_OBJECTS = roomba_comms.lo roomba_driver.lo
libroomba_la_OBJECTS = $(am_libroomba_la_OBJECTS)
@INCLUDE_ROOMBA_TRUE@am_libroomba_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -567,8 +565,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/khepera/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/khepera/Makefile.in
--- player-2.1.1/server/drivers/mixed/khepera/Makefile.in 2008-06-16 01:40:06.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/khepera/Makefile.in 2008-09-01 00:18:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libkhepera_la_OBJECTS = khepera.lo khepera_serial.lo
libkhepera_la_OBJECTS = $(am_libkhepera_la_OBJECTS)
@INCLUDE_KHEPERA_TRUE@am_libkhepera_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -546,8 +544,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -559,8 +557,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -570,12 +568,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/Makefile.in
--- player-2.1.1/server/drivers/mixed/Makefile.in 2008-06-16 01:40:03.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/Makefile.in 2008-09-01 00:18:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/mricp/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/mricp/Makefile.in
--- player-2.1.1/server/drivers/mixed/mricp/Makefile.in 2008-06-16 01:40:06.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/mricp/Makefile.in 2008-09-01 00:18:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,7 +53,7 @@
mricp_driver.lo nn.lo Timer.lo
libmricp_la_OBJECTS = $(am_libmricp_la_OBJECTS)
@INCLUDE_MRICP_TRUE@am_libmricp_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -609,8 +607,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -622,8 +620,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -633,12 +631,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/nomad/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/nomad/Makefile.in
--- player-2.1.1/server/drivers/mixed/nomad/Makefile.in 2008-06-16 01:40:07.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/nomad/Makefile.in 2008-09-01 00:18:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -54,7 +54,7 @@
nomad_sonar.lo
libnomad_la_OBJECTS = $(am_libnomad_la_OBJECTS)
@INCLUDE_NOMAD_TRUE@am_libnomad_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -145,7 +145,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -274,7 +273,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -585,8 +583,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -598,8 +596,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -609,12 +607,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/p2os/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/p2os/Makefile.in
--- player-2.1.1/server/drivers/mixed/p2os/Makefile.in 2008-06-16 01:40:07.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/p2os/Makefile.in 2008-09-01 00:18:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,7 +53,7 @@
kinecalc.lo
libp2os_la_OBJECTS = $(am_libp2os_la_OBJECTS)
@INCLUDE_P2OS_TRUE@am_libp2os_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -567,8 +565,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -578,12 +576,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/phidgetIFK/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/phidgetIFK/Makefile.in
--- player-2.1.1/server/drivers/mixed/phidgetIFK/Makefile.in 2008-06-16 01:40:07.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/phidgetIFK/Makefile.in 2008-09-01 00:18:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libphidgetIFK_la_OBJECTS = phidgetIFK.lo
libphidgetIFK_la_OBJECTS = $(am_libphidgetIFK_la_OBJECTS)
@INCLUDE_PHIDGETIFK_TRUE@am_libphidgetIFK_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/reb/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/reb/Makefile.in
--- player-2.1.1/server/drivers/mixed/reb/Makefile.in 2008-06-16 01:40:08.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/reb/Makefile.in 2008-09-01 00:18:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
libreb_a_LIBADD =
am_libreb_a_OBJECTS = reb.$(OBJEXT) reb_params.$(OBJEXT)
libreb_a_OBJECTS = $(am_libreb_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -543,8 +541,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -556,8 +554,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -567,12 +565,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/rflex/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/rflex/Makefile.in
--- player-2.1.1/server/drivers/mixed/rflex/Makefile.in 2008-06-16 01:40:08.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/rflex/Makefile.in 2008-09-01 00:18:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_librflex_la_OBJECTS = rflex.lo rflex_commands.lo rflex-io.lo
librflex_la_OBJECTS = $(am_librflex_la_OBJECTS)
@INCLUDE_RFLEX_TRUE@am_librflex_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -550,8 +548,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -563,8 +561,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -574,12 +572,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/rmp/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/rmp/Makefile.in
--- player-2.1.1/server/drivers/mixed/rmp/Makefile.in 2008-06-16 01:40:08.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/rmp/Makefile.in 2008-09-01 00:18:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libsegwayrmp_la_OBJECTS = segwayrmp.lo canio_kvaser.lo
libsegwayrmp_la_OBJECTS = $(am_libsegwayrmp_la_OBJECTS)
@INCLUDE_SEGWAYRMP_TRUE@am_libsegwayrmp_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -548,8 +546,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -561,8 +559,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -572,12 +570,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/robotino/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/robotino/Makefile.in
--- player-2.1.1/server/drivers/mixed/robotino/Makefile.in 2008-06-16 01:40:09.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/robotino/Makefile.in 2008-09-01 00:18:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_librobotino_la_OBJECTS = robotino_driver.lo
librobotino_la_OBJECTS = $(am_librobotino_la_OBJECTS)
@INCLUDE_ROBOTINO_TRUE@am_librobotino_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/sr3000/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/sr3000/Makefile.in
--- player-2.1.1/server/drivers/mixed/sr3000/Makefile.in 2008-06-16 01:40:09.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/sr3000/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libsr3000_la_OBJECTS = sr3000.lo
libsr3000_la_OBJECTS = $(am_libsr3000_la_OBJECTS)
@INCLUDE_SR3000_TRUE@am_libsr3000_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/wbr/914/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/wbr/914/Makefile.in
--- player-2.1.1/server/drivers/mixed/wbr/914/Makefile.in 2008-06-16 01:40:09.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/wbr/914/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libwbr914_la_OBJECTS = wbr914.lo
libwbr914_la_OBJECTS = $(am_libwbr914_la_OBJECTS)
@INCLUDE_WBR914_TRUE@am_libwbr914_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -545,8 +543,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -558,8 +556,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -569,12 +567,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/mixed/wbr/Makefile.in player-2.1.1.norpath_am/server/drivers/mixed/wbr/Makefile.in
--- player-2.1.1/server/drivers/mixed/wbr/Makefile.in 2008-06-16 01:40:09.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/mixed/wbr/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/opaque/Makefile.in player-2.1.1.norpath_am/server/drivers/opaque/Makefile.in
--- player-2.1.1/server/drivers/opaque/Makefile.in 2008-06-16 01:40:10.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/opaque/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
am_libtcpstream_la_OBJECTS = tcpstream.lo
libtcpstream_la_OBJECTS = $(am_libtcpstream_la_OBJECTS)
@INCLUDE_TCPSTREAM_TRUE@am_libtcpstream_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -140,7 +140,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -269,7 +268,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -546,8 +544,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -559,8 +557,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -570,12 +568,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/planner/Makefile.in player-2.1.1.norpath_am/server/drivers/planner/Makefile.in
--- player-2.1.1/server/drivers/planner/Makefile.in 2008-06-16 01:40:10.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/planner/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/planner/wavefront/Makefile.in player-2.1.1.norpath_am/server/drivers/planner/wavefront/Makefile.in
--- player-2.1.1/server/drivers/planner/wavefront/Makefile.in 2008-06-16 01:40:10.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/planner/wavefront/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,7 +53,7 @@
plan_control.lo wavefront.lo heap.lo
libwavefront_la_OBJECTS = $(am_libwavefront_la_OBJECTS)
@INCLUDE_WAVEFRONT_TRUE@am_libwavefront_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -574,8 +572,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -587,8 +585,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -598,12 +596,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/pointcloud3d/Makefile.in player-2.1.1.norpath_am/server/drivers/pointcloud3d/Makefile.in
--- player-2.1.1/server/drivers/pointcloud3d/Makefile.in 2008-06-16 01:40:11.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/pointcloud3d/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_liblaserptzcloud_la_OBJECTS = laserptzcloud.lo
liblaserptzcloud_la_OBJECTS = $(am_liblaserptzcloud_la_OBJECTS)
@INCLUDE_LASERPTZCLOUD_TRUE@am_liblaserptzcloud_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/ascension/Makefile.in player-2.1.1.norpath_am/server/drivers/position/ascension/Makefile.in
--- player-2.1.1/server/drivers/position/ascension/Makefile.in 2008-06-16 01:40:11.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/ascension/Makefile.in 2008-09-01 00:19:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libflockofbirds_la_OBJECTS = flockofbirds.lo
libflockofbirds_la_OBJECTS = $(am_libflockofbirds_la_OBJECTS)
@INCLUDE_FLOCKOFBIRDS_TRUE@am_libflockofbirds_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/bumpersafe/Makefile.in player-2.1.1.norpath_am/server/drivers/position/bumpersafe/Makefile.in
--- player-2.1.1/server/drivers/position/bumpersafe/Makefile.in 2008-06-16 01:40:11.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/bumpersafe/Makefile.in 2008-09-01 00:19:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libbumpersafe_la_OBJECTS = bumpersafe.lo
libbumpersafe_la_OBJECTS = $(am_libbumpersafe_la_OBJECTS)
@INCLUDE_BUMPERSAFE_TRUE@am_libbumpersafe_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/isense/Makefile.in player-2.1.1.norpath_am/server/drivers/position/isense/Makefile.in
--- player-2.1.1/server/drivers/position/isense/Makefile.in 2008-06-16 01:40:12.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/isense/Makefile.in 2008-09-01 00:19:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libisense_la_OBJECTS = inertiacube2.lo
libisense_la_OBJECTS = $(am_libisense_la_OBJECTS)
@INCLUDE_ISENSE_TRUE@am_libisense_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/lasersafe/Makefile.in player-2.1.1.norpath_am/server/drivers/position/lasersafe/Makefile.in
--- player-2.1.1/server/drivers/position/lasersafe/Makefile.in 2008-06-16 01:40:12.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/lasersafe/Makefile.in 2008-09-01 00:19:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_liblasersafe_la_OBJECTS = lasersafe.lo
liblasersafe_la_OBJECTS = $(am_liblasersafe_la_OBJECTS)
@INCLUDE_LASERSAFE_TRUE@am_liblasersafe_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/Makefile.in player-2.1.1.norpath_am/server/drivers/position/Makefile.in
--- player-2.1.1/server/drivers/position/Makefile.in 2008-06-16 01:40:11.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/Makefile.in 2008-09-01 00:19:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -254,7 +253,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -554,8 +552,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/mbicp/Makefile.in player-2.1.1.norpath_am/server/drivers/position/mbicp/Makefile.in
--- player-2.1.1/server/drivers/position/mbicp/Makefile.in 2008-06-16 01:40:12.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/mbicp/Makefile.in 2008-09-01 00:19:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,7 +53,7 @@
percolate.lo sp_matrix.lo
libmbicp_la_OBJECTS = $(am_libmbicp_la_OBJECTS)
@INCLUDE_MBICP_TRUE@am_libmbicp_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -571,8 +569,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -584,8 +582,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -595,12 +593,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/microstrain/Makefile.in player-2.1.1.norpath_am/server/drivers/position/microstrain/Makefile.in
--- player-2.1.1/server/drivers/position/microstrain/Makefile.in 2008-06-16 01:40:13.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/microstrain/Makefile.in 2008-09-01 00:19:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libmicrostrain_la_OBJECTS = 3dmg.lo
libmicrostrain_la_OBJECTS = $(am_libmicrostrain_la_OBJECTS)
@INCLUDE_MICROSTRAIN_TRUE@am_libmicrostrain_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/nav200/Makefile.in player-2.1.1.norpath_am/server/drivers/position/nav200/Makefile.in
--- player-2.1.1/server/drivers/position/nav200/Makefile.in 2008-06-16 01:40:13.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/nav200/Makefile.in 2008-09-01 00:19:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -65,7 +65,7 @@
am_test_program_init_OBJECTS = test_program_init.$(OBJEXT)
test_program_init_OBJECTS = $(am_test_program_init_OBJECTS)
test_program_init_DEPENDENCIES = libsicknav200.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -158,7 +158,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -287,7 +286,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -607,8 +605,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -620,8 +618,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -631,12 +629,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/nd/Makefile.in player-2.1.1.norpath_am/server/drivers/position/nd/Makefile.in
--- player-2.1.1/server/drivers/position/nd/Makefile.in 2008-06-16 01:40:13.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/nd/Makefile.in 2008-09-01 00:19:02.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libnd_la_OBJECTS = geometria.lo nd.lo nd_plugin.lo
libnd_la_OBJECTS = $(am_libnd_la_OBJECTS)
@INCLUDE_ND_TRUE@am_libnd_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -547,8 +545,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -560,8 +558,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -571,12 +569,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/roboteq/Makefile.in player-2.1.1.norpath_am/server/drivers/position/roboteq/Makefile.in
--- player-2.1.1/server/drivers/position/roboteq/Makefile.in 2008-06-16 01:40:13.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/roboteq/Makefile.in 2008-09-01 00:19:02.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libroboteq_la_OBJECTS = roboteq.lo
libroboteq_la_OBJECTS = $(am_libroboteq_la_OBJECTS)
@INCLUDE_ROBOTEQ_TRUE@am_libroboteq_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/position/vfh/Makefile.in player-2.1.1.norpath_am/server/drivers/position/vfh/Makefile.in
--- player-2.1.1/server/drivers/position/vfh/Makefile.in 2008-06-16 01:40:14.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/position/vfh/Makefile.in 2008-09-01 00:19:02.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libvfh_la_OBJECTS = vfh.lo vfh_algorithm.lo
libvfh_la_OBJECTS = $(am_libvfh_la_OBJECTS)
@INCLUDE_VFH_TRUE@am_libvfh_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -272,7 +271,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -546,8 +544,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -559,8 +557,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -570,12 +568,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/ptz/Makefile.in player-2.1.1.norpath_am/server/drivers/ptz/Makefile.in
--- player-2.1.1/server/drivers/ptz/Makefile.in 2008-06-16 01:40:14.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/ptz/Makefile.in 2008-09-01 00:19:02.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -67,7 +67,7 @@
am_libsonyevid30_la_OBJECTS = sonyevid30.lo
libsonyevid30_la_OBJECTS = $(am_libsonyevid30_la_OBJECTS)
@INCLUDE_SONYEVID30_TRUE@am_libsonyevid30_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -152,7 +152,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -281,7 +280,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -567,8 +565,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -580,8 +578,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -591,12 +589,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/ranger/Makefile.in player-2.1.1.norpath_am/server/drivers/ranger/Makefile.in
--- player-2.1.1/server/drivers/ranger/Makefile.in 2008-06-16 01:40:14.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/ranger/Makefile.in 2008-09-01 00:19:02.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -74,7 +74,7 @@
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(liburg_nz_la_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@INCLUDE_URG_NZ_TRUE@am_liburg_nz_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -159,7 +159,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -288,7 +287,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -593,8 +591,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -606,8 +604,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -617,12 +615,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/rfid/Makefile.in player-2.1.1.norpath_am/server/drivers/rfid/Makefile.in
--- player-2.1.1/server/drivers/rfid/Makefile.in 2008-06-16 01:40:15.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/rfid/Makefile.in 2008-09-01 00:19:02.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -67,7 +67,7 @@
am_libskyetekM1_la_OBJECTS = skyetekM1.lo
libskyetekM1_la_OBJECTS = $(am_libskyetekM1_la_OBJECTS)
@INCLUDE_SKYETEKM1_TRUE@am_libskyetekM1_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -161,7 +161,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -290,7 +289,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -577,8 +575,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -590,8 +588,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -601,12 +599,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/service_adv/Makefile.in player-2.1.1.norpath_am/server/drivers/service_adv/Makefile.in
--- player-2.1.1/server/drivers/service_adv/Makefile.in 2008-06-16 01:40:15.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/service_adv/Makefile.in 2008-09-01 00:19:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libservice_adv_mdns_la_OBJECTS = mdns.lo
libservice_adv_mdns_la_OBJECTS = $(am_libservice_adv_mdns_la_OBJECTS)
@INCLUDE_SERVICE_ADV_MDNS_TRUE@am_libservice_adv_mdns_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/shell/Makefile.in player-2.1.1.norpath_am/server/drivers/shell/Makefile.in
--- player-2.1.1/server/drivers/shell/Makefile.in 2008-06-16 01:40:15.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/shell/Makefile.in 2008-09-01 00:19:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -77,7 +77,7 @@
am_librelay_la_OBJECTS = relay.lo
librelay_la_OBJECTS = $(am_librelay_la_OBJECTS)
@INCLUDE_RELAY_TRUE@am_librelay_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -172,7 +172,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -301,7 +300,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -597,8 +595,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -610,8 +608,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -621,12 +619,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/speech/Makefile.in player-2.1.1.norpath_am/server/drivers/speech/Makefile.in
--- player-2.1.1/server/drivers/speech/Makefile.in 2008-06-16 01:40:16.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/speech/Makefile.in 2008-09-01 00:19:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libfestival_la_OBJECTS = festival.lo
libfestival_la_OBJECTS = $(am_libfestival_la_OBJECTS)
@INCLUDE_FESTIVAL_TRUE@am_libfestival_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -144,7 +144,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -273,7 +272,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -617,8 +615,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -643,8 +641,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -654,12 +652,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/speech/recognition/Makefile.in player-2.1.1.norpath_am/server/drivers/speech/recognition/Makefile.in
--- player-2.1.1/server/drivers/speech/recognition/Makefile.in 2008-06-16 01:40:16.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/speech/recognition/Makefile.in 2008-09-01 00:19:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
am_libsphinx2_la_OBJECTS = sphinx2.lo
libsphinx2_la_OBJECTS = $(am_libsphinx2_la_OBJECTS)
@INCLUDE_SPHINX2_TRUE@am_libsphinx2_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -536,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -549,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -560,12 +558,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/vectormap/Makefile.in player-2.1.1.norpath_am/server/drivers/vectormap/Makefile.in
--- player-2.1.1/server/drivers/vectormap/Makefile.in 2008-06-16 01:40:17.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/vectormap/Makefile.in 2008-09-01 00:19:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
am_libvec2map_la_OBJECTS = vec2map.lo
libvec2map_la_OBJECTS = $(am_libvec2map_la_OBJECTS)
@INCLUDE_VEC2MAP_TRUE@am_libvec2map_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -148,7 +148,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -277,7 +276,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -555,8 +553,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -568,8 +566,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -579,12 +577,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/wifi/Makefile.in player-2.1.1.norpath_am/server/drivers/wifi/Makefile.in
--- player-2.1.1/server/drivers/wifi/Makefile.in 2008-06-16 01:40:17.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/wifi/Makefile.in 2008-09-01 00:19:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -62,7 +62,7 @@
am_liblinuxwifi_la_OBJECTS = linuxwifi.lo
liblinuxwifi_la_OBJECTS = $(am_liblinuxwifi_la_OBJECTS)
@INCLUDE_LINUXWIFI_TRUE@am_liblinuxwifi_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -146,7 +146,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -275,7 +274,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -556,8 +554,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -569,8 +567,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -580,12 +578,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/drivers/wsn/Makefile.in player-2.1.1.norpath_am/server/drivers/wsn/Makefile.in
--- player-2.1.1/server/drivers/wsn/Makefile.in 2008-06-16 01:40:17.000000000 +0200
+++ player-2.1.1.norpath_am/server/drivers/wsn/Makefile.in 2008-09-01 00:19:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -62,7 +62,7 @@
am_librcore_xbridge_la_OBJECTS = rcore_xbridge.lo
librcore_xbridge_la_OBJECTS = $(am_librcore_xbridge_la_OBJECTS)
@INCLUDE_RCORE_XBRIDGE_TRUE@am_librcore_xbridge_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -155,7 +155,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -284,7 +283,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -565,8 +563,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -578,8 +576,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -589,12 +587,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/libplayerdrivers/Makefile.in player-2.1.1.norpath_am/server/libplayerdrivers/Makefile.in
--- player-2.1.1/server/libplayerdrivers/Makefile.in 2008-06-16 01:40:18.000000000 +0200
+++ player-2.1.1.norpath_am/server/libplayerdrivers/Makefile.in 2008-09-01 00:19:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -71,7 +71,7 @@
libplayerdrivers_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libplayerdrivers_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -167,7 +167,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -296,7 +295,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -542,8 +540,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -551,8 +549,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -640,8 +638,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -653,8 +651,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -664,12 +662,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/server/Makefile.am player-2.1.1.norpath_am/server/Makefile.am
--- player-2.1.1/server/Makefile.am 2008-04-13 00:16:22.000000000 +0200
+++ player-2.1.1.norpath_am/server/Makefile.am 2008-09-01 00:10:49.000000000 +0200
@@ -12,6 +12,9 @@
if HAVE_PLAYERSD
player_DEPENDENCIES += $(top_builddir)/libplayersd/libplayersd.la
endif
+if INCLUDE_JPEG
+player_DEPENDENCIES += $(top_builddir)/libplayerjpeg/libplayerjpeg.la
+endif
# Note to everybody: please do NOT break the following assignment onto
# separate lines with backslashes. It makes the link line look like shit and
@@ -21,6 +24,9 @@
if HAVE_PLAYERSD
player_LDADD += $(top_builddir)/libplayersd/libplayersd.la
endif
+if INCLUDE_JPEG
+player_LDADD += $(top_builddir)/libplayerjpeg/libplayerjpeg.la
+endif
#player_LDADD = -lm $(top_builddir)/server/libplayerdrivers/.libs/libplayerdrivers.a $(top_builddir)/libplayercore/.libs/libplayercore.a $(top_builddir)/libplayercore/.libs/libplayererror.a $(top_builddir)/libplayertcp/.libs/libplayertcp.a $(top_builddir)/libplayerxdr/.libs/libplayerxdr.a @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/.libs/libreplace.a
player_LDFLAGS = -export-dynamic
diff -urN player-2.1.1/server/Makefile.in player-2.1.1.norpath_am/server/Makefile.in
--- player-2.1.1/server/Makefile.in 2008-06-16 01:39:53.000000000 +0200
+++ player-2.1.1.norpath_am/server/Makefile.in 2008-09-01 00:18:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -34,7 +34,9 @@
host_triplet = @host@
target_triplet = @target@
@HAVE_PLAYERSD_TRUE@am__append_1 = $(top_builddir)/libplayersd/libplayersd.la
-@HAVE_PLAYERSD_TRUE@am__append_2 = $(top_builddir)/libplayersd/libplayersd.la
+@INCLUDE_JPEG_TRUE@am__append_2 = $(top_builddir)/libplayerjpeg/libplayerjpeg.la
+@HAVE_PLAYERSD_TRUE@am__append_3 = $(top_builddir)/libplayersd/libplayersd.la
+@INCLUDE_JPEG_TRUE@am__append_4 = $(top_builddir)/libplayerjpeg/libplayerjpeg.la
bin_PROGRAMS = player$(EXEEXT)
subdir = server
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -58,7 +60,7 @@
player_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(player_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -150,7 +152,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -279,7 +280,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -475,7 +475,8 @@
$(top_builddir)/libplayercore/libplayerutils.la \
$(top_builddir)/libplayertcp/libplayertcp.la \
$(top_builddir)/libplayertcp/libplayerudp.la \
- $(top_builddir)/libplayerxdr/libplayerxdr.la $(am__append_1)
+ $(top_builddir)/libplayerxdr/libplayerxdr.la $(am__append_1) \
+ $(am__append_2)
# Note to everybody: please do NOT break the following assignment onto
# separate lines with backslashes. It makes the link line look like shit and
@@ -491,7 +492,7 @@
$(top_builddir)/libplayerxdr/libplayerxdr.la \
@PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) \
$(top_builddir)/replace/libreplace.la @ARTOOLKITPLUS_LIBS@ \
- @GEOS_LIBS@ $(am__append_2)
+ @GEOS_LIBS@ $(am__append_3) $(am__append_4)
#player_LDADD = -lm $(top_builddir)/server/libplayerdrivers/.libs/libplayerdrivers.a $(top_builddir)/libplayercore/.libs/libplayercore.a $(top_builddir)/libplayercore/.libs/libplayererror.a $(top_builddir)/libplayertcp/.libs/libplayertcp.a $(top_builddir)/libplayerxdr/.libs/libplayerxdr.a @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/.libs/libreplace.a
player_LDFLAGS = -export-dynamic
player_SOURCES = server.cc
@@ -537,8 +538,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -670,8 +671,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -696,8 +697,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -707,12 +708,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/dgps_server/Makefile.in player-2.1.1.norpath_am/utils/dgps_server/Makefile.in
--- player-2.1.1/utils/dgps_server/Makefile.in 2008-06-16 01:40:18.000000000 +0200
+++ player-2.1.1.norpath_am/utils/dgps_server/Makefile.in 2008-09-01 00:19:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -113,7 +113,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -242,7 +241,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
diff -urN player-2.1.1/utils/logsplitter/Makefile.in player-2.1.1.norpath_am/utils/logsplitter/Makefile.in
--- player-2.1.1/utils/logsplitter/Makefile.in 2008-06-16 01:40:18.000000000 +0200
+++ player-2.1.1.norpath_am/utils/logsplitter/Makefile.in 2008-09-01 00:19:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,7 +53,7 @@
am_playerlogsplitter_OBJECTS = logsplitter.$(OBJEXT)
playerlogsplitter_OBJECTS = $(am_playerlogsplitter_OBJECTS)
playerlogsplitter_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -135,7 +135,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -264,7 +263,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -493,8 +491,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -556,8 +554,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -569,8 +567,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -580,12 +578,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/Makefile.in player-2.1.1.norpath_am/utils/Makefile.in
--- player-2.1.1/utils/Makefile.in 2008-06-16 01:40:18.000000000 +0200
+++ player-2.1.1.norpath_am/utils/Makefile.in 2008-09-01 00:19:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -130,7 +130,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -259,7 +258,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -579,8 +577,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -605,8 +603,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -616,12 +614,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playercam/Makefile.am player-2.1.1.norpath_am/utils/playercam/Makefile.am
--- player-2.1.1/utils/playercam/Makefile.am 2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playercam/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -9,4 +9,4 @@
endif
playercam_SOURCES = playercam.c
-playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GTK_LIBS@
+playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
diff -urN player-2.1.1/utils/playercam/Makefile.in player-2.1.1.norpath_am/utils/playercam/Makefile.in
--- player-2.1.1/utils/playercam/Makefile.in 2008-06-16 01:40:19.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playercam/Makefile.in 2008-09-01 00:19:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,8 +57,9 @@
playercam_DEPENDENCIES = \
$(top_builddir)/client_libs/libplayerc/libplayerc.la \
$(top_builddir)/libplayerxdr/libplayerxdr.la \
- $(top_builddir)/libplayercore/libplayererror.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+ $(top_builddir)/libplayercore/libplayererror.la \
+ $(top_builddir)/libplayercore/libplayerutils.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -140,7 +141,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -269,7 +269,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -456,7 +455,7 @@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)/client_libs -I$(top_srcdir)/client_libs @GTK_CFLAGS@
playercam_SOURCES = playercam.c
-playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GTK_LIBS@
+playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
all: all-am
.SUFFIXES:
@@ -499,8 +498,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -562,8 +561,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -575,8 +574,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -586,12 +585,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playerjoy/Makefile.am player-2.1.1.norpath_am/utils/playerjoy/Makefile.am
--- player-2.1.1/utils/playerjoy/Makefile.am 2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerjoy/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -19,7 +19,7 @@
$(top_builddir)/client_libs/libplayerc++/libplayerc++.la
playerjoy_CPPFLAGS = $(PLAYERCC_CFLAGS)
-playerjoy_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror
+playerjoy_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror -lplayerutils
playerjoy_DEPENDENCIES = $(PLAYERCC_DEPS)
diff -urN player-2.1.1/utils/playerjoy/Makefile.in player-2.1.1.norpath_am/utils/playerjoy/Makefile.in
--- player-2.1.1/utils/playerjoy/Makefile.in 2008-06-16 01:40:19.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerjoy/Makefile.in 2008-09-01 00:19:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
am_playerjoy_OBJECTS = playerjoy-playerjoy.$(OBJEXT)
playerjoy_OBJECTS = $(am_playerjoy_OBJECTS)
am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -137,7 +137,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -266,7 +265,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -467,7 +465,7 @@
$(top_builddir)/client_libs/libplayerc++/libplayerc++.la
playerjoy_CPPFLAGS = $(PLAYERCC_CFLAGS)
-playerjoy_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror
+playerjoy_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror -lplayerutils
playerjoy_DEPENDENCIES = $(PLAYERCC_DEPS)
playerjoy_SOURCES = playerjoy.cc
all: all-am
@@ -512,8 +510,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -589,8 +587,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -602,8 +600,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -613,12 +611,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playernav/Makefile.am player-2.1.1.norpath_am/utils/playernav/Makefile.am
--- player-2.1.1/utils/playernav/Makefile.am 2008-04-13 00:16:55.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playernav/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -8,4 +8,4 @@
playernav_SOURCES = playernav.c gui.c playernav.h player.c parse.c
-playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GNOMECANVAS_LIBS@
+playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GNOMECANVAS_LIBS@
diff -urN player-2.1.1/utils/playernav/Makefile.in player-2.1.1.norpath_am/utils/playernav/Makefile.in
--- player-2.1.1/utils/playernav/Makefile.in 2008-06-16 01:40:19.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playernav/Makefile.in 2008-09-01 00:19:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,8 +56,9 @@
playernav_DEPENDENCIES = \
$(top_builddir)/client_libs/libplayerc/libplayerc.la \
$(top_builddir)/libplayerxdr/libplayerxdr.la \
- $(top_builddir)/libplayercore/libplayererror.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+ $(top_builddir)/libplayercore/libplayererror.la \
+ $(top_builddir)/libplayercore/libplayerutils.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -139,7 +140,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -268,7 +268,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -456,7 +455,7 @@
AM_CPPFLAGS = -Wall -g -I$(top_builddir)/client_libs -I$(top_srcdir)/client_libs -I$(top_srcdir) @GNOMECANVAS_CFLAGS@ -fno-strict-aliasing
EXTRA_DIST = playernav-example.jpg
playernav_SOURCES = playernav.c gui.c playernav.h player.c parse.c
-playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GNOMECANVAS_LIBS@
+playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GNOMECANVAS_LIBS@
all: all-am
.SUFFIXES:
@@ -499,8 +498,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -565,8 +564,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -578,8 +577,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -589,12 +588,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playerprint/Makefile.am player-2.1.1.norpath_am/utils/playerprint/Makefile.am
--- player-2.1.1/utils/playerprint/Makefile.am 2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerprint/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -19,7 +19,7 @@
$(top_builddir)/client_libs/libplayerc++/libplayerc++.la
playerprint_CPPFLAGS = $(PLAYERCC_CFLAGS)
-playerprint_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
+playerprint_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
playerprint_DEPENDENCIES = $(PLAYERCC_DEPS)
playerprint_SOURCES = playerprint.cc
diff -urN player-2.1.1/utils/playerprint/Makefile.in player-2.1.1.norpath_am/utils/playerprint/Makefile.in
--- player-2.1.1/utils/playerprint/Makefile.in 2008-06-16 01:40:20.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerprint/Makefile.in 2008-09-01 00:19:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
am_playerprint_OBJECTS = playerprint-playerprint.$(OBJEXT)
playerprint_OBJECTS = $(am_playerprint_OBJECTS)
am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -137,7 +137,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -266,7 +265,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -467,7 +465,7 @@
$(top_builddir)/client_libs/libplayerc++/libplayerc++.la
playerprint_CPPFLAGS = $(PLAYERCC_CFLAGS)
-playerprint_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
+playerprint_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
playerprint_DEPENDENCIES = $(PLAYERCC_DEPS)
playerprint_SOURCES = playerprint.cc
all: all-am
@@ -512,8 +510,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -589,8 +587,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -602,8 +600,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -613,12 +611,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playerprop/Makefile.am player-2.1.1.norpath_am/utils/playerprop/Makefile.am
--- player-2.1.1/utils/playerprop/Makefile.am 2008-04-13 00:16:53.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerprop/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -19,7 +19,7 @@
$(top_builddir)/client_libs/libplayerc++/libplayerc++.la
playerprop_CPPFLAGS = $(PLAYERCC_CFLAGS)
-playerprop_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
+playerprop_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
playerprop_DEPENDENCIES = $(PLAYERCC_DEPS)
playerprop_SOURCES = playerprop.cpp
diff -urN player-2.1.1/utils/playerprop/Makefile.in player-2.1.1.norpath_am/utils/playerprop/Makefile.in
--- player-2.1.1/utils/playerprop/Makefile.in 2008-06-16 01:40:20.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerprop/Makefile.in 2008-09-01 00:19:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
am_playerprop_OBJECTS = playerprop-playerprop.$(OBJEXT)
playerprop_OBJECTS = $(am_playerprop_OBJECTS)
am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -137,7 +137,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -266,7 +265,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -467,7 +465,7 @@
$(top_builddir)/client_libs/libplayerc++/libplayerc++.la
playerprop_CPPFLAGS = $(PLAYERCC_CFLAGS)
-playerprop_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
+playerprop_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
playerprop_DEPENDENCIES = $(PLAYERCC_DEPS)
playerprop_SOURCES = playerprop.cpp
all: all-am
@@ -512,8 +510,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -589,8 +587,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -602,8 +600,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -613,12 +611,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playerv/Makefile.in player-2.1.1.norpath_am/utils/playerv/Makefile.in
--- player-2.1.1/utils/playerv/Makefile.in 2008-06-16 01:40:20.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerv/Makefile.in 2008-09-01 00:19:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -63,7 +63,7 @@
pv_dev_gripper.$(OBJEXT) pv_dev_ranger.$(OBJEXT) \
pv_dev_vectormap.$(OBJEXT)
playerv_OBJECTS = $(am_playerv_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -145,7 +145,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -274,7 +273,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -541,8 +539,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -625,8 +623,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -638,8 +636,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -649,12 +647,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playervcr/Makefile.am player-2.1.1.norpath_am/utils/playervcr/Makefile.am
--- player-2.1.1/utils/playervcr/Makefile.am 2008-04-13 00:16:55.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playervcr/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -9,4 +9,4 @@
playervcr_SOURCES = playervcr.c
playervcr_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
-playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la @GTK_LIBS@
+playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
diff -urN player-2.1.1/utils/playervcr/Makefile.in player-2.1.1.norpath_am/utils/playervcr/Makefile.in
--- player-2.1.1/utils/playervcr/Makefile.in 2008-06-16 01:40:21.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playervcr/Makefile.in 2008-09-01 00:19:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
PROGRAMS = $(bin_PROGRAMS)
am_playervcr_OBJECTS = playervcr.$(OBJEXT)
playervcr_OBJECTS = $(am_playervcr_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -452,7 +450,7 @@
EXTRA_DIST = playervcr-readlog.jpg playervcr-writelog.jpg
playervcr_SOURCES = playervcr.c
playervcr_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
-playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la @GTK_LIBS@
+playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
all: all-am
.SUFFIXES:
@@ -495,8 +493,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -558,8 +556,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -571,8 +569,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -582,12 +580,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/playerwritemap/Makefile.am player-2.1.1.norpath_am/utils/playerwritemap/Makefile.am
--- player-2.1.1/utils/playerwritemap/Makefile.am 2008-04-13 00:16:55.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerwritemap/Makefile.am 2008-08-15 10:10:37.000000000 +0200
@@ -7,4 +7,4 @@
playerwritemap_SOURCES = playerwritemap.c
playerwritemap_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
-playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GDK_PIXBUF_LIBS@
+playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GDK_PIXBUF_LIBS@
diff -urN player-2.1.1/utils/playerwritemap/Makefile.in player-2.1.1.norpath_am/utils/playerwritemap/Makefile.in
--- player-2.1.1/utils/playerwritemap/Makefile.in 2008-06-16 01:40:21.000000000 +0200
+++ player-2.1.1.norpath_am/utils/playerwritemap/Makefile.in 2008-09-01 00:19:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@
PROGRAMS = $(bin_PROGRAMS)
am_playerwritemap_OBJECTS = playerwritemap.$(OBJEXT)
playerwritemap_OBJECTS = $(am_playerwritemap_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -134,7 +134,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -263,7 +262,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -451,7 +449,7 @@
AM_CPPFLAGS = -Wall -g -I$(top_builddir)/client_libs -I$(top_srcdir)/client_libs -I$(top_srcdir) @GDK_PIXBUF_CFLAGS@ -fno-strict-aliasing
playerwritemap_SOURCES = playerwritemap.c
playerwritemap_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
-playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GDK_PIXBUF_LIBS@
+playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GDK_PIXBUF_LIBS@
all: all-am
.SUFFIXES:
@@ -494,8 +492,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -557,8 +555,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -570,8 +568,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -581,12 +579,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/pmap/Makefile.in player-2.1.1.norpath_am/utils/pmap/Makefile.in
--- player-2.1.1/utils/pmap/Makefile.in 2008-06-16 01:40:21.000000000 +0200
+++ player-2.1.1.norpath_am/utils/pmap/Makefile.in 2008-09-01 00:19:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -77,7 +77,7 @@
am_pmaptest_OBJECTS = pmap_test.$(OBJEXT)
pmaptest_OBJECTS = $(am_pmaptest_OBJECTS)
pmaptest_DEPENDENCIES =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -170,7 +170,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -299,7 +298,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -539,8 +537,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -548,8 +546,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -666,8 +664,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -679,8 +677,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -690,12 +688,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/xmms-plugin/Makefile.in player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in
--- player-2.1.1/utils/xmms-plugin/Makefile.in 2008-06-16 01:40:22.000000000 +0200
+++ player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in 2008-09-01 00:19:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -64,7 +64,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libplayerxmms_la_CFLAGS) \
$(CFLAGS) $(libplayerxmms_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_XMMS_TRUE@am_libplayerxmms_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -146,7 +146,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -275,7 +274,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -504,8 +502,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -513,8 +511,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -588,8 +586,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -599,12 +597,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique