diff -Nru gnonlin-0.10.11.2/aclocal.m4 gnonlin-0.10.12.2/aclocal.m4 --- gnonlin-0.10.11.2/aclocal.m4 2009-07-16 09:20:35.000000000 +0100 +++ gnonlin-0.10.12.2/aclocal.m4 2009-08-29 10:31:53.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.11 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 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. @@ -31,10 +31,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' +[am__api_version='1.11' 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.2], [], +m4_if([$1], [1.11], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.11])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -110,14 +110,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # 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 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -130,6 +130,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -143,14 +144,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # 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 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -207,6 +208,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -224,7 +235,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -234,19 +255,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -310,59 +335,61 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 4 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[# Autoconf 2.62 quotes --file arguments for eval, but not when files -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # 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 - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # 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 + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -394,13 +421,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, 2008, 2009 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 16 # 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. @@ -417,7 +444,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -468,8 +495,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -477,24 +504,37 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header @@ -517,7 +557,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -528,7 +568,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -555,27 +602,38 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # 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 4 +# serial 5 +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl + AC_SUBST([MAINT])dnl ] ) @@ -583,13 +641,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 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 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -598,7 +656,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -608,24 +666,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -670,14 +728,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # 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 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -694,7 +752,14 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -765,14 +830,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # 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 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -781,16 +846,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -843,18 +921,25 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 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 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/ChangeLog /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/ChangeLog --- gnonlin-0.10.11.2/ChangeLog 2009-05-30 17:00:06.000000000 +0100 +++ gnonlin-0.10.12.2/ChangeLog 2009-08-17 16:21:15.000000000 +0100 @@ -1,9 +1,207 @@ +=== release 0.10.12 === + +2009-08-10 Edward Hervey + + * configure.ac: + releasing 0.10.12, "Lots of people on the clothesline" + +2009-08-10 16:28:38 +0200 Edward Hervey + + * gnl/gnlfilesource.c: + * gnl/gnlfilesource.h: + gnlfilesource: Use uridecodebin and remove dead code. + Using decodebin2 directly fails because it blocks its own pads (therefore + making it impossible for us to block them ourselves. + +2009-08-06 17:35:21 +0200 Alessandro Decina + + * gnl/gnlghostpad.c: + When ghosting a pad that has negotiated caps, set those caps to the ghost as well. + +2009-08-04 17:47:34 +0200 Edward Hervey + + * configure.ac: + configure.ac: 0.10.11.3 pre-release + +2009-07-29 20:40:25 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + gnlcomposition: Only remove top-level pad if removed pad is a source pad. + "Wow, not all objects in the timeline are sources ?" + +2009-07-29 15:58:25 +0200 Edward Hervey + + * gnl/gnlsource.c: + gnlsource: Properly reset internal state when controlled pad has gone. + We weren't resetting pendingblock, resulting in some cases where a new pad + to control would appear, but would not be used because pendingblock was still TRUE. + +2009-07-01 18:53:43 +0200 Edward Hervey + + * gnl/gnloperation.c: + * gnl/gnloperation.h: + gnloperation: TEMPORARY COMMIT ! REBASE ME ! + Added the signal, the next step is to emit it from the composition + which requires replacing the gst_element_link with gst_pad_link... + which we should have been using ages ago :) + +2009-07-01 16:56:27 +0200 Edward Hervey + + * gnl/Makefile.am: + * gnl/gnlmarshal.list: + * gnl/gnloperation.c: + gnl: Adding signal marshaller + +2009-07-27 20:07:21 +0200 Adam Dingle + + * gnl/gnlfilesource.c: + gnlfilesource: Really use decodebin2. Fixes #589525 + +2009-07-24 00:43:47 +0300 Stefan Kost + + * common: + Automatic update of common submodule + From fedaaee to 94f95e3 + +2009-07-16 10:20:08 +0200 Edward Hervey + + * configure.ac: + 0.10.11.2 pre-release + +2009-07-13 12:24:46 -0400 Olivier Crête + + * common: + Automatic update of common submodule + From 5845b63 to fedaaee + +2009-06-26 13:44:04 +0100 Jan Schmidt + + * common: + Automatic update of common submodule + From f810030 to 5845b63 + +2009-06-24 19:15:30 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + gnlcomposition: Remove bogus debug statement. + +2009-06-24 15:16:42 +0100 Jan Schmidt + + * common: + Automatic update of common submodule + From f3bb51b to f810030 + +2009-06-14 11:35:52 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnlfilesource.c: + * gnl/gnlfilesource.h: + gnlcomposition/gnlfilesource: Don't use 'private' keyword. + This avoids build errors with C++ compilers. + +2009-06-12 20:00:00 +0200 Edward Hervey + + * gnl/gnloperation.c: + gnloperation: Don't forget to lower the pad count when removing one. + +2009-06-12 18:48:59 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + gnlcomposition: rewrite from scratch of pipeline unlinking/linking. + We currently weren't handling operations in general (and dynamic multi-sinkpad + operations in particular) in a safe fashion. + This rewrite makes sure that when redoing the pipeline: + * no streaming threads are flowing between elements when deactivating + * all source pads are blocked (asynchronously) + * flush start/stop is sent out if this is the consequence of a seek + +2009-06-12 18:46:34 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + gnlcomposition: When receiving a seek, let update_pipeline send the flush events. + +2009-06-12 18:44:46 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + gnlcomposition: *always* update pipeline when removing objects. + The object might currently have a streaming thread flowing out/through + of it. We therefore need to properly stop that by forcing a refresh of + the internal pipeline before calling the parent class remove_object() + +2009-06-12 18:43:51 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + gnlcomposition: Recheck for ghostpad existence in critical codepath. + +2009-06-12 18:42:25 +0200 Edward Hervey + + * gnl/gnlghostpad.c: + gnlghostpad: add G_UNLIKELY and remove useless warning + +2009-06-12 18:41:21 +0200 Edward Hervey + + * gnl/gnloperation.c: + gnloperation: Unset sink ghostpad targets and fix pad-synch for dynamic operations. + +2009-06-10 19:42:11 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + * gnl/gnlobject.h: + gnlcomposition: Simplify IN_ACTIVE_SEGMENT macro + It also fixes the issue when the object would start before the segment + start and end after the segment stop. + +2009-06-11 13:51:06 +0100 Jan Schmidt + + * common: + * docs/Makefile.am: + * docs/libs/Makefile.am: + * docs/upload.mak: + docs: Bump common. Remove extra upload.mak. Fix comment. + +2009-05-30 17:57:53 +0200 Edward Hervey + + * gnl/gnlcomposition.c: + * tests/check/complex.c: + * tests/check/gnloperation.c: + GnlComposition: Use expandable GnlObject property. + +2009-05-29 19:47:43 +0200 Edward Hervey + + * gnl/gnlobject.c: + * gnl/gnlobject.h: + GnlObject: Add an 'expandable' property/flag. + This indicates that when the given object is used in a GnlComposition, + it should expand to the full extent of the composition's start/duration. + +2009-05-29 19:35:52 +0200 Edward Hervey + + * tests/check/complex.c: + checks: Don't check for gstreamer 0.10.4 anymore. + We already depend on a much recent version. + +2009-05-30 17:59:39 +0200 Edward Hervey + + * common: + * configure.ac: + configure.ac: Back to development. + +2009-05-26 17:20:52 +0100 Jan Schmidt + + * common: + Automatic update of common submodule + From 888e0a2 to c572721 + === release 0.10.11 === -2009-05-24 Edward Hervey +2009-05-24 11:08:00 +0200 Edward Hervey + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 0.10.11, "How about green for the bikeshed?" + 0.10.11 release "How about green for the bikeshed?" 2009-05-22 10:21:31 +0100 Jan Schmidt @@ -2571,3 +2769,1344 @@ * gnl/gnlfilesource.c: (pad_blocked_cb): Do this hack from another thread. +2005-12-02 10:36:31 +0000 Edward Hervey + + configure.ac: Preparation for oh ten oh + Original commit message from CVS: + * configure.ac: + Preparation for oh ten oh + +2005-12-01 17:47:35 +0000 Edward Hervey + + gnl/gnlcomposition.c: Wow, that was some stupid error :) + Original commit message from CVS: + * gnl/gnlcomposition.c: (gnl_composition_sync_handler), + (objects_start_compare), (objects_stop_compare), + (update_start_stop_duration), (update_pipeline), + (object_start_changed), (object_stop_changed), + (gnl_composition_add_object): + Wow, that was some stupid error :) + * gnl/gnlobject.c: (translate_incoming_seek), + (internalpad_event_function), (flush_hack_check), + (ghostpad_event_function), (control_internal_pad), + (gnl_object_ghost_pad_full), (gnl_object_ghost_pad_no_target): + Better flush handling. + +2005-11-26 13:25:22 +0000 Edward Hervey + + gnl/: Update for latest API changes + Original commit message from CVS: + * gnl/gnlcomposition.c: (gnl_composition_put_sync_handler), + (gnl_composition_ghost_pad_set_target): + * gnl/gnlobject.c: (gnl_object_put_sync_handler), + (translate_outgoing_new_segment), (internalpad_event_function), + (gnl_object_ghost_pad_full), (gnl_object_ghost_pad_no_target): + * gnl/gnlobject.h: + Update for latest API changes + +2005-11-18 13:06:11 +0000 Edward Hervey + + gnl/gnlfilesource.c: Better behaviour as standalone element + Original commit message from CVS: + * gnl/gnlfilesource.c: (gnl_filesource_class_init), + (pad_blocked_cb), (gnl_filesource_prepare): + Better behaviour as standalone element + * gnl/gnlobject.c: (translate_incoming_seek): + Added debug + +2005-11-04 14:47:20 +0000 Edward Hervey + + gnl/gnlcomposition.c: Fixed problem in stack traversal + Original commit message from CVS: + * gnl/gnlcomposition.c: (gnl_composition_sync_handler), + (get_stack_list), (send_initial_seek), + (gnl_composition_change_state), (compare_relink_stack), + (update_pipeline), (object_start_changed), (object_stop_changed), + (object_priority_changed), (object_active_changed), + (gnl_composition_add_object), (gnl_composition_remove_object): + Fixed problem in stack traversal + Better State-Lock handling of elements + * gnl/gnlfilesource.c: (ghost_seek_pad): + * gnl/gnlobject.c: (gnl_object_init), (internalpad_event_function), + (flush_hack_check), (ghostpad_event_function), + (control_internal_pad), (gnl_object_ghost_pad_full), + (gnl_object_ghost_pad): + * gnl/gnlobject.h: + Added fields for segment seeking at the base GnlObject class level + Added hack for a flushing seek issue, we get deadlocks otherwise + +2005-11-03 17:43:14 +0000 Edward Hervey + + gnl/gnlcomposition.c: Override bin sync-bus, first step to rebuilding pipeline after segment-done + Original commit message from CVS: + * gnl/gnlcomposition.c: (gnl_composition_put_sync_handler), + (gnl_composition_init), (gnl_composition_dispose), + (gnl_composition_sync_handler), + (gnl_composition_ghost_pad_set_target), (get_stack_list), + (update_start_stop_duration), (compare_relink_stack): + Override bin sync-bus, first step to rebuilding pipeline after + segment-done + * gnl/gnlfilesource.c: (ghost_seek_pad), (pad_blocked_cb), + (decodebin_new_pad_cb), (gnl_filesource_init): + Use 'new-pad' signal from decodebin instead of 'no-more-pads' + * gnl/gnlobject.c: (gnl_object_put_sync_handler), + (gnl_object_init), (translate_incoming_seek), + (translate_outgoing_newsegment), (translate_message_segment_start), + (translate_message_segment_done), (gnl_object_sync_handler), + (update_values): + * gnl/gnlobject.h: + Added sync bus override, with functions to time-shift segment-start + and segment-done messages + +2005-11-02 19:07:55 +0000 Edward Hervey + + gnl/: Second part of using dynamic pads. Solves deadlocks. + Original commit message from CVS: + * gnl/gnlcomposition.c: (gnl_composition_init), + (gnl_composition_finalize), (gnl_composition_reset), + (gnl_composition_ghost_pad_set_target), + (gnl_composition_find_object_full), (send_initial_seek), + (gnl_composition_change_state), (no_more_pads_object_cb), + (compare_relink_stack), (update_pipeline), + (gnl_composition_add_object), (gnl_composition_remove_object): + * gnl/gnlfilesource.c: (gnl_filesource_class_init), + (ghost_seek_pad), (pad_blocked_cb), (decodebin_no_more_pads_cb), + (gnl_filesource_init), (gnl_filesource_send_event): + * gnl/gnlobject.c: (internalpad_event_function), + (internalpad_query_function), (ghostpad_event_function), + (ghostpad_query_function), (ghostpad_link_function): + * gnl/gnlsource.c: (no_more_pads_in_child), + (gnl_source_add_element): + Second part of using dynamic pads. Solves deadlocks. + Most of the work is down in sources. + +2005-11-02 08:41:35 +0000 Edward Hervey + + configure.ac: up to 0.9.4.1 + Original commit message from CVS: + * configure.ac: + up to 0.9.4.1 + * gnl/gnl.c: + gnonlin and not GNonLin for plugin name + * gnl/gnlcomposition.c: (hash_value_destroy), + (gnl_composition_init), (gnl_composition_finalize), + (gnl_composition_find_object_full), (update_pipeline), + (gnl_composition_add_object), (gnl_composition_remove_object): + Use a GMutex instead of a GStaticMutex + First step to using dynamic pads : don't add ghostpad at startup + * gnl/gnlfilesource.c: (gnl_filesource_class_init): + beautification + +2005-10-31 18:45:06 +0000 Edward Hervey + + gnl/: Added GnlFileSource, a higher-level decodebin-based source + Original commit message from CVS: + * gnl/Makefile.am: + * gnl/gnl.c: + * gnl/gnl.h: + * gnl/gnltypes.h: + * gnl/gnlfilesource.c: (gnl_filesource_base_init), + (gnl_filesource_class_init), (compare_src_pad), + (get_valid_src_pad), (decodebin_no_more_pads_cb), + (gnl_filesource_init), (gnl_filesource_dispose), + (gnl_filesource_finalize), (gnl_filesource_set_property), + (gnl_filesource_get_property): + * gnl/gnlfilesource.h: + Added GnlFileSource, a higher-level decodebin-based source + * gnl/gnlcomposition.c: (gnl_composition_class_init), + (gnl_composition_init), (gnl_composition_dispose), + (gnl_composition_reset), (gnl_composition_bus_watch), + (priority_comp), (get_stack_list), (get_clean_toplevel_stack), + (gnl_composition_find_object_full), (gnl_composition_find_object), + (get_src_pad), (gnl_composition_prepare), + (gnl_composition_change_state), (compare_relink_stack), + (update_pipeline), (object_start_changed), (object_stop_changed), + (object_priority_changed), (object_active_changed), + (gnl_composition_add_object), (gnl_composition_remove_object): + * gnl/gnlcomposition.h: + Added the supa-doopa traversal-with-stack functionnality for figuring out + quickly what should be played at any given moment. Why didn't I come up + with this before ?? + Removed deprecated pieces of code + * gnl/gnlobject.c: (gnl_object_class_init), + (gnl_object_to_media_time), (gnl_media_to_object_time), + (gnl_object_covers), (gnl_object_prepare_func), + (translate_incoming_seek), (translate_outgoing_seek), + (control_internal_pad), (ghostpad_link_function), + (ghostpad_unlink_function), (gnl_object_ghost_pad), + (gnl_object_ghost_pad_notarget), (gnl_object_ghost_pad_set_target), + (update_values), (gnl_object_change_state): + * gnl/gnlobject.h: + Fixes to the GhostPad system + Indentation beautification + * gnl/gnlsource.c: (gnl_source_class_init), + (no_more_pads_in_child), (gnl_source_remove_element): + * gnl/gnlsource.h: + Removed unused/useless code + * gnl/gnlelements.c: + bye bye + +2005-10-27 17:02:24 +0000 Edward Hervey + + gnl/gnlobject.*: Added two functions to be able to create GnlGhostPad without a target, and be able to set it later on. + Original commit message from CVS: + * gnl/gnlobject.c: (translate_incoming_seek), + (ghostpad_unlink_function), (gnl_object_ghost_pad), + (gnl_object_ghost_pad_notarget), (gnl_object_ghost_pad_set_target): + * gnl/gnlobject.h: + Added two functions to be able to create GnlGhostPad without a target, + and be able to set it later on. + +2005-10-27 14:27:59 +0000 Edward Hervey + + gnl/gnlcomposition.*: Initial Cleanup + Original commit message from CVS: + * gnl/gnlcomposition.c: (gnl_composition_class_init), + (hash_value_destroy), (gnl_composition_init), + (gnl_composition_dispose), (gnl_composition_finalize), + (objects_start_compare), (objects_stop_compare), + (update_start_stop_duration), (object_start_changed), + (object_stop_changed), (object_priority_changed), + (object_active_changed), (gnl_composition_add_object), + (gnl_composition_remove_object): + * gnl/gnlcomposition.h: + Initial Cleanup + Added new threadsafe way of handling objects + * gnl/gnlobject.c: (gnl_object_base_init), (gnl_object_class_init), + (gnl_object_init), (gnl_object_prepare_func), (gnl_object_prepare), + (gnl_object_release_pad), (translate_incoming_seek), + (translate_outgoing_newsegment), (update_values), + (gnl_object_set_property), (gnl_object_get_property), + (gnl_object_change_state): + * gnl/gnlobject.h: + stop position for object and media are now read-only + Added read/write duration for object and media + Saner event time modifications + Added GstObjectFlags for GnlObject for figuring out if the object is a + source or an operation + Re-added prepare virtual method, still have to see if it's useful, I'd + prefer to avoid using it... + * gnl/gnlsource.c: (gnl_source_class_init), (gnl_source_init), + (gnl_source_dispose), (gnl_source_finalize), + (no_more_pads_in_child), (gnl_source_remove_element): + * gnl/gnlsource.h: + Cleanups and proper finalize + +2005-10-25 16:27:19 +0000 Edward Hervey + + Object and Source are now useable and do proper time-shifting + Original commit message from CVS: + * gnl/gnlobject.c: (gnl_object_base_init), (gnl_object_class_init), + (gnl_object_init), (gnl_object_to_media_time), + (gnl_media_to_object_time), (gnl_object_covers_func), + (gnl_object_covers), (gnl_object_release_pad), + (translate_incoming_seek), (translate_outgoing_seek), + (translate_outgoing_newsegment), (internalpad_event_function), + (internalpad_query_function), (ghostpad_event_function), + (ghostpad_query_function), (control_internal_pad), + (ghostpad_link_function), (ghostpad_unlink_function), + (gnl_object_ghost_pad), (gnl_object_set_caps), + (gnl_object_set_property), (gnl_object_get_property): + * gnl/gnlobject.h: + * gnl/gnloperation.h: + * gnl/gnlsource.c: (gnl_source_base_init), (gnl_source_class_init), + (gnl_source_init), (compare_src_pad), (get_valid_src_pad), + (no_more_pads_in_child), (gnl_source_add_element), + (gnl_source_remove_element), (gnl_source_set_property), + (gnl_source_get_property): + * gnl/gnlsource.h: + * test/Makefile.am: + Object and Source are now useable and do proper time-shifting + +2005-10-20 14:30:15 +0000 Edward Hervey + + Part II of non-linear world domination. + Original commit message from CVS: + Part II of non-linear world domination. + * Makefile.am: + * docs/Makefile.am: + * gnl/Makefile.am: + * gnl/gnl.c: (plugin_init): + * gnl/gnl.h: + * gnl/gnlcomposition.c: (gnl_composition_class_init), + (gnl_composition_init): + * gnl/gnlcomposition.h: + * gnl/gnlobject.c: (gnl_object_base_init), (gnl_object_class_init), + (gnl_object_init), (gnl_object_get_property): + * gnl/gnlobject.h: + * gnl/gnloperation.c: (gnl_operation_class_init), + (gnl_operation_init): + * gnl/gnloperation.h: + * gnl/gnlsource.c: (gnl_source_class_init), (gnl_source_init), + (gnl_source_set_element), (gnl_source_get_property): + * gnl/gnlsource.h: + * gnl/gnltimeline.c: (gnl_timeline_base_init), + (gnl_timeline_class_init), (gnl_timeline_init): + * gnl/gnltimeline.h: + Plugin and ElementFactory are now 0.9 compatible and installable + Commented out almost everything, gradually adding features + +2005-10-20 14:28:14 +0000 Edward Hervey + + * ABOUT-NLS: + removed ABOUT-NLS + Original commit message from CVS: + removed ABOUT-NLS + +2005-10-20 10:16:08 +0000 Edward Hervey + + Make gnonlin more gst-0.9 friendly + Original commit message from CVS: + * .cvsignore: + * Makefile.am: + * autogen.sh: + * configure.ac: + * docs/Makefile.am: + * m4/Makefile.am: + * m4/codeset.m4: + * m4/gettext.m4: + * m4/glibc21.m4: + * m4/iconv.m4: + * m4/intdiv0.m4: + * m4/inttypes-pri.m4: + * m4/inttypes.m4: + * m4/inttypes_h.m4: + * m4/isc-posix.m4: + * m4/lcmessage.m4: + * m4/lib-ld.m4: + * m4/lib-link.m4: + * m4/lib-prefix.m4: + * m4/progtest.m4: + * m4/stdint_h.m4: + * m4/uintmax_t.m4: + * m4/ulonglong.m4: + * makeconfigure: + * po/Makefile.in.in: + * po/Rules-quot: + * po/boldquot.sed: + * po/en@boldquot.header: + * po/en@quot.header: + * po/insert-header.sin: + * po/quot.sed: + * po/remove-potcdate.sin: + * test/Makefile.am: + Make gnonlin more gst-0.9 friendly + +2005-07-14 13:07:24 +0000 Edward Hervey + + Updated to 0.9 dependency, removed gnonlin-config + Original commit message from CVS: + * Makefile.am: + * configure.ac: + * gnonlin-config.1: + * gnonlin-config.in: + * gnonlin.spec.in: (Group): + * gnonlin.pc.in: (Cflags): + Updated to 0.9 dependency, + removed gnonlin-config + +2005-06-27 08:41:44 +0000 Thomas Vander Stichele + + * gnonlin.spec.in: + fix spec + Original commit message from CVS: + fix spec + +2005-06-27 08:36:32 +0000 Thomas Vander Stichele + + * gnonlin.spec.in: + cleanup of spec + Original commit message from CVS: + cleanup of spec + +2005-06-27 08:31:12 +0000 Thomas Vander Stichele + + * .gitignore: + * docs/.gitignore: + * docs/libs/.gitignore: + * gnl/.gitignore: + * test/.gitignore: + ignore more + Original commit message from CVS: + ignore more + +2005-06-27 08:27:43 +0000 Thomas Vander Stichele + + * configure.ac: + we're in cvs mode + Original commit message from CVS: + we're in cvs mode + +2005-06-21 09:31:08 +0000 Edward Hervey + + gnl/: Removed buggy GST_INFO + Original commit message from CVS: + * gnl/gnltimeline.c: (gnl_timeline_new): + * gnl/gnlcomposition.c: (gnl_composition_new): + * gnl/gnloperation.c: (gnl_operation_new): + * gnl/gnlsource.c: (gnl_source_new): + Removed buggy GST_INFO + +2005-06-09 10:42:15 +0000 Thomas Vander Stichele + + ac/: remove + Original commit message from CVS: + * acconfig.h: + * acinclude.m4: + remove + * common/m4/as-compiler-flag.m4: + * common/m4/as-compiler.m4: + * common/m4/as-libtool.m4: + * common/m4/as-scrub-include.m4: + * common/m4/as-version.m4: + * common/m4/ax_create_stdint_h.m4: + sync with upstream + * configure.ac: + * gnonlin-uninstalled.pc.in: + fix up in sync with the installed copy + * gnonlin.pc.in: + typos + +2005-06-09 09:45:42 +0000 Thomas Vander Stichele + + * ChangeLog: + * docs/libs/Makefile.am: + comment out the overrides for gtk-doc + Original commit message from CVS: + comment out the overrides for gtk-doc + +2005-06-08 16:55:06 +0000 Edward Hervey + + gnl/gnltimeline.c: avoid outputting 2 EOS events if there's only one composition + Original commit message from CVS: + * gnl/gnltimeline.c: (gnl_timeline_timer_loop): + avoid outputting 2 EOS events if there's only one composition + +2005-06-03 16:00:36 +0000 Edward Hervey + + Forgot to add some files to the dist + Original commit message from CVS: + * configure.ac: + * Makefile.am: + * common/Makefile.am: + Forgot to add some files to the dist + +2005-05-26 09:58:10 +0000 Edward Hervey + + configure.ac: Releasing 0.2.2 + Original commit message from CVS: + * configure.ac: Releasing 0.2.2 + +2005-05-25 21:05:33 +0000 Edward Hervey + + * configure.ac: + * gnonlin.spec.in: + fix build files and spec file + Original commit message from CVS: + fix build files and spec file + +2005-05-25 20:58:48 +0000 Edward Hervey + + * gnonlin.spec.in: + fix spec file + Original commit message from CVS: + fix spec file + +2005-05-25 20:47:02 +0000 Edward Hervey + + Makefile.am: added normal equivalent of .in files + Original commit message from CVS: + * Makefile.am: (EXTRA_DIST): + added normal equivalent of .in files + +2005-05-25 20:35:09 +0000 Edward Hervey + + * ChangeLog: + * gnl/gnlcomposition.c: + * gnl/gnlsource.c: + * gnl/gnltimeline.c: + GCC4 bugfixes + Original commit message from CVS: + GCC4 bugfixes + +2005-05-25 20:02:30 +0000 Edward Hervey + + gnl/gnlsource.c: Handle case where the seek is delayed (using pending_seek) + Original commit message from CVS: + * gnl/gnlsource.c: + Handle case where the seek is delayed (using pending_seek) + * docs/libs/gnonlin-sections.txt: + * gnl/gnltimeline.h: + * gnl/gnlsource.h: + * gnl/gnloperation.h: + * gnl/gnlcomposition.h: + removed extern _details + * configure.ac : Releasing 0.2.1 + +2005-05-25 16:12:12 +0000 Edward Hervey + + configure.ac: Releasing 0.2.1 + Original commit message from CVS: + * configure.ac : Releasing 0.2.1 + +2005-05-25 10:38:40 +0000 Edward Hervey + + gnl/gnlsource.c: missing closing parenthisis removed unused 'filled' variable + Original commit message from CVS: + * gnl/gnlsource.c: (source_queue_media): + missing closing parenthisis + removed unused 'filled' variable + +2005-05-25 10:20:43 +0000 Edward Hervey + + gnl/gnlsource.c: memleak bugfix + Original commit message from CVS: + Reviewed by : Edward Hervey + * gnl/gnlsource.c: (source_queue_media): + memleak bugfix + +2005-05-23 16:37:52 +0000 Edward Hervey + + gnl/gnlsource.c: safer pre-rolling + Original commit message from CVS: + * gnl/gnlsource.c: + safer pre-rolling + * gnl/gnltimeline.c: + add query/event handling to timeline timer's pads + fixed bug in request pad handling + +2005-05-06 19:47:57 +0000 Edward Hervey + + gnl/gnlsource.c: No more using global "gnonlin" debug category, using element specific categories + Original commit message from CVS: + * gnl/gnlsource.c: + No more using global "gnonlin" debug category, using element specific categories + +2005-05-06 19:46:04 +0000 Edward Hervey + + gnl/gnltimeline.c: Added "src_%s" PadTemplate so _request_new_pad() works... + Original commit message from CVS: + * gnl/gnltimeline.c: + Added "src_%s" PadTemplate so _request_new_pad() works... + * gnl/gnl.c: + * gnl/gnl.h: + * gnl/gnlcomposition.c: + * gnl/gnlobject.c: + * gnl/gnloperation.c: + * gnl/gnltimeline.c: + No more using global "gnonlin" debug category, using element specific categories + * docs/libs/tmpl/gnloperation.sgml: added "element" property documentation + * docs/libs/gnonlin-sections.txt: removed GST_CAT_DEFAULT + +2005-05-06 17:08:16 +0000 Edward Hervey + + gnl/gnltimeline.c: Implemented GstElement->request_new_pad() in order to get a pad corresponding to a composition usi... + Original commit message from CVS: + * gnl/gnltimeline.c: + Implemented GstElement->request_new_pad() in order to get a pad + corresponding to a composition using standard API. + Implement GstBin->add_element() in order to add a composition to the + timeline using standard API. + * gnl/gnloperation.c: + GstElement of a GnlOperation can now be set/get using the "element" + property + +2005-04-19 11:23:00 +0000 Edward Hervey + + gnl/gnlcomposition.c: gnl_composition_dispose was superfluous, now removed + Original commit message from CVS: + * gnl/gnlcomposition.c: + gnl_composition_dispose was superfluous, now removed + +2005-04-12 09:27:28 +0000 Edward Hervey + + configure.ac: releasing 0.2.0 !! + Original commit message from CVS: + * configure.ac: releasing 0.2.0 !! + +2005-04-06 14:06:17 +0000 Wouter Paesen + + gnl/gnltimeline.c: Prevent a segfault when querying position before anything is scheduled. + Original commit message from CVS: + * gnl/gnltimeline.c: (gnl_timeline_query): + Prevent a segfault when querying position before anything is scheduled. + Patch by Wouter Paesen. + * gnl/gnlcomposition.c: (gnl_composition_schedule_operation): + Fixe scheduling when there's a gap between the operation's priority and + the child object's priority. Patch by Wouter Paesen. + +2005-04-06 12:12:26 +0000 Edward Hervey + + gnonlin-config.in: forgot to update it with new values + Original commit message from CVS: + * gnonlin-config.in: + forgot to update it with new values + * gnl/gnlsource.c: (source_getfunction): + gcc-2.95.* compilation error + +2005-04-04 17:17:24 +0000 Edward Hervey + + test/: updated to new api + Original commit message from CVS: + * test/sourcetest2.c: + * test/pipelines.c: + updated to new api + * test/Makefile.am: commenting out extra tests + * gnl/gnlobject.c: (gnl_object_covers): + added gtk-doc comment + * docs/libs/Makefile.am: corrections for distcheck + +2005-03-31 09:50:22 +0000 Edward Hervey + + docs/libs/tmpl/: Added documentation on GnlFindMethod, GnlCoverType and GnlDirection + Original commit message from CVS: + * docs/libs/tmpl/gnlcomposition.sgml: + * docs/libs/tmpl/gnlobject.sgml: + Added documentation on GnlFindMethod, GnlCoverType and GnlDirection + +2005-03-31 09:44:17 +0000 Edward Hervey + + docs/random/design: Updated explanatory documentation + Original commit message from CVS: + * docs/random/design: + Updated explanatory documentation + +2005-03-31 09:41:07 +0000 Edward Hervey + + * docs/random/srctree: + removing docs/random/srctree + Original commit message from CVS: + removing docs/random/srctree + +2005-03-30 15:27:15 +0000 Edward Hervey + + typo error in gnlobject.h, removed documentation for gnl_object_nearest_change() + Original commit message from CVS: + * gnl/gnl.h: + * gnl/gnlobject.h: + * docs/libs/gnonlin-sections.txt: + * docs/libs/tmpl/gnlobject.sgml: + typo error in gnlobject.h, + removed documentation for gnl_object_nearest_change() + +2005-03-30 15:07:38 +0000 Edward Hervey + + gnl/gnlobject.*: Removed gnl_object_nearest_change() and cleanup of commented code + Original commit message from CVS: + * gnl/gnlobject.h: + * gnl/gnlobject.c: + Removed gnl_object_nearest_change() and cleanup of commented code + +2005-03-30 10:52:18 +0000 Edward Hervey + + * ChangeLog: + * docs/libs/tmpl/gnlobject.sgml: + Typo in changelog + Original commit message from CVS: + Typo in changelog + +2005-03-30 10:48:50 +0000 Edward Hervey + + Removing GnlGroup docs/libs/gnonlin-docs.sgml docs/libs/gnonlin-sections.txt docs/libs/tmpl/gnlobject.sgml + Original commit message from CVS: + * gnl/Makefile.am: + * gnl/gnl.h: + * gnl/gnltypes.h: + * gnl/gnlgroup.c: + * gnl/gnlgroup.h: + * gnl/gnltimeline.h: + * gnl/gnltimeline.c: + * gnl/gnlelements.c: + * docs/libs/gnonlin-docs.sgml: + * docs/libs/gnonlin-sections.txt: + * docs/libs/gnonlin.types: + * docs/libs/tmpl/gnltimeline.sgml: + * docs/libs/tmpl/gnlgroup.sgml: + Removing GnlGroup + * docs/libs/gnonlin-docs.sgml + * docs/libs/gnonlin-sections.txt + * docs/libs/tmpl/gnlobject.sgml + * gnl/gnlobject.h: + * gnl/gnlobject.c: + Removing rate control property for GnlObject + +2005-03-29 14:32:55 +0000 Edward Hervey + + test/Makefile.am: added EXTRA_DIST=pipelines.c and -I$(top_srcdir) to build flags + Original commit message from CVS: + * test/Makefile.am: + added EXTRA_DIST=pipelines.c and -I$(top_srcdir) to build flags + * gnl/Makefile.am: (gnl_headers): forgot to add gnlobject.h + * docs/libs/Makefile.am: (GTKDOC_CFLAGS): added -I$(top_srcdir) for build + * Makefile.am: (EXTRA_DIST): removed gnonlin.m4 + +2005-03-24 17:38:39 +0000 Edward Hervey + + docs/libs/tmpl/: Added sgml file templates for documentation + Original commit message from CVS: + * docs/libs/tmpl/gnl.sgml: + * docs/libs/tmpl/gnlcomposition.sgml: + * docs/libs/tmpl/gnlgroup.sgml: + * docs/libs/tmpl/gnlobject.sgml: + * docs/libs/tmpl/gnloperation.sgml: + * docs/libs/tmpl/gnlsource.sgml: + * docs/libs/tmpl/gnltimeline.sgml: + Added sgml file templates for documentation + * docs/libs/gnonlin.types: + * docs/libs/gnonlin-sections.txt: + * docs/libs/gnonlin-docs.sgml: + Added files for better hierarchy of documentation + * configure.ac: + * docs/Makefile.am: + * docs/version.entities.in: + * docs/libs/Makefile.am: + Added version.entities for documentation + * docs/libs/Makefile.am: (GTKDOC_LIBS): added libgnl.la dependency + * gnl/gnlsource.c: (source_getfunction): typo mistake + * gnonlin.pc.in: more corrections from Wouter Paesen for correct + dependency checks + * configure.ac: (GST_PLUGIN_LDFLAGS), (GST_REQ): + sanity corrections from Wouter Paesen + +2005-03-24 13:48:56 +0000 Edward Hervey + + docs/libs/Makefile.am: added libgnl.la dependency + Original commit message from CVS: + * docs/libs/Makefile.am: (GTKDOC_LIBS): added libgnl.la dependency + * gnl/gnlsource.c: (source_getfunction): typo mistake + * gnonlin.pc.in: more corrections from Wouter Paesen for correct + dependency checks + * configure.ac: (GST_PLUGIN_LDFLAGS), (GST_REQ): + sanity corrections from Wouter Paesen + +2005-03-24 10:53:36 +0000 Edward Hervey + + gnonlin.pc.in: more corrections from Wouter Paesen for correct dependency checks + Original commit message from CVS: + * gnonlin.pc.in: more corrections from Wouter Paesen for correct + dependency checks + * configure.ac: (GST_PLUGIN_LDFLAGS), (GST_REQ): + sanity corrections from Wouter Paesen + +2005-03-23 17:38:03 +0000 Edward Hervey + + docs/Makefile.am: Make doc build depend on ./configure choice gnl/gnl.c, gnl/gnlcomposition.c, gnl/gnlelements.c, gnl... + Original commit message from CVS: + * docs/Makefile.am: Make doc build depend on ./configure choice + * gnl/gnl.c, gnl/gnlcomposition.c, gnl/gnlelements.c, + gnl/gnlgroup.c, gnl/gnlgroup.h, gnl/gnlobject.c, gnl/gnlobject.h, + gnl/gnloperation.c, gnl/gnloperation.h, gnl/gnlsource.c, + gnl/gnlsource.h, gnl/gnltimeline.c, gnl/gnltimeline.h: + Modifications so that elements are registered as gst-plugins + * gnl/Makefile.am: (plugin_LTLIBRARIES): + use plugin_ instead of lib_ so that it's installed in the gst-plugins + directory + * Makefile.am: removed useless lines + * gnl/gnlobject.c: (gnl_object_get_property): + was setting an enum instead of an int + * configure.ac: No spaces in value assignment !! + * test/sourcetest1.c: modified datarate of fakesrc + * gnl/gnl*.[ch]: correction for GST_DEBUG_* functions + * gnonlin.pc.in: updated file to correct dependencies versions + +2005-03-23 12:49:22 +0000 Edward Hervey + + test/sourcetest1.c: modified datarate of fakesrc + Original commit message from CVS: + * test/sourcetest1.c: modified datarate of fakesrc + * gnl/gnl*.[ch]: correction for GST_DEBUG_* functions + * gnonlin.pc.in: updated file to correct dependencies versions + +2005-03-23 10:08:48 +0000 Edward Hervey + + * ChangeLog: + * gnonlin.pc.in: + updated gnonlin.pc.in to correct dependencies versions + Original commit message from CVS: + updated gnonlin.pc.in to correct dependencies versions + +2005-03-22 17:47:39 +0000 Edward Hervey + + * ChangeLog: + * Makefile.am: + * configure.ac: + * docs/Makefile.am: + * docs/libs/Makefile.am: + * docs/upload.mak: + Added gtk-doc API documentation autofoo and skeleton + Original commit message from CVS: + Added gtk-doc API documentation autofoo and skeleton + +2005-03-22 16:28:08 +0000 Edward Hervey + + * ChangeLog: + * Makefile.am: + * gnl/Makefile.am: + * gnl/gnl.h: + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnlelements.c: + * gnl/gnlgroup.c: + * gnl/gnlgroup.h: + * gnl/gnlobject.c: + * gnl/gnlobject.h: + * gnl/gnloperation.c: + * gnl/gnloperation.h: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * gnl/gnltypes.h: + * test/Makefile.am: + * test/sourcetest1.c: + * test/sourcetest2.c: + * test/sourcetest3.c: + * test/sourcetest4.c: + Corrected header files dependencies , deactivated all tests except the sourcetest[1234].c ones which are converted to... + Original commit message from CVS: + Corrected header files dependencies , deactivated all tests except the sourcetest[1234].c ones which are converted to the new API + +2005-03-22 12:00:53 +0000 Edward Hervey + + * gnl/Makefile.am: + * gnl/gnltypes.h: + Updated gnl/Makefile.am and forgot to add gnltypes.h + Original commit message from CVS: + Updated gnl/Makefile.am and forgot to add gnltypes.h + +2005-03-21 18:00:30 +0000 Edward Hervey + + * AUTHORS: + * LICENSE: + * Makefile.am: + * REQUIREMENTS: + * autogen.sh: + * common: + * configure.ac: + * gnl/Makefile.am: + * gnl/gnl.c: + * gnl/gnl.h: + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnlelements.c: + * gnl/gnlgroup.c: + * gnl/gnlgroup.h: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlobject.c: + * gnl/gnlobject.h: + * gnl/gnloperation.c: + * gnl/gnloperation.h: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * gnl/gnlversion.h.in: + * gnl/gnlvlayer.c: + * gnl/gnlvlayer.h: + * gnonlin.spec.in: + Backport from the pitivi repository... expect borkage + Original commit message from CVS: + Backport from the pitivi repository... expect borkage + +2004-05-10 16:00:25 +0000 Edward Hervey + + * autogen.sh: + * common: + updated autogen.sh to new common/ files + Original commit message from CVS: + updated autogen.sh to new common/ files + +2004-03-26 13:05:40 +0000 Edward Hervey + + * autogen.sh: + * common: + * configure.ac: + cleanup of autogen.sh/configure.ac/Makefile.am and update of common/ + Original commit message from CVS: + cleanup of autogen.sh/configure.ac/Makefile.am and update of common/ + +2004-02-16 16:30:46 +0000 Edward Hervey + + * Makefile.am: + * common: + * configure.ac: + * gnl/Makefile.am: + * gnl/gnl.c: + * gnl/gnlelements.c: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + * gnl/gnltimeline.c: + * gnl/gnlvlayer.c: + * test/Makefile.am: + Updates to make gnonlin work with the cvs version of gstreamer. Includes a patch from Roman Kaliakine + Original commit message from CVS: + Updates to make gnonlin work with the cvs version of gstreamer. Includes a patch from Roman Kaliakine + +2004-02-10 15:04:59 +0000 Edward Hervey + + * common: + * configure.ac: + * gnl/gnlsource.c: + Update to Gstreamer v0.6.* + Original commit message from CVS: + Update to Gstreamer v0.6.* + +2002-10-11 19:11:45 +0000 Wim Taymans + + * gnl/gnlsource.c: + * gnl/gnltimeline.c: + Do caps negotiation for groups + Original commit message from CVS: + Do caps negotiation for groups + Don't send buffers outside of the requested range + +2002-10-10 22:12:26 +0000 Wim Taymans + + * test/Makefile.am: + * test/composition.c: + * test/composition2.c: + * test/dynamic1.c: + * test/dynamic2.c: + * test/layertest.c: + * test/layertest2.c: + * test/layertest3.c: + * test/layertest4.c: + * test/pipelines.c: + * test/pipelines.h: + * test/simple.c: + * test/simple1.c: + * test/simple2.c: + * test/simple3.c: + * test/simple4.c: + * test/simple5.c: + * test/sourcetest1.c: + * test/sourcetest2.c: + * test/sourcetest3.c: + * test/sourcetest4.c: + * test/vlayertest.c: + Added a bunch of tests + Original commit message from CVS: + Added a bunch of tests + +2002-10-10 22:07:27 +0000 Wim Taymans + + * common: + * gnl/Makefile.am: + * gnl/gnl.c: + * gnl/gnl.h: + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnlelements.c: + * gnl/gnlgroup.c: + * gnl/gnlgroup.h: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlmarshal.list: + * gnl/gnloperation.c: + * gnl/gnloperation.h: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * gnl/gnltimer.c: + * gnl/gnltimer.h: + * gnl/gnlvlayer.c: + * gnl/gnlvlayer.h: + Rewrite 2. This one can schedule a bit more, compositions are broken. + Original commit message from CVS: + Rewrite 2. This one can schedule a bit more, compositions are broken. + +2002-09-15 18:01:43 +0000 Thomas Vander Stichele + + * common: + * gnl/gnllayer.c: + * gnl/gnloperation.c: + const fixes + Original commit message from CVS: + const fixes + +2002-06-30 14:14:49 +0000 Wim Taymans + + * test/composition.c: + * test/composition2.c: + * test/group.c: + * test/layertest.c: + * test/layertest2.c: + * test/simple.c: + * test/simple2.c: + * test/simple3.c: + * test/simple4.c: + Compile fixes against latest CVS + Original commit message from CVS: + Compile fixes against latest CVS + +2002-06-30 14:14:25 +0000 Wim Taymans + + * common: + * gnl/gnlcomposition.c: + * gnl/gnlgroup.c: + * gnl/gnlsource.c: + * gnl/gnltimer.c: + * gnl/gnltimer.h: + Compile fixed for latest gst CVS + Original commit message from CVS: + Compile fixed for latest gst CVS + +2002-03-13 21:34:51 +0000 Wim Taymans + + * test/group.c: + * test/simple4.c: + Added group.c + Original commit message from CVS: + Added group.c + +2002-03-05 21:18:08 +0000 Wim Taymans + + * test/Makefile.am: + * test/simple4.c: + Added a composition inside a composition example. + Original commit message from CVS: + Added a composition inside a composition example. + +2002-03-05 19:45:16 +0000 Wim Taymans + + * common: + * gnl/gnlcomposition.c: + Implement occupies_time on compositions. + Original commit message from CVS: + Implement occupies_time on compositions. + +2002-03-03 23:08:22 +0000 Wim Taymans + + * docs/random/design: + * docs/random/srctree: + Updated docs. + Original commit message from CVS: + Updated docs. + +2002-03-03 23:07:58 +0000 Wim Taymans + + * test/Makefile.am: + * test/composition.c: + * test/composition2.c: + * test/layertest.c: + * test/layertest2.c: + * test/simple.c: + * test/simple2.c: + * test/simple3.c: + Updated the examples + Original commit message from CVS: + Updated the examples + Added a simple composition test + +2002-03-03 23:07:15 +0000 Wim Taymans + + * common: + * gnl/Makefile.am: + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnlgroup.c: + * gnl/gnlgroup.h: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnloperation.c: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * gnl/gnltimer.c: + Added groups + Original commit message from CVS: + Added groups + Reworked the scheduling using callbacks + +2002-03-01 22:03:01 +0000 Thomas Vander Stichele + + * Makefile.am: + * configure.ac: + build fixes + Original commit message from CVS: + build fixes + +2002-03-01 21:57:35 +0000 Wim Taymans + + * test/composition.c: + Updated the composition test + Original commit message from CVS: + Updated the composition test + +2002-03-01 21:57:11 +0000 Wim Taymans + + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnloperation.c: + * gnl/gnloperation.h: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + Added a first attempt on adding operations. + Original commit message from CVS: + Added a first attempt on adding operations. + +2002-03-01 21:54:46 +0000 Wim Taymans + + * docs/random/design: + My current line of thought. + Original commit message from CVS: + My current line of thought. + +2002-03-01 21:50:34 +0000 Wim Taymans + + * docs/random/design: + Updated docs + Original commit message from CVS: + Updated docs + +2002-03-01 21:48:02 +0000 Thomas Vander Stichele + + * Makefile.am: + * configure.ac: + no docs yet generate config debian typo fix (?) + Original commit message from CVS: + no docs yet + generate config + debian typo fix (?) + +2002-03-01 21:42:51 +0000 Wim Taymans + + * configure.ac: + Added gnlversion.h + Original commit message from CVS: + Added gnlversion.h + +2002-03-01 21:35:23 +0000 Wim Taymans + + * configure.ac: + added configure.ac + Original commit message from CVS: + added configure.ac + +2002-02-27 19:44:18 +0000 Wim Taymans + + * test/Makefile.am: + * test/layertest2.c: + * test/simple3.c: + Added another testcase + Original commit message from CVS: + Added another testcase + +2002-02-27 19:43:44 +0000 Wim Taymans + + * gnl/gnlcomposition.c: + * gnl/gnllayer.c: + More cleanups + Original commit message from CVS: + More cleanups + Handle more cases. + +2002-02-26 22:34:33 +0000 Wim Taymans + + * test/Makefile.am: + * test/layertest.c: + * test/layertest2.c: + * test/simple.c: + * test/simple2.c: + Updated the simple examples. + Original commit message from CVS: + Updated the simple examples. + +2002-02-26 22:33:35 +0000 Wim Taymans + + * gnl/Makefile.am: + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnloperation.c: + * gnl/gnlsource.c: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * gnl/gnltimer.c: + * gnl/gnltimer.h: + This one can do some simple scheduling, see tests + Original commit message from CVS: + This one can do some simple scheduling, see tests + +2002-02-23 13:13:29 +0000 Wim Taymans + + * docs/random/design: + * gnl/Makefile.am: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlsource.c: + * gnl/gnltimeline.h: + * gnl/gnltimer.c: + * gnl/gnltimer.h: + * test/Makefile.am: + * test/layertest.c: + * test/layertest2.c: + Sources are scheduled at the right time. + Original commit message from CVS: + Sources are scheduled at the right time. + Added a timer plugin that monitors stream timestamps and performs + seeking. + Added layertest2 to mp3 seeking and timing. + This requires some gst core changes + +2002-02-22 17:25:08 +0000 Wim Taymans + + * .gitmodules: + * Makefile.am: + * acconfig.h: + * autogen.sh: + * common: + * configure.base: + * gnl/Makefile.am: + * gnl/gnl.c: + * gnl/gnlcomposition.c: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlsource.c: + * test/Makefile.am: + * test/layertest.c: + Automake 1.5 fixes another test app. + Original commit message from CVS: + Automake 1.5 fixes + another test app. + use pkg-config to find gstreamer + +2001-07-30 19:14:45 +0000 Steve Baker + + * AUTHORS: + vanity + Original commit message from CVS: + vanity + +2001-07-30 15:19:52 +0000 Wim Taymans + + * gnl/.gitignore: + * gnl/gnl.c: + * gnl/gnlcomposition.c: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlsource.c: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * test/simple.c: + More silly changes.. testing the commit log features... + Original commit message from CVS: + More silly changes.. testing the commit log features... + +2001-07-29 20:01:14 +0000 Wim Taymans + + * gnl/.gitignore: + Added .cvsignore. + Original commit message from CVS: + Added .cvsignore. + +2001-07-29 20:00:20 +0000 Wim Taymans + + * gnl/gnloperation.c: + * gnl/gnloperation.h: + Added the operation object that will be responsible for applying effects on N other layers. + Original commit message from CVS: + Added the operation object that will be responsible for applying effects + on N other layers. + +2001-07-29 19:59:20 +0000 Wim Taymans + + * configure.base: + * gnl/Makefile.am: + * gnl/gnl.c: + * gnl/gnl.h: + * gnl/gnlcomposition.c: + * gnl/gnlcomposition.h: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * test/composition.c: + * test/simple.c: + Lots of compile fixes + Original commit message from CVS: + Lots of compile fixes + Added an empty composition object. + +2001-07-29 15:01:42 +0000 Wim Taymans + + * .gitignore: + Added.... + Original commit message from CVS: + Added.... + +2001-07-29 15:00:42 +0000 Wim Taymans + + * gnonlin-uninstalled.pc.in: + * gnonlin.pc.in: + Some small changes.. + Original commit message from CVS: + Some small changes.. + +2001-07-29 14:54:07 +0000 Wim Taymans + + * ABOUT-NLS: + * AUTHORS: + * COPYING: + * COPYING.LIB: + * ChangeLog: + * INSTALL: + * LICENSE: + * Makefile.am: + * NEWS: + * README: + * REQUIREMENTS: + * acconfig.h: + * acinclude.m4: + * autogen.sh: + * configure.base: + * gnl/Makefile.am: + * gnl/gnl.c: + * gnl/gnl.h: + * gnl/gnlversion.h.in: + * gnonlin-config.1: + * gnonlin-config.in: + * gnonlin-uninstalled.pc.in: + * gnonlin.pc.in: + * makeconfigure: + * stamp.h.in: + * test/Makefile.am: + Added the initial build system. + Original commit message from CVS: + Added the initial build system. + Code to build against uninstalled gstreamer is not added yet. + +2001-07-29 11:40:55 +0000 Wim Taymans + + Initial import + Original commit message from CVS: + Initial import + +2001-07-29 11:40:55 +0000 Wim Taymans + + * docs/random/design: + * docs/random/srctree: + * gnl/gnlcomposition.h: + * gnl/gnllayer.c: + * gnl/gnllayer.h: + * gnl/gnlobject.h: + * gnl/gnlsource.c: + * gnl/gnlsource.h: + * gnl/gnltimeline.c: + * gnl/gnltimeline.h: + * test/composition.c: + * test/simple.c: + Initial revision + Original commit message from CVS: + Initial revision + diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/common/gtk-doc-plugins.mak /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/common/gtk-doc-plugins.mak --- gnonlin-0.10.11.2/common/gtk-doc-plugins.mak 2009-06-17 06:30:36.000000000 +0100 +++ gnonlin-0.10.12.2/common/gtk-doc-plugins.mak 2009-08-07 10:23:04.000000000 +0100 @@ -236,11 +236,7 @@ @for f in $(content_files); do cp $(srcdir)/$$f html; done cp -pr xml html cp ../version.entities html - cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) \ - 2>&1 | tee ../html-build.log - @if grep "warning:" html-build.log > /dev/null; then \ - echo "ERROR"; grep "warning:" html-build.log; exit 1; fi - @rm html-build.log + cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) mv html/index.sgml html/index.sgml.bak $(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml rm -f html/index.sgml.bak diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/common/m4/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/common/m4/Makefile.in --- gnonlin-0.10.11.2/common/m4/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/common/m4/Makefile.in 2009-08-29 10:31:55.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -63,6 +65,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -320,9 +323,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/m4/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu common/m4/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/m4/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu common/m4/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -340,6 +343,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -369,13 +373,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -403,6 +411,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -421,6 +430,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -429,18 +440,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -474,6 +495,7 @@ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/common/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/common/Makefile.in --- gnonlin-0.10.11.2/common/Makefile.in 2009-07-16 09:20:37.000000000 +0100 +++ gnonlin-0.10.12.2/common/Makefile.in 2009-08-29 10:31:55.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -63,6 +65,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -74,10 +77,38 @@ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ AMTAR = @AMTAR@ @@ -312,9 +343,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu common/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu common/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -332,6 +363,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): shave: $(top_builddir)/config.status $(srcdir)/shave.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ shave-libtool: $(top_builddir)/config.status $(srcdir)/shave-libtool.in @@ -367,7 +399,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -401,16 +433,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -425,7 +457,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -437,7 +469,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -446,29 +478,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -489,29 +526,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -541,6 +593,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -559,6 +612,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -567,18 +622,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -599,8 +664,8 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -616,6 +681,7 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/common/mangle-tmpl.py /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/common/mangle-tmpl.py --- gnonlin-0.10.11.2/common/mangle-tmpl.py 2009-04-07 18:25:11.000000000 +0100 +++ gnonlin-0.10.12.2/common/mangle-tmpl.py 2009-08-07 10:23:04.000000000 +0100 @@ -148,7 +148,9 @@ # put in an include if not yet there line = '\n' + 'element-' + element + '-details.xml">' + \ + '' + \ + '\n' section = tmpl.get_section("Long_Description") if not section[0] == line: section.insert(0, line) diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/compile /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/compile --- gnonlin-0.10.11.2/compile 2009-04-07 18:25:19.000000000 +0100 +++ gnonlin-0.10.12.2/compile 2009-08-29 10:09:47.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,8 +18,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -103,13 +103,13 @@ fi # Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name +# Note: use `[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d while true; do if mkdir "$lockdir" >/dev/null 2>&1; then break @@ -138,5 +138,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/configure /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/configure --- gnonlin-0.10.11.2/configure 2009-07-16 09:20:37.000000000 +0100 +++ gnonlin-0.10.12.2/configure 2009-08-29 10:31:54.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for GNonLin 0.10.11.2. +# Generated by GNU Autoconf 2.63 for GNonLin 0.10.12.2. # # Report bugs to . # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='GNonLin' PACKAGE_TARNAME='gnonlin' -PACKAGE_VERSION='0.10.11.2' -PACKAGE_STRING='GNonLin 0.10.11.2' +PACKAGE_VERSION='0.10.12.2' +PACKAGE_STRING='GNonLin 0.10.12.2' PACKAGE_BUGREPORT='http://gnonlin.sourceforge.net/' ac_unique_file="gnl/gnl.c" @@ -786,7 +786,9 @@ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS Q V @@ -1611,7 +1613,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNonLin 0.10.11.2 to adapt to many kinds of systems. +\`configure' configures GNonLin 0.10.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1681,7 +1683,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNonLin 0.10.11.2:";; + short | recursive ) echo "Configuration of GNonLin 0.10.12.2:";; esac cat <<\_ACEOF @@ -1833,7 +1835,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNonLin configure 0.10.11.2 +GNonLin configure 0.10.12.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1847,7 +1849,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNonLin $as_me 0.10.11.2, which was +It was created by GNonLin $as_me 0.10.12.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2220,7 +2222,7 @@ -am__api_version='1.10' +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2351,16 +2353,33 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} + { (exit 1); exit 1; }; };; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} + { (exit 1); exit 1; }; };; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2404,7 +2423,14 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -2414,6 +2440,115 @@ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip" + $as_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_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then @@ -2568,7 +2703,7 @@ # Define the identity of the package. PACKAGE='gnonlin' - VERSION='0.10.11.2' + VERSION='0.10.12.2' cat >>confdefs.h <<_ACEOF @@ -2596,108 +2731,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip" - $as_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_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -2712,9 +2745,9 @@ - PACKAGE_VERSION_MAJOR=$(echo 0.10.11.2 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 0.10.11.2 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 0.10.11.2 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 0.10.12.2 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 0.10.12.2 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 0.10.12.2 | cut -d'.' -f3) @@ -2725,7 +2758,7 @@ { $as_echo "$as_me:$LINENO: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 0.10.11.2 | cut -d'.' -f4) + NANO=$(echo 0.10.12.2 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:$LINENO: result: 0 (release)" >&5 @@ -2749,6 +2782,7 @@ ac_config_headers="$ac_config_headers config.h" + { $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -3196,7 +3230,7 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -3207,24 +3241,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi @@ -4213,6 +4247,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -4230,7 +4269,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -4240,19 +4289,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -4885,13 +4938,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4888: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4941: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4891: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4944: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4894: output\"" >&5) + (eval echo "\"\$as_me:4947: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6094,7 +6147,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6097 "configure"' > conftest.$ac_ext + echo '#line 6150 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7949,11 +8002,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:7952: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8005: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7956: \$? = $ac_status" >&5 + echo "$as_me:8009: \$? = $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. @@ -8288,11 +8341,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:8291: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8344: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8295: \$? = $ac_status" >&5 + echo "$as_me:8348: \$? = $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. @@ -8393,11 +8446,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:8396: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8449: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8400: \$? = $ac_status" >&5 + echo "$as_me:8453: \$? = $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 @@ -8448,11 +8501,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:8451: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8504: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8455: \$? = $ac_status" >&5 + echo "$as_me:8508: \$? = $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 @@ -11261,7 +11314,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11264 "configure" +#line 11317 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11357,7 +11410,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11360 "configure" +#line 11413 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12864,6 +12917,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -12881,7 +12939,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -12891,19 +12959,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -16363,6 +16435,14 @@ LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -16776,7 +16856,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNonLin $as_me 0.10.11.2, which was +This file was extended by GNonLin $as_me 0.10.12.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16839,7 +16919,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -GNonLin config.status 0.10.11.2 +GNonLin config.status 0.10.12.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -17888,27 +17968,28 @@ case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # 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 - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # 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 + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ @@ -17931,28 +18012,28 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ @@ -17975,7 +18056,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir + { as_dir=$dirpart/$fdir case $as_dir in #( -*) as_dir=./$as_dir;; esac @@ -18016,10 +18097,11 @@ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ;; "libtool":C) diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/configure.ac /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/configure.ac --- gnonlin-0.10.11.2/configure.ac 2009-07-16 09:19:55.000000000 +0100 +++ gnonlin-0.10.12.2/configure.ac 2009-08-29 10:17:53.000000000 +0100 @@ -3,7 +3,7 @@ dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT(GNonLin, 0.10.11.2, +AC_INIT(GNonLin, 0.10.12.2, http://gnonlin.sourceforge.net/, gnonlin) diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/debian/changelog /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/debian/changelog --- gnonlin-0.10.11.2/debian/changelog 2009-08-29 11:36:12.000000000 +0100 +++ gnonlin-0.10.12.2/debian/changelog 2009-08-29 11:36:12.000000000 +0100 @@ -1,14 +1,31 @@ -gnonlin (0.10.11.2-1~bpo2) jaunty; urgency=low +gnonlin (0.10.12.2-0~jaunty1) jaunty; urgency=low - * Trigger new build. + * New upstream pre-release. + + -- Alessandro Decina Sat, 29 Aug 2009 12:32:17 +0200 + +gnonlin (0.10.12-1) unstable; urgency=low + + * New upstream release, 'Lots of people on the clothesline'. + + -- Sebastian Dröge Tue, 11 Aug 2009 10:17:58 +0200 + +gnonlin (0.10.11.3-2) UNRELEASED; urgency=low - -- Alessandro Decina Fri, 24 Jul 2009 12:10:09 +0200 + * debian/control: + + Move debug package into the debug category. + + Update Standards-Version to 3.8.2. + + -- Sebastian Dröge Wed, 05 Aug 2009 08:19:15 +0200 -gnonlin (0.10.11.2-1~bpo1) jaunty; urgency=low +gnonlin (0.10.11.3-1) experimental; urgency=low - * Build on jaunty. + * New upstream pre-release. + * debian/patches/99_ltmain_as-needed.patch: + + Dropped, the ltmain.sh from the tarball already contains the patch + for some reason. - -- Alessandro Decina Fri, 24 Jul 2009 11:56:42 +0200 + -- Sebastian Dröge Wed, 05 Aug 2009 06:57:17 +0200 gnonlin (0.10.11.2-1) experimental; urgency=low @@ -34,10 +51,14 @@ gnonlin (0.10.10.2-2) unstable; urgency=low + [ Sebastian Dröge ] * debian/control: + Move B-D-I to B-D to fix FTBFS (Closes: #591735). - -- Sebastian Dröge Sun, 15 Mar 2009 14:57:15 +0100 + [ Alessandro Decina ] + * - + + -- Alessandro Decina Thu, 14 May 2009 23:04:01 +0200 gnonlin (0.10.10.2-1) unstable; urgency=low diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/debian/control /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/debian/control --- gnonlin-0.10.11.2/debian/control 2009-08-29 11:36:12.000000000 +0100 +++ gnonlin-0.10.12.2/debian/control 2009-08-29 11:36:12.000000000 +0100 @@ -17,7 +17,7 @@ gstreamer0.10-plugins-good, python (>= 2.1), gtk-doc-tools (>= 1.3) -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Homepage: http://gstreamer.freedesktop.org Package: gstreamer0.10-gnonlin @@ -68,7 +68,7 @@ Package: gstreamer0.10-gnonlin-dbg Architecture: any -Section: libdevel +Section: debug Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/debian/patches/99_ltmain_as-needed.patch /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/debian/patches/99_ltmain_as-needed.patch --- gnonlin-0.10.11.2/debian/patches/99_ltmain_as-needed.patch 2009-08-29 11:36:12.000000000 +0100 +++ gnonlin-0.10.12.2/debian/patches/99_ltmain_as-needed.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ ---- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200 -+++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200 -@@ -1794,6 +1794,11 @@ - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - -+ -Wl,--as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= -@@ -2137,6 +2142,15 @@ - lib= - found=no - case $deplib in -+ -Wl,--as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/depcomp /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/depcomp --- gnonlin-0.10.11.2/depcomp 2009-04-07 18:25:19.000000000 +0100 +++ gnonlin-0.10.12.2/depcomp 2009-08-29 10:09:47.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,6 +85,15 @@ depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -192,14 +199,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -328,7 +335,12 @@ if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -404,7 +416,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -455,32 +467,39 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -500,7 +519,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -538,13 +557,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +590,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -585,5 +625,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/ch01.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/ch01.html --- gnonlin-0.10.11.2/docs/libs/html/ch01.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/ch01.html 2009-08-29 10:32:19.000000000 +0100 @@ -4,9 +4,9 @@ GNonLin Elements - - - + + + @@ -18,7 +18,7 @@ Prev   Home -GNonLin 0.10.11.2 Reference Manual +GNonLin 0.10.12.2 Reference Manual Next
diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/ch02.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/ch02.html --- gnonlin-0.10.11.2/docs/libs/html/ch02.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/ch02.html 2009-08-29 10:32:19.000000000 +0100 @@ -4,8 +4,8 @@ Base Classes - - + + @@ -18,7 +18,7 @@ Prev   Home -GNonLin 0.10.11.2 Reference Manual +GNonLin 0.10.12.2 Reference Manual Next
diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/GnlComposition.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/GnlComposition.html --- gnonlin-0.10.11.2/docs/libs/html/GnlComposition.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/GnlComposition.html 2009-08-29 10:32:19.000000000 +0100 @@ -4,7 +4,7 @@ GnlComposition - + @@ -19,7 +19,7 @@ Prev Up Home -GNonLin 0.10.11.2 Reference Manual +GNonLin 0.10.12.2 Reference Manual Next @@ -92,7 +92,7 @@

Synopsis

-

Element Information

+

Element Information

@@ -115,7 +115,7 @@
-

Element Pads

+

Element Pads

diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/GnlFileSource.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/GnlFileSource.html --- gnonlin-0.10.11.2/docs/libs/html/GnlFileSource.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/GnlFileSource.html 2009-08-29 10:32:19.000000000 +0100 @@ -4,7 +4,7 @@ GnlFileSource - + @@ -19,7 +19,7 @@ - +
Prev Up HomeGNonLin 0.10.11.2 Reference ManualGNonLin 0.10.12.2 Reference Manual Next
@@ -94,7 +94,7 @@

Synopsis

-

Element Information

+

Element Information

@@ -117,7 +117,7 @@
-

Element Pads

+

Element Pads

diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/GnlObject.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/GnlObject.html --- gnonlin-0.10.11.2/docs/libs/html/GnlObject.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/GnlObject.html 2009-08-29 10:32:19.000000000 +0100 @@ -4,7 +4,7 @@ GnlObject - + @@ -18,7 +18,7 @@ - + - +
Prev Up HomeGNonLin 0.10.11.2 Reference ManualGNonLin 0.10.12.2 Reference Manual  
@@ -117,7 +117,7 @@

-

+

GnlObject encapsulates default behaviour and implements standard properties provided by all the GNonLin elements.

diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/GnlOperation.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/GnlOperation.html --- gnonlin-0.10.11.2/docs/libs/html/GnlOperation.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/GnlOperation.html 2009-08-29 10:32:19.000000000 +0100 @@ -4,7 +4,7 @@ GnlOperation - + @@ -19,7 +19,7 @@
Prev Up HomeGNonLin 0.10.11.2 Reference ManualGNonLin 0.10.12.2 Reference Manual Next
@@ -89,7 +89,7 @@

-

+

A GnlOperation performs a transformation or mixing operation on the data from one or more GnlSources, which is used to implement filters or effects. @@ -98,7 +98,7 @@

Synopsis

-

Element Information

+

Element Information

@@ -121,7 +121,7 @@
-

Element Pads

+

Element Pads

diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/GnlSource.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/GnlSource.html --- gnonlin-0.10.11.2/docs/libs/html/GnlSource.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/GnlSource.html 2009-08-29 10:32:19.000000000 +0100 @@ -4,7 +4,7 @@ GnlSource - + @@ -19,7 +19,7 @@ - +
Prev Up HomeGNonLin 0.10.11.2 Reference ManualGNonLin 0.10.12.2 Reference Manual Next
@@ -83,7 +83,7 @@

Synopsis

-

Element Information

+

Element Information

@@ -106,7 +106,7 @@
-

Element Pads

+

Element Pads

diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/gnonlin.devhelp /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/gnonlin.devhelp --- gnonlin-0.10.11.2/docs/libs/html/gnonlin.devhelp 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/gnonlin.devhelp 2009-08-29 10:32:19.000000000 +0100 @@ -1,6 +1,6 @@ - + @@ -13,23 +13,23 @@ - - + + - - + + - - - + + + - - + + - + diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/gnonlin.devhelp2 /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/gnonlin.devhelp2 --- gnonlin-0.10.11.2/docs/libs/html/gnonlin.devhelp2 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/gnonlin.devhelp2 2009-08-29 10:32:19.000000000 +0100 @@ -1,6 +1,6 @@ - + @@ -13,23 +13,23 @@ - - + + - - + + - - - + + + - - + + - + diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/html/index.html /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/html/index.html --- gnonlin-0.10.11.2/docs/libs/html/index.html 2009-07-16 09:21:43.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/html/index.html 2009-08-29 10:32:19.000000000 +0100 @@ -2,9 +2,9 @@ -GNonLin 0.10.11.2 Reference Manual +GNonLin 0.10.12.2 Reference Manual - + @@ -12,12 +12,12 @@ -
+
-
+

- for GStreamer GNonLin Plugins 0.10 (0.10.11.2) + for GStreamer GNonLin Plugins 0.10 (0.10.12.2) The latest version of this documentation can be found on-line at http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gnonlin/html/.

diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/libs/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/libs/Makefile.in --- gnonlin-0.10.11.2/docs/libs/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/docs/libs/Makefile.in 2009-08-29 10:31:55.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -32,8 +33,9 @@ # for GStreamer plug-ins VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -82,6 +84,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -490,9 +493,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/libs/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/libs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -510,6 +513,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -539,13 +543,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -577,6 +585,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -594,6 +603,8 @@ dvi-am: +html-am: + info: info-am info-am: @@ -602,18 +613,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -827,11 +848,7 @@ @ENABLE_GTK_DOC_TRUE@ @for f in $(content_files); do cp $(srcdir)/$$f html; done @ENABLE_GTK_DOC_TRUE@ cp -pr xml html @ENABLE_GTK_DOC_TRUE@ cp ../version.entities html -@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) \ -@ENABLE_GTK_DOC_TRUE@ 2>&1 | tee ../html-build.log -@ENABLE_GTK_DOC_TRUE@ @if grep "warning:" html-build.log > /dev/null; then \ -@ENABLE_GTK_DOC_TRUE@ echo "ERROR"; grep "warning:" html-build.log; exit 1; fi -@ENABLE_GTK_DOC_TRUE@ @rm html-build.log +@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ mv html/index.sgml html/index.sgml.bak @ENABLE_GTK_DOC_TRUE@ $(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml @ENABLE_GTK_DOC_TRUE@ rm -f html/index.sgml.bak @@ -939,6 +956,7 @@ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/docs/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/docs/Makefile.in --- gnonlin-0.10.11.2/docs/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/docs/Makefile.in 2009-08-29 10:31:55.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -64,6 +66,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.entities +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -75,9 +78,37 @@ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ AMTAR = @AMTAR@ @@ -299,9 +330,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -319,6 +350,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): version.entities: $(top_builddir)/config.status $(srcdir)/version.entities.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -352,7 +384,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -386,16 +418,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -410,7 +442,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -422,7 +454,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -431,29 +463,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -474,29 +511,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -526,6 +578,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -544,6 +597,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -552,18 +607,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -584,8 +649,8 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -601,6 +666,7 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlcomposition.c /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlcomposition.c --- gnonlin-0.10.11.2/gnl/gnlcomposition.c 2009-07-03 18:24:30.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlcomposition.c 2009-08-24 16:56:03.000000000 +0100 @@ -162,9 +162,9 @@ static GstClockTime get_current_position (GnlComposition * comp); static void gnl_composition_set_update (GnlComposition * comp, gboolean update); -static gboolean -update_pipeline (GnlComposition * comp, GstClockTime currenttime, - gboolean initial, gboolean change_state, gboolean modify); +static gboolean update_pipeline (GnlComposition * comp, + GstClockTime currenttime, gboolean initial, gboolean change_state, + gboolean modify); #define COMP_REAL_START(comp) \ @@ -954,15 +954,18 @@ break; } - /* FIXME : What should we do here if waitingpads != 0 ?? */ - /* Delay ? Ignore ? Refuse ? */ - if (res && comp->priv->ghostpad) { - GST_DEBUG_OBJECT (comp, "About to call gnl_event_pad_func()"); COMP_OBJECTS_LOCK (comp); - res = comp->priv->gnl_event_pad_func (comp->priv->ghostpad, event); + /* If the timeline isn't entirely reconstructed, we silently ignore the + * event. In the case of seeks the pipeline will already be correctly + * configured at this point*/ + if (comp->priv->waitingpads == 0) { + GST_DEBUG_OBJECT (comp, "About to call gnl_event_pad_func()"); + res = comp->priv->gnl_event_pad_func (comp->priv->ghostpad, event); + GST_DEBUG_OBJECT (comp, "Done calling gnl_event_pad_func() %d", res); + } else + gst_event_unref (event); COMP_OBJECTS_UNLOCK (comp); - GST_DEBUG_OBJECT (comp, "Done calling gnl_event_pad_func() %d", res); } gst_object_unref (comp); return res; @@ -1604,14 +1607,29 @@ comp->priv->waitingpads); if (tmp->parent) { - /* child, link to parent */ - /* FIXME, shouldn't we check the order in which we link to the parent ? */ - if (!(gst_element_link (element, GST_ELEMENT (tmp->parent->data)))) { - GST_WARNING_OBJECT (comp, "Couldn't link %s to %s", - GST_ELEMENT_NAME (element), - GST_ELEMENT_NAME (GST_ELEMENT (tmp->parent->data))); + GstElement *parent = (GstElement *) tmp->parent->data; + GstPad *sinkpad; + + /* Get an unlinked sinkpad from the parent */ + sinkpad = get_unlinked_sink_ghost_pad ((GnlOperation *) parent); + if (G_UNLIKELY (sinkpad == NULL)) { + GST_WARNING_OBJECT (comp, "Couldn't find an unlinked sinkpad from %s", + GST_ELEMENT_NAME (parent)); goto done; } + + /* Link pad to parent sink pad */ + if (G_UNLIKELY (gst_pad_link (pad, sinkpad) != GST_PAD_LINK_OK)) { + GST_WARNING_OBJECT (comp, "Failed to link pads, error:"); + gst_object_unref (sinkpad); + goto done; + } + + /* inform operation of incoming stream priority */ + gnl_operation_signal_input_priority_changed ((GnlOperation *) parent, + sinkpad, object->priority); + + gst_object_unref (sinkpad); gst_pad_set_blocked_async (pad, FALSE, (GstPadBlockCallback) pad_blocked, comp); } @@ -1744,17 +1762,34 @@ /* relink to new parent in required order */ if (newparent) { + GstPad *sinkpad; + GST_LOG_OBJECT (comp, "Linking %s and %s", GST_ELEMENT_NAME (GST_ELEMENT (newobj)), GST_ELEMENT_NAME (GST_ELEMENT (newparent))); - /* FIXME : do it in required order */ - if (!(gst_element_link ((GstElement *) newobj, - (GstElement *) newparent))) - GST_ERROR_OBJECT (comp, "Couldn't link %s to %s", - GST_ELEMENT_NAME (newobj), GST_ELEMENT_NAME (newparent)); + + sinkpad = get_unlinked_sink_ghost_pad ((GnlOperation *) newparent); + if (G_UNLIKELY (sinkpad == NULL)) { + GST_WARNING_OBJECT (comp, "Couldn't find an unlinked sinkpad from %s", + GST_ELEMENT_NAME (newparent)); + } else { + if (G_UNLIKELY (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK)) { + GST_WARNING_OBJECT (comp, "Failed to link pads"); + } + gst_object_unref (sinkpad); + } } } else GST_LOG_OBJECT (newobj, "Same parent and same position in the new stack"); + + /* If there's an operation, inform it about priority changes */ + if (newparent) { + GstPad *sinkpad = gst_pad_get_peer (srcpad); + gnl_operation_signal_input_priority_changed ((GnlOperation *) newparent, + sinkpad, newobj->priority); + gst_object_unref (sinkpad); + } + } else { GnlCompositionEntry *entry = COMP_ENTRY (comp, newobj); @@ -2289,8 +2324,10 @@ object_pad_removed (GnlObject * object, GstPad * pad, GnlComposition * comp) { GST_DEBUG_OBJECT (comp, "pad %s:%s was removed", GST_DEBUG_PAD_NAME (pad)); + /* remove ghostpad if it's the current top stack object */ - if (comp->priv->current && ((GnlObject *) comp->priv->current->data == object) + if (GST_PAD_IS_SRC (pad) && comp->priv->current + && ((GnlObject *) comp->priv->current->data == object) && comp->priv->ghostpad) { GST_DEBUG_OBJECT (comp, "Removing ghostpad"); gnl_object_remove_ghost_pad ((GnlObject *) comp, comp->priv->ghostpad); diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlfilesource.c /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlfilesource.c --- gnonlin-0.10.11.2/gnl/gnlfilesource.c 2009-07-02 13:02:18.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlfilesource.c 2009-08-24 10:56:25.000000000 +0100 @@ -57,16 +57,6 @@ ARG_LOCATION, }; -struct _GnlFileSourcePrivate -{ - gboolean dispose_has_run; - GstElement *filesource; -}; - -static void gnl_filesource_dispose (GObject * object); - -static void gnl_filesource_finalize (GObject * object); - static void gnl_filesource_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); @@ -101,9 +91,6 @@ GST_DEBUG_CATEGORY_INIT (gnlfilesource, "gnlfilesource", GST_DEBUG_FG_BLUE | GST_DEBUG_BOLD, "GNonLin File Source Element"); - gobject_class->dispose = GST_DEBUG_FUNCPTR (gnl_filesource_dispose); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gnl_filesource_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gnl_filesource_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gnl_filesource_get_property); @@ -118,66 +105,74 @@ gnl_filesource_init (GnlFileSource * filesource, GnlFileSourceClass * klass G_GNUC_UNUSED) { - GstElement *filesrc, *decodebin; + GstElement *filesrc = NULL, *decodebin = NULL; GST_OBJECT_FLAG_SET (filesource, GNL_OBJECT_SOURCE); - filesource->priv = g_new0 (GnlFileSourcePrivate, 1); /* We create a bin with source and decodebin within */ + if ((decodebin = + gst_element_factory_make ("uridecodebin", "internal-uridecodebin"))) { + GST_DEBUG ("Using uridecodebin"); + + gst_bin_add (GST_BIN (filesource), decodebin); + } else { + - if (!(filesrc = - gst_element_factory_make ("gnomevfssrc", "internal-filesource"))) if (!(filesrc = - gst_element_factory_make ("filesrc", "internal-filesource"))) + gst_element_factory_make ("gnomevfssrc", "internal-filesource"))) + if (!(filesrc = + gst_element_factory_make ("filesrc", "internal-filesource"))) + g_warning + ("Could not create a gnomevfssrc or filesource element, are you sure you have any of them installed ?"); + if (!(decodebin = + gst_element_factory_make ("decodebin2", "internal-decodebin")) + && !(decodebin = + gst_element_factory_make ("decodebin", "internal-decodebin"))) g_warning - ("Could not create a gnomevfssrc or filesource element, are you sure you have any of them installed ?"); - if (!(decodebin = - gst_element_factory_make ("decodebin2", "internal-decodebin")) - || !(decodebin = - gst_element_factory_make ("decodebin", "internal-decodebin"))) - g_warning - ("Could not create a decodebin element, are you sure you have decodebin installed ?"); - - filesource->priv->filesource = filesrc; - - if (filesrc && decodebin) { - gst_bin_add_many (GST_BIN (filesource), filesrc, decodebin, NULL); - if (!(gst_element_link (filesrc, decodebin))) - g_warning ("Could not link the file source element to decodebin"); + ("Could not create a decodebin element, are you sure you have decodebin installed ?"); + + if (filesrc && decodebin) { + gst_bin_add_many (GST_BIN (filesource), filesrc, decodebin, NULL); + if (!(gst_element_link (filesrc, decodebin))) + g_warning ("Could not link the file source element to decodebin"); + } + + if (decodebin) { + GNL_SOURCE_GET_CLASS (filesource)->control_element ( + (GnlSource *) filesource, decodebin); + } } if (decodebin) { GNL_SOURCE_GET_CLASS (filesource)->control_element ( (GnlSource *) filesource, decodebin); + filesource->filesource = filesrc; + filesource->decodebin = decodebin; } GST_DEBUG_OBJECT (filesource, "done"); } static void -gnl_filesource_dispose (GObject * object) +gnl_filesource_set_location (GnlFileSource * fs, const gchar * location) { - GnlFileSource *filesource = (GnlFileSource *) object; + GST_DEBUG_OBJECT (fs, "location: '%s'", location); - if (filesource->priv->dispose_has_run) - return; + GST_DEBUG_OBJECT (fs, "%p %p", fs->filesource, fs->decodebin); - GST_INFO_OBJECT (object, "dispose"); - filesource->priv->dispose_has_run = TRUE; - - G_OBJECT_CLASS (parent_class)->dispose (object); - GST_INFO_OBJECT (object, "dispose END"); -} - -static void -gnl_filesource_finalize (GObject * object) -{ - GnlFileSource *filesource = (GnlFileSource *) object; - - GST_INFO_OBJECT (object, "finalize"); - g_free (filesource->priv); - - G_OBJECT_CLASS (parent_class)->finalize (object); + if (fs->filesource) { + g_object_set (G_OBJECT (fs->filesource), "location", location, NULL); + } else { + gchar *tmp; + + if (g_ascii_strncasecmp (location, "file://", 7)) + tmp = g_strdup_printf ("file://%s", location); + else + tmp = g_strdup (location); + GST_DEBUG (tmp); + g_object_set (G_OBJECT (fs->decodebin), "uri", tmp, NULL); + g_free (tmp); + } } static void @@ -189,8 +184,7 @@ switch (prop_id) { case ARG_LOCATION: /* proxy to gnomevfssrc */ - g_object_set_property (G_OBJECT (fs->priv->filesource), "location", - value); + gnl_filesource_set_location (fs, g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -207,8 +201,7 @@ switch (prop_id) { case ARG_LOCATION: /* proxy from gnomevfssrc */ - g_object_get_property (G_OBJECT (fs->priv->filesource), "location", - value); + g_object_get_property (G_OBJECT (fs->filesource), "location", value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlfilesource.h /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlfilesource.h --- gnonlin-0.10.11.2/gnl/gnlfilesource.h 2009-06-17 06:30:32.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlfilesource.h 2009-08-17 16:21:15.000000000 +0100 @@ -38,15 +38,14 @@ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GNL_TYPE_FILESOURCE)) #define GNL_IS_FILESOURCE_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GNL_TYPE_FILESOURCE)) -typedef struct _GnlFileSourcePrivate GnlFileSourcePrivate; struct _GnlFileSource { GnlSource parent; /*< private >*/ - - GnlFileSourcePrivate *priv; + GstElement *filesource; + GstElement *decodebin; }; struct _GnlFileSourceClass diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlghostpad.c /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlghostpad.c --- gnonlin-0.10.11.2/gnl/gnlghostpad.c 2009-07-02 13:02:18.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlghostpad.c 2009-08-24 16:56:03.000000000 +0100 @@ -52,11 +52,13 @@ "incoming qos prop:%f, diff:%" G_GINT64_FORMAT ", timestamp:%" GST_TIME_FORMAT, prop, diff, GST_TIME_ARGS (timestamp)); - if (!(gnl_object_to_media_time (object, timestamp, ×tamp2)) || - ((diff < 0) && (-diff > timestamp))) { + if (!(gnl_object_to_media_time (object, timestamp, ×tamp2))) { GST_DEBUG ("Invalid timestamp, discarding event"); gst_event_unref (event); } else { + if (diff < 0 && -diff > timestamp2) + diff = -timestamp2; + GST_DEBUG_OBJECT (object, "translated qos prop:%f, diff:%" G_GINT64_FORMAT ", timestamp:%" GST_TIME_FORMAT, prop, diff, @@ -722,7 +724,6 @@ return NULL; } - /* activate pad */ gst_pad_set_active (ghost, TRUE); /* add it to element */ @@ -812,6 +813,17 @@ if (!(gst_ghost_pad_set_target (GST_GHOST_PAD (ghost), target))) return FALSE; + if (target) { + GstCaps *negotiated_caps; + + /* if the target has negotiated caps, forward them to the ghost */ + if ((negotiated_caps = gst_pad_get_negotiated_caps (target))) { + gst_pad_set_caps (ghost, negotiated_caps); + gst_caps_unref (negotiated_caps); + } + } + + if (!GST_OBJECT_IS_FLOATING (ghost)) control_internal_pad (ghost, object); diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlmarshal.c /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlmarshal.c --- gnonlin-0.10.11.2/gnl/gnlmarshal.c 1970-01-01 01:00:00.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlmarshal.c 2009-08-29 10:09:58.000000000 +0100 @@ -0,0 +1,88 @@ +#include "glib-object.h" +#include "gnlmarshal.h" + +#include + + +#ifdef G_ENABLE_DEBUG +#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) +#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) +#define g_marshal_value_peek_int(v) g_value_get_int (v) +#define g_marshal_value_peek_uint(v) g_value_get_uint (v) +#define g_marshal_value_peek_long(v) g_value_get_long (v) +#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) +#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) +#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) +#define g_marshal_value_peek_enum(v) g_value_get_enum (v) +#define g_marshal_value_peek_flags(v) g_value_get_flags (v) +#define g_marshal_value_peek_float(v) g_value_get_float (v) +#define g_marshal_value_peek_double(v) g_value_get_double (v) +#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) +#define g_marshal_value_peek_param(v) g_value_get_param (v) +#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) +#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) +#define g_marshal_value_peek_object(v) g_value_get_object (v) +#else /* !G_ENABLE_DEBUG */ +/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. + * Do not access GValues directly in your code. Instead, use the + * g_value_get_*() functions + */ +#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int +#define g_marshal_value_peek_char(v) (v)->data[0].v_int +#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint +#define g_marshal_value_peek_int(v) (v)->data[0].v_int +#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint +#define g_marshal_value_peek_long(v) (v)->data[0].v_long +#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong +#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 +#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong +#define g_marshal_value_peek_float(v) (v)->data[0].v_float +#define g_marshal_value_peek_double(v) (v)->data[0].v_double +#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#endif /* !G_ENABLE_DEBUG */ + + +/* VOID:OBJECT,UINT (gnlmarshal.list:1) */ +void +gnl_marshal_VOID__OBJECT_UINT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__OBJECT_UINT) (gpointer data1, + gpointer arg_1, + guint arg_2, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_UINT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_UINT) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_object (param_values + 1), + g_marshal_value_peek_uint (param_values + 2), + data2); +} + diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlmarshal.h /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlmarshal.h --- gnonlin-0.10.11.2/gnl/gnlmarshal.h 1970-01-01 01:00:00.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlmarshal.h 2009-08-29 10:21:55.000000000 +0100 @@ -0,0 +1,20 @@ + +#ifndef __gnl_marshal_MARSHAL_H__ +#define __gnl_marshal_MARSHAL_H__ + +#include + +G_BEGIN_DECLS + +/* VOID:OBJECT,UINT (gnlmarshal.list:1) */ +extern void gnl_marshal_VOID__OBJECT_UINT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + +G_END_DECLS + +#endif /* __gnl_marshal_MARSHAL_H__ */ + diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlmarshal.list /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlmarshal.list --- gnonlin-0.10.11.2/gnl/gnlmarshal.list 1970-01-01 01:00:00.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlmarshal.list 2009-08-07 10:23:02.000000000 +0100 @@ -0,0 +1,2 @@ +VOID:OBJECT,UINT + diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnloperation.c /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnloperation.c --- gnonlin-0.10.11.2/gnl/gnloperation.c 2009-07-03 18:24:30.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnloperation.c 2009-08-24 10:56:25.000000000 +0100 @@ -24,6 +24,7 @@ #endif #include "gnl.h" +#include "gnlmarshal.h" /** * SECTION:element-gnloperation @@ -67,6 +68,14 @@ ARG_SINKS, }; +enum +{ + INPUT_PRIORITY_CHANGED, + LAST_SIGNAL +}; + +static guint gnl_operation_signals[LAST_SIGNAL] = { 0 }; + static void gnl_operation_finalize (GObject * object); static void gnl_operation_set_property (GObject * object, guint prop_id, @@ -123,6 +132,20 @@ "Number of input sinks (-1 for automatic handling)", -1, G_MAXINT, -1, G_PARAM_READWRITE)); + /** + * GnlOperation:input-priority-changed: + * @pad: The operation's input pad whose priority changed. + * @priority: The new priority + * + * Signals that the @priority of the stream being fed to the given @pad + * might have changed. + */ + gnl_operation_signals[INPUT_PRIORITY_CHANGED] = + g_signal_new ("input-priority-changed", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GnlOperationClass, + input_priority_changed), NULL, NULL, gnl_marshal_VOID__OBJECT_UINT, + G_TYPE_NONE, 2, GST_TYPE_PAD, G_TYPE_UINT); + gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR (gnl_operation_request_new_pad); gstelement_class->release_pad = GST_DEBUG_FUNCPTR (gnl_operation_release_pad); @@ -492,7 +515,7 @@ return ret; } -static GstPad * +GstPad * get_unlinked_sink_ghost_pad (GnlOperation * operation) { GstIterator *pads; @@ -715,3 +738,13 @@ remove_sink_pad ((GnlOperation *) element, pad); } + +void +gnl_operation_signal_input_priority_changed (GnlOperation * operation, + GstPad * pad, guint32 priority) +{ + GST_DEBUG_OBJECT (operation, "pad:%s:%s, priority:%d", + GST_DEBUG_PAD_NAME (pad), priority); + g_signal_emit (operation, gnl_operation_signals[INPUT_PRIORITY_CHANGED], + 0, pad, priority); +} diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnloperation.h /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnloperation.h --- gnonlin-0.10.11.2/gnl/gnloperation.h 2009-07-03 18:24:30.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnloperation.h 2009-08-23 17:39:11.000000000 +0100 @@ -67,8 +67,17 @@ struct _GnlOperationClass { GnlObjectClass parent_class; + + void (*input_priority_changed) (GnlOperation * operation, GstPad *pad, guint32 priority); }; +GstPad * get_unlinked_sink_ghost_pad (GnlOperation * operation); + +void +gnl_operation_signal_input_priority_changed(GnlOperation * operation, GstPad *pad, + guint32 priority); + + /* normal GOperation stuff */ GType gnl_operation_get_type (void); diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/gnlsource.c /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/gnlsource.c --- gnonlin-0.10.11.2/gnl/gnlsource.c 2009-07-02 13:02:18.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/gnlsource.c 2009-08-24 10:56:25.000000000 +0100 @@ -216,7 +216,9 @@ if (source->priv->ghostpad || source->priv->pendingblock) { GST_WARNING_OBJECT (source, - "We already have (pending) ghost-ed a valid source pad"); + "We already have (pending) ghost-ed a valid source pad (ghostpad:%s:%s, pendingblock:%d", + GST_DEBUG_PAD_NAME (source->priv->ghostpad), + source->priv->pendingblock); return; } @@ -244,24 +246,29 @@ element_pad_removed_cb (GstElement * element G_GNUC_UNUSED, GstPad * pad, GnlSource * source) { - GST_DEBUG_OBJECT (source, "pad %s:%s", GST_DEBUG_PAD_NAME (pad)); + GST_DEBUG_OBJECT (source, "pad %s:%s (controlled pad %s:%s)", + GST_DEBUG_PAD_NAME (pad), GST_DEBUG_PAD_NAME (source->priv->ghostedpad)); - if (source->priv->ghostpad) { - GstPad *target = - gst_ghost_pad_get_target (GST_GHOST_PAD (source->priv->ghostpad)); + if (pad == source->priv->ghostedpad) { + GST_DEBUG_OBJECT (source, + "The removed pad is the controlled pad, clearing up"); + + if (source->priv->ghostpad) { + GST_DEBUG_OBJECT (source, "Clearing up ghostpad"); - if (target == pad) { - gst_pad_set_blocked_async (target, FALSE, + gst_pad_set_blocked_async (pad, FALSE, (GstPadBlockCallback) pad_blocked_cb, source); gnl_object_remove_ghost_pad ((GnlObject *) source, source->priv->ghostpad); source->priv->ghostpad = NULL; - gst_object_unref (target); - } else { - GST_DEBUG_OBJECT (source, "The removed pad wasn't our ghostpad target"); } + + source->priv->pendingblock = FALSE; + source->priv->ghostedpad = NULL; + } else { + GST_DEBUG_OBJECT (source, "The removed pad is NOT our controlled pad"); } } @@ -573,6 +580,7 @@ source->priv->ghostpad); source->priv->ghostpad = NULL; source->priv->ghostedpad = NULL; + source->priv->pendingblock = FALSE; } default: break; diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/Makefile.am /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/Makefile.am --- gnonlin-0.10.11.2/gnl/Makefile.am 2009-07-03 18:24:30.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/Makefile.am 2009-08-07 10:23:02.000000000 +0100 @@ -1,10 +1,15 @@ +built_header_make = gnlmarshal.h +build_source_make = gnlmarshal.c plugin_LTLIBRARIES = libgnl.la +EXTRA_libgnl_la_SOURCES = gnlmarshal.list + libgnl_la_SOURCES = \ gnl.c \ gnlobject.c \ gnlcomposition.c \ gnlghostpad.c \ + gnlmarshal.c \ gnloperation.c \ gnlsource.c \ gnlfilesource.c @@ -27,4 +32,22 @@ DISTCLEANFILE = $(CLEANFILES) noinst_HEADERS = $(gnl_headers) +#files built on make all/check/instal +BUILT_SOURCES = \ + $(built_header_configure) \ + $(built_header_make) \ + $(built_source_make) + +CLEANFILES = $(built_header_make) $(built_source_make) + +noinst_HEADERS = $(gnl_headers) $(built_header_make) $(built_header_configure) + +gnlmarshal.h: gnlmarshal.list + glib-genmarshal --header --prefix=gnl_marshal $^ > gnlmarshal.h.tmp + mv gnlmarshal.h.tmp gnlmarshal.h +gnlmarshal.c: gnlmarshal.list + echo "#include \"glib-object.h\"" >gnlmarshal.c.tmp + echo "#include \"gnlmarshal.h\"" >> gnlmarshal.c.tmp + glib-genmarshal --body --prefix=gnl_marshal $^ >> gnlmarshal.c.tmp + mv gnlmarshal.c.tmp gnlmarshal.c diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnl/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnl/Makefile.in --- gnonlin-0.10.11.2/gnl/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/gnl/Makefile.in 2009-08-29 10:31:56.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -17,8 +18,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -66,21 +68,36 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(plugindir)" -pluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(plugin_LTLIBRARIES) am__DEPENDENCIES_1 = libgnl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libgnl_la_OBJECTS = libgnl_la-gnl.lo libgnl_la-gnlobject.lo \ libgnl_la-gnlcomposition.lo libgnl_la-gnlghostpad.lo \ - libgnl_la-gnloperation.lo libgnl_la-gnlsource.lo \ - libgnl_la-gnlfilesource.lo + libgnl_la-gnlmarshal.lo libgnl_la-gnloperation.lo \ + libgnl_la-gnlsource.lo libgnl_la-gnlfilesource.lo libgnl_la_OBJECTS = $(am_libgnl_la_OBJECTS) libgnl_la_LINK = $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgnl_la_CFLAGS) \ @@ -88,6 +105,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -97,8 +115,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libgnl_la_SOURCES) -DIST_SOURCES = $(libgnl_la_SOURCES) +SOURCES = $(libgnl_la_SOURCES) $(EXTRA_libgnl_la_SOURCES) +DIST_SOURCES = $(libgnl_la_SOURCES) $(EXTRA_libgnl_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -305,12 +323,16 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +built_header_make = gnlmarshal.h +build_source_make = gnlmarshal.c plugin_LTLIBRARIES = libgnl.la +EXTRA_libgnl_la_SOURCES = gnlmarshal.list libgnl_la_SOURCES = \ gnl.c \ gnlobject.c \ gnlcomposition.c \ gnlghostpad.c \ + gnlmarshal.c \ gnloperation.c \ gnlsource.c \ gnlfilesource.c @@ -331,8 +353,16 @@ gnlfilesource.h DISTCLEANFILE = $(CLEANFILES) -noinst_HEADERS = $(gnl_headers) -all: all-am +noinst_HEADERS = $(gnl_headers) $(built_header_make) $(built_header_configure) +#files built on make all/check/instal +BUILT_SOURCES = \ + $(built_header_configure) \ + $(built_header_make) \ + $(built_source_make) + +CLEANFILES = $(built_header_make) $(built_source_make) +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -345,9 +375,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnl/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gnl/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnl/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu gnl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -365,23 +395,28 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + list2="$$list2 $$p"; \ else :; fi; \ - done + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ done clean-pluginLTLIBRARIES: @@ -405,79 +440,87 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnl_la-gnlcomposition.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnl_la-gnlfilesource.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnl_la-gnlghostpad.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnl_la-gnlmarshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnl_la-gnlobject.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnl_la-gnloperation.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnl_la-gnlsource.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libgnl_la-gnl.lo: gnl.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnl.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnl.Tpo -c -o libgnl_la-gnl.lo `test -f 'gnl.c' || echo '$(srcdir)/'`gnl.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgnl_la-gnl.Tpo $(DEPDIR)/libgnl_la-gnl.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnl.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnl.Tpo -c -o libgnl_la-gnl.lo `test -f 'gnl.c' || echo '$(srcdir)/'`gnl.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnl.Tpo $(DEPDIR)/libgnl_la-gnl.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnl.c' object='libgnl_la-gnl.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnl.lo `test -f 'gnl.c' || echo '$(srcdir)/'`gnl.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnl.lo `test -f 'gnl.c' || echo '$(srcdir)/'`gnl.c libgnl_la-gnlobject.lo: gnlobject.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlobject.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlobject.Tpo -c -o libgnl_la-gnlobject.lo `test -f 'gnlobject.c' || echo '$(srcdir)/'`gnlobject.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgnl_la-gnlobject.Tpo $(DEPDIR)/libgnl_la-gnlobject.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlobject.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlobject.Tpo -c -o libgnl_la-gnlobject.lo `test -f 'gnlobject.c' || echo '$(srcdir)/'`gnlobject.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnlobject.Tpo $(DEPDIR)/libgnl_la-gnlobject.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnlobject.c' object='libgnl_la-gnlobject.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlobject.lo `test -f 'gnlobject.c' || echo '$(srcdir)/'`gnlobject.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlobject.lo `test -f 'gnlobject.c' || echo '$(srcdir)/'`gnlobject.c libgnl_la-gnlcomposition.lo: gnlcomposition.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlcomposition.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlcomposition.Tpo -c -o libgnl_la-gnlcomposition.lo `test -f 'gnlcomposition.c' || echo '$(srcdir)/'`gnlcomposition.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgnl_la-gnlcomposition.Tpo $(DEPDIR)/libgnl_la-gnlcomposition.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlcomposition.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlcomposition.Tpo -c -o libgnl_la-gnlcomposition.lo `test -f 'gnlcomposition.c' || echo '$(srcdir)/'`gnlcomposition.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnlcomposition.Tpo $(DEPDIR)/libgnl_la-gnlcomposition.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnlcomposition.c' object='libgnl_la-gnlcomposition.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlcomposition.lo `test -f 'gnlcomposition.c' || echo '$(srcdir)/'`gnlcomposition.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlcomposition.lo `test -f 'gnlcomposition.c' || echo '$(srcdir)/'`gnlcomposition.c libgnl_la-gnlghostpad.lo: gnlghostpad.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlghostpad.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlghostpad.Tpo -c -o libgnl_la-gnlghostpad.lo `test -f 'gnlghostpad.c' || echo '$(srcdir)/'`gnlghostpad.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgnl_la-gnlghostpad.Tpo $(DEPDIR)/libgnl_la-gnlghostpad.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlghostpad.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlghostpad.Tpo -c -o libgnl_la-gnlghostpad.lo `test -f 'gnlghostpad.c' || echo '$(srcdir)/'`gnlghostpad.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnlghostpad.Tpo $(DEPDIR)/libgnl_la-gnlghostpad.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnlghostpad.c' object='libgnl_la-gnlghostpad.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlghostpad.lo `test -f 'gnlghostpad.c' || echo '$(srcdir)/'`gnlghostpad.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlghostpad.lo `test -f 'gnlghostpad.c' || echo '$(srcdir)/'`gnlghostpad.c + +libgnl_la-gnlmarshal.lo: gnlmarshal.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlmarshal.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlmarshal.Tpo -c -o libgnl_la-gnlmarshal.lo `test -f 'gnlmarshal.c' || echo '$(srcdir)/'`gnlmarshal.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnlmarshal.Tpo $(DEPDIR)/libgnl_la-gnlmarshal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnlmarshal.c' object='libgnl_la-gnlmarshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlmarshal.lo `test -f 'gnlmarshal.c' || echo '$(srcdir)/'`gnlmarshal.c libgnl_la-gnloperation.lo: gnloperation.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnloperation.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnloperation.Tpo -c -o libgnl_la-gnloperation.lo `test -f 'gnloperation.c' || echo '$(srcdir)/'`gnloperation.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgnl_la-gnloperation.Tpo $(DEPDIR)/libgnl_la-gnloperation.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnloperation.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnloperation.Tpo -c -o libgnl_la-gnloperation.lo `test -f 'gnloperation.c' || echo '$(srcdir)/'`gnloperation.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnloperation.Tpo $(DEPDIR)/libgnl_la-gnloperation.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnloperation.c' object='libgnl_la-gnloperation.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnloperation.lo `test -f 'gnloperation.c' || echo '$(srcdir)/'`gnloperation.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnloperation.lo `test -f 'gnloperation.c' || echo '$(srcdir)/'`gnloperation.c libgnl_la-gnlsource.lo: gnlsource.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlsource.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlsource.Tpo -c -o libgnl_la-gnlsource.lo `test -f 'gnlsource.c' || echo '$(srcdir)/'`gnlsource.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgnl_la-gnlsource.Tpo $(DEPDIR)/libgnl_la-gnlsource.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlsource.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlsource.Tpo -c -o libgnl_la-gnlsource.lo `test -f 'gnlsource.c' || echo '$(srcdir)/'`gnlsource.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnlsource.Tpo $(DEPDIR)/libgnl_la-gnlsource.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnlsource.c' object='libgnl_la-gnlsource.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlsource.lo `test -f 'gnlsource.c' || echo '$(srcdir)/'`gnlsource.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlsource.lo `test -f 'gnlsource.c' || echo '$(srcdir)/'`gnlsource.c libgnl_la-gnlfilesource.lo: gnlfilesource.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlfilesource.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlfilesource.Tpo -c -o libgnl_la-gnlfilesource.lo `test -f 'gnlfilesource.c' || echo '$(srcdir)/'`gnlfilesource.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgnl_la-gnlfilesource.Tpo $(DEPDIR)/libgnl_la-gnlfilesource.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -MT libgnl_la-gnlfilesource.lo -MD -MP -MF $(DEPDIR)/libgnl_la-gnlfilesource.Tpo -c -o libgnl_la-gnlfilesource.lo `test -f 'gnlfilesource.c' || echo '$(srcdir)/'`gnlfilesource.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgnl_la-gnlfilesource.Tpo $(DEPDIR)/libgnl_la-gnlfilesource.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnlfilesource.c' object='libgnl_la-gnlfilesource.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlfilesource.lo `test -f 'gnlfilesource.c' || echo '$(srcdir)/'`gnlfilesource.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(libgnl_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnl_la_CFLAGS) $(CFLAGS) -c -o libgnl_la-gnlfilesource.lo `test -f 'gnlfilesource.c' || echo '$(srcdir)/'`gnlfilesource.c mostlyclean-libtool: -rm -f *.lo @@ -497,7 +540,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -505,29 +548,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -548,24 +596,30 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(plugindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -582,13 +636,16 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ @@ -606,6 +663,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -614,18 +673,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -648,7 +717,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES -.MAKE: install-am install-strip +.MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pluginLTLIBRARIES ctags distclean \ @@ -664,6 +733,17 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + +gnlmarshal.h: gnlmarshal.list + glib-genmarshal --header --prefix=gnl_marshal $^ > gnlmarshal.h.tmp + mv gnlmarshal.h.tmp gnlmarshal.h + +gnlmarshal.c: gnlmarshal.list + echo "#include \"glib-object.h\"" >gnlmarshal.c.tmp + echo "#include \"gnlmarshal.h\"" >> gnlmarshal.c.tmp + glib-genmarshal --body --prefix=gnl_marshal $^ >> gnlmarshal.c.tmp + mv gnlmarshal.c.tmp gnlmarshal.c + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/gnonlin.spec /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/gnonlin.spec --- gnonlin-0.10.11.2/gnonlin.spec 2009-07-16 09:20:46.000000000 +0100 +++ gnonlin-0.10.12.2/gnonlin.spec 2009-08-29 10:32:03.000000000 +0100 @@ -1,5 +1,5 @@ Name: gnonlin -Version: 0.10.11.2 +Version: 0.10.12.2 Release: 1 Summary: GStreamer extension library for non-linear editing diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/install-sh /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/install-sh --- gnonlin-0.10.11.2/install-sh 2009-04-07 18:25:19.000000000 +0100 +++ gnonlin-0.10.12.2/install-sh 2009-08-29 10:09:47.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -515,5 +515,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/m4/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/m4/Makefile.in --- gnonlin-0.10.11.2/m4/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/m4/Makefile.in 2009-08-29 10:31:56.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -63,6 +65,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -283,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu m4/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu m4/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -303,6 +306,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -332,13 +336,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -366,6 +374,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -384,6 +393,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -392,18 +403,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -450,6 +471,7 @@ progtest.m4 \ stdint_h.m4 \ uintmax_t.m4 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/Makefile.in --- gnonlin-0.10.11.2/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/Makefile.in 2009-08-29 10:31:56.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -18,8 +19,9 @@ # include $(top_srcdir)/common/release.mak VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -73,6 +75,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = gnonlin.spec +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -84,15 +87,43 @@ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -327,15 +358,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -351,9 +382,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ @@ -365,7 +397,7 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -407,7 +439,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -441,16 +473,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -465,7 +497,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -477,7 +509,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -486,36 +518,41 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -531,38 +568,54 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -574,6 +627,10 @@ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -603,6 +660,8 @@ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -614,10 +673,12 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -639,13 +700,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -687,6 +750,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -708,6 +772,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -716,18 +782,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -750,24 +826,24 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool 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-gzip dist-lzma dist-shar dist-tarZ dist-xz 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 release: dist @@ -801,6 +877,7 @@ @HAVE_CHECK_TRUE@ cd tests/check && make torture @HAVE_CHECK_FALSE@check-torture: @HAVE_CHECK_FALSE@ true + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/missing /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/missing --- gnonlin-0.10.11.2/missing 2009-04-07 18:25:19.000000000 +0100 +++ gnonlin-0.10.12.2/missing 2009-08-29 10:09:47.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/NEWS /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/NEWS --- gnonlin-0.10.11.2/NEWS 2009-05-30 17:00:06.000000000 +0100 +++ gnonlin-0.10.12.2/NEWS 2009-08-17 16:21:15.000000000 +0100 @@ -1,3 +1,12 @@ +This is GNonLin 0.10.12 "Lots of people on the clothesline" + +Features of this release + + * New property for faster composition updates + * Speedups + * various fixes + + This is GNonLin 0.10.11 "How about green for the bikeshed?" Features of this release diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/RELEASE /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/RELEASE --- gnonlin-0.10.11.2/RELEASE 2009-05-30 17:00:06.000000000 +0100 +++ gnonlin-0.10.12.2/RELEASE 2009-08-17 16:21:15.000000000 +0100 @@ -1,5 +1,5 @@ -Release notes for GNonLin Non-Linear Editing Plug-ins 0.10.11 "How about green for the bikeshed?" +Release notes for GNonLin Non-Linear Editing Plug-ins 0.10.12 "Lots of people on the clothesline" @@ -29,22 +29,11 @@ Features of this release - * Speedup option to avoid recalculation during composition changes - * Switch to regular seeks for more efficient beheaviour - * More GstQuery/GstEvent handling - * Bugfixes on GnlOperation - * Switch to GIT - * Documentation - -Bugs fixed in this release - - * 398453 : Implement time-shifting for QoS events - * 555898 : [optimisation] Block signals from timeline while doing co... - * 563507 : Tests are using " alpha " element from gst-plugins-good but... - * 566796 : Deadlock using nested compositions - * 569854 : Generic duration reporting/querying - * 578234 : [gnloperation] Implement time-shifting on sinkpad event/q... - * 575972 : [GnlComposition] Switch to using regular segment seeks in... + * New property for faster composition updates + * Speedups + * various fixes +There were no bugs fixed in this release + Download @@ -74,13 +63,10 @@ Contributors to this release + * Adam Dingle * Alessandro Decina - * Cygwin Ports maintainer - * David Schleef * Edward Hervey - * Felipe Contreras * Jan Schmidt - * Marc-Andre Lureau - * Sebastian Dröge + * Olivier Crête * Stefan Kost   \ No newline at end of file diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/tests/check/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/tests/check/Makefile.in --- gnonlin-0.10.11.2/tests/check/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/tests/check/Makefile.in 2009-08-29 10:31:56.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -17,8 +18,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -70,6 +72,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) __complex_SOURCES = ./complex.c __complex_OBJECTS = complex.$(OBJEXT) @@ -97,6 +100,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -113,6 +117,8 @@ HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -353,9 +359,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/check/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/check/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/check/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/check/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -373,20 +379,25 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list ./complex$(EXEEXT): $(__complex_OBJECTS) $(__complex_DEPENDENCIES) @rm -f ./complex$(EXEEXT) $(LINK) $(__complex_OBJECTS) $(__complex_LDADD) $(LIBS) @@ -417,91 +428,91 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< complex.o: ./complex.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT complex.o -MD -MP -MF $(DEPDIR)/complex.Tpo -c -o complex.o `test -f './complex.c' || echo '$(srcdir)/'`./complex.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/complex.Tpo $(DEPDIR)/complex.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/complex.Tpo $(DEPDIR)/complex.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./complex.c' object='complex.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o complex.o `test -f './complex.c' || echo '$(srcdir)/'`./complex.c complex.obj: ./complex.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT complex.obj -MD -MP -MF $(DEPDIR)/complex.Tpo -c -o complex.obj `if test -f './complex.c'; then $(CYGPATH_W) './complex.c'; else $(CYGPATH_W) '$(srcdir)/./complex.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/complex.Tpo $(DEPDIR)/complex.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/complex.Tpo $(DEPDIR)/complex.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./complex.c' object='complex.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o complex.obj `if test -f './complex.c'; then $(CYGPATH_W) './complex.c'; else $(CYGPATH_W) '$(srcdir)/./complex.c'; fi` gnlcomposition.o: ./gnlcomposition.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnlcomposition.o -MD -MP -MF $(DEPDIR)/gnlcomposition.Tpo -c -o gnlcomposition.o `test -f './gnlcomposition.c' || echo '$(srcdir)/'`./gnlcomposition.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnlcomposition.Tpo $(DEPDIR)/gnlcomposition.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnlcomposition.Tpo $(DEPDIR)/gnlcomposition.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./gnlcomposition.c' object='gnlcomposition.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnlcomposition.o `test -f './gnlcomposition.c' || echo '$(srcdir)/'`./gnlcomposition.c gnlcomposition.obj: ./gnlcomposition.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnlcomposition.obj -MD -MP -MF $(DEPDIR)/gnlcomposition.Tpo -c -o gnlcomposition.obj `if test -f './gnlcomposition.c'; then $(CYGPATH_W) './gnlcomposition.c'; else $(CYGPATH_W) '$(srcdir)/./gnlcomposition.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnlcomposition.Tpo $(DEPDIR)/gnlcomposition.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnlcomposition.Tpo $(DEPDIR)/gnlcomposition.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./gnlcomposition.c' object='gnlcomposition.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnlcomposition.obj `if test -f './gnlcomposition.c'; then $(CYGPATH_W) './gnlcomposition.c'; else $(CYGPATH_W) '$(srcdir)/./gnlcomposition.c'; fi` gnloperation.o: ./gnloperation.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnloperation.o -MD -MP -MF $(DEPDIR)/gnloperation.Tpo -c -o gnloperation.o `test -f './gnloperation.c' || echo '$(srcdir)/'`./gnloperation.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnloperation.Tpo $(DEPDIR)/gnloperation.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnloperation.Tpo $(DEPDIR)/gnloperation.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./gnloperation.c' object='gnloperation.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnloperation.o `test -f './gnloperation.c' || echo '$(srcdir)/'`./gnloperation.c gnloperation.obj: ./gnloperation.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnloperation.obj -MD -MP -MF $(DEPDIR)/gnloperation.Tpo -c -o gnloperation.obj `if test -f './gnloperation.c'; then $(CYGPATH_W) './gnloperation.c'; else $(CYGPATH_W) '$(srcdir)/./gnloperation.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnloperation.Tpo $(DEPDIR)/gnloperation.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnloperation.Tpo $(DEPDIR)/gnloperation.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./gnloperation.c' object='gnloperation.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnloperation.obj `if test -f './gnloperation.c'; then $(CYGPATH_W) './gnloperation.c'; else $(CYGPATH_W) '$(srcdir)/./gnloperation.c'; fi` gnlsource.o: ./gnlsource.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnlsource.o -MD -MP -MF $(DEPDIR)/gnlsource.Tpo -c -o gnlsource.o `test -f './gnlsource.c' || echo '$(srcdir)/'`./gnlsource.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnlsource.Tpo $(DEPDIR)/gnlsource.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnlsource.Tpo $(DEPDIR)/gnlsource.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./gnlsource.c' object='gnlsource.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnlsource.o `test -f './gnlsource.c' || echo '$(srcdir)/'`./gnlsource.c gnlsource.obj: ./gnlsource.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnlsource.obj -MD -MP -MF $(DEPDIR)/gnlsource.Tpo -c -o gnlsource.obj `if test -f './gnlsource.c'; then $(CYGPATH_W) './gnlsource.c'; else $(CYGPATH_W) '$(srcdir)/./gnlsource.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnlsource.Tpo $(DEPDIR)/gnlsource.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnlsource.Tpo $(DEPDIR)/gnlsource.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./gnlsource.c' object='gnlsource.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnlsource.obj `if test -f './gnlsource.c'; then $(CYGPATH_W) './gnlsource.c'; else $(CYGPATH_W) '$(srcdir)/./gnlsource.c'; fi` simple.o: ./simple.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simple.o -MD -MP -MF $(DEPDIR)/simple.Tpo -c -o simple.o `test -f './simple.c' || echo '$(srcdir)/'`./simple.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/simple.Tpo $(DEPDIR)/simple.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/simple.Tpo $(DEPDIR)/simple.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./simple.c' object='simple.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simple.o `test -f './simple.c' || echo '$(srcdir)/'`./simple.c simple.obj: ./simple.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simple.obj -MD -MP -MF $(DEPDIR)/simple.Tpo -c -o simple.obj `if test -f './simple.c'; then $(CYGPATH_W) './simple.c'; else $(CYGPATH_W) '$(srcdir)/./simple.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/simple.Tpo $(DEPDIR)/simple.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/simple.Tpo $(DEPDIR)/simple.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./simple.c' object='simple.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simple.obj `if test -f './simple.c'; then $(CYGPATH_W) './simple.c'; else $(CYGPATH_W) '$(srcdir)/./simple.c'; fi` @@ -524,7 +535,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -532,29 +543,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -563,6 +579,7 @@ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ + $(am__tty_colors); \ if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ @@ -574,10 +591,10 @@ *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ + col=$$red; res=XPASS; \ ;; \ *) \ - echo "PASS: $$tst"; \ + col=$$grn; res=PASS; \ ;; \ esac; \ elif test $$? -ne 77; then \ @@ -585,17 +602,18 @@ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ + col=$$lgn; res=XFAIL; \ ;; \ *) \ failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ + col=$$red; res=FAIL; \ ;; \ esac; \ else \ skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ + col=$$blu; res=SKIP; \ fi; \ + echo "$${col}$$res$${std}: $$tst"; \ done; \ if test "$$all" -eq 1; then \ tests="test"; \ @@ -637,11 +655,15 @@ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ echo "$$banner"; \ test -z "$$skipped" || echo "$$skipped"; \ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ + echo "$$dashes$$std"; \ test "$$failed" -eq 0; \ else :; fi @@ -661,13 +683,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -698,6 +724,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -719,6 +746,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -727,18 +756,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -761,7 +800,7 @@ uninstall-am: -.MAKE: install-am install-strip +.MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool clean-local \ @@ -935,6 +974,7 @@ $(CHECK_REGISTRY): $(TESTS_ENVIRONMENT) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/Eft5vd3XAb/gnonlin-0.10.11.2/tests/Makefile.in /tmp/cKdXo7FpNV/gnonlin-0.10.12.2/tests/Makefile.in --- gnonlin-0.10.11.2/tests/Makefile.in 2009-07-16 09:20:38.000000000 +0100 +++ gnonlin-0.10.12.2/tests/Makefile.in 2009-08-29 10:31:56.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 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, 2007, 2008, 2009 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. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -63,6 +65,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -74,9 +77,37 @@ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ AMTAR = @AMTAR@ @@ -299,9 +330,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -319,6 +350,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -350,7 +382,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -384,16 +416,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -408,7 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -420,7 +452,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -429,29 +461,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -472,29 +509,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -524,6 +576,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -542,6 +595,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -550,18 +605,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -582,8 +647,8 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -599,6 +664,7 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: