diff -Nru libaqbanking-5.4.3beta/aclocal.m4 libaqbanking-5.6.1beta/aclocal.m4 --- libaqbanking-5.4.3beta/aclocal.m4 2014-04-17 20:57:21.000000000 +0000 +++ libaqbanking-5.6.1beta/aclocal.m4 2015-06-01 16:31:27.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) @@ -180,25 +180,22 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 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 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # 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.11' +[am__api_version='1.14' 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.11.6], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,24 +211,22 @@ # 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.11.6])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -250,7 +245,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -276,22 +271,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -310,16 +302,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# 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, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -329,7 +319,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -342,12 +332,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -355,8 +346,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -396,16 +387,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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 + # 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 @@ -414,8 +405,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -423,7 +414,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -471,7 +462,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -481,9 +472,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -498,20 +493,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf 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 @@ -524,7 +517,7 @@ # 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 + # 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. @@ -536,21 +529,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # 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 + 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 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -568,7 +559,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -578,18 +569,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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 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. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -602,7 +596,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.62])dnl +[AC_PREREQ([2.65])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 @@ -631,31 +625,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -666,34 +669,78 @@ [_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])], + [m4_define([AC_PROG_CC], + m4_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])], + [m4_define([AC_PROG_CXX], + m4_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])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])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_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro 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 +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +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 # that is generated. The stamp files are numbered to have different names. @@ -715,15 +762,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 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 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -737,16 +781,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -762,14 +804,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -787,7 +827,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# 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 @@ -814,15 +854,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -830,11 +867,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -847,54 +883,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 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 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 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 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -904,7 +908,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -918,24 +922,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 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. -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 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 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 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. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# 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=' @@ -946,32 +1008,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -981,46 +1051,118 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 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. # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# 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. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1034,18 +1176,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 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_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1055,76 +1195,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru libaqbanking-5.4.3beta/admin/Makefile.in libaqbanking-5.6.1beta/admin/Makefile.in --- libaqbanking-5.4.3beta/admin/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/admin/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = admin -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,6 +93,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -73,10 +112,12 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -165,6 +206,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -375,11 +417,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -515,15 +557,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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 maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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 \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/aqbanking-config.cmake.in libaqbanking-5.6.1beta/aqbanking-config.cmake.in --- libaqbanking-5.4.3beta/aqbanking-config.cmake.in 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/aqbanking-config.cmake.in 2014-08-03 21:06:06.000000000 +0000 @@ -0,0 +1,27 @@ + +macro(set_and_check _var _file) + set(${_var} "${_file}") + if(NOT EXISTS "${_file}") + message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") + endif() +endmacro() + +macro(check_required_components _NAME) + foreach(comp ${${_NAME}_FIND_COMPONENTS}) + if(NOT ${_NAME}_${comp}_FOUND) + if(${_NAME}_FIND_REQUIRED_${comp}) + set(${_NAME}_FOUND FALSE) + endif() + endif() + endforeach() +endmacro() + +find_package(Gwenhywfar "@GWENHYWFAR_MINIMUM_VERSION@" REQUIRED) + +set_and_check(prefix "@prefix@") +set_and_check(exec_prefix "@exec_prefix@") +set_and_check(AQBANKING_INCLUDE_DIRS "@includedir@/aqbanking@AQBANKING_VERSION_MAJOR@") +set_and_check(AQBANKING_LIBRARIES "@libdir@/libaqbanking.so") +set(AQBANKING_LIBRARIES ${AQBANKING_LIBRARIES} ${GWENHYWFAR_LIBRARIES}) + +mark_as_advanced( AQBANKING_INCLUDE_DIRS AQBANKING_LIBRARIES ) diff -Nru libaqbanking-5.4.3beta/aqbanking-config-version.cmake.in libaqbanking-5.6.1beta/aqbanking-config-version.cmake.in --- libaqbanking-5.4.3beta/aqbanking-config-version.cmake.in 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/aqbanking-config-version.cmake.in 2014-08-03 21:06:06.000000000 +0000 @@ -0,0 +1,10 @@ +set(PACKAGE_VERSION "@VERSION@") + +if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() diff -Nru libaqbanking-5.4.3beta/aqbanking.iss libaqbanking-5.6.1beta/aqbanking.iss --- libaqbanking-5.4.3beta/aqbanking.iss 2014-04-17 20:57:33.000000000 +0000 +++ libaqbanking-5.6.1beta/aqbanking.iss 2015-06-01 16:31:40.000000000 +0000 @@ -8,7 +8,7 @@ [Setup] ; Using the name here directly because we want it capitalized AppName=AqBanking -AppVerName=AqBanking 5.4.3beta +AppVerName=AqBanking 5.6.1beta AppPublisher=AqBanking Development Team AppPublisherURL=http://sourceforge.net/projects/aqbanking AppSupportURL=http://sourceforge.net/support/getsupport.php?group_id=115695 @@ -18,7 +18,7 @@ DirExistsWarning=no InfoAfterFile=README LicenseFile=COPYING -OutputBaseFilename=aqbanking-5.4.3beta-setup +OutputBaseFilename=aqbanking-5.6.1beta-setup OutputDir=. UninstallFilesDir={app}\uninstall\aqbanking @@ -45,8 +45,8 @@ Source: "win32-tmp\usr\lib\aqbanking\*"; DestDir: "{app}\lib\aqbanking"; Flags: recursesubdirs; Components: main ; The plugins that belong to gwenhywfar. -Source: "win32-tmp\gwen\dbio\*"; DestDir: "{reg:HKLM\Software\Gwenhywfar\Paths,dbio-plugins|{app}\lib\aqbanking\plugins\34}"; Flags: ignoreversion recursesubdirs; Components: main -Source: "win32-tmp\gwen\crypttoken\*"; DestDir: "{reg:HKLM\Software\Gwenhywfar\Paths,plugindir|{app}\lib\aqbanking\plugins\34}\crypttoken"; Flags: ignoreversion recursesubdirs; Components: main +Source: "win32-tmp\gwen\dbio\*"; DestDir: "{reg:HKLM\Software\Gwenhywfar\Paths,dbio-plugins|{app}\lib\aqbanking\plugins\35}"; Flags: ignoreversion recursesubdirs; Components: main +Source: "win32-tmp\gwen\crypttoken\*"; DestDir: "{reg:HKLM\Software\Gwenhywfar\Paths,plugindir|{app}\lib\aqbanking\plugins\35}\crypttoken"; Flags: ignoreversion recursesubdirs; Components: main ; The commandline tools Source: "win32-tmp\usr\bin\*.exe"; DestDir: "{app}\bin"; Components: main @@ -84,17 +84,17 @@ Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\aqbanking"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "plugindir"; ValueData: "{app}\lib\aqbanking\plugins\34"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\34\providers"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\34\bankinfo"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "imexporterdir"; ValueData: "{app}\lib\aqbanking\plugins\34\imexporters"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\34\imexporters"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "plugindir"; ValueData: "{app}\lib\aqbanking\plugins\35"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\35\providers"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\35\bankinfo"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "imexporterdir"; ValueData: "{app}\lib\aqbanking\plugins\35\imexporters"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\35\imexporters"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\34\wizards"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\35\wizards"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\34\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\35\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -135,7 +135,7 @@ appdir := MingwBacksl(ExpandConstant('{app}')); includedir := appdir + '/include'; bindir := appdir + '/bin'; - plugindir := appdir + '/lib/aqbanking/plugins/34'; + plugindir := appdir + '/lib/aqbanking/plugins/35'; datadir := appdir + '/share'; pkgdatadir := datadir + '/aqbanking'; @@ -150,8 +150,8 @@ StringChange(FileString, '@'+'aqbanking_plugindir@', plugindir); StringChange(FileString, '@'+'aqbanking_pkgdatadir@', pkgdatadir); StringChange(FileString, '@'+'AQBANKING_VERSION_MAJOR@', '5'); - StringChange(FileString, '@'+'AQBANKING_VERSION_MINOR@', '4'); - StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '3'); + StringChange(FileString, '@'+'AQBANKING_VERSION_MINOR@', '6'); + StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '1'); StringChange(FileString, '@'+'AQBANKING_VERSION_BUILD@', '0'); StringChange(FileString, '@'+'AQBANKING_VERSION_TAG@', 'beta'); diff -Nru libaqbanking-5.4.3beta/aqbanking.pc.in libaqbanking-5.6.1beta/aqbanking.pc.in --- libaqbanking-5.4.3beta/aqbanking.pc.in 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/aqbanking.pc.in 2015-05-17 07:37:03.000000000 +0000 @@ -22,14 +22,6 @@ aqbanking_plugindir=@aqbanking_plugindir@ aqhbci_includes=@aqhbci_includes@ aqhbci_libs=@aqhbci_ldflags@ @aqhbci_libs@ -aqhbci_plugindir=@aqhbci_plugindir@ -aqhbci_datadir=@aqhbci_data@ -qbanking_includes=@qbanking_includes@ -qbanking_libs=@qbanking_libs@ -qbanking_datadir=@qbanking_data@ -q4banking_includes=@q4banking_includes@ -q4banking_libs=@q4banking_libs@ -q4banking_datadir=@q4banking_data@ # Human-readable name Name: AqBanking diff -Nru libaqbanking-5.4.3beta/aqbanking.spec libaqbanking-5.6.1beta/aqbanking.spec --- libaqbanking-5.4.3beta/aqbanking.spec 2014-04-17 20:57:33.000000000 +0000 +++ libaqbanking-5.6.1beta/aqbanking.spec 2015-06-01 16:31:40.000000000 +0000 @@ -2,13 +2,13 @@ # neededforbuild gwenhywfar gwenhywfar-devel ktoblzcheck python python-ctypes pyyxml libchipcard2-devel libchipcard2 pkgconfig gettext-devel libacl-devel libacl libattr-devel libattr %define name aqbanking -%define version 5.4.3beta +%define version 5.6.1beta -%define dist -%define disttag +%define dist Ubuntu +%define disttag ubuntu %define distver -%define aq_plugindir %{_libdir}/aqbanking/plugins/34 +%define aq_plugindir %{_libdir}/aqbanking/plugins/35 %define fronts_libdir %{aq_plugindir}/frontends %define imex_plugindir %{aq_plugindir}/imexporters %define imex_datadir %{_datadir}/%{name}/imexporters diff -Nru libaqbanking-5.4.3beta/ChangeLog libaqbanking-5.6.1beta/ChangeLog --- libaqbanking-5.4.3beta/ChangeLog 2014-04-17 21:00:20.000000000 +0000 +++ libaqbanking-5.6.1beta/ChangeLog 2015-06-01 17:21:40.000000000 +0000 @@ -1,663 +1,566 @@ ------------------------------------------------------------------ -2014-04-02 15:33:02 +0000 martin -Aqbanking-cli: Needed to fix the argument type -We now use char because the period type is expected to be a string. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2549 5c42a225-8b10-0410-9873-89b7810ad06e +2015-06-01 19:16:43 +0200 Martin Preuss +Disabled debug output again. ------------------------------------------------------------------ -2014-03-30 20:03:41 +0000 martin -Prepared release 5.4.2beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2548 5c42a225-8b10-0410-9873-89b7810ad06e +2015-06-01 19:16:18 +0200 Martin Preuss +Hmm, the problem with SEPA tags in SWIFT parser is more persistent than I thought... +Should be fixed now. ------------------------------------------------------------------ -2014-03-30 00:10:53 +0000 martin -CSV: Added a profile for SEPA debit notes. -This profile can be used to import SEPA debit notes to be send to a bank. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2547 5c42a225-8b10-0410-9873-89b7810ad06e +2015-06-01 18:33:09 +0200 Martin Preuss +Prepared release 5.6.1beta. ------------------------------------------------------------------ -2014-03-25 21:58:38 +0000 martin -CSV-ImExporter: Added SEPA debit note fields to "full" profile. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2546 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-31 16:22:55 +0200 Martin Preuss +Removed unneeded code. ------------------------------------------------------------------ -2014-03-25 21:51:24 +0000 martin -AqBanking-CLI: Added command "sepadebitnotes" -This command reads multiple debit notes from a file. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2545 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-31 16:11:46 +0200 Martin Preuss +SWIFT: Really fixed the no-SEPA-tags problem. +Even if there is no real SEPA tag, the code always creates a "_purpose" +variable ion dbSepaTags, so a simple test for an empty dbSepaTags isn't +enough... ------------------------------------------------------------------ -2014-03-25 21:49:57 +0000 martin -AqBanking-CLI: Fixed a typo. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2544 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-31 15:50:40 +0200 Martin Preuss +SWIFT_Parser: Fixed a problem with transaction without SEPA tags. +If a transaction does not contain SEPA tags then the purpose strings +are handles as before. ------------------------------------------------------------------ -2014-03-24 21:45:23 +0000 martin -AqHBCI: Started supporting COR1 SEPA debit notes. -Those new jobs aren't used ATM, we still have to figure out a way to select -this type of jobs. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2543 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-31 14:34:19 +0200 Matthias Gehre +AcHBCI: DKKKU: Set FiId from "Referenz" ------------------------------------------------------------------ -2014-03-02 14:49:50 +0000 martin -Prepared release 5.4.1beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2542 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-31 13:07:16 +0200 Matthias Gehre +AqHBCI: Update of DKKKU to handle additional purpose lines ------------------------------------------------------------------ -2014-03-01 20:23:13 +0000 martin -AqBanking-CLI: No need to check local BIC twice (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2541 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-25 18:33:24 +0200 Martin Preuss +Prepared release 5.6.0beta. ------------------------------------------------------------------ -2014-03-01 20:22:01 +0000 martin -AqBanking-CLI: Drop redundant if clauses (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2540 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-25 18:33:12 +0200 Martin Preuss +Updated German bank data. ------------------------------------------------------------------ -2014-03-01 20:20:49 +0000 martin -AqBanking-CLI: Allow 97 through 99 as "day of month" for standing orders (Elias Oltmanns) -According to the HBCI specs, these values refer to the last three days -of a month respectively. +2015-05-25 13:23:32 +0200 Elias Oltmanns +AqHBCI: Add support for COR1 SEPA multi debit notes. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2539 5c42a225-8b10-0410-9873-89b7810ad06e +------------------------------------------------------------------ +2015-05-25 11:39:30 +0200 Elias Oltmanns +AqHBCI: Remove autogenerated file from repository +Commit 35292bfb erroneously added plugin/ajobs/accountjobs.xml to the +repository. Just drop it again and adjust the corresponding entry in +.gitignore instead. ------------------------------------------------------------------ -2014-03-01 20:19:39 +0000 martin -Add support for complete DTAUS character set in SEPA transactions (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2538 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-20 21:51:40 +0200 Martin Preuss +Fixed a memory leak. +Correctly fixes a memory leak regarding "ctx". ------------------------------------------------------------------ -2014-03-01 20:18:22 +0000 martin -AqHBCI: Make code more readable (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2537 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-20 21:32:24 +0200 Martin Preuss +Partly revert a patch: Removed an errornous call to GWEN_Crypt_Token_Context_free(). +The object "ctx" ist still used after that call, because we use some +variables later which are stored inside the "ctx" object (e.g. in +"luserId" etc). So we must not free the object at that point... ------------------------------------------------------------------ -2014-03-01 20:17:07 +0000 martin -AqHBCI: Do not use uninitialised variable (Elias Oltmanns) -Also, rearrange comments for better code readability and remove unused -snippets of code. +2015-05-17 18:51:51 +0200 Martin Preuss +Disabled debugging code. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2536 5c42a225-8b10-0410-9873-89b7810ad06e +------------------------------------------------------------------ +2015-05-17 18:51:23 +0200 Martin Preuss +Removed unneeded code. ------------------------------------------------------------------ -2014-03-01 20:11:34 +0000 martin -Modified patch submitted by Elias Oltmanns. -Don't set the default charset in AqBanking, leave that to Gwen. +2015-05-17 13:18:34 +0200 Martin Preuss +Minor fix of SWIFT parser. +Manually add purpose string outside a SEPA field as its own purpose line. -The modification is that the original patch was changing some lines like -"if (s && *s)" to just "if (s)", this modified patch doesn't. +------------------------------------------------------------------ +2015-05-17 12:28:12 +0200 Martin Preuss +Mainly a test for the CVS mailing list. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2535 5c42a225-8b10-0410-9873-89b7810ad06e +------------------------------------------------------------------ +2015-05-17 12:19:55 +0200 Martin Preuss +Removes some unneeded preprocessor commands. ------------------------------------------------------------------ -2014-03-01 20:10:16 +0000 martin -Removed unneeded asserts. -At this point the asserts are not necessary because before those asserts -AH_Dialog functions have already been called, and those functions would -already have thrown an exception if dlg was NULL. +2015-05-17 12:16:04 +0200 Martin Preuss +Adapted SWIFT MT940 parser to bad behavior of some bank servers. +Some banks - namely Sparda bank - don't adhere to the specs which state +that SEPA fields (e.g. "EREF+") must start at SWIFT groups (e.g. "?20"). +However, those banks put those SEPA tags anywere inside the SWIFT groups, +so we need to concatenate all the purpose lines and cut out the SEPA fields +by ourselves. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2534 5c42a225-8b10-0410-9873-89b7810ad06e +This WILL change the output for those banks so that know the important +information gets extracted now. This should not change the output for +banks which already behave according to the specs (at least it does not +for Sparkasse Wilhelmshaven, which always followed the specs here). ------------------------------------------------------------------ -2014-03-01 20:08:56 +0000 martin -AqBanking-CLI: NULL pointer check -Modified the following patch by Elias Oltmanns: - AB_Banking_FindAccounts() already checks whether the list contains 0 - elements and simply returns a NULL pointer if so. +2015-05-16 14:37:54 +0200 Micha Lenk +Re-work Compiler Symbol Visibility Check +This was inspired by http://stackoverflow.com/questions/5987219/best-practices-for-probing-for-symbol-visibility-extensions-in-autoconf -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2533 5c42a225-8b10-0410-9873-89b7810ad06e +------------------------------------------------------------------ +2015-05-15 19:24:47 +0000 Micha Lenk +Fix symbol visibilty check for GCC 5.x +GCC 5.x supports the -fvisibility=hidden flag too. ------------------------------------------------------------------ -2014-03-01 19:42:20 +0000 martin -AqBanking-CLI: Don't bother setting country and rcountry (Elias Oltmanns) -Except for chkacc, this never worked in the first place. None of the -AqBanking-CLI commands accepted the country (as in local country) -option, and the rcountry option, when specified, was ignored by -mkTransfer, hence had no effect. Since IBAN and BIC will make this -information redundant anyway, rather drop than fix the code. Leave -chkacc untouched since it actually works as advertised and may be -useful to someone out there. +2015-05-10 17:08:40 +0200 Micha Lenk +Drop unsubstituted variables from aqbanking.pc.in +These variables are currently not substituted by ./configure, so they could not +have worked for quite a while. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2532 5c42a225-8b10-0410-9873-89b7810ad06e +Taking a closer look: +- aqhbci_plugindir isn't defined by configure.ac +- aqhbci_datadir referred to @aqhbci_data@, i.e. a typo +- qbanking_libs, qbanking_datadir, q4banking_libs and q4banking_datadir refer + to the gone frontend libraries qbanking and q4banking. ------------------------------------------------------------------ -2014-03-01 19:41:07 +0000 martin -AqBanking-CLI: Return an error when execution cycle has not been specified for standing orders (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2531 5c42a225-8b10-0410-9873-89b7810ad06e +2015-05-10 14:36:48 +0200 Micha Lenk +Add configure option --with-build-datetime for fixed build timestamps +With free software, anyone can inspect the source code for malicious flaws. But +Debian provide binary packages to its users. The idea of “deterministic” or +“reproducible” builds is to empower anyone to verify that no flaws have been +introduced during the build process by reproducing byte-for-byte identical +binary packages from a given source. +See also https://wiki.debian.org/ReproducibleBuilds/About + +To support this idea, AqBanking should avoid adding timestamps to generated +build artifacts. Currently it uses the DATETIME variable based on the output of +`date +"%Y%m%d%H%M%S"' to auto-generate a version string for aqhbci.xml (see +src/plugins/backends/aqhbci/plugin/header.xml.in line 4). Specifying this +option the build system can influence this variable, so that the Debian +packaging can ensure the same value is generated when building the same source +package at a later time. ------------------------------------------------------------------ -2014-03-01 19:39:56 +0000 martin -AqBanking-CLI: Remove dubious code duplication (Elias Oltmanns) -Clean up the code in writeContext(). Exporting the context twice may -or may not have actually been harmful but was certainly unintended. +2015-05-04 00:03:33 +0200 Micha Lenk +Revert "Disable timestamps in HTML pages generated by Doxygen" +This reverts commit 214dad250316f00f55b9dcb21b3ed8ad74d02cf1. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2530 5c42a225-8b10-0410-9873-89b7810ad06e +Debian's Doxygen as of version 1.8.9.1-3 will have this disabled by default, so +this change is not needed anymore. ------------------------------------------------------------------ -2014-03-01 19:38:46 +0000 martin -Accommodate for the effects of fixing Gwen's stringlist sorting functions (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2529 5c42a225-8b10-0410-9873-89b7810ad06e +2015-04-13 19:35:45 +0200 Micha Lenk +Disable timestamps in HTML pages generated by Doxygen +There is a Debian initiative working on making builds reproducible, i.e. to +make it possible to reproduce byte-for-byte identical binary packages from a +given source. https://wiki.debian.org/ReproducibleBuilds ------------------------------------------------------------------- -2014-03-01 19:37:28 +0000 martin -Typo in translation string (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2528 5c42a225-8b10-0410-9873-89b7810ad06e +One reason why AqBanking currently is not reproducible is the use of timestamps +in HTML pages generated by Doxygen. More details about this particular issue +can be found here: +https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByDoxygen ------------------------------------------------------------------ -2014-03-01 19:36:17 +0000 martin -Fix various memory leaks (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2527 5c42a225-8b10-0410-9873-89b7810ad06e +2015-04-05 10:43:47 +0200 Christian Stimming +document functions and log levels ------------------------------------------------------------------ -2014-03-01 19:34:37 +0000 martin -Fix subtle issues when using Gwen's very own memory allocator (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2526 5c42a225-8b10-0410-9873-89b7810ad06e +2015-03-09 20:52:03 +0100 Tomas Pospisek +rename AHB_SWIFT__ReadDocument to AHB_SWIFT_ReadTextBlock ------------------------------------------------------------------ -2014-03-01 19:33:22 +0000 martin -Make charset conversion for imexporters more robust and generic (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2525 5c42a225-8b10-0410-9873-89b7810ad06e +2015-02-01 22:22:21 +0100 Micha Lenk +Force effective SONAME bump in next release +This is needed because some symbols that were released in an earlier +release got dropped in commit 2caec44c464b8894eba6075b3257bf79e276f922. ------------------------------------------------------------------ -2014-03-01 19:32:11 +0000 martin -The country code in IBANs is required to be in upper case (Elias Oltmanns) -Although this requirement apparently does not extend to letters -contained in the BBAN, the country code definitely is case sensitive. +2015-01-07 21:24:53 +0100 Martin Preuss +Decreased verbosity even more. +Apparently this message shows more often than I expected, and it is quite +annoying. So I decreased the verbosity to only show this message if the +loglevel is INFO or more. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2524 5c42a225-8b10-0410-9873-89b7810ad06e +------------------------------------------------------------------ +2015-01-07 20:53:39 +0100 Christian Stimming +Decreate aqbanking logger verbosity: Set the initial "notice" value only if the logger did not yet exist. +If the logger already exists, this is most likely because the +application already set some LogLevel, and this shouldn't be +overridden here. ------------------------------------------------------------------ -2014-03-01 19:31:01 +0000 martin -aqhbci-tool: Return error when invalid flag has been specified on cmdline (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2523 5c42a225-8b10-0410-9873-89b7810ad06e +2015-01-02 21:30:42 +0100 Martin Preuss +Prepared release 5.5.1 ------------------------------------------------------------------ -2014-03-01 19:29:43 +0000 martin -AqHBCI: Properly handle connection failure in AH_Dialog_TestServer_Https() (Elias Oltmanns) -An assertion is raised in GWEN_HttpSession_Fini() when dlg->httpsSession -has not been initialised. +2014-11-11 22:41:16 +0100 Martin Preuss +Reworked SWIFT MT940 parser. +The Netbank/Sparda server is extremely nasty: The FinTS specs state, that +a new SEPA identifier must start in a new SWIFT subfield ("?20" etc). +However, this server just sends the SEPA multiple tags like "EREF+" et al +within a single subfield, so our parser, adhering to the specs, can't parse +the purpose string from this server... -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2522 5c42a225-8b10-0410-9873-89b7810ad06e +The next step will have to be to just concatenate all purpose-related subfields +and try to read those SEPA tags from a single line. This is extremely ugly, +and it will also significantly slow down the parser, and all that because +those banking IT guys can't adhere to the specs which are extremely clean +regarding this point... ------------------------------------------------------------------ -2014-03-01 19:28:28 +0000 martin -AqHBCI: Handle locking as well as unmounting of crypttoken more consistently (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2521 5c42a225-8b10-0410-9873-89b7810ad06e +2014-11-11 22:06:00 +0100 Martin Preuss +SWIFT Parser: Removed old code. ------------------------------------------------------------------ -2014-03-01 19:27:15 +0000 martin -AqHBCI: Make sure that limits are properly obeyed when adding jobs to queue (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2520 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-19 21:54:10 +0200 Rudi Weiner +Add HKDAL in aqbanking-cli ------------------------------------------------------------------ -2014-03-01 19:25:59 +0000 martin -AqHBCI: Fix handling of multiple dialog queues (Elias Oltmanns) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2519 5c42a225-8b10-0410-9873-89b7810ad06e +2014-10-08 20:42:48 +0200 Christian Stimming +Extend aqhbci-tool "listaccounts" to optionally also show subAccountId and UniqueId. ------------------------------------------------------------------ -2014-03-01 19:24:40 +0000 martin -Added patches/ folder to .gitignore. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2518 5c42a225-8b10-0410-9873-89b7810ad06e +2014-10-06 20:49:29 +0200 Christian Stimming +Fix erroneous double-free when aborting the multijobs. ------------------------------------------------------------------ -2014-02-22 19:07:48 +0000 martin -aqbanking-cli: Fixed a bug in standing orders -Use enums instead of errornous fixed numbers (thanks to Rudi for spotting this) - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2517 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-27 23:30:01 +0200 Christian Stimming +Code refactoring: Cover multi-transfers and multi-debitnotes by the same command implementation. +The actual source code differences were really only the +AB_JobSepa** creation call, so this could easily be merged into +one command implementation. ------------------------------------------------------------------ -2014-02-22 18:54:24 +0000 martin -CSV ImExporter: Added handling of mandateDate. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2516 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-26 23:06:36 +0200 Christian Stimming +Improve error handling in sepadebitnotes: Parse through all transactions, showing all errors, and only abort before actually executing. ------------------------------------------------------------------ -2014-02-15 14:18:47 +0000 martin -Prepared release 5.4.0beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2515 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-26 22:58:37 +0200 Christian Stimming +Fix wrong check of IBAN codes: A failed checksum check was errorneously ignored. ------------------------------------------------------------------ -2014-02-15 14:17:35 +0000 martin -BankInfo: Updated German bank data. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2514 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-24 22:12:34 +0200 Christian Stimming +Fix default profileName of sepadebitnotes. Fix documentation string. +Pointed out by Claus-Justus Heine . ------------------------------------------------------------------ -2014-02-13 18:54:02 +0000 martin -Added function AB_Value_toHbciString(). -Use that function for challenge strings and for sums. -Maybe we need to use that in other places, too, in case of servers which -really rely on the removal of trailing after-komma zeroes... - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2513 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-23 22:34:50 +0200 Christian Stimming +Add option in sepadebitnotes to use COR1 version in multi debit note job. ------------------------------------------------------------------ -2014-02-04 21:22:32 +0000 martin -AqHBCI: Automatically request SEPA information for accounts. -Now we add a GetSepaAccountInfo job to a queue for every account involved -for which no IBAN is currently set. - -This should retrieve SEPA account info automagically, so users should no -longer be required to use the command line tool for that. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2512 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-23 22:32:46 +0200 Christian Stimming +Minor refactoring: Merge almost identical command calling code into one file and an extra function argument. ------------------------------------------------------------------ -2014-02-04 21:21:18 +0000 martin -Added function AB_Account_List2_GetAccountByUniqueId(). -Also exported AB_Account_List2_FreeAll(). +2014-09-23 11:57:58 +0200 Micha Lenk +Small corrections in German translation +This was originally reported as Debian bug #762374 +by Mechtilde . -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2511 5c42a225-8b10-0410-9873-89b7810ad06e +https://bugs.debian.org/762374 ------------------------------------------------------------------ -2014-02-03 20:45:49 +0000 martin -Added a flag to AB_Transaction_CheckForSepaConformity(). -If !=0 then the restricted SEPA charset is to be used. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2510 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-22 23:03:37 +0200 Christian Stimming +Fix command line help: Let all commands appear as help text. Sort help and commands in identical order. ------------------------------------------------------------------ -2014-02-03 20:44:30 +0000 martin -AqHBCI: Fixed a merge problem ;-} -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2509 5c42a225-8b10-0410-9873-89b7810ad06e +2014-09-21 22:25:58 +0200 Christian Stimming +Add useful error message if profile file cannot be parsed. ------------------------------------------------------------------ -2014-02-03 19:48:15 +0000 martin -AqHBCI: Fixed RDH10 key size determination. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2508 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-30 11:56:36 +0200 Martin Preuss +Updated German bankinfo files. ------------------------------------------------------------------ -2014-02-03 19:34:53 +0000 christian -When printing the error about invalid character, also print the character itself. -Even though this does not (yet) work for the general case -when e.g. the invalid character is a multibyte utf-8 character, -it at least gives a hint at simple invalid characters such -as '&'. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2507 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-20 21:44:21 +0200 Martin Preuss +Administrative changes: Shorten paths of some AqHBCI files. +"tar" has a filename limit of 99, so we need to shorten the total path, +otherwise "make dist" will fail. ------------------------------------------------------------------ -2014-01-30 19:33:18 +0000 martin -Prepared release 5.3.6beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2506 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-19 21:13:17 +0200 Martin Preuss +Merge branch 'master' of https://git.aqbanking.de/git/aqbanking ------------------------------------------------------------------ -2014-01-30 19:21:45 +0000 martin -AqHBCI: Make default keysize for RDH10 2048 bits. -Normally, the size for the user keys should be determined with regard to -the size of the server keys. However, this doesn't seem to be working -(there is sometimes no modulus in the keyinfo). So we us a reasonable -default now which should work with all banks... - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2505 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-19 21:08:20 +0200 Martin Preuss +SEPA exporter: Changed default for "singleBookingWanted" to 1 +One user reported that the current default of 0 doesn't work. ------------------------------------------------------------------ -2014-01-30 19:00:28 +0000 martin -OFX Parser: Added a tag to be ignored -Bank of America sends tags which weren't handled by the parser. -Thanks to Yury Perzov for tracking this one down. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2504 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-15 13:28:43 +0200 Elias Oltmanns +AqHBCI: Parse credit card transactions more liberally. ------------------------------------------------------------------ -2014-01-30 16:50:18 +0000 martin -Updated COPYING. -- AqPaypal is no longer provided -- exceptions are no longer necessary - - OpenSSL is not used with AqBanking anymore - - AqEBICS is now part of AqBanking (GPL) - - AqYellownet is no longer provided - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2503 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-15 19:00:10 +0200 martin +Test, please ignore. ------------------------------------------------------------------ -2014-01-26 21:55:50 +0000 mlenk -Remove obsolete hint to package libaqbanking-plugins-libgwenhywfar on Debian/Ubuntu systems -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2502 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-12 23:24:53 +0200 Martin Preuss +Added some entries to the TODO list. ------------------------------------------------------------------ -2014-01-26 14:51:53 +0000 martin -Prepared release 5.3.5beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2501 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-12 21:49:37 +0200 Martin Preuss +aqbanking-tool: Mention the sepatransfers command (Holger Hans Peter Freyther) ------------------------------------------------------------------ -2014-01-26 14:50:45 +0000 martin -Install all AqBanking plugins into AqBanking's own folders -NEEDS Gwenhywfar 4.10.0beta or newer! - -We now install the GWEN_DBIO plugins into a folder inside the realm of -AqBanking, so plugins are now separated per library. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2500 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-12 21:07:44 +0200 Martin Preuss +Prepared GIT-release for Andreas. ------------------------------------------------------------------ -2014-01-24 22:35:25 +0000 mlenk -Remove dropped files also from configure.ac -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2499 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-12 21:04:19 +0200 Martin Preuss +Removed some duplicate fields from AB_TRANSACTION. - mandateReference (replaced by mandateId) - creditorIdentifier (replaced by creditorSchemeId) ------------------------------------------------------------------ -2014-01-24 22:16:08 +0000 mlenk -remove yet another obsolete ressource.rc file -This apparently didn't made it into revision 2496 (due to an aborted commit?). - - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2498 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-04 22:21:23 +0200 Martin Preuss +aqbanking-cli: Added new requst type "sepaSto" for SEPA standing orders. ------------------------------------------------------------------ -2014-01-24 22:12:10 +0000 mlenk -Revert unintended changes from previous commit (revision 2496) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2497 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-04 22:20:57 +0200 Martin Preuss +AqHBCI: More work on AH_Job_SepaStandingOrdersGet. ------------------------------------------------------------------ -2014-01-24 22:06:18 +0000 mlenk -remove obsolete ressource.rc files -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2496 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-04 22:20:29 +0200 Martin Preuss +AqHBCI: Fixed XML definition for JobSepaStandingOrderGet. ------------------------------------------------------------------ -2014-01-22 19:22:21 +0000 martin -Prepared release 5.3.4beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2495 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-03 23:14:31 +0200 Martin Preuss +AqHBCI: Fixed a typo. ------------------------------------------------------------------ -2014-01-22 19:21:13 +0000 martin -AqHBCI: Fixed another bug with sum value... -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2494 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-03 23:14:19 +0200 Martin Preuss +Added new CMAKE files to .gitignore. ------------------------------------------------------------------ -2014-01-22 16:41:14 +0000 martin -AqHBCI: Fixed a bug. -Was using a false variable name. +2014-08-03 23:07:16 +0200 Martin Preuss +Added CMake package configuration files +Makes live for cmake users a lot easier. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2493 5c42a225-8b10-0410-9873-89b7810ad06e +It is not platform idependent as the library extension .so is hard +coded. ------------------------------------------------------------------- -2014-01-21 22:03:29 +0000 martin -Prepared release 5.3.3beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2492 5c42a225-8b10-0410-9873-89b7810ad06e +Signed-off-by: Martin Preuss ------------------------------------------------------------------ -2014-01-21 20:11:24 +0000 martin -AqHBCI: Calculate sum in multi transfer. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2491 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-03 19:17:42 +0200 Martin Preuss +AqHBCI: Started working on job SepaGetStandingOrders. ------------------------------------------------------------------ -2014-01-21 20:10:13 +0000 martin -AqHBCI: Abort if missing sum value in AH_HHD14_AddChallengeParams_32() -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2490 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-03 19:16:59 +0200 Martin Preuss +AqBanking: Added job SepaGetStandingOrders. +Also added handling for some other jobs in AB_Job_Type2Char() and +AB_Job_Type2LocalChar(). ------------------------------------------------------------------ -2014-01-19 17:09:18 +0000 martin -Indent... -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2489 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-02 18:24:36 +0200 Martin Preuss +Added test-driver to .gitingore. ------------------------------------------------------------------ -2014-01-19 17:08:07 +0000 martin -AqBanking/AqHBCI: Implemented AB_Job_TypeSepaCreateStandingOrder -- implemented AB_Job_TypeSepaCreateStandingOrder in AqHBCI -- added aqbanking-cli command "sepacreatesto" which creates standing orders -- improved aqbanking-cli function "mkSepaTransfer" - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2488 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-02 18:24:05 +0200 Martin Preuss +Force IBAN and BIC for SEPA transfers and debit notes. +The group "kti_i" his quite vague, it allows for either national or +international specification of the local bank account, the parser can't handle +that too well. Some jobs need SEPA info (e.g. the SEPA transfer jobs), and +for those the parser should fail if IBAN or BIC are missing. ------------------------------------------------------------------ -2014-01-18 13:32:26 +0000 martin -AqHBCI: Started working on SEPA standing orders. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2487 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-02 18:21:35 +0200 Martin Preuss +Fixed a typo. ------------------------------------------------------------------ -2014-01-18 13:31:17 +0000 martin -Added a TODO mark. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2486 5c42a225-8b10-0410-9873-89b7810ad06e +2014-08-02 18:21:27 +0200 Martin Preuss +Added compile to .gitignore. ------------------------------------------------------------------ -2014-01-18 13:30:07 +0000 martin -Finetuning of min/max setup times. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2485 5c42a225-8b10-0410-9873-89b7810ad06e +2014-07-15 22:52:17 +0200 Martin Preuss +Ok, one more test for the email notifier... +At least this one informs me about changed to the GIT repository. +Maybe I will change later to git-multimail... ------------------------------------------------------------------ -2014-01-15 22:19:06 +0000 martin -Prepared release 5.3.2beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2484 5c42a225-8b10-0410-9873-89b7810ad06e +2014-07-15 22:34:48 +0200 Martin Preuss +Last test for today... ------------------------------------------------------------------ -2014-01-15 21:40:33 +0000 martin -AqHBCI: Set delay limits in AH_Job_SepaDebitDatedSingleCreate -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2483 5c42a225-8b10-0410-9873-89b7810ad06e +2014-07-15 22:31:08 +0200 Martin Preuss +Test5. ------------------------------------------------------------------ -2014-01-15 21:39:25 +0000 martin -AqHBCI: Added segment SepaDebitSingleResponse. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2482 5c42a225-8b10-0410-9873-89b7810ad06e +2014-07-15 22:28:54 +0200 Martin Preuss +Test4... ------------------------------------------------------------------ -2014-01-15 21:38:17 +0000 martin -AqHBCI: Use AB_TransactionLimits_SetNeedDate() in transfer jobs. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2481 5c42a225-8b10-0410-9873-89b7810ad06e +2014-07-15 22:24:55 +0200 Martin Preuss +Test3... ------------------------------------------------------------------ -2014-01-15 21:37:07 +0000 martin -AqHBCI: Added AH_Job_SepaStandingOrderCreate -This is the HBCI implementation for "Create SEPA standing order". +2014-07-15 22:20:07 +0200 Martin Preuss +Test... -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2480 5c42a225-8b10-0410-9873-89b7810ad06e +------------------------------------------------------------------ +2014-07-15 21:31:10 +0200 Martin Preuss +Test... ------------------------------------------------------------------ -2014-01-15 21:35:58 +0000 martin -AqHBCI: Added HHD challenge param handling for class "35" -This HHD visualisation class is used for SEPA standing orders. +2014-07-03 11:45:41 +0000 martin +SEPA exporter: Fix some memory leaks. +From: Elias Oltmanns -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2479 5c42a225-8b10-0410-9873-89b7810ad06e +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2595 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-15 21:34:49 +0000 martin -Added transaction limit "needDate". -This specifies for transfer jobs whether the date should (value=1) -or must not (value=-1) be set via AB_Transaction_SetDate(). - -This allows applications to simplify dialog creation; the app can now decide -from this value whether a date input widget should be presented to the -user. +2014-07-03 11:44:30 +0000 martin +SEPA exporter: Enforce explicit setting of sequence type for debit notes. +From: Elias Oltmanns -The app can't learn about this from other sources, since e.g. for SEPA -debit notes the HBCI backend uses either AH_Job_SepaDebitDatedMultiCreate, -AH_Job_SepaDebitDatedSingleCreate (date required) or AH_Job_SepaDebitSingle -(date not allowed). Which HBCI job is used depends on what the particular -bank offers for a given account :-/ +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2594 5c42a225-8b10-0410-9873-89b7810ad06e -However, AqHBCI knows which HBCI job it is going to use, so the app can now -read from the transaction limits whether a date should be specified or -omitted. +------------------------------------------------------------------ +2014-07-03 11:43:17 +0000 martin +SEPA exporter: Eliminate reference to uninitialised variable. +From: Elias Oltmanns -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2478 5c42a225-8b10-0410-9873-89b7810ad06e +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2593 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-15 21:33:39 +0000 martin -Added job AB_JobSepaCreateStandingOrder. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2477 5c42a225-8b10-0410-9873-89b7810ad06e +2014-06-15 20:11:18 +0000 mlenk +aqbanking-cli: Fix parameters for calling AH_Provider_SendDtazv from libaqhbci +The parameter 'withProgress' were added to function AH_Provider_SendDtazv in +SVN revision 1860. Prior to this change the function used a hard-coded 1 +instead of the new parameter. So I figured that 1 is the correct value to +restore the behavior prior to rev. 1860. This fixes the compiler error +intentionally introduced by the previous commit. ------------------------------------------------------------------- -2014-01-15 19:52:23 +0000 martin -AqHBCI: Fixed a bug in SEPA description selection, simplified AH_Job_SepaDebitDatedSingleCreate -- Was announcing a false SEPA pain descriptor in: - - AH_Job_SepaDebitDatedMultiCreate_Prepare() - - AH_Job_SepaDebitSingle_Prepare() +This fixes a regression that was introduced in SVN revision 1860 and that was +discovered thanks to Michael Tautschnig reporting Debian bug +#750046 ( http://bugs.debian.org/750046 ). -- simplified AH_Job_SepaDebitDatedSingleCreate_new - This class now also uses the base class. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2476 5c42a225-8b10-0410-9873-89b7810ad06e +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2592 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-14 22:17:56 +0000 martin -AqHBCI: Very much simplified SEPA jobs. -The new base class AH_Job_TransferBase now handles most of the HBCI stuff. -Transfer classes now only handle their specific things, This makes the code -much cleaner and improves readability. +2014-06-15 19:43:17 +0000 mlenk +Fix conflicting declarations of function AH_Provider_SendDtazv +aqbanking-cli used a local declaration of function AH_Provider_SendDtazv that +is used at compile time. It shadows the real one from libaqhbci that is used at +link time. This would not matter if the types of both functions match, but they +do not match. -Changed SEPA limits; instead of one purpose line of 140 chars length we -now accept 4 lines by 35 chars. +I fixed this by dumping the local declaration in aqbanking-cli. Instead I +included the ones from libaqhbci that are also used at linktime. This will now +cause a compile error because the function paramter counts differ. -Increase SO version of libaqhbci.so. +Thanks to Michael Tautschnig for discovering and reporting this +issue in Debian bug #750046, see http://bugs.debian.org/750046 . -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2475 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------- -2014-01-14 22:16:46 +0000 martin -AqHBCI: Changed AH_Job_TransferBase_ExportTransaction() to AH_Job_TransferBase_SepaExportTransactions() -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2474 5c42a225-8b10-0410-9873-89b7810ad06e +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2591 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-14 22:15:38 +0000 martin -Indents... -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2473 5c42a225-8b10-0410-9873-89b7810ad06e +2014-06-08 20:22:55 +0000 mlenk +Update Subversion's svn:ignore attributes +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2590 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-14 22:14:29 +0000 martin -AqHBCI: Added missing files to Makefile.am -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2472 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-29 15:55:59 +0000 martin +SWIFT parser: Ignore doc tag 21 when content is "NONREF"(by Ludolf Holzheid) +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2589 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-14 22:13:21 +0000 martin -AqHBCI: Fixed bugs in HITAN definitions. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2471 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-23 20:20:39 +0000 martin +AqHBCI-Tool4: Add user as an option to the sendkeys command (Elias Oltmanns). +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2588 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-14 22:12:12 +0000 martin -Added base class for transfer jobs. -This will simpliy creating of new transfer jobs, both SEPA and non-SEPA. -It will be used to clean up the mess of jobmultitransfer and jobsingletransfer -which are cluttered beyond recognition... - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2470 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-23 20:16:43 +0000 martin +AqHBCI: Make sure that the size (in bits) of RDH-10 keys is a multiple of 8 (Elias Oltmanns). +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2587 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-14 22:11:01 +0000 martin -AqHBCI: Store name of the response segment. -Needed to simplify transfer jobs in the next step. +2014-05-21 19:09:06 +0000 martin +AqHBCI: Fixed previous patch. +Previous 4 patches provided by Elias Oltmanns (need to find a way to easily +put the real patch author in SVN logs when using "git svn"). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2469 5c42a225-8b10-0410-9873-89b7810ad06e +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2586 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-13 22:30:00 +0000 martin -AqHBCI: Fixed a few typos. -Was using a false enum for transaction types... - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2468 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-21 19:07:54 +0000 martin +AqHBCI: Generate RDH-10 keys of the same size as the server's keys. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2585 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-13 22:28:51 +0000 martin -Prepared release 5.3.1beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2467 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-21 19:06:43 +0000 martin +SEPA exporter: Avoid unjustified usage of callbacks (portability issues). +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2584 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-13 18:59:17 +0000 martin -Makefile.cvs: Added "--enable-full-doc=yes" to my target. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2466 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-21 19:05:32 +0000 martin +Keep the logic for choosing teh right SEPA profile inside AqHBCI. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2583 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-13 18:58:10 +0000 martin -Added convenience function AB_ImExporterContext_WriteContext(). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2465 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-21 19:04:07 +0000 martin +Fix usage of GWEN_Text_ComparePattern(). +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2582 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-13 18:57:02 +0000 martin -Fixed a bug in AB_Job_SetTransaction -There was a problem when the same transaction is set back to the job. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2464 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-19 17:07:06 +0000 martin +Increased log output in AH_Job_GetAccountSepaInfo_Process() +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2581 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-13 18:55:54 +0000 martin -SEPA exporter: Added debug message in case of an error -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2463 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:29:34 +0000 martin +Do not accept lower case letters in BIC. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2580 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-13 18:54:44 +0000 martin -AqBanking/AqHBCI: Fixed SEPA multi debit note -- Changed API for previously added functions/replaced those functions: - - AB_Transaction_CheckPurposeAgainstLimits - - AB_Transaction_CheckNamesAgainstLimits - - AB_Transaction_CheckTextKeyAgainstLimits - - AB_Transaction_CheckRecurrenceAgainstLimits - - AB_Transaction_CheckFirstExecutionDateAgainstLimits - - AB_Transaction_CheckDateAgainstLimits - Those functions were previously named *Validate*. The new version have - const arguments now, and they don't change the transaction given. -- job AH_Job_SepaDebitDatedMultiCreate now works! -- added function AH_Provider_WriteValueToDb - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2462 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:28:23 +0000 martin +AqHBCI: Do not free AH_JOBs as long as there are AB_JOBs linked to them. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2579 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 17:47:46 +0000 martin -AqHBCI: Added HKSPA definitions for versions 2 and 3. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2461 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:27:11 +0000 martin +AqHBCI: Properly exchange results of SEPA multi jobs. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2578 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 17:07:47 +0000 martin -Prepared 5.3.0beta. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2460 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:24:16 +0000 martin +Add support for IBAN only transactions. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2577 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 17:06:40 +0000 martin -SWIFT-Parser: Handle all codes below 900 as structured in :86: fields. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2459 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:22:59 +0000 martin +AqHBCI: Fix a typo and some comments in the xml file for COR1 single debitnotes. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2576 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 17:05:31 +0000 martin -AqHBCI: Fixed a bug. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2458 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:21:47 +0000 martin +AqHBCI: Actually use the flag AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2575 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 17:04:21 +0000 martin -AqHBCI: Moved functions to top (easier to find). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2457 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:20:35 +0000 martin +AqHBCI: Add support for SEPA multi transfers. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2574 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 17:02:47 +0000 martin -AqHBCI: Finished simplification of AH_PROVIDER -Now there is only one function which creates new AH_JOB objects. -This function is now used from within the AH_PROVIDER fnctions. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2456 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-12 17:01:38 +0000 martin -AqHBCI: Started simplification of AH_PROVIDER -I only want one function which creates new AH_JOB objects, otherwise -things get very complicated... - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2455 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:19:19 +0000 martin +AqHBCI: Some jobs listed in the bpd may still be disabled on specific accounts. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2573 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 16:59:51 +0000 martin -AqHBCI: Simplification. -- moved maxTransfers, transferList and transferCount to AH_JOB -- added functions AH_Outbox_FindDatedTransferJob - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2454 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:18:07 +0000 martin +Handle batch booking requests for SEPA jobs. +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2572 5c42a225-8b10-0410-9873-89b7810ad06e ------------------------------------------------------------------ -2014-01-12 16:57:15 +0000 martin -AqHBCI: More work on AH_JOB_CREATESEPAMULTIDEBIT -Removed unneeded fields. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2453 5c42a225-8b10-0410-9873-89b7810ad06e +2014-05-17 14:16:52 +0000 martin +AqHBCI: Simply look up multi-jobs by their job names +Since the SEPA exporter now graciously handles batches of +transactions, the algorithm on the job level can be significantly +simplified. In fact, the same rules apply to SEPA and traditional +multi-jobs now. ------------------------------------------------------------------- -2014-01-12 16:54:38 +0000 martin -AqHBCI: Added transferCount and maxTransfers to AH_JOB. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2452 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-11 19:23:35 +0000 mlenk -List command 'getaccsepa' in help output -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2451 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-01-08 22:28:56 +0000 martin -AqHBCI: Started working on job JobSepaDebitDatedMultiCreate. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2450 5c42a225-8b10-0410-9873-89b7810ad06e +git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2571 5c42a225-8b10-0410-9873-89b7810ad06e diff -Nru libaqbanking-5.4.3beta/compile libaqbanking-5.6.1beta/compile --- libaqbanking-5.4.3beta/compile 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/compile 2014-01-02 19:14:59.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +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 +# 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 +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru libaqbanking-5.4.3beta/config.guess libaqbanking-5.6.1beta/config.guess --- libaqbanking-5.4.3beta/config.guess 2012-06-26 08:52:32.000000000 +0000 +++ libaqbanking-5.6.1beta/config.guess 2013-08-11 11:49:21.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -273,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,13 +366,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -389,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -828,7 +830,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1546,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1586,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru libaqbanking-5.4.3beta/configure libaqbanking-5.6.1beta/configure --- libaqbanking-5.4.3beta/configure 2014-04-17 20:57:27.000000000 +0000 +++ libaqbanking-5.6.1beta/configure 2015-06-01 16:31:32.000000000 +0000 @@ -718,6 +718,7 @@ gwenhywfar_bindir gwenhywfar_plugins gwenhywfar_dir +GWENHYWFAR_MINIMUM_VERSION ktoblzcheck_includes ktoblzcheck_libs WITH_KTOBLZCHECK_FALSE @@ -821,6 +822,10 @@ AQHBCI_VERSION_PATCHLEVEL AQHBCI_VERSION_MINOR AQHBCI_VERSION_MAJOR +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -906,6 +911,8 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +with_build_datetime +enable_silent_rules enable_static enable_shared enable_dependency_tracking @@ -1586,10 +1593,14 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1610,6 +1621,9 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-build-datetime=DATETIME + use fixed datetime for build (default: current date + and time) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -2728,8 +2742,8 @@ # AQBANKING_VERSION_MAJOR=5 -AQBANKING_VERSION_MINOR=4 -AQBANKING_VERSION_PATCHLEVEL=3 +AQBANKING_VERSION_MINOR=6 +AQBANKING_VERSION_PATCHLEVEL=1 AQBANKING_VERSION_BUILD=0 AQBANKING_VERSION_TAG="beta" @@ -2744,9 +2758,9 @@ # AqBanking # -AQBANKING_SO_CURRENT=38 -AQBANKING_SO_AGE=4 -AQBANKING_SO_REVISION=3 +AQBANKING_SO_CURRENT=40 +AQBANKING_SO_AGE=5 +AQBANKING_SO_REVISION=1 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # @@ -2789,7 +2803,7 @@ ;; git) - AQBANKING_VERSION_FULL_STRING="$AQBANKING_VERSION_MAJOR.$AQBANKING_VERSION_MINOR.${AQBANKING_VERSION_PATCHLEVEL}.${AQBANKING_VERSION_BUILD}-${AQBANKING_VERSION_TAG}" + AQBANKING_VERSION_FULL_STRING="$AQBANKING_VERSION_MAJOR.$AQBANKING_VERSION_MINOR.${AQBANKING_VERSION_PATCHLEVEL}.${AQBANKING_VERSION_BUILD}" ;; esac @@ -2831,7 +2845,18 @@ # # datetime # -DATETIME="`date +\"%Y%m%d%H%M%S\"`" + +# Check whether --with-build-datetime was given. +if test "${with_build_datetime+set}" = set; then : + withval=$with_build_datetime; if test "x$withval" = "xyes"; then : + DATETIME="`date +\"%Y%m%d%H%M%S\"`" +else + DATETIME="`date +\"%Y%m%d%H%M%S\" --date=\"$withval\"`" +fi +else + DATETIME="`date +\"%Y%m%d%H%M%S\"`" +fi + @@ -2886,7 +2911,7 @@ _ACEOF -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2983,9 +3008,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# 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=' @@ -2996,32 +3018,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -3033,6 +3063,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3055,12 +3095,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -3072,10 +3112,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# 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. +# 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. @@ -3214,12 +3254,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3302,6 +3336,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3323,6 +3396,7 @@ # Define the identity of the package. + PACKAGE=aqbanking VERSION=$AQBANKING_VERSION_RELEASE_STRING @@ -3352,12 +3426,22 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3365,6 +3449,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # # same for AqHBCI @@ -3818,7 +3944,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# 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 @@ -4651,6 +4777,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4662,8 +4847,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4698,16 +4883,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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 + # 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 @@ -4716,8 +4901,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4725,7 +4910,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -5785,6 +5970,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -5796,8 +6040,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -5832,16 +6076,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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 + # 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 @@ -5850,8 +6094,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -5859,7 +6103,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -6181,8 +6425,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -6217,16 +6461,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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 + # 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 @@ -6235,8 +6479,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -6244,7 +6488,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -8505,7 +8749,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -8530,7 +8774,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8549,7 +8796,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -18017,6 +18267,9 @@ # Check for Gwen # +# Variable used in aqbanking-config.cmake +GWENHYWFAR_MINIMUM_VERSION="4.10.0.0" + if test -z "4"; then vma="0"; else vma="4"; fi @@ -19161,54 +19414,40 @@ ###------------------------------------------------------------------------- # -# GCC version (check for usability) +# Compiler check for symbol visibility # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if symbol visibility is supported" >&5 -$as_echo_n "checking if symbol visibility is supported... " >&6; } -visibility_cflags="" -case `basename $CC` in - *gcc*) - gccversion="` ${CC} --version | head -1 | ${SED} 's/.*\([0-9]\.[0-9]\.[0-9]*\).*/\1/' `" - case $gccversion in - 4.*) - # Activate -fvisibility=hidden only for explicit 4.x gcc - # versions. We never now what future gcc's might do with - # that argument, and we also can't be sure that other - # gcc's happen to show very weird version - # numbers. Therefore leave the default at non-activated. - visibility_supported="yes, gcc-${gccversion}" - -$as_echo "#define GCC_WITH_VISIBILITY_ATTRIBUTE 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports symbol visibility" >&5 +$as_echo_n "checking whether compiler supports symbol visibility... " >&6; } +if ${ac_cv_hidden_visibility_attribute+:} false; then : + $as_echo_n "(cached) " >&6 +else - visibility_cflags="-fvisibility=hidden" - ;; - *) - # Default: -fvisibility=hidden not activated. - visibility_supported="no (needs gcc >=4.0, you have gcc-${gccversion})" - ;; - esac - ;; - *) - visibility_supported="no (needs gcc >=4.0, you use $CC)" - ;; -esac + echo 'int __attribute__ ((visibility ("hidden"))) foo (void) { return 1; }' > conftest.c + ac_cv_hidden_visibility_attribute=no + if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; + then + if grep '\.hidden.*foo' conftest.s >/dev/null; + then + ac_cv_hidden_visibility_attribute=yes + fi + fi + rm -f conftest.* -# -fvisibility is at least not available on MinGW/gcc-3.4.4 (will -# give an "unrecognized cmdline option"). Also, unfortunately I -# don't know an easy way to ask the compiler here. Maybe -# http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html -case "$OS_TYPE" in - windows) - visibility_supported="no (not yet on MinGW/Windows)" - visibility_cflags="" - ;; - *) - ;; -esac +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hidden_visibility_attribute" >&5 +$as_echo "$ac_cv_hidden_visibility_attribute" >&6; } +if test $ac_cv_hidden_visibility_attribute = yes; +then +$as_echo "#define GCC_WITH_VISIBILITY_ATTRIBUTE 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${visibility_supported}" >&5 -$as_echo "${visibility_supported}" >&6; } + visibility_cflags="-fvisibility=hidden" +fi @@ -19978,7 +20217,7 @@ # Output files # -ac_config_files="$ac_config_files mksymlinks.sh admin/Makefile doc/Makefile m4/Makefile src/Makefile src/libs/Makefile src/libs/aqbanking/Makefile src/libs/aqbanking/jobs/Makefile src/libs/aqbanking/types/Makefile src/libs/aqbanking/gui/Makefile src/libs/aqbanking/dialogs/Makefile src/libs/aqbanking/typemaker2/Makefile src/libs/aqbanking/typemaker2/c/Makefile src/libs/aqbanking/backendsupport/Makefile src/libs/aqbankingpp/Makefile src/plugins/Makefile src/plugins/bankinfo/Makefile src/plugins/bankinfo/at/Makefile src/plugins/bankinfo/at/at.xml src/plugins/bankinfo/ca/Makefile src/plugins/bankinfo/ca/ca.xml src/plugins/bankinfo/ch/Makefile src/plugins/bankinfo/ch/ch.xml src/plugins/bankinfo/de/Makefile src/plugins/bankinfo/de/de.xml src/plugins/bankinfo/us/Makefile src/plugins/bankinfo/us/us.xml src/plugins/bankinfo/generic/Makefile src/plugins/imexporters/Makefile src/plugins/imexporters/dtaus/Makefile src/plugins/imexporters/dtaus/dtaus.xml src/plugins/imexporters/dtaus/profiles/Makefile src/plugins/imexporters/dtaus/profiles/default.conf src/plugins/imexporters/dtaus/profiles/debitnote.conf src/plugins/imexporters/dtaus/profiles/transfer.conf src/plugins/imexporters/eri2/Makefile src/plugins/imexporters/eri2/eri2.xml src/plugins/imexporters/eri2/profiles/Makefile src/plugins/imexporters/eri2/profiles/default.conf src/plugins/imexporters/ofx/Makefile src/plugins/imexporters/ofx/ofx.xml src/plugins/imexporters/ofx/parser/Makefile src/plugins/imexporters/ofx/profiles/Makefile src/plugins/imexporters/ofx/profiles/default.conf src/plugins/imexporters/ofx/profiles/iso8859.conf src/plugins/imexporters/swift/Makefile src/plugins/imexporters/swift/swift.xml src/plugins/imexporters/swift/profiles/Makefile src/plugins/imexporters/swift/profiles/swiftmt940.conf src/plugins/imexporters/swift/profiles/swiftmt942.conf src/plugins/imexporters/swift/profiles/amro940.conf src/plugins/imexporters/swift/profiles/amro942.conf src/plugins/imexporters/csv/Makefile src/plugins/imexporters/csv/csv.xml src/plugins/imexporters/csv/profiles/Makefile src/plugins/imexporters/csv/profiles/default.conf src/plugins/imexporters/csv/profiles/amex.conf src/plugins/imexporters/csv/profiles/aqmoney1.conf src/plugins/imexporters/csv/profiles/aqmoney2.conf src/plugins/imexporters/csv/profiles/comdirect.conf src/plugins/imexporters/csv/profiles/consors-tagesgeld.conf src/plugins/imexporters/csv/profiles/mijnpostbank.conf src/plugins/imexporters/csv/profiles/oko.conf src/plugins/imexporters/csv/profiles/spk-aachen.conf src/plugins/imexporters/csv/profiles/spk-steiermark.conf src/plugins/imexporters/csv/profiles/tonline-banking.conf src/plugins/imexporters/csv/profiles/test.conf src/plugins/imexporters/csv/profiles/vrnetworld.conf src/plugins/imexporters/csv/profiles/lbbberlin.conf src/plugins/imexporters/csv/profiles/bankaustria.conf src/plugins/imexporters/csv/profiles/psk.conf src/plugins/imexporters/csv/profiles/diba.conf src/plugins/imexporters/csv/profiles/dkb.conf src/plugins/imexporters/csv/profiles/dkb-cash.conf src/plugins/imexporters/csv/profiles/sparda.conf src/plugins/imexporters/csv/profiles/full.conf src/plugins/imexporters/csv/profiles/hypovereinsbank.conf src/plugins/imexporters/csv/profiles/postbankffm.conf src/plugins/imexporters/csv/profiles/cli-transfers.conf src/plugins/imexporters/csv/profiles/sns.conf src/plugins/imexporters/csv/profiles/transfers.conf src/plugins/imexporters/csv/profiles/sepadebitnotes.conf src/plugins/imexporters/openhbci1/Makefile src/plugins/imexporters/openhbci1/openhbci1.xml src/plugins/imexporters/openhbci1/profiles/Makefile src/plugins/imexporters/openhbci1/profiles/default.conf src/plugins/imexporters/qif/Makefile src/plugins/imexporters/qif/qif.xml src/plugins/imexporters/qif/profiles/Makefile src/plugins/imexporters/qif/profiles/default.conf src/plugins/imexporters/yellownet/Makefile src/plugins/imexporters/yellownet/yellownet.xml src/plugins/imexporters/yellownet/profiles/Makefile src/plugins/imexporters/yellownet/profiles/default.conf src/plugins/imexporters/xmldb/Makefile src/plugins/imexporters/xmldb/xmldb.xml src/plugins/imexporters/xmldb/profiles/Makefile src/plugins/imexporters/xmldb/profiles/default.conf src/plugins/imexporters/sepa/Makefile src/plugins/imexporters/sepa/sepa.xml src/plugins/imexporters/sepa/profiles/Makefile src/plugins/imexporters/sepa/profiles/default.conf src/plugins/imexporters/sepa/profiles/ccm.conf src/plugins/imexporters/sepa/profiles/001_002_03.conf src/plugins/imexporters/sepa/profiles/008_001_01.conf src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf src/plugins/imexporters/sepa/profiles/008_002_02.conf src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf src/plugins/imexporters/sepa/profiles/008_003_02.conf src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf src/plugins/imexporters/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/profiles/Makefile src/plugins/imexporters/ctxfile/profiles/default.conf src/plugins/imexporters/q43/Makefile src/plugins/imexporters/q43/q43.xml src/plugins/imexporters/q43/profiles/Makefile src/plugins/imexporters/q43/profiles/default.conf src/plugins/parsers/Makefile src/plugins/parsers/dtaus/Makefile src/plugins/parsers/dtaus/dtaus.xml src/plugins/parsers/swift/Makefile src/plugins/parsers/swift/swift.xml src/plugins/backends/Makefile src/plugins/backends/aqhbci/Makefile src/plugins/backends/aqhbci/plugin/Makefile src/plugins/backends/aqhbci/plugin/aqhbci.xml src/plugins/backends/aqhbci/plugin/dialogs/Makefile src/plugins/backends/aqhbci/plugin/header.xml src/plugins/backends/aqhbci/plugin/banking/Makefile src/plugins/backends/aqhbci/plugin/msglayer/Makefile src/plugins/backends/aqhbci/plugin/joblayer/Makefile src/plugins/backends/aqhbci/plugin/applayer/Makefile src/plugins/backends/aqhbci/plugin/accountjobs/Makefile src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile src/plugins/backends/aqhbci/plugin/version.h src/plugins/backends/aqhbci/tools/Makefile src/plugins/backends/aqhbci/tools/hbcixml/Makefile src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile src/plugins/backends/aqofxconnect/Makefile src/plugins/backends/aqofxconnect/version.h src/plugins/backends/aqofxconnect/plugin/Makefile src/plugins/backends/aqofxconnect/plugin/aqofxconnect.xml src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile src/plugins/backends/aqnone/Makefile src/plugins/backends/aqnone/aqnone.xml src/plugins/backends/aqebics/Makefile src/plugins/backends/aqebics/plugin/Makefile src/plugins/backends/aqebics/plugin/aqebics.xml src/plugins/backends/aqebics/plugin/client/Makefile src/plugins/backends/aqebics/plugin/dialogs/Makefile src/plugins/backends/aqebics/plugin/msg/Makefile src/plugins/backends/aqebics/tools/Makefile src/plugins/backends/aqebics/tools/aqebics-tool/Makefile src/test/Makefile src/tools/Makefile src/tools/aqbanking-cli/Makefile tutorials/Makefile po/Makefile Doxyfile Makefile aqbanking-config.in aqbanking.pc aqbanking.spec aqbanking.iss version.h system.h" +ac_config_files="$ac_config_files mksymlinks.sh admin/Makefile doc/Makefile m4/Makefile src/Makefile src/libs/Makefile src/libs/aqbanking/Makefile src/libs/aqbanking/jobs/Makefile src/libs/aqbanking/types/Makefile src/libs/aqbanking/gui/Makefile src/libs/aqbanking/dialogs/Makefile src/libs/aqbanking/typemaker2/Makefile src/libs/aqbanking/typemaker2/c/Makefile src/libs/aqbanking/backendsupport/Makefile src/libs/aqbankingpp/Makefile src/plugins/Makefile src/plugins/bankinfo/Makefile src/plugins/bankinfo/at/Makefile src/plugins/bankinfo/at/at.xml src/plugins/bankinfo/ca/Makefile src/plugins/bankinfo/ca/ca.xml src/plugins/bankinfo/ch/Makefile src/plugins/bankinfo/ch/ch.xml src/plugins/bankinfo/de/Makefile src/plugins/bankinfo/de/de.xml src/plugins/bankinfo/us/Makefile src/plugins/bankinfo/us/us.xml src/plugins/bankinfo/generic/Makefile src/plugins/imexporters/Makefile src/plugins/imexporters/dtaus/Makefile src/plugins/imexporters/dtaus/dtaus.xml src/plugins/imexporters/dtaus/profiles/Makefile src/plugins/imexporters/dtaus/profiles/default.conf src/plugins/imexporters/dtaus/profiles/debitnote.conf src/plugins/imexporters/dtaus/profiles/transfer.conf src/plugins/imexporters/eri2/Makefile src/plugins/imexporters/eri2/eri2.xml src/plugins/imexporters/eri2/profiles/Makefile src/plugins/imexporters/eri2/profiles/default.conf src/plugins/imexporters/ofx/Makefile src/plugins/imexporters/ofx/ofx.xml src/plugins/imexporters/ofx/parser/Makefile src/plugins/imexporters/ofx/profiles/Makefile src/plugins/imexporters/ofx/profiles/default.conf src/plugins/imexporters/ofx/profiles/iso8859.conf src/plugins/imexporters/swift/Makefile src/plugins/imexporters/swift/swift.xml src/plugins/imexporters/swift/profiles/Makefile src/plugins/imexporters/swift/profiles/swiftmt940.conf src/plugins/imexporters/swift/profiles/swiftmt942.conf src/plugins/imexporters/swift/profiles/amro940.conf src/plugins/imexporters/swift/profiles/amro942.conf src/plugins/imexporters/csv/Makefile src/plugins/imexporters/csv/csv.xml src/plugins/imexporters/csv/profiles/Makefile src/plugins/imexporters/csv/profiles/default.conf src/plugins/imexporters/csv/profiles/amex.conf src/plugins/imexporters/csv/profiles/aqmoney1.conf src/plugins/imexporters/csv/profiles/aqmoney2.conf src/plugins/imexporters/csv/profiles/comdirect.conf src/plugins/imexporters/csv/profiles/consors-tagesgeld.conf src/plugins/imexporters/csv/profiles/mijnpostbank.conf src/plugins/imexporters/csv/profiles/oko.conf src/plugins/imexporters/csv/profiles/spk-aachen.conf src/plugins/imexporters/csv/profiles/spk-steiermark.conf src/plugins/imexporters/csv/profiles/tonline-banking.conf src/plugins/imexporters/csv/profiles/test.conf src/plugins/imexporters/csv/profiles/vrnetworld.conf src/plugins/imexporters/csv/profiles/lbbberlin.conf src/plugins/imexporters/csv/profiles/bankaustria.conf src/plugins/imexporters/csv/profiles/psk.conf src/plugins/imexporters/csv/profiles/diba.conf src/plugins/imexporters/csv/profiles/dkb.conf src/plugins/imexporters/csv/profiles/dkb-cash.conf src/plugins/imexporters/csv/profiles/sparda.conf src/plugins/imexporters/csv/profiles/full.conf src/plugins/imexporters/csv/profiles/hypovereinsbank.conf src/plugins/imexporters/csv/profiles/postbankffm.conf src/plugins/imexporters/csv/profiles/cli-transfers.conf src/plugins/imexporters/csv/profiles/sns.conf src/plugins/imexporters/csv/profiles/transfers.conf src/plugins/imexporters/csv/profiles/sepadebitnotes.conf src/plugins/imexporters/openhbci1/Makefile src/plugins/imexporters/openhbci1/openhbci1.xml src/plugins/imexporters/openhbci1/profiles/Makefile src/plugins/imexporters/openhbci1/profiles/default.conf src/plugins/imexporters/qif/Makefile src/plugins/imexporters/qif/qif.xml src/plugins/imexporters/qif/profiles/Makefile src/plugins/imexporters/qif/profiles/default.conf src/plugins/imexporters/yellownet/Makefile src/plugins/imexporters/yellownet/yellownet.xml src/plugins/imexporters/yellownet/profiles/Makefile src/plugins/imexporters/yellownet/profiles/default.conf src/plugins/imexporters/xmldb/Makefile src/plugins/imexporters/xmldb/xmldb.xml src/plugins/imexporters/xmldb/profiles/Makefile src/plugins/imexporters/xmldb/profiles/default.conf src/plugins/imexporters/sepa/Makefile src/plugins/imexporters/sepa/sepa.xml src/plugins/imexporters/sepa/profiles/Makefile src/plugins/imexporters/sepa/profiles/default.conf src/plugins/imexporters/sepa/profiles/001_001_02.conf src/plugins/imexporters/sepa/profiles/001_002_03.conf src/plugins/imexporters/sepa/profiles/001_003_03.conf src/plugins/imexporters/sepa/profiles/008_001_01.conf src/plugins/imexporters/sepa/profiles/008_002_02.conf src/plugins/imexporters/sepa/profiles/008_003_02.conf src/plugins/imexporters/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/profiles/Makefile src/plugins/imexporters/ctxfile/profiles/default.conf src/plugins/imexporters/q43/Makefile src/plugins/imexporters/q43/q43.xml src/plugins/imexporters/q43/profiles/Makefile src/plugins/imexporters/q43/profiles/default.conf src/plugins/parsers/Makefile src/plugins/parsers/dtaus/Makefile src/plugins/parsers/dtaus/dtaus.xml src/plugins/parsers/swift/Makefile src/plugins/parsers/swift/swift.xml src/plugins/backends/Makefile src/plugins/backends/aqhbci/Makefile src/plugins/backends/aqhbci/plugin/Makefile src/plugins/backends/aqhbci/plugin/aqhbci.xml src/plugins/backends/aqhbci/plugin/dialogs/Makefile src/plugins/backends/aqhbci/plugin/header.xml src/plugins/backends/aqhbci/plugin/banking/Makefile src/plugins/backends/aqhbci/plugin/msglayer/Makefile src/plugins/backends/aqhbci/plugin/joblayer/Makefile src/plugins/backends/aqhbci/plugin/applayer/Makefile src/plugins/backends/aqhbci/plugin/ajobs/Makefile src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile src/plugins/backends/aqhbci/plugin/version.h src/plugins/backends/aqhbci/tools/Makefile src/plugins/backends/aqhbci/tools/hbcixml/Makefile src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile src/plugins/backends/aqofxconnect/Makefile src/plugins/backends/aqofxconnect/version.h src/plugins/backends/aqofxconnect/plugin/Makefile src/plugins/backends/aqofxconnect/plugin/aqofxconnect.xml src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile src/plugins/backends/aqnone/Makefile src/plugins/backends/aqnone/aqnone.xml src/plugins/backends/aqebics/Makefile src/plugins/backends/aqebics/plugin/Makefile src/plugins/backends/aqebics/plugin/aqebics.xml src/plugins/backends/aqebics/plugin/client/Makefile src/plugins/backends/aqebics/plugin/dialogs/Makefile src/plugins/backends/aqebics/plugin/msg/Makefile src/plugins/backends/aqebics/tools/Makefile src/plugins/backends/aqebics/tools/aqebics-tool/Makefile src/test/Makefile src/tools/Makefile src/tools/aqbanking-cli/Makefile tutorials/Makefile po/Makefile Doxyfile Makefile aqbanking-config.in aqbanking.pc aqbanking.spec aqbanking.iss version.h system.h aqbanking-config.cmake aqbanking-config-version.cmake" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20089,6 +20328,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -21293,14 +21540,12 @@ "src/plugins/imexporters/sepa/sepa.xml") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/sepa.xml" ;; "src/plugins/imexporters/sepa/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/Makefile" ;; "src/plugins/imexporters/sepa/profiles/default.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/default.conf" ;; - "src/plugins/imexporters/sepa/profiles/ccm.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/ccm.conf" ;; + "src/plugins/imexporters/sepa/profiles/001_001_02.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/001_001_02.conf" ;; "src/plugins/imexporters/sepa/profiles/001_002_03.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/001_002_03.conf" ;; + "src/plugins/imexporters/sepa/profiles/001_003_03.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/001_003_03.conf" ;; "src/plugins/imexporters/sepa/profiles/008_001_01.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/008_001_01.conf" ;; - "src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf" ;; "src/plugins/imexporters/sepa/profiles/008_002_02.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/008_002_02.conf" ;; - "src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf" ;; "src/plugins/imexporters/sepa/profiles/008_003_02.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/008_003_02.conf" ;; - "src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf" ;; "src/plugins/imexporters/ctxfile/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/ctxfile/Makefile" ;; "src/plugins/imexporters/ctxfile/ctxfile.xml") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/ctxfile/ctxfile.xml" ;; "src/plugins/imexporters/ctxfile/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/imexporters/ctxfile/profiles/Makefile" ;; @@ -21324,7 +21569,7 @@ "src/plugins/backends/aqhbci/plugin/msglayer/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/plugin/msglayer/Makefile" ;; "src/plugins/backends/aqhbci/plugin/joblayer/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/plugin/joblayer/Makefile" ;; "src/plugins/backends/aqhbci/plugin/applayer/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/plugin/applayer/Makefile" ;; - "src/plugins/backends/aqhbci/plugin/accountjobs/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/plugin/accountjobs/Makefile" ;; + "src/plugins/backends/aqhbci/plugin/ajobs/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/plugin/ajobs/Makefile" ;; "src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile" ;; "src/plugins/backends/aqhbci/plugin/version.h") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/plugin/version.h" ;; "src/plugins/backends/aqhbci/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqhbci/tools/Makefile" ;; @@ -21358,6 +21603,8 @@ "aqbanking.iss") CONFIG_FILES="$CONFIG_FILES aqbanking.iss" ;; "version.h") CONFIG_FILES="$CONFIG_FILES version.h" ;; "system.h") CONFIG_FILES="$CONFIG_FILES system.h" ;; + "aqbanking-config.cmake") CONFIG_FILES="$CONFIG_FILES aqbanking-config.cmake" ;; + "aqbanking-config-version.cmake") CONFIG_FILES="$CONFIG_FILES aqbanking-config-version.cmake" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -21954,7 +22201,7 @@ 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 + # Older Autoconf 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 @@ -21967,7 +22214,7 @@ # 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 + # 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. @@ -22001,21 +22248,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # 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 + 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 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru libaqbanking-5.4.3beta/configure.ac libaqbanking-5.6.1beta/configure.ac --- libaqbanking-5.4.3beta/configure.ac 2014-04-17 20:57:00.000000000 +0000 +++ libaqbanking-5.6.1beta/configure.ac 2015-06-01 16:30:35.000000000 +0000 @@ -5,7 +5,7 @@ # The following line makes sure that this file is always touched when a new # revision is checked out. # -# $Rev$ +# $Rev: 2550 $ # @@ -24,8 +24,8 @@ # AQBANKING_VERSION_MAJOR=5 -AQBANKING_VERSION_MINOR=4 -AQBANKING_VERSION_PATCHLEVEL=3 +AQBANKING_VERSION_MINOR=6 +AQBANKING_VERSION_PATCHLEVEL=1 AQBANKING_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "svn" AQBANKING_VERSION_TAG="beta" @@ -41,9 +41,9 @@ # AqBanking # -AQBANKING_SO_CURRENT=38 -AQBANKING_SO_AGE=4 -AQBANKING_SO_REVISION=3 +AQBANKING_SO_CURRENT=40 +AQBANKING_SO_AGE=5 +AQBANKING_SO_REVISION=1 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # @@ -86,7 +86,7 @@ ;; git) - AQBANKING_VERSION_FULL_STRING="$AQBANKING_VERSION_MAJOR.$AQBANKING_VERSION_MINOR.${AQBANKING_VERSION_PATCHLEVEL}.${AQBANKING_VERSION_BUILD}-${AQBANKING_VERSION_TAG}" + AQBANKING_VERSION_FULL_STRING="$AQBANKING_VERSION_MAJOR.$AQBANKING_VERSION_MINOR.${AQBANKING_VERSION_PATCHLEVEL}.${AQBANKING_VERSION_BUILD}" ;; esac @@ -128,7 +128,13 @@ # # datetime # -DATETIME="`date +\"%Y%m%d%H%M%S\"`" +AC_ARG_WITH([build-datetime], + [AS_HELP_STRING([--with-build-datetime=DATETIME], + [use fixed datetime for build (default: current date and time)])], + [AS_IF([test "x$withval" = "xyes"], + [DATETIME="`date +\"%Y%m%d%H%M%S\"`"], + [DATETIME="`date +\"%Y%m%d%H%M%S\" --date=\"$withval\"`"])], + [DATETIME="`date +\"%Y%m%d%H%M%S\"`"]) AC_SUBST(DATETIME) @@ -594,6 +600,8 @@ # Check for Gwen # +# Variable used in aqbanking-config.cmake +AC_SUBST(GWENHYWFAR_MINIMUM_VERSION, "4.10.0.0") AC_GWENHYWFAR(4,10,0,0) all_includes="$all_includes $gwenhywfar_includes" @@ -927,52 +935,26 @@ ###------------------------------------------------------------------------- # -# GCC version (check for usability) +# Compiler check for symbol visibility # -AC_MSG_CHECKING(if symbol visibility is supported) -visibility_cflags="" -case `basename $CC` in - *gcc*) - dnl Determine version number (watch out: the outside square - dnl parenteses are vitally important here!) - gccversion=["` ${CC} --version | head -1 | ${SED} 's/.*\([0-9]\.[0-9]\.[0-9]*\).*/\1/' `"] - case $gccversion in - 4.*) - # Activate -fvisibility=hidden only for explicit 4.x gcc - # versions. We never now what future gcc's might do with - # that argument, and we also can't be sure that other - # gcc's happen to show very weird version - # numbers. Therefore leave the default at non-activated. - visibility_supported="yes, gcc-${gccversion}" - AC_DEFINE(GCC_WITH_VISIBILITY_ATTRIBUTE, 1, [visibility]) - visibility_cflags="-fvisibility=hidden" - ;; - *) - # Default: -fvisibility=hidden not activated. - visibility_supported="no (needs gcc >=4.0, you have gcc-${gccversion})" - ;; - esac - ;; - *) - visibility_supported="no (needs gcc >=4.0, you use $CC)" - ;; -esac - -# -fvisibility is at least not available on MinGW/gcc-3.4.4 (will -# give an "unrecognized cmdline option"). Also, unfortunately I -# don't know an easy way to ask the compiler here. Maybe -# http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html -case "$OS_TYPE" in - windows) - visibility_supported="no (not yet on MinGW/Windows)" - visibility_cflags="" - ;; - *) - ;; -esac - - -AC_MSG_RESULT(${visibility_supported}) +AC_CACHE_CHECK([whether compiler supports symbol visibility], + ac_cv_hidden_visibility_attribute, [ + echo 'int __attribute__ ((visibility ("hidden"))) foo (void) { return 1; }' > conftest.c + ac_cv_hidden_visibility_attribute=no + if AC_TRY_COMMAND(${CC-cc} -Werror -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD); + then + if grep '\.hidden.*foo' conftest.s >/dev/null; + then + ac_cv_hidden_visibility_attribute=yes + fi + fi + rm -f conftest.* + ]) +if test $ac_cv_hidden_visibility_attribute = yes; +then + AC_DEFINE(GCC_WITH_VISIBILITY_ATTRIBUTE, 1, [visibility]) + visibility_cflags="-fvisibility=hidden" +fi AC_SUBST(visibility_cflags) @@ -1452,14 +1434,12 @@ src/plugins/imexporters/sepa/sepa.xml src/plugins/imexporters/sepa/profiles/Makefile src/plugins/imexporters/sepa/profiles/default.conf - src/plugins/imexporters/sepa/profiles/ccm.conf + src/plugins/imexporters/sepa/profiles/001_001_02.conf src/plugins/imexporters/sepa/profiles/001_002_03.conf + src/plugins/imexporters/sepa/profiles/001_003_03.conf src/plugins/imexporters/sepa/profiles/008_001_01.conf - src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf src/plugins/imexporters/sepa/profiles/008_002_02.conf - src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf src/plugins/imexporters/sepa/profiles/008_003_02.conf - src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf src/plugins/imexporters/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/profiles/Makefile @@ -1483,7 +1463,7 @@ src/plugins/backends/aqhbci/plugin/msglayer/Makefile src/plugins/backends/aqhbci/plugin/joblayer/Makefile src/plugins/backends/aqhbci/plugin/applayer/Makefile - src/plugins/backends/aqhbci/plugin/accountjobs/Makefile + src/plugins/backends/aqhbci/plugin/ajobs/Makefile src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile src/plugins/backends/aqhbci/plugin/version.h src/plugins/backends/aqhbci/tools/Makefile @@ -1517,6 +1497,8 @@ aqbanking.iss version.h system.h + aqbanking-config.cmake + aqbanking-config-version.cmake ]) AC_OUTPUT diff -Nru libaqbanking-5.4.3beta/debian/changelog libaqbanking-5.6.1beta/debian/changelog --- libaqbanking-5.4.3beta/debian/changelog 2014-06-15 20:54:37.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/changelog 2015-07-02 19:00:18.000000000 +0000 @@ -1,3 +1,58 @@ +libaqbanking (5.6.1beta-1~ppa1) vivid; urgency=low + + * Backported from Debian unstable. + - Needed for GnuCash 2.6.7-1. + + -- Nate Muench Thu, 02 Jul 2015 13:59:22 -0500 + +libaqbanking (5.6.1beta-1) unstable; urgency=medium + + * New upstream version 5.6.1beta. + + -- Micha Lenk Fri, 05 Jun 2015 21:13:00 +0200 + +libaqbanking (5.6.0beta-2) experimental; urgency=medium + + * Rename package libaqbanking35-dev to libaqbanking-dev, as discussed with + release managers in Debian bug #787024. + + -- Micha Lenk Thu, 28 May 2015 21:06:19 +0200 + +libaqbanking (5.6.0beta-1) experimental; urgency=medium + + * New upstream version: AqBanking 5.6.0beta + - fixes build failure with GCC 5 (closes: #777937). + * debian/rules: Drop explicit setting of CC=gcc. This is obsoleted by a + reworked symbol visibility check in upstream's configure. + * debian/rules: Explicitly configure a build timestamp and set TZ=UTC to make + the version in /usr/share/aqbanking/backends/aqhbci/hbci.xml reproducible. + * Bump SONAME libaqbanking34 -> libaqbanking35. + + -- Micha Lenk Wed, 27 May 2015 21:45:16 +0200 + +libaqbanking (5.5.1-1) experimental; urgency=medium + + * New upstream release + - incorporates small corrections in German translation (closes: #762374). + - includes fix for aqbanking-cli, so we can drop patch + 01_bug_750046_fix_AH_Provider_SendDtazv_signature. + * debian/libaqbanking34.symbols: + - added symbols AB_JobSepaFlashDebitNote_new and + AB_JobSepaGetStandingOrders_new + - CAUTION: Following symbols are gone (another reason to upload to + experimental only): AB_Transaction_GetCreditorIdentifier, + AB_Transaction_GetMandateReference, AB_Transaction_SetCreditorIdentifier, + AB_Transaction_SetMandateReference. The next upload to unstable will not + be done without a SONAME bump. + * debian/libaqhbci22.symbols: Added a few symbols. + * debian/libaqofxconnect7.symbols: Added a few symbols. + * Tweak debian/watch file to ignore beta versions. + * Package management transitioned from Subversion to Git, so updated + Vcs-* fields in debian/control. + * Package is compliant to Debian Policy 3.9.6 (no changes needed). + + -- Micha Lenk Thu, 05 Feb 2015 22:27:50 +0100 + libaqbanking (5.4.3beta-2) unstable; urgency=medium * Added patch 01_bug_750046_fix_AH_Provider_SendDtazv_signature to fix broken diff -Nru libaqbanking-5.4.3beta/debian/control libaqbanking-5.6.1beta/debian/control --- libaqbanking-5.4.3beta/debian/control 2014-04-19 16:08:23.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/control 2015-06-05 19:13:36.000000000 +0000 @@ -11,18 +11,16 @@ libgmp10-dev, asciidoc, xmlto -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.aquamaniac.de/aqbanking/ -Vcs-Browser: http://anonscm.debian.org/viewvc/aqbanking/libaqbanking/trunk/ -Vcs-Svn: svn://anonscm.debian.org/aqbanking/libaqbanking/trunk/ +Vcs-Browser: http://source.lenk.info/git/pkg-libaqbanking.git +Vcs-Git: git://source.lenk.info/git/pkg-libaqbanking.git -Package: libaqbanking34-dev -Provides: libaqbanking-dev -Conflicts: libaqbanking-dev +Package: libaqbanking-dev Suggests: libaqbanking-doc Section: libdevel Architecture: any -Depends: libaqbanking34 (= ${binary:Version}), +Depends: libaqbanking35 (= ${binary:Version}), libaqhbci22 (= ${binary:Version}), libaqofxconnect7 (= ${binary:Version}), libgwenhywfar60-dev, @@ -42,7 +40,7 @@ Section: doc Architecture: all Depends: libjs-jquery, ${misc:Depends} -Enhances: libaqbanking34-dev +Enhances: libaqbanking-dev Description: library for online banking applications AqBanking provides a middle layer between the applications and online banking libraries implementing various file formats and protocols. @@ -53,7 +51,7 @@ Package: aqbanking-tools Section: utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libaqbanking34-plugins +Depends: ${shlibs:Depends}, ${misc:Depends}, libaqbanking35-plugins Suggests: gwenhywfar-tools Description: basic command line homebanking utilities AqBanking provides a middle layer between the applications @@ -62,13 +60,13 @@ . This package provides a basic command line interface to AqBanking. -Package: libaqbanking34-plugins +Package: libaqbanking35-plugins Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libaqbanking-plugins-libgwenhywfar60 (<< 5.3.5beta) Replaces: libaqbanking-plugins-libgwenhywfar60 (<< 5.3.5beta) -Description: plugins needed by libaqbanking34 +Description: plugins needed by libaqbanking35 AqBanking provides a middle layer between the applications and online banking libraries implementing various file formats and protocols. Plugins supporting OFX, DTAUS, HBCI, and EBICS are available. @@ -85,7 +83,7 @@ Section: libs Architecture: all Depends: ${misc:Depends} -Recommends: libaqbanking34 +Recommends: libaqbanking35 Description: configuration files for libaqbanking AqBanking provides a middle layer between the applications and online banking libraries implementing various file formats and protocols. @@ -93,28 +91,28 @@ . This package contains data files for AqBanking. -Package: libaqbanking34 +Package: libaqbanking35 Section: libs Architecture: any Depends: ${shlibs:Depends}, libaqbanking-data (>= ${source:Version}), ${misc:Depends} -Recommends: libaqbanking34-plugins (>= ${source:Version}) +Recommends: libaqbanking35-plugins (>= ${source:Version}) Suggests: aqbanking-tools -Breaks: libaqbanking34-plugins (<< ${source:Version}) +Breaks: libaqbanking35-plugins (<< ${source:Version}) Description: library for online banking applications AqBanking provides a middle layer between the applications and online banking libraries implementing various file formats and protocols. Plugins supporting OFX, DTAUS, HBCI, and EBICS are available. -Package: libaqbanking34-dbg +Package: libaqbanking35-dbg Priority: extra Provides: libaqbanking-dbg Conflicts: libaqbanking-dbg Section: debug Architecture: any -Depends: libaqbanking34 (= ${binary:Version}), - libaqbanking34-plugins (= ${binary:Version}), +Depends: libaqbanking35 (= ${binary:Version}), + libaqbanking35-plugins (= ${binary:Version}), libaqhbci22 (= ${binary:Version}), libaqofxconnect7 (= ${binary:Version}), aqbanking-tools (= ${binary:Version}), @@ -129,7 +127,7 @@ Package: libaqhbci22 Provides: libaqbanking-backend -Enhances: libaqbanking34 +Enhances: libaqbanking35 Section: libs Architecture: any Depends: ${shlibs:Depends}, diff -Nru libaqbanking-5.4.3beta/debian/debhelper/dh_aqbanking libaqbanking-5.6.1beta/debian/debhelper/dh_aqbanking --- libaqbanking-5.4.3beta/debian/debhelper/dh_aqbanking 2014-01-27 20:00:37.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/debhelper/dh_aqbanking 2015-06-05 19:13:36.000000000 +0000 @@ -23,14 +23,14 @@ init(); foreach my $package (@{$dh{DOPACKAGES}}) { - addsubstvar($package, "aqbanking:Depends", 'libaqbanking34-plugins'); + addsubstvar($package, "aqbanking:Depends", 'libaqbanking35-plugins'); } =head1 SEE ALSO L -This program is a part of libaqbanking34-dev. +This program is a part of libaqbanking35-dev. =head1 AUTHOR diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-dbg.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking34-dbg.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking34-dbg.lintian-overrides 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-dbg.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# upstream increments the version number for every release, i.e. release -# candidates have lower version numbers than the expected final release. -rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-dev.docs libaqbanking-5.6.1beta/debian/libaqbanking34-dev.docs --- libaqbanking-5.4.3beta/debian/libaqbanking34-dev.docs 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-dev.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -AUTHORS -NEWS -doc/02-CODING -doc/03-APPS diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-dev.install libaqbanking-5.6.1beta/debian/libaqbanking34-dev.install --- libaqbanking-5.4.3beta/debian/libaqbanking34-dev.install 2014-01-27 19:45:08.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -usr/bin/*-config -usr/share/aclocal -usr/include/* -usr/lib/*.so -usr/lib/pkgconfig -debian/debhelper/dh_aqbanking /usr/bin -debian/debhelper/aqbanking.pm /usr/share/perl5/Debian/Debhelper/Sequence diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-dev.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking34-dev.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking34-dev.lintian-overrides 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# upstream increments the version number for every release, i.e. release -# candidates have lower version numbers than the expected final release. -rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-dev.manpages libaqbanking-5.6.1beta/debian/libaqbanking34-dev.manpages --- libaqbanking-5.4.3beta/debian/libaqbanking34-dev.manpages 2014-01-27 20:02:03.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-dev.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian/doc/aqbanking-config.1 -debian/doc/dh_aqbanking.1 diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34.docs libaqbanking-5.6.1beta/debian/libaqbanking34.docs --- libaqbanking-5.4.3beta/debian/libaqbanking34.docs 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -AUTHORS -NEWS -README diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34.install libaqbanking-5.6.1beta/debian/libaqbanking34.install --- libaqbanking-5.4.3beta/debian/libaqbanking34.install 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/libaqbanking.so.* -usr/lib/libaqnone.so.* diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking34.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking34.lintian-overrides 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# upstream increments the version number for every release, i.e. release -# candidates have lower version numbers than the expected final release. -rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.dir libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.dir --- libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.dir 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.dir 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/aqbanking/plugins/34 diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.docs libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.docs --- libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.docs 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -AUTHORS -NEWS -README diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.install libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.install --- libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.install 2014-01-27 20:27:16.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/aqbanking/plugins diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking34-plugins.lintian-overrides 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34-plugins.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# upstream increments the version number for every release, i.e. release -# candidates have lower version numbers than the expected final release. -rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking34.symbols libaqbanking-5.6.1beta/debian/libaqbanking34.symbols --- libaqbanking-5.4.3beta/debian/libaqbanking34.symbols 2014-02-16 20:29:16.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking34.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,1816 +0,0 @@ -libaqbanking.so.34 libaqbanking34 #MINVER# -* Build-Depends-Package: libaqbanking34-dev, libaqbanking-dev - AB_ACCOUNTQUEUE__INHERIT_GETLIST@Base 4.99.18 - AB_ACCOUNTQUEUE__INHERIT_ISOFTYPE@Base 4.99.18 - AB_ACCOUNTQUEUE__INHERIT_SETDATA@Base 4.99.18 - AB_ACCOUNTQUEUE__INHERIT_UNLINK@Base 4.99.18 - AB_ACCOUNT__INHERIT_GETLIST@Base 4.0.0 - AB_ACCOUNT__INHERIT_ISOFTYPE@Base 4.0.0 - AB_ACCOUNT__INHERIT_SETDATA@Base 4.0.0 - AB_ACCOUNT__INHERIT_UNLINK@Base 4.0.0 - AB_AccountQueue_AddJob@Base 4.99.18 - AB_AccountQueue_Attach@Base 4.99.18 - AB_AccountQueue_FindJobQueue@Base 4.99.18 - AB_AccountQueue_GetAccount@Base 4.99.18 - AB_AccountQueue_GetJobQueueList@Base 4.99.18 - AB_AccountQueue_List_Add@Base 4.99.18 - AB_AccountQueue_List_AddList@Base 4.99.18 - AB_AccountQueue_List_Clear@Base 4.99.18 - AB_AccountQueue_List_Del@Base 4.99.18 - AB_AccountQueue_List_First@Base 4.99.18 - AB_AccountQueue_List_GetCount@Base 4.99.18 - AB_AccountQueue_List_HasElement@Base 4.99.18 - AB_AccountQueue_List_Insert@Base 4.99.18 - AB_AccountQueue_List_Last@Base 4.99.18 - AB_AccountQueue_List_Next@Base 4.99.18 - AB_AccountQueue_List_Previous@Base 4.99.18 - AB_AccountQueue_List_SetSortFn@Base 5.0.10 - AB_AccountQueue_List_Sort@Base 5.0.10 - AB_AccountQueue_List_dup@Base 4.99.18 - AB_AccountQueue_List_free@Base 4.99.18 - AB_AccountQueue_List_new@Base 4.99.18 - AB_AccountQueue_SetAccount@Base 4.99.18 - AB_AccountQueue_SetJobQueueList@Base 4.99.18 - AB_AccountQueue_dup@Base 4.99.18 - AB_AccountQueue_free@Base 4.99.18 - AB_AccountQueue_new@Base 4.99.18 - AB_AccountStatus_GetBankLine@Base 4.0.0 - AB_AccountStatus_GetBookedBalance@Base 4.0.0 - AB_AccountStatus_GetDisposable@Base 4.0.0 - AB_AccountStatus_GetDisposed@Base 4.0.0 - AB_AccountStatus_GetNotedBalance@Base 4.0.0 - AB_AccountStatus_GetTime@Base 4.0.0 - AB_AccountStatus_List2Iterator_Data@Base 4.0.0 - AB_AccountStatus_List2Iterator_GetLinkCount@Base 4.0.0 - AB_AccountStatus_List2Iterator_IncLinkCount@Base 4.0.0 - AB_AccountStatus_List2Iterator_Next@Base 4.0.0 - AB_AccountStatus_List2Iterator_Previous@Base 4.0.0 - AB_AccountStatus_List2Iterator_free@Base 4.0.0 - AB_AccountStatus_List2Iterator_new@Base 4.0.0 - AB_AccountStatus_List2_Clear@Base 4.0.0 - AB_AccountStatus_List2_Contains@Base 4.0.0 - AB_AccountStatus_List2_Dump@Base 4.0.0 - AB_AccountStatus_List2_Erase@Base 4.0.0 - AB_AccountStatus_List2_FindIter@Base 4.0.0 - AB_AccountStatus_List2_First@Base 4.0.0 - AB_AccountStatus_List2_ForEach@Base 4.0.0 - AB_AccountStatus_List2_GetBack@Base 4.0.0 - AB_AccountStatus_List2_GetFront@Base 4.0.0 - AB_AccountStatus_List2_GetSize@Base 4.0.0 - AB_AccountStatus_List2_IsEmpty@Base 4.0.0 - AB_AccountStatus_List2_Last@Base 4.0.0 - AB_AccountStatus_List2_PopBack@Base 4.0.0 - AB_AccountStatus_List2_PopFront@Base 4.0.0 - AB_AccountStatus_List2_PushBack@Base 4.0.0 - AB_AccountStatus_List2_PushFront@Base 4.0.0 - AB_AccountStatus_List2_Remove@Base 4.0.0 - AB_AccountStatus_List2_Unshare@Base 4.0.0 - AB_AccountStatus_List2_dup@Base 4.0.0 - AB_AccountStatus_List2_free@Base 4.0.0 - AB_AccountStatus_List2_freeAll@Base 4.0.0 - AB_AccountStatus_List2_new@Base 4.0.0 - AB_AccountStatus_SetBankLine@Base 4.0.0 - AB_AccountStatus_SetBookedBalance@Base 4.0.0 - AB_AccountStatus_SetDisposable@Base 4.0.0 - AB_AccountStatus_SetDisposed@Base 4.0.0 - AB_AccountStatus_SetNotedBalance@Base 4.0.0 - AB_AccountStatus_SetTime@Base 4.0.0 - AB_AccountStatus_dup@Base 4.0.0 - AB_AccountStatus_free@Base 4.0.0 - AB_AccountStatus_fromDb@Base 4.0.0 - AB_AccountStatus_new@Base 4.0.0 - AB_AccountStatus_toDb@Base 4.0.0 - AB_Account_GetAccountName@Base 4.0.0 - AB_Account_GetAccountNumber@Base 4.0.0 - AB_Account_GetAccountType@Base 4.0.0 - AB_Account_GetBIC@Base 4.0.0 - AB_Account_GetBackendName@Base 4.0.0 - AB_Account_GetBankCode@Base 4.0.0 - AB_Account_GetBankName@Base 4.0.0 - AB_Account_GetBanking@Base 4.0.0 - AB_Account_GetCountry@Base 4.0.0 - AB_Account_GetCurrency@Base 4.0.0 - AB_Account_GetFirstSelectedUser@Base 4.0.0 - AB_Account_GetFirstUser@Base 4.0.0 - AB_Account_GetIBAN@Base 4.0.0 - AB_Account_GetOwnerName@Base 4.0.0 - AB_Account_GetProvider@Base 4.0.0 - AB_Account_GetSelectedUsers@Base 4.0.0 - AB_Account_GetSubAccountId@Base 5.0.1 - AB_Account_GetUniqueId@Base 4.0.0 - AB_Account_GetUsers@Base 4.0.0 - AB_Account_List2Iterator_Data@Base 4.0.0 - AB_Account_List2Iterator_GetLinkCount@Base 4.0.0 - AB_Account_List2Iterator_IncLinkCount@Base 4.0.0 - AB_Account_List2Iterator_Next@Base 4.0.0 - AB_Account_List2Iterator_Previous@Base 4.0.0 - AB_Account_List2Iterator_free@Base 4.0.0 - AB_Account_List2Iterator_new@Base 4.0.0 - AB_Account_List2_Clear@Base 4.0.0 - AB_Account_List2_Contains@Base 4.0.0 - AB_Account_List2_Dump@Base 4.0.0 - AB_Account_List2_Erase@Base 4.0.0 - AB_Account_List2_FindIter@Base 4.0.0 - AB_Account_List2_First@Base 4.0.0 - AB_Account_List2_ForEach@Base 4.0.0 - AB_Account_List2_FreeAll@Base 4.0.0 - AB_Account_List2_GetAccountByUniqueId@Base 5.4.0beta - AB_Account_List2_GetBack@Base 4.0.0 - AB_Account_List2_GetFront@Base 4.0.0 - AB_Account_List2_GetSize@Base 4.0.0 - AB_Account_List2_IsEmpty@Base 4.0.0 - AB_Account_List2_Last@Base 4.0.0 - AB_Account_List2_PopBack@Base 4.0.0 - AB_Account_List2_PopFront@Base 4.0.0 - AB_Account_List2_PushBack@Base 4.0.0 - AB_Account_List2_PushFront@Base 4.0.0 - AB_Account_List2_Remove@Base 4.0.0 - AB_Account_List2_Unshare@Base 4.0.0 - AB_Account_List2_dup@Base 4.0.0 - AB_Account_List2_free@Base 4.0.0 - AB_Account_List2_new@Base 4.0.0 - AB_Account_SetAccountName@Base 4.0.0 - AB_Account_SetAccountNumber@Base 4.0.0 - AB_Account_SetAccountType@Base 4.0.0 - AB_Account_SetBIC@Base 4.0.0 - AB_Account_SetBankCode@Base 4.0.0 - AB_Account_SetBankName@Base 4.0.0 - AB_Account_SetCountry@Base 4.0.0 - AB_Account_SetCurrency@Base 4.0.0 - AB_Account_SetIBAN@Base 4.0.0 - AB_Account_SetOwnerName@Base 4.0.0 - AB_Account_SetSelectedUser@Base 4.0.0 - AB_Account_SetSelectedUsers@Base 4.0.0 - AB_Account_SetSubAccountId@Base 5.0.1 - AB_Account_SetUniqueId@Base 4.0.0 - AB_Account_SetUser@Base 4.0.0 - AB_Account_SetUsers@Base 4.0.0 - AB_Account_free@Base 4.0.0 - AB_BANKINFO_PLUGIN__INHERIT_GETLIST@Base 4.0.0 - AB_BANKINFO_PLUGIN__INHERIT_ISOFTYPE@Base 4.0.0 - AB_BANKINFO_PLUGIN__INHERIT_SETDATA@Base 4.0.0 - AB_BANKINFO_PLUGIN__INHERIT_UNLINK@Base 4.0.0 - AB_BANKING__INHERIT_GETLIST@Base 4.0.0 - AB_BANKING__INHERIT_ISOFTYPE@Base 4.0.0 - AB_BANKING__INHERIT_SETDATA@Base 4.0.0 - AB_BANKING__INHERIT_UNLINK@Base 4.0.0 - AB_Balance_GetTime@Base 4.0.0 - AB_Balance_GetValue@Base 4.0.0 - AB_Balance_SetValue@Base 4.0.0 - AB_Balance_dup@Base 4.0.0 - AB_Balance_free@Base 4.0.0 - AB_Balance_fromDb@Base 4.0.0 - AB_Balance_new@Base 4.0.0 - AB_Balance_toDb@Base 4.0.0 - AB_BankInfoPlugin_Attach@Base 4.0.0 - AB_BankInfoPlugin_CheckAccount@Base 4.0.0 - AB_BankInfoPlugin_GetBankInfo@Base 4.0.0 - AB_BankInfoPlugin_GetBankInfoByTemplate@Base 4.0.0 - AB_BankInfoPlugin_GetCountry@Base 4.0.0 - AB_BankInfoPlugin_List2Iterator_Data@Base 4.0.0 - AB_BankInfoPlugin_List2Iterator_GetLinkCount@Base 4.0.0 - AB_BankInfoPlugin_List2Iterator_IncLinkCount@Base 4.0.0 - AB_BankInfoPlugin_List2Iterator_Next@Base 4.0.0 - AB_BankInfoPlugin_List2Iterator_Previous@Base 4.0.0 - AB_BankInfoPlugin_List2Iterator_free@Base 4.0.0 - AB_BankInfoPlugin_List2Iterator_new@Base 4.0.0 - AB_BankInfoPlugin_List2_Clear@Base 4.0.0 - AB_BankInfoPlugin_List2_Contains@Base 4.0.0 - AB_BankInfoPlugin_List2_Dump@Base 4.0.0 - AB_BankInfoPlugin_List2_Erase@Base 4.0.0 - AB_BankInfoPlugin_List2_FindIter@Base 4.0.0 - AB_BankInfoPlugin_List2_First@Base 4.0.0 - AB_BankInfoPlugin_List2_ForEach@Base 4.0.0 - AB_BankInfoPlugin_List2_GetBack@Base 4.0.0 - AB_BankInfoPlugin_List2_GetFront@Base 4.0.0 - AB_BankInfoPlugin_List2_GetSize@Base 4.0.0 - AB_BankInfoPlugin_List2_IsEmpty@Base 4.0.0 - AB_BankInfoPlugin_List2_Last@Base 4.0.0 - AB_BankInfoPlugin_List2_PopBack@Base 4.0.0 - AB_BankInfoPlugin_List2_PopFront@Base 4.0.0 - AB_BankInfoPlugin_List2_PushBack@Base 4.0.0 - AB_BankInfoPlugin_List2_PushFront@Base 4.0.0 - AB_BankInfoPlugin_List2_Remove@Base 4.0.0 - AB_BankInfoPlugin_List2_Unshare@Base 4.0.0 - AB_BankInfoPlugin_List2_dup@Base 4.0.0 - AB_BankInfoPlugin_List2_free@Base 4.0.0 - AB_BankInfoPlugin_List2_new@Base 4.0.0 - AB_BankInfoPlugin_List_Add@Base 4.0.0 - AB_BankInfoPlugin_List_AddList@Base 4.0.0 - AB_BankInfoPlugin_List_Clear@Base 4.0.0 - AB_BankInfoPlugin_List_Del@Base 4.0.0 - AB_BankInfoPlugin_List_First@Base 4.0.0 - AB_BankInfoPlugin_List_GetCount@Base 4.0.0 - AB_BankInfoPlugin_List_HasElement@Base 4.0.0 - AB_BankInfoPlugin_List_Insert@Base 4.0.0 - AB_BankInfoPlugin_List_Last@Base 4.0.0 - AB_BankInfoPlugin_List_Next@Base 4.0.0 - AB_BankInfoPlugin_List_Previous@Base 4.0.0 - AB_BankInfoPlugin_List_SetSortFn@Base 5.0.10 - AB_BankInfoPlugin_List_Sort@Base 5.0.10 - AB_BankInfoPlugin_List_free@Base 4.0.0 - AB_BankInfoPlugin_List_new@Base 4.0.0 - AB_BankInfoPlugin_SetCheckAccountFn@Base 4.0.0 - AB_BankInfoPlugin_SetGetBankInfoByTemplateFn@Base 4.0.0 - AB_BankInfoPlugin_SetGetBankInfoFn@Base 4.0.0 - AB_BankInfoPlugin_free@Base 4.0.0 - AB_BankInfoPlugin_new@Base 4.0.0 - AB_BankInfoService_Attach@Base 4.0.0 - AB_BankInfoService_GetAddress@Base 4.0.0 - AB_BankInfoService_GetAux1@Base 4.0.0 - AB_BankInfoService_GetAux2@Base 4.0.0 - AB_BankInfoService_GetAux3@Base 4.0.0 - AB_BankInfoService_GetAux4@Base 4.0.0 - AB_BankInfoService_GetHversion@Base 4.99.18 - AB_BankInfoService_GetMode@Base 4.0.0 - AB_BankInfoService_GetPversion@Base 4.0.0 - AB_BankInfoService_GetSuffix@Base 4.0.0 - AB_BankInfoService_GetType@Base 4.0.0 - AB_BankInfoService_GetUserFlags@Base 4.99.18 - AB_BankInfoService_IsModified@Base 4.0.0 - AB_BankInfoService_List2Iterator_Data@Base 4.0.0 - AB_BankInfoService_List2Iterator_GetLinkCount@Base 4.0.0 - AB_BankInfoService_List2Iterator_IncLinkCount@Base 4.0.0 - AB_BankInfoService_List2Iterator_Next@Base 4.0.0 - AB_BankInfoService_List2Iterator_Previous@Base 4.0.0 - AB_BankInfoService_List2Iterator_free@Base 4.0.0 - AB_BankInfoService_List2Iterator_new@Base 4.0.0 - AB_BankInfoService_List2_Clear@Base 4.0.0 - AB_BankInfoService_List2_Contains@Base 4.0.0 - AB_BankInfoService_List2_Dump@Base 4.0.0 - AB_BankInfoService_List2_Erase@Base 4.0.0 - AB_BankInfoService_List2_FindIter@Base 4.0.0 - AB_BankInfoService_List2_First@Base 4.0.0 - AB_BankInfoService_List2_ForEach@Base 4.0.0 - AB_BankInfoService_List2_GetBack@Base 4.0.0 - AB_BankInfoService_List2_GetFront@Base 4.0.0 - AB_BankInfoService_List2_GetSize@Base 4.0.0 - AB_BankInfoService_List2_IsEmpty@Base 4.0.0 - AB_BankInfoService_List2_Last@Base 4.0.0 - AB_BankInfoService_List2_PopBack@Base 4.0.0 - AB_BankInfoService_List2_PopFront@Base 4.0.0 - AB_BankInfoService_List2_PushBack@Base 4.0.0 - AB_BankInfoService_List2_PushFront@Base 4.0.0 - AB_BankInfoService_List2_Remove@Base 4.0.0 - AB_BankInfoService_List2_Unshare@Base 4.0.0 - AB_BankInfoService_List2_dup@Base 4.0.0 - AB_BankInfoService_List2_free@Base 4.0.0 - AB_BankInfoService_List2_freeAll@Base 4.0.0 - AB_BankInfoService_List2_new@Base 4.0.0 - AB_BankInfoService_List_Add@Base 4.0.0 - AB_BankInfoService_List_AddList@Base 4.0.0 - AB_BankInfoService_List_Clear@Base 4.0.0 - AB_BankInfoService_List_Del@Base 4.0.0 - AB_BankInfoService_List_First@Base 4.0.0 - AB_BankInfoService_List_GetCount@Base 4.0.0 - AB_BankInfoService_List_HasElement@Base 4.0.0 - AB_BankInfoService_List_Insert@Base 4.0.0 - AB_BankInfoService_List_Last@Base 4.0.0 - AB_BankInfoService_List_Next@Base 4.0.0 - AB_BankInfoService_List_Previous@Base 4.0.0 - AB_BankInfoService_List_SetSortFn@Base 5.0.10 - AB_BankInfoService_List_Sort@Base 5.0.10 - AB_BankInfoService_List_dup@Base 4.0.0 - AB_BankInfoService_List_free@Base 4.0.0 - AB_BankInfoService_List_new@Base 4.0.0 - AB_BankInfoService_ReadDb@Base 4.0.0 - AB_BankInfoService_SetAddress@Base 4.0.0 - AB_BankInfoService_SetAux1@Base 4.0.0 - AB_BankInfoService_SetAux2@Base 4.0.0 - AB_BankInfoService_SetAux3@Base 4.0.0 - AB_BankInfoService_SetAux4@Base 4.0.0 - AB_BankInfoService_SetHversion@Base 4.99.18 - AB_BankInfoService_SetMode@Base 4.0.0 - AB_BankInfoService_SetModified@Base 4.0.0 - AB_BankInfoService_SetPversion@Base 4.0.0 - AB_BankInfoService_SetSuffix@Base 4.0.0 - AB_BankInfoService_SetType@Base 4.0.0 - AB_BankInfoService_SetUserFlags@Base 4.99.18 - AB_BankInfoService_dup@Base 4.0.0 - AB_BankInfoService_free@Base 4.0.0 - AB_BankInfoService_fromDb@Base 4.0.0 - AB_BankInfoService_new@Base 4.0.0 - AB_BankInfoService_toDb@Base 4.0.0 - AB_BankInfo_Attach@Base 4.0.0 - AB_BankInfo_GetBankId@Base 4.0.0 - AB_BankInfo_GetBankName@Base 4.0.0 - AB_BankInfo_GetBic@Base 4.0.0 - AB_BankInfo_GetBranchId@Base 4.0.0 - AB_BankInfo_GetCity@Base 4.0.0 - AB_BankInfo_GetCountry@Base 4.0.0 - AB_BankInfo_GetEmail@Base 4.0.0 - AB_BankInfo_GetFax@Base 4.0.0 - AB_BankInfo_GetLocation@Base 4.0.0 - AB_BankInfo_GetPhone@Base 4.0.0 - AB_BankInfo_GetRegion@Base 4.0.0 - AB_BankInfo_GetServices@Base 4.0.0 - AB_BankInfo_GetStreet@Base 4.0.0 - AB_BankInfo_GetWebsite@Base 4.0.0 - AB_BankInfo_GetZipcode@Base 4.0.0 - AB_BankInfo_IsModified@Base 4.0.0 - AB_BankInfo_List2Iterator_Data@Base 4.0.0 - AB_BankInfo_List2Iterator_GetLinkCount@Base 4.0.0 - AB_BankInfo_List2Iterator_IncLinkCount@Base 4.0.0 - AB_BankInfo_List2Iterator_Next@Base 4.0.0 - AB_BankInfo_List2Iterator_Previous@Base 4.0.0 - AB_BankInfo_List2Iterator_free@Base 4.0.0 - AB_BankInfo_List2Iterator_new@Base 4.0.0 - AB_BankInfo_List2_Clear@Base 4.0.0 - AB_BankInfo_List2_Contains@Base 4.0.0 - AB_BankInfo_List2_Dump@Base 4.0.0 - AB_BankInfo_List2_Erase@Base 4.0.0 - AB_BankInfo_List2_FindIter@Base 4.0.0 - AB_BankInfo_List2_First@Base 4.0.0 - AB_BankInfo_List2_ForEach@Base 4.0.0 - AB_BankInfo_List2_GetBack@Base 4.0.0 - AB_BankInfo_List2_GetFront@Base 4.0.0 - AB_BankInfo_List2_GetSize@Base 4.0.0 - AB_BankInfo_List2_IsEmpty@Base 4.0.0 - AB_BankInfo_List2_Last@Base 4.0.0 - AB_BankInfo_List2_PopBack@Base 4.0.0 - AB_BankInfo_List2_PopFront@Base 4.0.0 - AB_BankInfo_List2_PushBack@Base 4.0.0 - AB_BankInfo_List2_PushFront@Base 4.0.0 - AB_BankInfo_List2_Remove@Base 4.0.0 - AB_BankInfo_List2_Unshare@Base 4.0.0 - AB_BankInfo_List2_dup@Base 4.0.0 - AB_BankInfo_List2_free@Base 4.0.0 - AB_BankInfo_List2_freeAll@Base 4.0.0 - AB_BankInfo_List2_new@Base 4.0.0 - AB_BankInfo_List_Add@Base 4.0.0 - AB_BankInfo_List_AddList@Base 4.0.0 - AB_BankInfo_List_Clear@Base 4.0.0 - AB_BankInfo_List_Del@Base 4.0.0 - AB_BankInfo_List_First@Base 4.0.0 - AB_BankInfo_List_GetCount@Base 4.0.0 - AB_BankInfo_List_HasElement@Base 4.0.0 - AB_BankInfo_List_Insert@Base 4.0.0 - AB_BankInfo_List_Last@Base 4.0.0 - AB_BankInfo_List_Next@Base 4.0.0 - AB_BankInfo_List_Previous@Base 4.0.0 - AB_BankInfo_List_SetSortFn@Base 5.0.10 - AB_BankInfo_List_Sort@Base 5.0.10 - AB_BankInfo_List_dup@Base 4.0.0 - AB_BankInfo_List_free@Base 4.0.0 - AB_BankInfo_List_new@Base 4.0.0 - AB_BankInfo_ReadDb@Base 4.0.0 - AB_BankInfo_SetBankId@Base 4.0.0 - AB_BankInfo_SetBankName@Base 4.0.0 - AB_BankInfo_SetBic@Base 4.0.0 - AB_BankInfo_SetBranchId@Base 4.0.0 - AB_BankInfo_SetCity@Base 4.0.0 - AB_BankInfo_SetCountry@Base 4.0.0 - AB_BankInfo_SetEmail@Base 4.0.0 - AB_BankInfo_SetFax@Base 4.0.0 - AB_BankInfo_SetLocation@Base 4.0.0 - AB_BankInfo_SetModified@Base 4.0.0 - AB_BankInfo_SetPhone@Base 4.0.0 - AB_BankInfo_SetRegion@Base 4.0.0 - AB_BankInfo_SetServices@Base 4.0.0 - AB_BankInfo_SetStreet@Base 4.0.0 - AB_BankInfo_SetWebsite@Base 4.0.0 - AB_BankInfo_SetZipcode@Base 4.0.0 - AB_BankInfo_dup@Base 4.0.0 - AB_BankInfo_free@Base 4.0.0 - AB_BankInfo_fromDb@Base 4.0.0 - AB_BankInfo_new@Base 4.0.0 - AB_BankInfo_toDb@Base 4.0.0 - AB_Banking_AddAccount@Base 4.0.0 - AB_Banking_AddUser@Base 4.0.0 - AB_Banking_BeginExclUseAccount@Base 4.0.0 - AB_Banking_BeginExclUseUser@Base 4.0.0 - AB_Banking_CheckAccount@Base 4.0.0 - AB_Banking_CheckCryptToken@Base 4.0.0 - AB_Banking_CheckIban@Base 4.0.0 - AB_Banking_ClearCryptTokenList@Base 4.0.0 - AB_Banking_CreateAccount@Base 4.0.0 - AB_Banking_CreateUser@Base 4.0.0 - AB_Banking_DeleteAccount@Base 4.0.0 - AB_Banking_DeleteUser@Base 4.0.0 - AB_Banking_EndExclUseAccount@Base 4.0.0 - AB_Banking_EndExclUseUser@Base 4.0.0 - AB_Banking_ExecuteJobs@Base 4.0.0 - AB_Banking_ExecutionProgress@Base 4.0.0 - AB_Banking_ExportToBuffer@Base 4.1.0 - AB_Banking_ExportToFile@Base 4.99.2 - AB_Banking_ExportToFileWithProfile@Base 4.99.2 - AB_Banking_ExportWithProfile@Base 4.0.0 - AB_Banking_FillGapsInImExporterContext@Base 4.0.0 - AB_Banking_FillGapsInTransaction@Base 5.2.0beta - AB_Banking_FindAccount@Base 4.0.0 - AB_Banking_FindAccounts@Base 4.0.0 - AB_Banking_FindCountryByCode@Base 4.0.0 - AB_Banking_FindCountryByLocalName@Base 4.0.0 - AB_Banking_FindCountryByName@Base 4.0.0 - AB_Banking_FindCountryByNumeric@Base 4.0.0 - AB_Banking_FindDebugger@Base 4.0.0 - AB_Banking_FindFirstAccountOfUser@Base 4.0.0 - AB_Banking_FindUser@Base 4.0.0 - AB_Banking_FindUsers@Base 4.0.0 - AB_Banking_FindWizard@Base 4.0.0 - AB_Banking_Fini@Base 4.0.0 - AB_Banking_GetAccount@Base 4.0.0 - AB_Banking_GetAccountByAlias@Base 4.0.0 - AB_Banking_GetAccountByCodeAndNumber@Base 4.0.0 - AB_Banking_GetAccountByIban@Base 4.0.0 - AB_Banking_GetAccounts@Base 4.0.0 - AB_Banking_GetActiveProviders@Base 4.0.0 - AB_Banking_GetAppName@Base 4.0.0 - AB_Banking_GetAppUserDataDir@Base 4.0.0 - AB_Banking_GetBankInfo@Base 4.0.0 - AB_Banking_GetBankInfoByTemplate@Base 4.0.0 - AB_Banking_GetCert@Base 4.99.20 - AB_Banking_GetCryptToken@Base 4.0.0 - AB_Banking_GetDebuggerDescrs@Base 4.0.0 - AB_Banking_GetEscapedAppName@Base 4.0.0 - AB_Banking_GetGlobalDataDirs@Base 4.0.0 - AB_Banking_GetGlobalSysconfDirs@Base 4.0.0 - AB_Banking_GetImExporter@Base 4.0.0 - AB_Banking_GetImExporterDescrs@Base 4.0.0 - AB_Banking_GetImExporterProfile@Base 4.99.2 - AB_Banking_GetImExporterProfiles@Base 4.0.0 - AB_Banking_GetNewUserDialog@Base 4.99.18 - AB_Banking_GetProvider@Base 4.0.0 - AB_Banking_GetProviderDescrs@Base 4.0.0 - AB_Banking_GetProviderUserDataDir@Base 4.0.0 - AB_Banking_GetSharedDataDir@Base 4.0.0 - AB_Banking_GetUniqueId@Base 4.0.0 - AB_Banking_GetUser@Base 4.0.0 - AB_Banking_GetUserData@Base 4.0.0 - AB_Banking_GetUserDataDir@Base 4.0.0 - AB_Banking_GetUsers@Base 4.0.0 - AB_Banking_GetVersion@Base 4.0.0 - AB_Banking_GetWizardDescrs@Base 4.0.0 - AB_Banking_HasConf2@Base 4.0.0 - AB_Banking_HasConf3@Base 4.0.0 - AB_Banking_HasConf4@Base 4.0.0 - AB_Banking_ImportBuffer@Base 4.99.2 - AB_Banking_ImportConf2@Base 4.0.0 - AB_Banking_ImportConf3@Base 4.0.0 - AB_Banking_ImportFileWithProfile@Base 4.2.6 - AB_Banking_ImportWithProfile@Base 4.0.0 - AB_Banking_Init@Base 4.0.0 - AB_Banking_ListCountriesByLocalName@Base 4.0.0 - AB_Banking_ListCountriesByName@Base 4.0.0 - AB_Banking_LoadAppConfig@Base 4.0.0 - AB_Banking_LoadPluginConfig@Base 4.0.0 - AB_Banking_LoadSharedConfig@Base 4.0.0 - AB_Banking_LockAppConfig@Base 4.0.0 - AB_Banking_LockPluginConfig@Base 4.0.0 - AB_Banking_LockSharedConfig@Base 4.0.0 - AB_Banking_MakeGermanIban@Base 5.2.0beta - AB_Banking_OnlineFini@Base 4.0.0 - AB_Banking_OnlineInit@Base 4.0.0 - AB_Banking_SaveAccountConfig@Base 4.2.0 - AB_Banking_SaveAppConfig@Base 4.0.0 - AB_Banking_SaveLocalImExporterProfile@Base 4.2.6 - AB_Banking_SavePluginConfig@Base 4.0.0 - AB_Banking_SaveSharedConfig@Base 4.0.0 - AB_Banking_SaveUserConfig@Base 4.2.0 - AB_Banking_SetAccountAlias@Base 4.0.0 - AB_Banking_SetUserData@Base 4.0.0 - AB_Banking_UnlockAppConfig@Base 4.0.0 - AB_Banking_UnlockPluginConfig@Base 4.0.0 - AB_Banking_UnlockSharedConfig@Base 4.0.0 - AB_Banking_free@Base 4.0.0 - AB_Banking_new@Base 4.0.0 - AB_CellPhoneProduct_Attach@Base 4.0.0 - AB_CellPhoneProduct_GetAllowFreeValue@Base 4.0.0 - AB_CellPhoneProduct_GetId@Base 4.0.0 - AB_CellPhoneProduct_GetMaximumValue@Base 4.0.0 - AB_CellPhoneProduct_GetMinimumValue@Base 4.0.0 - AB_CellPhoneProduct_GetProductName@Base 4.0.0 - AB_CellPhoneProduct_GetProviderName@Base 4.0.0 - AB_CellPhoneProduct_GetValues@Base 4.0.0 - AB_CellPhoneProduct_IsModified@Base 4.0.0 - AB_CellPhoneProduct_List2Iterator_Data@Base 4.0.0 - AB_CellPhoneProduct_List2Iterator_GetLinkCount@Base 4.0.0 - AB_CellPhoneProduct_List2Iterator_IncLinkCount@Base 4.0.0 - AB_CellPhoneProduct_List2Iterator_Next@Base 4.0.0 - AB_CellPhoneProduct_List2Iterator_Previous@Base 4.0.0 - AB_CellPhoneProduct_List2Iterator_free@Base 4.0.0 - AB_CellPhoneProduct_List2Iterator_new@Base 4.0.0 - AB_CellPhoneProduct_List2_Clear@Base 4.0.0 - AB_CellPhoneProduct_List2_Contains@Base 4.0.0 - AB_CellPhoneProduct_List2_Dump@Base 4.0.0 - AB_CellPhoneProduct_List2_Erase@Base 4.0.0 - AB_CellPhoneProduct_List2_FindIter@Base 4.0.0 - AB_CellPhoneProduct_List2_First@Base 4.0.0 - AB_CellPhoneProduct_List2_ForEach@Base 4.0.0 - AB_CellPhoneProduct_List2_GetBack@Base 4.0.0 - AB_CellPhoneProduct_List2_GetFront@Base 4.0.0 - AB_CellPhoneProduct_List2_GetSize@Base 4.0.0 - AB_CellPhoneProduct_List2_IsEmpty@Base 4.0.0 - AB_CellPhoneProduct_List2_Last@Base 4.0.0 - AB_CellPhoneProduct_List2_PopBack@Base 4.0.0 - AB_CellPhoneProduct_List2_PopFront@Base 4.0.0 - AB_CellPhoneProduct_List2_PushBack@Base 4.0.0 - AB_CellPhoneProduct_List2_PushFront@Base 4.0.0 - AB_CellPhoneProduct_List2_Remove@Base 4.0.0 - AB_CellPhoneProduct_List2_Unshare@Base 4.0.0 - AB_CellPhoneProduct_List2_dup@Base 4.0.0 - AB_CellPhoneProduct_List2_free@Base 4.0.0 - AB_CellPhoneProduct_List2_freeAll@Base 4.0.0 - AB_CellPhoneProduct_List2_new@Base 4.0.0 - AB_CellPhoneProduct_List_Add@Base 4.0.0 - AB_CellPhoneProduct_List_AddList@Base 4.0.0 - AB_CellPhoneProduct_List_Clear@Base 4.0.0 - AB_CellPhoneProduct_List_Del@Base 4.0.0 - AB_CellPhoneProduct_List_First@Base 4.0.0 - AB_CellPhoneProduct_List_GetCount@Base 4.0.0 - AB_CellPhoneProduct_List_HasElement@Base 4.0.0 - AB_CellPhoneProduct_List_Insert@Base 4.0.0 - AB_CellPhoneProduct_List_Last@Base 4.0.0 - AB_CellPhoneProduct_List_Next@Base 4.0.0 - AB_CellPhoneProduct_List_Previous@Base 4.0.0 - AB_CellPhoneProduct_List_SetSortFn@Base 5.0.10 - AB_CellPhoneProduct_List_Sort@Base 5.0.10 - AB_CellPhoneProduct_List_dup@Base 4.0.0 - AB_CellPhoneProduct_List_free@Base 4.0.0 - AB_CellPhoneProduct_List_new@Base 4.0.0 - AB_CellPhoneProduct_ReadDb@Base 4.0.0 - AB_CellPhoneProduct_SetAllowFreeValue@Base 4.0.0 - AB_CellPhoneProduct_SetId@Base 4.0.0 - AB_CellPhoneProduct_SetMaximumValue@Base 4.0.0 - AB_CellPhoneProduct_SetMinimumValue@Base 4.0.0 - AB_CellPhoneProduct_SetModified@Base 4.0.0 - AB_CellPhoneProduct_SetProductName@Base 4.0.0 - AB_CellPhoneProduct_SetProviderName@Base 4.0.0 - AB_CellPhoneProduct_SetValues@Base 4.0.0 - AB_CellPhoneProduct_dup@Base 4.0.0 - AB_CellPhoneProduct_free@Base 4.0.0 - AB_CellPhoneProduct_fromDb@Base 4.0.0 - AB_CellPhoneProduct_new@Base 4.0.0 - AB_CellPhoneProduct_toDb@Base 4.0.0 - AB_Country_ConstList2Iterator_Data@Base 4.0.0 - AB_Country_ConstList2Iterator_Next@Base 4.0.0 - AB_Country_ConstList2Iterator_Previous@Base 4.0.0 - AB_Country_ConstList2Iterator_free@Base 4.0.0 - AB_Country_ConstList2Iterator_new@Base 4.0.0 - AB_Country_ConstList2_Clear@Base 4.0.0 - AB_Country_ConstList2_Contains@Base 4.0.0 - AB_Country_ConstList2_FindIter@Base 4.0.0 - AB_Country_ConstList2_First@Base 4.0.0 - AB_Country_ConstList2_ForEach@Base 4.0.0 - AB_Country_ConstList2_GetBack@Base 4.0.0 - AB_Country_ConstList2_GetFront@Base 4.0.0 - AB_Country_ConstList2_GetSize@Base 4.0.0 - AB_Country_ConstList2_IsEmpty@Base 4.0.0 - AB_Country_ConstList2_Last@Base 4.0.0 - AB_Country_ConstList2_PopBack@Base 4.0.0 - AB_Country_ConstList2_PopFront@Base 4.0.0 - AB_Country_ConstList2_PushBack@Base 4.0.0 - AB_Country_ConstList2_PushFront@Base 4.0.0 - AB_Country_ConstList2_Remove@Base 4.0.0 - AB_Country_ConstList2_free@Base 4.0.0 - AB_Country_ConstList2_new@Base 4.0.0 - AB_Country_GetCode@Base 4.0.0 - AB_Country_GetCurrencyCode@Base 4.0.0 - AB_Country_GetCurrencyName@Base 4.0.0 - AB_Country_GetLocalCurrencyName@Base 4.0.0 - AB_Country_GetLocalName@Base 4.0.0 - AB_Country_GetName@Base 4.0.0 - AB_Country_GetNumericCode@Base 4.0.0 - AB_EditAccountDialog_new@Base 4.99.2 - AB_EditUserDialog_new@Base 4.99.2 - AB_EuTransferInfo_Attach@Base 4.0.0 - AB_EuTransferInfo_GetCountryCode@Base 4.0.0 - AB_EuTransferInfo_GetFieldLimits@Base 4.0.0 - AB_EuTransferInfo_GetLimitForeignValue@Base 4.0.0 - AB_EuTransferInfo_GetLimitLocalValue@Base 4.0.0 - AB_EuTransferInfo_IsModified@Base 4.0.0 - AB_EuTransferInfo_List2Iterator_Data@Base 4.0.0 - AB_EuTransferInfo_List2Iterator_GetLinkCount@Base 4.0.0 - AB_EuTransferInfo_List2Iterator_IncLinkCount@Base 4.0.0 - AB_EuTransferInfo_List2Iterator_Next@Base 4.0.0 - AB_EuTransferInfo_List2Iterator_Previous@Base 4.0.0 - AB_EuTransferInfo_List2Iterator_free@Base 4.0.0 - AB_EuTransferInfo_List2Iterator_new@Base 4.0.0 - AB_EuTransferInfo_List2_Clear@Base 4.0.0 - AB_EuTransferInfo_List2_Contains@Base 4.0.0 - AB_EuTransferInfo_List2_Dump@Base 4.0.0 - AB_EuTransferInfo_List2_Erase@Base 4.0.0 - AB_EuTransferInfo_List2_FindIter@Base 4.0.0 - AB_EuTransferInfo_List2_First@Base 4.0.0 - AB_EuTransferInfo_List2_ForEach@Base 4.0.0 - AB_EuTransferInfo_List2_GetBack@Base 4.0.0 - AB_EuTransferInfo_List2_GetFront@Base 4.0.0 - AB_EuTransferInfo_List2_GetSize@Base 4.0.0 - AB_EuTransferInfo_List2_IsEmpty@Base 4.0.0 - AB_EuTransferInfo_List2_Last@Base 4.0.0 - AB_EuTransferInfo_List2_PopBack@Base 4.0.0 - AB_EuTransferInfo_List2_PopFront@Base 4.0.0 - AB_EuTransferInfo_List2_PushBack@Base 4.0.0 - AB_EuTransferInfo_List2_PushFront@Base 4.0.0 - AB_EuTransferInfo_List2_Remove@Base 4.0.0 - AB_EuTransferInfo_List2_Unshare@Base 4.0.0 - AB_EuTransferInfo_List2_dup@Base 4.0.0 - AB_EuTransferInfo_List2_free@Base 4.0.0 - AB_EuTransferInfo_List2_freeAll@Base 4.0.0 - AB_EuTransferInfo_List2_new@Base 4.0.0 - AB_EuTransferInfo_List_Add@Base 4.0.0 - AB_EuTransferInfo_List_AddList@Base 4.0.0 - AB_EuTransferInfo_List_Clear@Base 4.0.0 - AB_EuTransferInfo_List_Del@Base 4.0.0 - AB_EuTransferInfo_List_First@Base 4.0.0 - AB_EuTransferInfo_List_GetCount@Base 4.0.0 - AB_EuTransferInfo_List_HasElement@Base 4.0.0 - AB_EuTransferInfo_List_Insert@Base 4.0.0 - AB_EuTransferInfo_List_Last@Base 4.0.0 - AB_EuTransferInfo_List_Next@Base 4.0.0 - AB_EuTransferInfo_List_Previous@Base 4.0.0 - AB_EuTransferInfo_List_SetSortFn@Base 5.0.10 - AB_EuTransferInfo_List_Sort@Base 5.0.10 - AB_EuTransferInfo_List_dup@Base 4.0.0 - AB_EuTransferInfo_List_free@Base 4.0.0 - AB_EuTransferInfo_List_new@Base 4.0.0 - AB_EuTransferInfo_ReadDb@Base 4.0.0 - AB_EuTransferInfo_SetCountryCode@Base 4.0.0 - AB_EuTransferInfo_SetFieldLimits@Base 4.0.0 - AB_EuTransferInfo_SetLimitForeignValue@Base 4.0.0 - AB_EuTransferInfo_SetLimitLocalValue@Base 4.0.0 - AB_EuTransferInfo_SetModified@Base 4.0.0 - AB_EuTransferInfo_dup@Base 4.0.0 - AB_EuTransferInfo_free@Base 4.0.0 - AB_EuTransferInfo_fromDb@Base 4.0.0 - AB_EuTransferInfo_new@Base 4.0.0 - AB_EuTransferInfo_toDb@Base 4.0.0 - AB_Gui_Extend@Base 4.1.0 - AB_Gui_Unextend@Base 4.1.0 - AB_Gui_new@Base 4.1.0 - AB_HttpSession_ClearLog@Base 4.0.0 - AB_HttpSession_GetLog@Base 4.0.0 - AB_HttpSession_GetProvider@Base 4.0.0 - AB_HttpSession_GetUser@Base 4.0.0 - AB_HttpSession_new@Base 4.0.0 - AB_IMEXPORTER__INHERIT_GETLIST@Base 4.0.0 - AB_IMEXPORTER__INHERIT_ISOFTYPE@Base 4.0.0 - AB_IMEXPORTER__INHERIT_SETDATA@Base 4.0.0 - AB_IMEXPORTER__INHERIT_UNLINK@Base 4.0.0 - AB_ImExporterAccountInfo_AddAccountStatus@Base 4.0.0 - AB_ImExporterAccountInfo_AddDatedTransfer@Base 4.0.0 - AB_ImExporterAccountInfo_AddNotedTransaction@Base 4.0.0 - AB_ImExporterAccountInfo_AddStandingOrder@Base 4.0.0 - AB_ImExporterAccountInfo_AddTransaction@Base 4.0.0 - AB_ImExporterAccountInfo_AddTransfer@Base 4.0.0 - AB_ImExporterAccountInfo_ClearTransactions@Base 4.2.7 - AB_ImExporterAccountInfo_FillFromAccount@Base 4.0.0 - AB_ImExporterAccountInfo_GetAccountId@Base 4.0.0 - AB_ImExporterAccountInfo_GetAccountName@Base 4.0.0 - AB_ImExporterAccountInfo_GetAccountNumber@Base 4.0.0 - AB_ImExporterAccountInfo_GetBankCode@Base 4.0.0 - AB_ImExporterAccountInfo_GetBankName@Base 4.0.0 - AB_ImExporterAccountInfo_GetBic@Base 4.0.0 - AB_ImExporterAccountInfo_GetCurrency@Base 4.0.0 - AB_ImExporterAccountInfo_GetDatedTransferCount@Base 4.0.0 - AB_ImExporterAccountInfo_GetDescription@Base 4.0.0 - AB_ImExporterAccountInfo_GetFirstAccountStatus@Base 4.0.0 - AB_ImExporterAccountInfo_GetFirstDatedTransfer@Base 4.0.0 - AB_ImExporterAccountInfo_GetFirstNotedTransaction@Base 4.0.0 - AB_ImExporterAccountInfo_GetFirstStandingOrder@Base 4.0.0 - AB_ImExporterAccountInfo_GetFirstTransaction@Base 4.0.0 - AB_ImExporterAccountInfo_GetFirstTransfer@Base 4.0.0 - AB_ImExporterAccountInfo_GetIban@Base 4.0.0 - AB_ImExporterAccountInfo_GetNextAccountStatus@Base 4.0.0 - AB_ImExporterAccountInfo_GetNextDatedTransfer@Base 4.0.0 - AB_ImExporterAccountInfo_GetNextNotedTransaction@Base 4.0.0 - AB_ImExporterAccountInfo_GetNextStandingOrder@Base 4.0.0 - AB_ImExporterAccountInfo_GetNextTransaction@Base 4.0.0 - AB_ImExporterAccountInfo_GetNextTransfer@Base 4.0.0 - AB_ImExporterAccountInfo_GetNotedTransactionCount@Base 4.0.0 - AB_ImExporterAccountInfo_GetOwner@Base 4.0.0 - AB_ImExporterAccountInfo_GetStandingOrderCount@Base 4.0.0 - AB_ImExporterAccountInfo_GetTransactionCount@Base 4.0.0 - AB_ImExporterAccountInfo_GetTransferCount@Base 4.0.0 - AB_ImExporterAccountInfo_GetType@Base 4.0.0 - AB_ImExporterAccountInfo_List_Add@Base 4.0.0 - AB_ImExporterAccountInfo_List_AddList@Base 4.0.0 - AB_ImExporterAccountInfo_List_Clear@Base 4.0.0 - AB_ImExporterAccountInfo_List_Del@Base 4.0.0 - AB_ImExporterAccountInfo_List_First@Base 4.0.0 - AB_ImExporterAccountInfo_List_GetCount@Base 4.0.0 - AB_ImExporterAccountInfo_List_HasElement@Base 4.0.0 - AB_ImExporterAccountInfo_List_Insert@Base 4.0.0 - AB_ImExporterAccountInfo_List_Last@Base 4.0.0 - AB_ImExporterAccountInfo_List_Next@Base 4.0.0 - AB_ImExporterAccountInfo_List_Previous@Base 4.0.0 - AB_ImExporterAccountInfo_List_SetSortFn@Base 5.0.10 - AB_ImExporterAccountInfo_List_Sort@Base 5.0.10 - AB_ImExporterAccountInfo_List_free@Base 4.0.0 - AB_ImExporterAccountInfo_List_new@Base 4.0.0 - AB_ImExporterAccountInfo_SetAccountId@Base 4.0.0 - AB_ImExporterAccountInfo_SetAccountName@Base 4.0.0 - AB_ImExporterAccountInfo_SetAccountNumber@Base 4.0.0 - AB_ImExporterAccountInfo_SetBankCode@Base 4.0.0 - AB_ImExporterAccountInfo_SetBankName@Base 4.0.0 - AB_ImExporterAccountInfo_SetBic@Base 4.0.0 - AB_ImExporterAccountInfo_SetCurrency@Base 4.0.0 - AB_ImExporterAccountInfo_SetDescription@Base 4.0.0 - AB_ImExporterAccountInfo_SetIban@Base 4.0.0 - AB_ImExporterAccountInfo_SetOwner@Base 4.0.0 - AB_ImExporterAccountInfo_SetType@Base 4.0.0 - AB_ImExporterAccountInfo_TransactionsForEach@Base 4.0.0 - AB_ImExporterAccountInfo_dup@Base 4.0.0 - AB_ImExporterAccountInfo_free@Base 4.0.0 - AB_ImExporterAccountInfo_new@Base 4.0.0 - AB_ImExporterContext_AccountInfoForEach@Base 4.0.0 - AB_ImExporterContext_AddAccountInfo@Base 4.0.0 - AB_ImExporterContext_AddContext@Base 4.0.0 - AB_ImExporterContext_AddDatedTransfer@Base 4.0.0 - AB_ImExporterContext_AddLog@Base 4.0.0 - AB_ImExporterContext_AddMessage@Base 4.0.0 - AB_ImExporterContext_AddSecurity@Base 4.0.0 - AB_ImExporterContext_AddStandingOrder@Base 4.0.0 - AB_ImExporterContext_AddTransaction@Base 4.0.0 - AB_ImExporterContext_AddTransfer@Base 4.0.0 - AB_ImExporterContext_Clear@Base 4.2.6 - AB_ImExporterContext_ClearLog@Base 4.0.0 - AB_ImExporterContext_FindAccountInfo@Base 4.0.0 - AB_ImExporterContext_FindAccountInfoByIban@Base 5.1.0beta - AB_ImExporterContext_FindSecurity@Base 4.0.0 - AB_ImExporterContext_GetAccountInfo@Base 4.0.0 - AB_ImExporterContext_GetAccountInfoByIban@Base 5.1.0beta - AB_ImExporterContext_GetAccountInfoCount@Base 4.0.0 - AB_ImExporterContext_GetFirstAccountInfo@Base 4.0.0 - AB_ImExporterContext_GetFirstMessage@Base 4.0.0 - AB_ImExporterContext_GetFirstSecurity@Base 4.0.0 - AB_ImExporterContext_GetLog@Base 4.0.0 - AB_ImExporterContext_GetNextAccountInfo@Base 4.0.0 - AB_ImExporterContext_GetNextMessage@Base 4.0.0 - AB_ImExporterContext_GetNextSecurity@Base 4.0.0 - AB_ImExporterContext_ReadDb@Base 4.0.0 - AB_ImExporterContext_WriteContext@Base 5.3.1beta - AB_ImExporterContext_free@Base 4.0.0 - AB_ImExporterContext_fromDb@Base 4.0.0 - AB_ImExporterContext_new@Base 4.0.0 - AB_ImExporterContext_toDb@Base 4.0.0 - AB_ImExporter_AddFlags@Base 4.2.6 - AB_ImExporter_CheckFile@Base 4.0.0 - AB_ImExporter_DateFromString@Base 4.0.0 - AB_ImExporter_DbFromIso8859_1ToUtf8@Base 4.0.0 - AB_ImExporter_DtaToUtf8@Base 4.0.0 - AB_ImExporter_Export@Base 4.0.0 - AB_ImExporter_ExportToBuffer@Base 4.1.0 - AB_ImExporter_ExportToFile@Base 4.99.2 - AB_ImExporter_GetBanking@Base 4.0.0 - AB_ImExporter_GetEditProfileDialog@Base 4.2.6 - AB_ImExporter_GetFlags@Base 4.2.6 - AB_ImExporter_GetName@Base 4.0.0 - AB_ImExporter_Import@Base 4.0.0 - AB_ImExporter_ImportBuffer@Base 4.0.0 - AB_ImExporter_ImportFile@Base 4.0.0 - AB_ImExporter_Iso8859_1ToUtf8@Base 4.0.0 - AB_ImExporter_List_Add@Base 4.0.0 - AB_ImExporter_List_AddList@Base 4.0.0 - AB_ImExporter_List_Clear@Base 4.0.0 - AB_ImExporter_List_Del@Base 4.0.0 - AB_ImExporter_List_First@Base 4.0.0 - AB_ImExporter_List_GetCount@Base 4.0.0 - AB_ImExporter_List_HasElement@Base 4.0.0 - AB_ImExporter_List_Insert@Base 4.0.0 - AB_ImExporter_List_Last@Base 4.0.0 - AB_ImExporter_List_Next@Base 4.0.0 - AB_ImExporter_List_Previous@Base 4.0.0 - AB_ImExporter_List_SetSortFn@Base 5.0.10 - AB_ImExporter_List_Sort@Base 5.0.10 - AB_ImExporter_List_free@Base 4.0.0 - AB_ImExporter_List_new@Base 4.0.0 - AB_ImExporter_SetCheckFileFn@Base 4.0.0 - AB_ImExporter_SetExportFn@Base 4.0.0 - AB_ImExporter_SetFlags@Base 4.2.6 - AB_ImExporter_SetGetEditProfileDialogFn@Base 4.2.6 - AB_ImExporter_SetImportFn@Base 4.0.0 - AB_ImExporter_SubFlags@Base 4.2.6 - AB_ImExporter_Utf8ToDta@Base 4.0.0 - AB_ImExporter_free@Base 4.0.0 - AB_ImExporter_new@Base 4.0.0 - AB_ImporterDialog_new@Base 4.2.6 - AB_JOBQUEUE__INHERIT_GETLIST@Base 4.99.18 - AB_JOBQUEUE__INHERIT_ISOFTYPE@Base 4.99.18 - AB_JOBQUEUE__INHERIT_SETDATA@Base 4.99.18 - AB_JOBQUEUE__INHERIT_UNLINK@Base 4.99.18 - AB_JobCreateDatedTransfer_GetFieldLimits@Base 4.0.0 - AB_JobCreateDatedTransfer_GetTransaction@Base 4.0.0 - AB_JobCreateDatedTransfer_SetFieldLimits@Base 4.0.0 - AB_JobCreateDatedTransfer_SetTransaction@Base 4.0.0 - AB_JobCreateDatedTransfer_new@Base 4.0.0 - AB_JobCreateStandingOrder_GetFieldLimits@Base 4.0.0 - AB_JobCreateStandingOrder_GetTransaction@Base 4.0.0 - AB_JobCreateStandingOrder_SetFieldLimits@Base 4.0.0 - AB_JobCreateStandingOrder_SetTransaction@Base 4.0.0 - AB_JobCreateStandingOrder_new@Base 4.0.0 - AB_JobDeleteDatedTransfer_GetFieldLimits@Base 4.0.0 - AB_JobDeleteDatedTransfer_GetTransaction@Base 4.0.0 - AB_JobDeleteDatedTransfer_SetFieldLimits@Base 4.0.0 - AB_JobDeleteDatedTransfer_SetTransaction@Base 4.0.0 - AB_JobDeleteDatedTransfer_new@Base 4.0.0 - AB_JobDeleteStandingOrder_GetFieldLimits@Base 4.0.0 - AB_JobDeleteStandingOrder_GetTransaction@Base 4.0.0 - AB_JobDeleteStandingOrder_SetFieldLimits@Base 4.0.0 - AB_JobDeleteStandingOrder_SetTransaction@Base 4.0.0 - AB_JobDeleteStandingOrder_new@Base 4.0.0 - AB_JobEuTransfer_FindCountryInfo@Base 4.0.0 - AB_JobEuTransfer_GetChargeWhom@Base 4.0.0 - AB_JobEuTransfer_GetCountryInfoList@Base 4.0.0 - AB_JobEuTransfer_GetIbanAllowed@Base 4.0.0 - AB_JobEuTransfer_GetTransaction@Base 4.0.0 - AB_JobEuTransfer_SetChargeWhom@Base 4.0.0 - AB_JobEuTransfer_SetCountryInfoList@Base 4.0.0 - AB_JobEuTransfer_SetIbanAllowed@Base 4.0.0 - AB_JobEuTransfer_SetTransaction@Base 4.0.0 - AB_JobEuTransfer_new@Base 4.0.0 - AB_JobGetBalance_GetAccountStatus@Base 4.0.0 - AB_JobGetBalance_new@Base 4.0.0 - AB_JobGetDatedTransfers_GetDatedTransfers@Base 4.0.0 - AB_JobGetDatedTransfers_new@Base 4.0.0 - AB_JobGetStandingOrders_GetStandingOrders@Base 4.0.0 - AB_JobGetStandingOrders_new@Base 4.0.0 - AB_JobGetTransactions_GetAccountStatusList@Base 4.0.0 - AB_JobGetTransactions_GetFromTime@Base 4.0.0 - AB_JobGetTransactions_GetMaxStoreDays@Base 4.0.0 - AB_JobGetTransactions_GetToTime@Base 4.0.0 - AB_JobGetTransactions_GetTransactions@Base 4.0.0 - AB_JobGetTransactions_SetFromTime@Base 4.0.0 - AB_JobGetTransactions_SetMaxStoreDays@Base 4.0.0 - AB_JobGetTransactions_SetToTime@Base 4.0.0 - AB_JobGetTransactions_new@Base 4.0.0 - AB_JobInternalTransfer_GetFieldLimits@Base 4.0.0 - AB_JobInternalTransfer_GetTransaction@Base 4.0.0 - AB_JobInternalTransfer_SetFieldLimits@Base 4.0.0 - AB_JobInternalTransfer_SetTransaction@Base 4.0.0 - AB_JobInternalTransfer_new@Base 4.0.0 - AB_JobLoadCellPhone_GetCellPhoneProduct@Base 4.0.0 - AB_JobLoadCellPhone_GetCellPhoneProductList@Base 4.0.0 - AB_JobLoadCellPhone_GetPhoneNumber@Base 4.0.0 - AB_JobLoadCellPhone_GetValue@Base 4.0.0 - AB_JobLoadCellPhone_SetCellPhoneProduct@Base 4.0.0 - AB_JobLoadCellPhone_SetPhoneNumber@Base 4.0.0 - AB_JobLoadCellPhone_SetProductList@Base 4.0.0 - AB_JobLoadCellPhone_SetValue@Base 4.0.0 - AB_JobLoadCellPhone_new@Base 4.0.0 - AB_JobModifyDatedTransfer_GetFieldLimits@Base 4.0.0 - AB_JobModifyDatedTransfer_GetTransaction@Base 4.0.0 - AB_JobModifyDatedTransfer_SetFieldLimits@Base 4.0.0 - AB_JobModifyDatedTransfer_SetTransaction@Base 4.0.0 - AB_JobModifyDatedTransfer_new@Base 4.0.0 - AB_JobModifyStandingOrder_GetFieldLimits@Base 4.0.0 - AB_JobModifyStandingOrder_GetTransaction@Base 4.0.0 - AB_JobModifyStandingOrder_SetFieldLimits@Base 4.0.0 - AB_JobModifyStandingOrder_SetTransaction@Base 4.0.0 - AB_JobModifyStandingOrder_new@Base 4.0.0 - AB_JobQueue_Attach@Base 4.99.18 - AB_JobQueue_GetJobList@Base 4.99.18 - AB_JobQueue_GetJobType@Base 4.99.18 - AB_JobQueue_List_Add@Base 4.99.18 - AB_JobQueue_List_AddList@Base 4.99.18 - AB_JobQueue_List_Clear@Base 4.99.18 - AB_JobQueue_List_Del@Base 4.99.18 - AB_JobQueue_List_First@Base 4.99.18 - AB_JobQueue_List_GetCount@Base 4.99.18 - AB_JobQueue_List_HasElement@Base 4.99.18 - AB_JobQueue_List_Insert@Base 4.99.18 - AB_JobQueue_List_Last@Base 4.99.18 - AB_JobQueue_List_Next@Base 4.99.18 - AB_JobQueue_List_Previous@Base 4.99.18 - AB_JobQueue_List_SetSortFn@Base 5.0.10 - AB_JobQueue_List_Sort@Base 5.0.10 - AB_JobQueue_List_dup@Base 4.99.18 - AB_JobQueue_List_free@Base 4.99.18 - AB_JobQueue_List_new@Base 4.99.18 - AB_JobQueue_SetJobList@Base 4.99.18 - AB_JobQueue_SetJobType@Base 4.99.18 - AB_JobQueue_dup@Base 4.99.18 - AB_JobQueue_free@Base 4.99.18 - AB_JobQueue_new@Base 4.99.18 - AB_JobSepaCreateStandingOrder_new@Base 5.3.2beta - AB_JobSepaDebitNote_GetFieldLimits@Base 4.0.0 - AB_JobSepaDebitNote_GetTransaction@Base 4.0.0 - AB_JobSepaDebitNote_SetFieldLimits@Base 4.0.0 - AB_JobSepaDebitNote_SetTransaction@Base 4.0.0 - AB_JobSepaDebitNote_new@Base 4.0.0 - AB_JobSepaTransfer_GetFieldLimits@Base 4.0.0 - AB_JobSepaTransfer_GetTransaction@Base 4.0.0 - AB_JobSepaTransfer_SetFieldLimits@Base 4.0.0 - AB_JobSepaTransfer_SetTransaction@Base 4.0.0 - AB_JobSepaTransfer_new@Base 4.0.0 - AB_JobSingleDebitNote_GetFieldLimits@Base 4.0.0 - AB_JobSingleDebitNote_GetTransaction@Base 4.0.0 - AB_JobSingleDebitNote_SetFieldLimits@Base 4.0.0 - AB_JobSingleDebitNote_SetTransaction@Base 4.0.0 - AB_JobSingleDebitNote_new@Base 4.0.0 - AB_JobSingleTransfer_GetFieldLimits@Base 4.0.0 - AB_JobSingleTransfer_GetTransaction@Base 4.0.0 - AB_JobSingleTransfer_SetFieldLimits@Base 4.0.0 - AB_JobSingleTransfer_SetTransaction@Base 4.0.0 - AB_JobSingleTransfer_new@Base 4.0.0 - AB_Job_Attach@Base 4.0.0 - AB_Job_Char2Status@Base 4.0.0 - AB_Job_Char2Type@Base 4.0.0 - AB_Job_CheckAvailability@Base 4.0.0 - AB_Job_DateFromDb@Base 4.0.0 - AB_Job_DateOnlyFromDb@Base 4.0.0 - AB_Job_DateOnlyToDb@Base 4.0.0 - AB_Job_DateToDb@Base 4.0.0 - AB_Job_GetAccount@Base 4.0.0 - AB_Job_GetAppData@Base 4.0.0 - AB_Job_GetCreatedBy@Base 4.0.0 - AB_Job_GetFieldLimits@Base 5.3.1beta - AB_Job_GetIdForProvider@Base 4.0.0 - AB_Job_GetJobId@Base 4.0.0 - AB_Job_GetLastStatusChange@Base 4.0.0 - AB_Job_GetLogs@Base 4.0.0 - AB_Job_GetProviderData@Base 4.0.0 - AB_Job_GetResultText@Base 4.0.0 - AB_Job_GetStatus@Base 4.0.0 - AB_Job_GetTransaction@Base 5.3.1beta - AB_Job_GetType@Base 4.0.0 - AB_Job_GetUsedTan@Base 4.0.0 - AB_Job_List2Iterator_Data@Base 4.0.0 - AB_Job_List2Iterator_GetLinkCount@Base 4.0.0 - AB_Job_List2Iterator_IncLinkCount@Base 4.0.0 - AB_Job_List2Iterator_Next@Base 4.0.0 - AB_Job_List2Iterator_Previous@Base 4.0.0 - AB_Job_List2Iterator_free@Base 4.0.0 - AB_Job_List2Iterator_new@Base 4.0.0 - AB_Job_List2_Clear@Base 4.0.0 - AB_Job_List2_ClearAll@Base 4.0.0 - AB_Job_List2_Contains@Base 4.0.0 - AB_Job_List2_Dump@Base 4.0.0 - AB_Job_List2_Erase@Base 4.0.0 - AB_Job_List2_FindIter@Base 4.0.0 - AB_Job_List2_First@Base 4.0.0 - AB_Job_List2_ForEach@Base 4.0.0 - AB_Job_List2_FreeAll@Base 4.0.0 - AB_Job_List2_GetBack@Base 4.0.0 - AB_Job_List2_GetFront@Base 4.0.0 - AB_Job_List2_GetSize@Base 4.0.0 - AB_Job_List2_IsEmpty@Base 4.0.0 - AB_Job_List2_Last@Base 4.0.0 - AB_Job_List2_PopBack@Base 4.0.0 - AB_Job_List2_PopFront@Base 4.0.0 - AB_Job_List2_PushBack@Base 4.0.0 - AB_Job_List2_PushFront@Base 4.0.0 - AB_Job_List2_Remove@Base 4.0.0 - AB_Job_List2_Unshare@Base 4.0.0 - AB_Job_List2_dup@Base 4.0.0 - AB_Job_List2_free@Base 4.0.0 - AB_Job_List2_new@Base 4.0.0 - AB_Job_Log@Base 4.0.0 - AB_Job_LogRaw@Base 4.0.0 - AB_Job_SetFieldLimits@Base 5.3.1beta - AB_Job_SetIdForProvider@Base 4.0.0 - AB_Job_SetResultText@Base 4.0.0 - AB_Job_SetStatus@Base 4.0.0 - AB_Job_SetTransaction@Base 5.3.1beta - AB_Job_SetUsedTan@Base 4.0.0 - AB_Job_Status2Char@Base 4.0.0 - AB_Job_Type2Char@Base 4.0.0 - AB_Job_Type2LocalChar@Base 4.0.0 - AB_Job_free@Base 4.0.0 - AB_Message_Attach@Base 4.0.0 - AB_Message_GetAccountId@Base 5.0.6 - AB_Message_GetDateReceived@Base 4.0.0 - AB_Message_GetSubject@Base 4.0.0 - AB_Message_GetText@Base 4.0.0 - AB_Message_GetUserId@Base 5.0.6 - AB_Message_IsModified@Base 4.0.0 - AB_Message_List2Iterator_Data@Base 4.0.0 - AB_Message_List2Iterator_GetLinkCount@Base 4.0.0 - AB_Message_List2Iterator_IncLinkCount@Base 4.0.0 - AB_Message_List2Iterator_Next@Base 4.0.0 - AB_Message_List2Iterator_Previous@Base 4.0.0 - AB_Message_List2Iterator_free@Base 4.0.0 - AB_Message_List2Iterator_new@Base 4.0.0 - AB_Message_List2_Clear@Base 4.0.0 - AB_Message_List2_Contains@Base 4.0.0 - AB_Message_List2_Dump@Base 4.0.0 - AB_Message_List2_Erase@Base 4.0.0 - AB_Message_List2_FindIter@Base 4.0.0 - AB_Message_List2_First@Base 4.0.0 - AB_Message_List2_ForEach@Base 4.0.0 - AB_Message_List2_GetBack@Base 4.0.0 - AB_Message_List2_GetFront@Base 4.0.0 - AB_Message_List2_GetSize@Base 4.0.0 - AB_Message_List2_IsEmpty@Base 4.0.0 - AB_Message_List2_Last@Base 4.0.0 - AB_Message_List2_PopBack@Base 4.0.0 - AB_Message_List2_PopFront@Base 4.0.0 - AB_Message_List2_PushBack@Base 4.0.0 - AB_Message_List2_PushFront@Base 4.0.0 - AB_Message_List2_Remove@Base 4.0.0 - AB_Message_List2_Unshare@Base 4.0.0 - AB_Message_List2_dup@Base 4.0.0 - AB_Message_List2_free@Base 4.0.0 - AB_Message_List2_freeAll@Base 4.0.0 - AB_Message_List2_new@Base 4.0.0 - AB_Message_List_Add@Base 4.0.0 - AB_Message_List_AddList@Base 4.0.0 - AB_Message_List_Clear@Base 4.0.0 - AB_Message_List_Del@Base 4.0.0 - AB_Message_List_First@Base 4.0.0 - AB_Message_List_GetCount@Base 4.0.0 - AB_Message_List_HasElement@Base 4.0.0 - AB_Message_List_Insert@Base 4.0.0 - AB_Message_List_Last@Base 4.0.0 - AB_Message_List_Next@Base 4.0.0 - AB_Message_List_Previous@Base 4.0.0 - AB_Message_List_SetSortFn@Base 5.0.10 - AB_Message_List_Sort@Base 5.0.10 - AB_Message_List_dup@Base 4.0.0 - AB_Message_List_free@Base 4.0.0 - AB_Message_List_new@Base 4.0.0 - AB_Message_ReadDb@Base 4.0.0 - AB_Message_SetAccountId@Base 5.0.6 - AB_Message_SetDateReceived@Base 4.0.0 - AB_Message_SetModified@Base 4.0.0 - AB_Message_SetSubject@Base 4.0.0 - AB_Message_SetText@Base 4.0.0 - AB_Message_SetUserId@Base 5.0.6 - AB_Message_dup@Base 4.0.0 - AB_Message_free@Base 4.0.0 - AB_Message_fromDb@Base 4.0.0 - AB_Message_new@Base 4.0.0 - AB_Message_toDb@Base 4.0.0 - AB_MsgEngine_new@Base 4.0.0 - AB_NewAccountDialog_GetAccount@Base 4.99.2 - AB_NewAccountDialog_SetAccount@Base 4.99.2 - AB_NewAccountDialog_new@Base 4.99.2 - AB_NewUserDialog_GetBanking@Base 4.99.2 - AB_NewUserDialog_GetUser@Base 4.99.2 - AB_NewUserDialog_SetUser@Base 4.99.2 - AB_NewUserDialog_new@Base 4.99.2 - AB_PROVIDER__INHERIT_GETLIST@Base 4.0.0 - AB_PROVIDER__INHERIT_ISOFTYPE@Base 4.0.0 - AB_PROVIDER__INHERIT_SETDATA@Base 4.0.0 - AB_PROVIDER__INHERIT_UNLINK@Base 4.0.0 - AB_Pin_GetHash@Base 4.0.0 - AB_Pin_GetStatus@Base 4.0.0 - AB_Pin_GetToken@Base 4.0.0 - AB_Pin_GetValue@Base 4.0.0 - AB_Pin_SetHash@Base 4.0.0 - AB_Pin_SetStatus@Base 4.0.0 - AB_Pin_SetToken@Base 4.0.0 - AB_Pin_SetValue@Base 4.0.0 - AB_Plugin_BankInfo_Factory@Base 4.0.0 - AB_Plugin_BankInfo_SetFactoryFn@Base 4.0.0 - AB_Plugin_BankInfo_new@Base 4.0.0 - AB_Plugin_ImExporter_Factory@Base 4.0.0 - AB_Plugin_ImExporter_SetFactoryFn@Base 4.0.0 - AB_Plugin_ImExporter_new@Base 4.0.0 - AB_Plugin_Provider_Factory@Base 4.0.0 - AB_Plugin_Provider_SetFactoryFn@Base 4.0.0 - AB_Plugin_Provider_new@Base 4.0.0 - AB_ProviderGetUserTypeDialog@Base 4.99.18 - AB_Provider_AddFlags@Base 4.99.2 - AB_Provider_AddJob@Base 4.0.0 - AB_Provider_Execute@Base 4.0.0 - AB_Provider_ExtendAccount@Base 4.0.0 - AB_Provider_ExtendUser@Base 4.0.0 - AB_Provider_Fini@Base 4.0.0 - AB_Provider_GetBanking@Base 4.0.0 - AB_Provider_GetEditAccountDialog@Base 4.99.2 - AB_Provider_GetEditUserDialog@Base 4.99.2 - AB_Provider_GetEscapedName@Base 4.0.0 - AB_Provider_GetFlags@Base 4.0.0 - AB_Provider_GetName@Base 4.0.0 - AB_Provider_GetNewAccountDialog@Base 4.99.2 - AB_Provider_GetNewUserDialog@Base 4.99.2 - AB_Provider_GetUserDataDir@Base 4.0.0 - AB_Provider_Init@Base 4.0.0 - AB_Provider_IsInit@Base 4.0.0 - AB_Provider_ResetQueue@Base 4.0.0 - AB_Provider_SetAddJobFn@Base 4.0.0 - AB_Provider_SetExecuteFn@Base 4.0.0 - AB_Provider_SetExtendAccountFn@Base 4.0.0 - AB_Provider_SetExtendUserFn@Base 4.0.0 - AB_Provider_SetFiniFn@Base 4.0.0 - AB_Provider_SetGetEditAccountDialogFn@Base 4.99.2 - AB_Provider_SetGetEditUserDialogFn@Base 4.99.2 - AB_Provider_SetGetNewAccountDialogFn@Base 4.99.2 - AB_Provider_SetGetNewUserDialogFn@Base 4.99.2 - AB_Provider_SetGetUserTypeDialogFn@Base 4.99.18 - AB_Provider_SetInitFn@Base 4.0.0 - AB_Provider_SetResetQueueFn@Base 4.0.0 - AB_Provider_SetUpdateFn@Base 4.0.0 - AB_Provider_SetUpdateJobFn@Base 4.0.0 - AB_Provider_Update@Base 4.0.0 - AB_Provider_UpdateJob@Base 4.0.0 - AB_Provider_new@Base 4.0.0 - AB_QUEUE__INHERIT_GETLIST@Base 4.99.18 - AB_QUEUE__INHERIT_ISOFTYPE@Base 4.99.18 - AB_QUEUE__INHERIT_SETDATA@Base 4.99.18 - AB_QUEUE__INHERIT_UNLINK@Base 4.99.18 - AB_Queue_AddJob@Base 4.99.18 - AB_Queue_Attach@Base 4.99.18 - AB_Queue_FindFirstJobLikeThis@Base 4.99.18 - AB_Queue_FindUserQueue@Base 4.99.18 - AB_Queue_GetUserQueueList@Base 4.99.18 - AB_Queue_SetUserQueueList@Base 4.99.18 - AB_Queue_copy@Base 5.1.0beta - AB_Queue_dup@Base 4.99.18 - AB_Queue_free@Base 4.99.18 - AB_Queue_new@Base 4.99.18 - AB_Security_Attach@Base 4.0.0 - AB_Security_GetName@Base 4.0.0 - AB_Security_GetNameSpace@Base 4.0.0 - AB_Security_GetTickerSymbol@Base 4.0.0 - AB_Security_GetUniqueId@Base 4.0.0 - AB_Security_GetUnitPriceDate@Base 4.0.0 - AB_Security_GetUnitPriceValue@Base 4.0.0 - AB_Security_GetUnits@Base 4.0.0 - AB_Security_IsModified@Base 4.0.0 - AB_Security_List2Iterator_Data@Base 4.0.0 - AB_Security_List2Iterator_GetLinkCount@Base 4.0.0 - AB_Security_List2Iterator_IncLinkCount@Base 4.0.0 - AB_Security_List2Iterator_Next@Base 4.0.0 - AB_Security_List2Iterator_Previous@Base 4.0.0 - AB_Security_List2Iterator_free@Base 4.0.0 - AB_Security_List2Iterator_new@Base 4.0.0 - AB_Security_List2_Clear@Base 4.0.0 - AB_Security_List2_Contains@Base 4.0.0 - AB_Security_List2_Dump@Base 4.0.0 - AB_Security_List2_Erase@Base 4.0.0 - AB_Security_List2_FindIter@Base 4.0.0 - AB_Security_List2_First@Base 4.0.0 - AB_Security_List2_ForEach@Base 4.0.0 - AB_Security_List2_GetBack@Base 4.0.0 - AB_Security_List2_GetFront@Base 4.0.0 - AB_Security_List2_GetSize@Base 4.0.0 - AB_Security_List2_IsEmpty@Base 4.0.0 - AB_Security_List2_Last@Base 4.0.0 - AB_Security_List2_PopBack@Base 4.0.0 - AB_Security_List2_PopFront@Base 4.0.0 - AB_Security_List2_PushBack@Base 4.0.0 - AB_Security_List2_PushFront@Base 4.0.0 - AB_Security_List2_Remove@Base 4.0.0 - AB_Security_List2_Unshare@Base 4.0.0 - AB_Security_List2_dup@Base 4.0.0 - AB_Security_List2_free@Base 4.0.0 - AB_Security_List2_freeAll@Base 4.0.0 - AB_Security_List2_new@Base 4.0.0 - AB_Security_List_Add@Base 4.0.0 - AB_Security_List_AddList@Base 4.0.0 - AB_Security_List_Clear@Base 4.0.0 - AB_Security_List_Del@Base 4.0.0 - AB_Security_List_First@Base 4.0.0 - AB_Security_List_GetCount@Base 4.0.0 - AB_Security_List_HasElement@Base 4.0.0 - AB_Security_List_Insert@Base 4.0.0 - AB_Security_List_Last@Base 4.0.0 - AB_Security_List_Next@Base 4.0.0 - AB_Security_List_Previous@Base 4.0.0 - AB_Security_List_SetSortFn@Base 5.0.10 - AB_Security_List_Sort@Base 5.0.10 - AB_Security_List_dup@Base 4.0.0 - AB_Security_List_free@Base 4.0.0 - AB_Security_List_new@Base 4.0.0 - AB_Security_ReadDb@Base 4.0.0 - AB_Security_SetModified@Base 4.0.0 - AB_Security_SetName@Base 4.0.0 - AB_Security_SetNameSpace@Base 4.0.0 - AB_Security_SetTickerSymbol@Base 4.0.0 - AB_Security_SetUniqueId@Base 4.0.0 - AB_Security_SetUnitPriceDate@Base 4.0.0 - AB_Security_SetUnitPriceValue@Base 4.0.0 - AB_Security_SetUnits@Base 4.0.0 - AB_Security_dup@Base 4.0.0 - AB_Security_free@Base 4.0.0 - AB_Security_fromDb@Base 4.0.0 - AB_Security_new@Base 4.0.0 - AB_Security_toDb@Base 4.0.0 - AB_SelectBackend@Base 4.99.2 - AB_SelectBackendDialog_GetSelectedProvider@Base 4.99.2 - AB_SelectBackendDialog_SetSelectedProvider@Base 4.99.2 - AB_SelectBackendDialog_new@Base 4.99.2 - AB_SelectBankInfoDialog_GetSelectedBankInfo@Base 4.99.2 - AB_SelectBankInfoDialog_new@Base 4.99.2 - AB_SetupDialog_new@Base 4.99.2 - AB_SetupNewUserDialog_new@Base 4.99.18 - AB_TRANSACTION__INHERIT_GETLIST@Base 4.0.0 - AB_TRANSACTION__INHERIT_ISOFTYPE@Base 4.0.0 - AB_TRANSACTION__INHERIT_SETDATA@Base 4.0.0 - AB_TRANSACTION__INHERIT_UNLINK@Base 4.0.0 - AB_TextKeyDescr_Attach@Base 4.0.0 - AB_TextKeyDescr_GetDescr@Base 4.0.0 - AB_TextKeyDescr_GetName@Base 4.0.0 - AB_TextKeyDescr_GetValue@Base 4.0.0 - AB_TextKeyDescr_IsModified@Base 4.0.0 - AB_TextKeyDescr_List2Iterator_Data@Base 4.0.0 - AB_TextKeyDescr_List2Iterator_GetLinkCount@Base 4.0.0 - AB_TextKeyDescr_List2Iterator_IncLinkCount@Base 4.0.0 - AB_TextKeyDescr_List2Iterator_Next@Base 4.0.0 - AB_TextKeyDescr_List2Iterator_Previous@Base 4.0.0 - AB_TextKeyDescr_List2Iterator_free@Base 4.0.0 - AB_TextKeyDescr_List2Iterator_new@Base 4.0.0 - AB_TextKeyDescr_List2_Clear@Base 4.0.0 - AB_TextKeyDescr_List2_Contains@Base 4.0.0 - AB_TextKeyDescr_List2_Dump@Base 4.0.0 - AB_TextKeyDescr_List2_Erase@Base 4.0.0 - AB_TextKeyDescr_List2_FindIter@Base 4.0.0 - AB_TextKeyDescr_List2_First@Base 4.0.0 - AB_TextKeyDescr_List2_ForEach@Base 4.0.0 - AB_TextKeyDescr_List2_GetBack@Base 4.0.0 - AB_TextKeyDescr_List2_GetFront@Base 4.0.0 - AB_TextKeyDescr_List2_GetSize@Base 4.0.0 - AB_TextKeyDescr_List2_IsEmpty@Base 4.0.0 - AB_TextKeyDescr_List2_Last@Base 4.0.0 - AB_TextKeyDescr_List2_PopBack@Base 4.0.0 - AB_TextKeyDescr_List2_PopFront@Base 4.0.0 - AB_TextKeyDescr_List2_PushBack@Base 4.0.0 - AB_TextKeyDescr_List2_PushFront@Base 4.0.0 - AB_TextKeyDescr_List2_Remove@Base 4.0.0 - AB_TextKeyDescr_List2_Unshare@Base 4.0.0 - AB_TextKeyDescr_List2_dup@Base 4.0.0 - AB_TextKeyDescr_List2_free@Base 4.0.0 - AB_TextKeyDescr_List2_freeAll@Base 4.0.0 - AB_TextKeyDescr_List2_new@Base 4.0.0 - AB_TextKeyDescr_List_Add@Base 4.0.0 - AB_TextKeyDescr_List_AddList@Base 4.0.0 - AB_TextKeyDescr_List_Clear@Base 4.0.0 - AB_TextKeyDescr_List_Del@Base 4.0.0 - AB_TextKeyDescr_List_First@Base 4.0.0 - AB_TextKeyDescr_List_GetCount@Base 4.0.0 - AB_TextKeyDescr_List_HasElement@Base 4.0.0 - AB_TextKeyDescr_List_Insert@Base 4.0.0 - AB_TextKeyDescr_List_Last@Base 4.0.0 - AB_TextKeyDescr_List_Next@Base 4.0.0 - AB_TextKeyDescr_List_Previous@Base 4.0.0 - AB_TextKeyDescr_List_SetSortFn@Base 5.0.10 - AB_TextKeyDescr_List_Sort@Base 5.0.10 - AB_TextKeyDescr_List_dup@Base 4.0.0 - AB_TextKeyDescr_List_free@Base 4.0.0 - AB_TextKeyDescr_List_new@Base 4.0.0 - AB_TextKeyDescr_ReadDb@Base 4.0.0 - AB_TextKeyDescr_SetDescr@Base 4.0.0 - AB_TextKeyDescr_SetModified@Base 4.0.0 - AB_TextKeyDescr_SetName@Base 4.0.0 - AB_TextKeyDescr_SetValue@Base 4.0.0 - AB_TextKeyDescr_dup@Base 4.0.0 - AB_TextKeyDescr_free@Base 4.0.0 - AB_TextKeyDescr_fromDb@Base 4.0.0 - AB_TextKeyDescr_new@Base 4.0.0 - AB_TextKeyDescr_toDb@Base 4.0.0 - AB_TransactionLimits_AddValuesCycleMonth@Base 4.0.0 - AB_TransactionLimits_AddValuesCycleWeek@Base 4.0.0 - AB_TransactionLimits_AddValuesExecutionDayMonth@Base 4.0.0 - AB_TransactionLimits_AddValuesExecutionDayWeek@Base 4.0.0 - AB_TransactionLimits_AddValuesTextKey@Base 4.0.0 - AB_TransactionLimits_Attach@Base 4.0.0 - AB_TransactionLimits_ClearValuesCycleMonth@Base 4.0.0 - AB_TransactionLimits_ClearValuesCycleWeek@Base 4.0.0 - AB_TransactionLimits_ClearValuesExecutionDayMonth@Base 4.0.0 - AB_TransactionLimits_ClearValuesExecutionDayWeek@Base 4.0.0 - AB_TransactionLimits_ClearValuesTextKey@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeCycle@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeExecutionDay@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeFirstExecutionDate@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeLastExecutionDate@Base 4.0.0 - AB_TransactionLimits_GetAllowChangePeriod@Base 4.0.0 - AB_TransactionLimits_GetAllowChangePurpose@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeRecipientAccount@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeRecipientName@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeTextKey@Base 4.0.0 - AB_TransactionLimits_GetAllowChangeValue@Base 4.0.0 - AB_TransactionLimits_GetAllowMonthly@Base 4.0.0 - AB_TransactionLimits_GetAllowWeekly@Base 4.0.0 - AB_TransactionLimits_GetMaxLenBankReference@Base 4.0.0 - AB_TransactionLimits_GetMaxLenCustomerReference@Base 4.0.0 - AB_TransactionLimits_GetMaxLenLocalAccountNumber@Base 4.0.0 - AB_TransactionLimits_GetMaxLenLocalBankCode@Base 4.0.0 - AB_TransactionLimits_GetMaxLenLocalName@Base 4.0.0 - AB_TransactionLimits_GetMaxLenLocalSuffix@Base 4.0.0 - AB_TransactionLimits_GetMaxLenPurpose@Base 4.0.0 - AB_TransactionLimits_GetMaxLenRemoteAccountNumber@Base 4.0.0 - AB_TransactionLimits_GetMaxLenRemoteBankCode@Base 4.0.0 - AB_TransactionLimits_GetMaxLenRemoteIban@Base 4.0.0 - AB_TransactionLimits_GetMaxLenRemoteName@Base 4.0.0 - AB_TransactionLimits_GetMaxLenRemoteSuffix@Base 4.0.0 - AB_TransactionLimits_GetMaxLenTextKey@Base 4.0.0 - AB_TransactionLimits_GetMaxLinesPurpose@Base 4.0.0 - AB_TransactionLimits_GetMaxLinesRemoteName@Base 4.0.0 - AB_TransactionLimits_GetMaxValueSetupTime@Base 4.0.0 - AB_TransactionLimits_GetMaxValueSetupTimeFinal@Base 5.3.3beta - AB_TransactionLimits_GetMaxValueSetupTimeFirst@Base 5.3.3beta - AB_TransactionLimits_GetMaxValueSetupTimeOnce@Base 5.3.3beta - AB_TransactionLimits_GetMaxValueSetupTimeRecurring@Base 5.3.3beta - AB_TransactionLimits_GetMinLenBankReference@Base 4.0.0 - AB_TransactionLimits_GetMinLenCustomerReference@Base 4.0.0 - AB_TransactionLimits_GetMinLenLocalAccountNumber@Base 4.0.0 - AB_TransactionLimits_GetMinLenLocalBankCode@Base 4.0.0 - AB_TransactionLimits_GetMinLenLocalName@Base 4.0.0 - AB_TransactionLimits_GetMinLenLocalSuffix@Base 4.0.0 - AB_TransactionLimits_GetMinLenPurpose@Base 4.0.0 - AB_TransactionLimits_GetMinLenRemoteAccountNumber@Base 4.0.0 - AB_TransactionLimits_GetMinLenRemoteBankCode@Base 4.0.0 - AB_TransactionLimits_GetMinLenRemoteIban@Base 4.0.0 - AB_TransactionLimits_GetMinLenRemoteName@Base 4.0.0 - AB_TransactionLimits_GetMinLenRemoteSuffix@Base 4.0.0 - AB_TransactionLimits_GetMinLenTextKey@Base 4.0.0 - AB_TransactionLimits_GetMinLinesPurpose@Base 4.0.0 - AB_TransactionLimits_GetMinLinesRemoteName@Base 4.0.0 - AB_TransactionLimits_GetMinValueSetupTime@Base 4.0.0 - AB_TransactionLimits_GetMinValueSetupTimeFinal@Base 5.3.3beta - AB_TransactionLimits_GetMinValueSetupTimeFirst@Base 5.3.3beta - AB_TransactionLimits_GetMinValueSetupTimeOnce@Base 5.3.3beta - AB_TransactionLimits_GetMinValueSetupTimeRecurring@Base 5.3.3beta - AB_TransactionLimits_GetNeedDate@Base 5.3.2beta - AB_TransactionLimits_GetTextKeys@Base 4.0.0 - AB_TransactionLimits_GetValuesCycleMonth@Base 4.0.0 - AB_TransactionLimits_GetValuesCycleWeek@Base 4.0.0 - AB_TransactionLimits_GetValuesExecutionDayMonth@Base 4.0.0 - AB_TransactionLimits_GetValuesExecutionDayWeek@Base 4.0.0 - AB_TransactionLimits_GetValuesTextKey@Base 4.0.0 - AB_TransactionLimits_HasValuesCycleMonth@Base 4.0.0 - AB_TransactionLimits_HasValuesCycleWeek@Base 4.0.0 - AB_TransactionLimits_HasValuesExecutionDayMonth@Base 4.0.0 - AB_TransactionLimits_HasValuesExecutionDayWeek@Base 4.0.0 - AB_TransactionLimits_HasValuesTextKey@Base 4.0.0 - AB_TransactionLimits_IsModified@Base 4.0.0 - AB_TransactionLimits_List2Iterator_Data@Base 4.0.0 - AB_TransactionLimits_List2Iterator_GetLinkCount@Base 4.0.0 - AB_TransactionLimits_List2Iterator_IncLinkCount@Base 4.0.0 - AB_TransactionLimits_List2Iterator_Next@Base 4.0.0 - AB_TransactionLimits_List2Iterator_Previous@Base 4.0.0 - AB_TransactionLimits_List2Iterator_free@Base 4.0.0 - AB_TransactionLimits_List2Iterator_new@Base 4.0.0 - AB_TransactionLimits_List2_Clear@Base 4.0.0 - AB_TransactionLimits_List2_Contains@Base 4.0.0 - AB_TransactionLimits_List2_Dump@Base 4.0.0 - AB_TransactionLimits_List2_Erase@Base 4.0.0 - AB_TransactionLimits_List2_FindIter@Base 4.0.0 - AB_TransactionLimits_List2_First@Base 4.0.0 - AB_TransactionLimits_List2_ForEach@Base 4.0.0 - AB_TransactionLimits_List2_GetBack@Base 4.0.0 - AB_TransactionLimits_List2_GetFront@Base 4.0.0 - AB_TransactionLimits_List2_GetSize@Base 4.0.0 - AB_TransactionLimits_List2_IsEmpty@Base 4.0.0 - AB_TransactionLimits_List2_Last@Base 4.0.0 - AB_TransactionLimits_List2_PopBack@Base 4.0.0 - AB_TransactionLimits_List2_PopFront@Base 4.0.0 - AB_TransactionLimits_List2_PushBack@Base 4.0.0 - AB_TransactionLimits_List2_PushFront@Base 4.0.0 - AB_TransactionLimits_List2_Remove@Base 4.0.0 - AB_TransactionLimits_List2_Unshare@Base 4.0.0 - AB_TransactionLimits_List2_dup@Base 4.0.0 - AB_TransactionLimits_List2_free@Base 4.0.0 - AB_TransactionLimits_List2_freeAll@Base 4.0.0 - AB_TransactionLimits_List2_new@Base 4.0.0 - AB_TransactionLimits_List_Add@Base 4.0.0 - AB_TransactionLimits_List_AddList@Base 4.0.0 - AB_TransactionLimits_List_Clear@Base 4.0.0 - AB_TransactionLimits_List_Del@Base 4.0.0 - AB_TransactionLimits_List_First@Base 4.0.0 - AB_TransactionLimits_List_GetCount@Base 4.0.0 - AB_TransactionLimits_List_HasElement@Base 4.0.0 - AB_TransactionLimits_List_Insert@Base 4.0.0 - AB_TransactionLimits_List_Last@Base 4.0.0 - AB_TransactionLimits_List_Next@Base 4.0.0 - AB_TransactionLimits_List_Previous@Base 4.0.0 - AB_TransactionLimits_List_SetSortFn@Base 5.0.10 - AB_TransactionLimits_List_Sort@Base 5.0.10 - AB_TransactionLimits_List_dup@Base 4.0.0 - AB_TransactionLimits_List_free@Base 4.0.0 - AB_TransactionLimits_List_new@Base 4.0.0 - AB_TransactionLimits_ReadDb@Base 4.0.0 - AB_TransactionLimits_RemoveValuesCycleMonth@Base 4.0.0 - AB_TransactionLimits_RemoveValuesCycleWeek@Base 4.0.0 - AB_TransactionLimits_RemoveValuesExecutionDayMonth@Base 4.0.0 - AB_TransactionLimits_RemoveValuesExecutionDayWeek@Base 4.0.0 - AB_TransactionLimits_RemoveValuesTextKey@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeCycle@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeExecutionDay@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeFirstExecutionDate@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeLastExecutionDate@Base 4.0.0 - AB_TransactionLimits_SetAllowChangePeriod@Base 4.0.0 - AB_TransactionLimits_SetAllowChangePurpose@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeRecipientAccount@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeRecipientName@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeTextKey@Base 4.0.0 - AB_TransactionLimits_SetAllowChangeValue@Base 4.0.0 - AB_TransactionLimits_SetAllowMonthly@Base 4.0.0 - AB_TransactionLimits_SetAllowWeekly@Base 4.0.0 - AB_TransactionLimits_SetMaxLenBankReference@Base 4.0.0 - AB_TransactionLimits_SetMaxLenCustomerReference@Base 4.0.0 - AB_TransactionLimits_SetMaxLenLocalAccountNumber@Base 4.0.0 - AB_TransactionLimits_SetMaxLenLocalBankCode@Base 4.0.0 - AB_TransactionLimits_SetMaxLenLocalName@Base 4.0.0 - AB_TransactionLimits_SetMaxLenLocalSuffix@Base 4.0.0 - AB_TransactionLimits_SetMaxLenPurpose@Base 4.0.0 - AB_TransactionLimits_SetMaxLenRemoteAccountNumber@Base 4.0.0 - AB_TransactionLimits_SetMaxLenRemoteBankCode@Base 4.0.0 - AB_TransactionLimits_SetMaxLenRemoteIban@Base 4.0.0 - AB_TransactionLimits_SetMaxLenRemoteName@Base 4.0.0 - AB_TransactionLimits_SetMaxLenRemoteSuffix@Base 4.0.0 - AB_TransactionLimits_SetMaxLenTextKey@Base 4.0.0 - AB_TransactionLimits_SetMaxLinesPurpose@Base 4.0.0 - AB_TransactionLimits_SetMaxLinesRemoteName@Base 4.0.0 - AB_TransactionLimits_SetMaxValueSetupTime@Base 4.0.0 - AB_TransactionLimits_SetMaxValueSetupTimeFinal@Base 5.3.3beta - AB_TransactionLimits_SetMaxValueSetupTimeFirst@Base 5.3.3beta - AB_TransactionLimits_SetMaxValueSetupTimeOnce@Base 5.3.3beta - AB_TransactionLimits_SetMaxValueSetupTimeRecurring@Base 5.3.3beta - AB_TransactionLimits_SetMinLenBankReference@Base 4.0.0 - AB_TransactionLimits_SetMinLenCustomerReference@Base 4.0.0 - AB_TransactionLimits_SetMinLenLocalAccountNumber@Base 4.0.0 - AB_TransactionLimits_SetMinLenLocalBankCode@Base 4.0.0 - AB_TransactionLimits_SetMinLenLocalName@Base 4.0.0 - AB_TransactionLimits_SetMinLenLocalSuffix@Base 4.0.0 - AB_TransactionLimits_SetMinLenPurpose@Base 4.0.0 - AB_TransactionLimits_SetMinLenRemoteAccountNumber@Base 4.0.0 - AB_TransactionLimits_SetMinLenRemoteBankCode@Base 4.0.0 - AB_TransactionLimits_SetMinLenRemoteIban@Base 4.0.0 - AB_TransactionLimits_SetMinLenRemoteName@Base 4.0.0 - AB_TransactionLimits_SetMinLenRemoteSuffix@Base 4.0.0 - AB_TransactionLimits_SetMinLenTextKey@Base 4.0.0 - AB_TransactionLimits_SetMinLinesPurpose@Base 4.0.0 - AB_TransactionLimits_SetMinLinesRemoteName@Base 4.0.0 - AB_TransactionLimits_SetMinValueSetupTime@Base 4.0.0 - AB_TransactionLimits_SetMinValueSetupTimeFinal@Base 5.3.3beta - AB_TransactionLimits_SetMinValueSetupTimeFirst@Base 5.3.3beta - AB_TransactionLimits_SetMinValueSetupTimeOnce@Base 5.3.3beta - AB_TransactionLimits_SetMinValueSetupTimeRecurring@Base 5.3.3beta - AB_TransactionLimits_SetModified@Base 4.0.0 - AB_TransactionLimits_SetNeedDate@Base 5.3.2beta - AB_TransactionLimits_SetTextKeys@Base 4.0.0 - AB_TransactionLimits_SetValuesCycleMonth@Base 4.0.0 - AB_TransactionLimits_SetValuesCycleWeek@Base 4.0.0 - AB_TransactionLimits_SetValuesExecutionDayMonth@Base 4.0.0 - AB_TransactionLimits_SetValuesExecutionDayWeek@Base 4.0.0 - AB_TransactionLimits_SetValuesTextKey@Base 4.0.0 - AB_TransactionLimits_dup@Base 4.0.0 - AB_TransactionLimits_free@Base 4.0.0 - AB_TransactionLimits_fromDb@Base 4.0.0 - AB_TransactionLimits_new@Base 4.0.0 - AB_TransactionLimits_toDb@Base 4.0.0 - AB_Transaction_AddCategory@Base 4.0.0 - AB_Transaction_AddPurpose@Base 4.0.0 - AB_Transaction_AddRemoteName@Base 4.0.0 - AB_Transaction_Attach@Base 4.0.0 - AB_Transaction_Charge_fromString@Base 4.0.0 - AB_Transaction_Charge_toString@Base 4.0.0 - AB_Transaction_CheckDateAgainstLimits@Base 5.3.1beta - AB_Transaction_CheckDateAgainstSequenceLimits@Base 5.3.3beta - AB_Transaction_CheckFirstExecutionDateAgainstLimits@Base 5.3.1beta - AB_Transaction_CheckForSepaConformity@Base 5.3.1beta - AB_Transaction_CheckNamesAgainstLimits@Base 5.3.1beta - AB_Transaction_CheckPurposeAgainstLimits@Base 5.3.1beta - AB_Transaction_CheckRecurrenceAgainstLimits@Base 5.3.1beta - AB_Transaction_CheckTextKeyAgainstLimits@Base 5.3.1beta - AB_Transaction_ClearCategory@Base 4.0.0 - AB_Transaction_ClearPurpose@Base 4.0.0 - AB_Transaction_ClearRemoteName@Base 4.0.0 - AB_Transaction_Compare@Base 4.0.0 - AB_Transaction_FillLocalFromAccount@Base 4.0.0 - AB_Transaction_GetBankReference@Base 4.0.0 - AB_Transaction_GetCategory@Base 4.0.0 - AB_Transaction_GetCharge@Base 4.0.0 - AB_Transaction_GetCommission@Base 4.0.0 - AB_Transaction_GetCreditorIdentifier@Base 4.2.3+svn.r1797 - AB_Transaction_GetCreditorSchemeId@Base 5.0.31beta - AB_Transaction_GetCustomerReference@Base 4.0.0 - AB_Transaction_GetCycle@Base 4.0.0 - AB_Transaction_GetDate@Base 4.0.0 - AB_Transaction_GetEndToEndReference@Base 4.2.3+svn.r1797 - AB_Transaction_GetExecutionDay@Base 4.0.0 - AB_Transaction_GetFees@Base 4.0.0 - AB_Transaction_GetFiId@Base 4.0.0 - AB_Transaction_GetFirstExecutionDate@Base 4.0.0 - AB_Transaction_GetGroupId@Base 4.0.0 - AB_Transaction_GetIdForApplication@Base 4.0.0 - AB_Transaction_GetLastExecutionDate@Base 4.0.0 - AB_Transaction_GetLocalAccountNumber@Base 4.0.0 - AB_Transaction_GetLocalBankCode@Base 4.0.0 - AB_Transaction_GetLocalBic@Base 4.0.0 - AB_Transaction_GetLocalBranchId@Base 4.0.0 - AB_Transaction_GetLocalCountry@Base 4.0.0 - AB_Transaction_GetLocalIban@Base 4.0.0 - AB_Transaction_GetLocalName@Base 4.0.0 - AB_Transaction_GetLocalSuffix@Base 4.0.0 - AB_Transaction_GetMandateDate@Base 5.0.31beta - AB_Transaction_GetMandateDebitorName@Base 5.0.31beta - AB_Transaction_GetMandateId@Base 5.0.31beta - AB_Transaction_GetMandateReference@Base 4.2.3+svn.r1797 - AB_Transaction_GetNextExecutionDate@Base 4.0.0 - AB_Transaction_GetOriginalCreditorName@Base 5.0.31beta - AB_Transaction_GetOriginalCreditorSchemeId@Base 5.0.31beta - AB_Transaction_GetOriginalMandateId@Base 5.0.31beta - AB_Transaction_GetOriginatorIdentifier@Base 4.2.3+svn.r1797 - AB_Transaction_GetPeriod@Base 4.0.0 - AB_Transaction_GetPrimanota@Base 4.0.0 - AB_Transaction_GetPurpose@Base 4.0.0 - AB_Transaction_GetRemoteAccountNumber@Base 4.0.0 - AB_Transaction_GetRemoteAddrCity@Base 4.0.0 - AB_Transaction_GetRemoteAddrStreet@Base 4.0.0 - AB_Transaction_GetRemoteAddrZipcode@Base 4.0.0 - AB_Transaction_GetRemoteBankCode@Base 4.0.0 - AB_Transaction_GetRemoteBankLocation@Base 4.0.0 - AB_Transaction_GetRemoteBankName@Base 4.0.0 - AB_Transaction_GetRemoteBic@Base 4.0.0 - AB_Transaction_GetRemoteBranchId@Base 4.0.0 - AB_Transaction_GetRemoteCountry@Base 4.0.0 - AB_Transaction_GetRemoteIban@Base 4.0.0 - AB_Transaction_GetRemoteName@Base 4.0.0 - AB_Transaction_GetRemotePhone@Base 4.0.0 - AB_Transaction_GetRemoteSuffix@Base 4.0.0 - AB_Transaction_GetSequenceType@Base 5.1.0beta - AB_Transaction_GetStatus@Base 4.0.0 - AB_Transaction_GetSubType@Base 4.0.0 - AB_Transaction_GetTextKey@Base 4.0.0 - AB_Transaction_GetTextKeyExt@Base 4.0.0 - AB_Transaction_GetTransactionCode@Base 4.0.0 - AB_Transaction_GetTransactionKey@Base 4.0.0 - AB_Transaction_GetTransactionText@Base 4.0.0 - AB_Transaction_GetType@Base 4.0.0 - AB_Transaction_GetUniqueId@Base 4.0.0 - AB_Transaction_GetUnitId@Base 4.0.0 - AB_Transaction_GetUnitIdNameSpace@Base 4.0.0 - AB_Transaction_GetUnitPrice@Base 4.0.0 - AB_Transaction_GetUnits@Base 4.0.0 - AB_Transaction_GetValue@Base 4.0.0 - AB_Transaction_GetValutaDate@Base 4.0.0 - AB_Transaction_HasCategory@Base 4.0.0 - AB_Transaction_HasPurpose@Base 4.0.0 - AB_Transaction_HasRemoteName@Base 4.0.0 - AB_Transaction_IsModified@Base 4.0.0 - AB_Transaction_List2Iterator_Data@Base 4.0.0 - AB_Transaction_List2Iterator_GetLinkCount@Base 4.0.0 - AB_Transaction_List2Iterator_IncLinkCount@Base 4.0.0 - AB_Transaction_List2Iterator_Next@Base 4.0.0 - AB_Transaction_List2Iterator_Previous@Base 4.0.0 - AB_Transaction_List2Iterator_free@Base 4.0.0 - AB_Transaction_List2Iterator_new@Base 4.0.0 - AB_Transaction_List2_Clear@Base 4.0.0 - AB_Transaction_List2_Contains@Base 4.0.0 - AB_Transaction_List2_Dump@Base 4.0.0 - AB_Transaction_List2_Erase@Base 4.0.0 - AB_Transaction_List2_FindIter@Base 4.0.0 - AB_Transaction_List2_First@Base 4.0.0 - AB_Transaction_List2_ForEach@Base 4.0.0 - AB_Transaction_List2_GetBack@Base 4.0.0 - AB_Transaction_List2_GetFront@Base 4.0.0 - AB_Transaction_List2_GetSize@Base 4.0.0 - AB_Transaction_List2_IsEmpty@Base 4.0.0 - AB_Transaction_List2_Last@Base 4.0.0 - AB_Transaction_List2_PopBack@Base 4.0.0 - AB_Transaction_List2_PopFront@Base 4.0.0 - AB_Transaction_List2_PushBack@Base 4.0.0 - AB_Transaction_List2_PushFront@Base 4.0.0 - AB_Transaction_List2_Remove@Base 4.0.0 - AB_Transaction_List2_Unshare@Base 4.0.0 - AB_Transaction_List2_dup@Base 4.0.0 - AB_Transaction_List2_free@Base 4.0.0 - AB_Transaction_List2_freeAll@Base 4.0.0 - AB_Transaction_List2_new@Base 4.0.0 - AB_Transaction_List_Add@Base 5.3.1beta - AB_Transaction_List_AddList@Base 5.3.1beta - AB_Transaction_List_Clear@Base 5.3.1beta - AB_Transaction_List_Del@Base 5.3.1beta - AB_Transaction_List_First@Base 5.3.1beta - AB_Transaction_List_GetCount@Base 5.3.1beta - AB_Transaction_List_HasElement@Base 5.3.1beta - AB_Transaction_List_Insert@Base 5.3.1beta - AB_Transaction_List_Last@Base 5.3.1beta - AB_Transaction_List_Next@Base 5.3.1beta - AB_Transaction_List_Previous@Base 5.3.1beta - AB_Transaction_List_SetSortFn@Base 5.3.1beta - AB_Transaction_List_Sort@Base 5.3.1beta - AB_Transaction_List_dup@Base 5.3.1beta - AB_Transaction_List_free@Base 5.3.1beta - AB_Transaction_List_new@Base 5.3.1beta - AB_Transaction_Period_fromString@Base 4.0.0 - AB_Transaction_Period_toString@Base 4.0.0 - AB_Transaction_ReadDb@Base 4.0.0 - AB_Transaction_RemoveCategory@Base 4.0.0 - AB_Transaction_RemovePurpose@Base 4.0.0 - AB_Transaction_RemoveRemoteName@Base 4.0.0 - AB_Transaction_SequenceType_fromString@Base 5.1.0beta - AB_Transaction_SequenceType_toString@Base 5.1.0beta - AB_Transaction_SetBankReference@Base 4.0.0 - AB_Transaction_SetCategory@Base 4.0.0 - AB_Transaction_SetCharge@Base 4.0.0 - AB_Transaction_SetCommission@Base 4.0.0 - AB_Transaction_SetCreditorIdentifier@Base 4.2.3+svn.r1797 - AB_Transaction_SetCreditorSchemeId@Base 5.0.31beta - AB_Transaction_SetCustomerReference@Base 4.0.0 - AB_Transaction_SetCycle@Base 4.0.0 - AB_Transaction_SetDate@Base 4.0.0 - AB_Transaction_SetEndToEndReference@Base 4.2.3+svn.r1797 - AB_Transaction_SetExecutionDay@Base 4.0.0 - AB_Transaction_SetFees@Base 4.0.0 - AB_Transaction_SetFiId@Base 4.0.0 - AB_Transaction_SetFirstExecutionDate@Base 4.0.0 - AB_Transaction_SetGroupId@Base 4.0.0 - AB_Transaction_SetIdForApplication@Base 4.0.0 - AB_Transaction_SetLastExecutionDate@Base 4.0.0 - AB_Transaction_SetLocalAccountNumber@Base 4.0.0 - AB_Transaction_SetLocalBankCode@Base 4.0.0 - AB_Transaction_SetLocalBic@Base 4.0.0 - AB_Transaction_SetLocalBranchId@Base 4.0.0 - AB_Transaction_SetLocalCountry@Base 4.0.0 - AB_Transaction_SetLocalIban@Base 4.0.0 - AB_Transaction_SetLocalName@Base 4.0.0 - AB_Transaction_SetLocalSuffix@Base 4.0.0 - AB_Transaction_SetMandateDate@Base 5.0.31beta - AB_Transaction_SetMandateDebitorName@Base 5.0.31beta - AB_Transaction_SetMandateId@Base 5.0.31beta - AB_Transaction_SetMandateReference@Base 4.2.3+svn.r1797 - AB_Transaction_SetModified@Base 4.0.0 - AB_Transaction_SetNextExecutionDate@Base 4.0.0 - AB_Transaction_SetOriginalCreditorName@Base 5.0.31beta - AB_Transaction_SetOriginalCreditorSchemeId@Base 5.0.31beta - AB_Transaction_SetOriginalMandateId@Base 5.0.31beta - AB_Transaction_SetOriginatorIdentifier@Base 4.2.3+svn.r1797 - AB_Transaction_SetPeriod@Base 4.0.0 - AB_Transaction_SetPrimanota@Base 4.0.0 - AB_Transaction_SetPurpose@Base 4.0.0 - AB_Transaction_SetRemoteAccountNumber@Base 4.0.0 - AB_Transaction_SetRemoteAddrCity@Base 4.0.0 - AB_Transaction_SetRemoteAddrStreet@Base 4.0.0 - AB_Transaction_SetRemoteAddrZipcode@Base 4.0.0 - AB_Transaction_SetRemoteBankCode@Base 4.0.0 - AB_Transaction_SetRemoteBankLocation@Base 4.0.0 - AB_Transaction_SetRemoteBankName@Base 4.0.0 - AB_Transaction_SetRemoteBic@Base 4.0.0 - AB_Transaction_SetRemoteBranchId@Base 4.0.0 - AB_Transaction_SetRemoteCountry@Base 4.0.0 - AB_Transaction_SetRemoteIban@Base 4.0.0 - AB_Transaction_SetRemoteName@Base 4.0.0 - AB_Transaction_SetRemotePhone@Base 4.0.0 - AB_Transaction_SetRemoteSuffix@Base 4.0.0 - AB_Transaction_SetSequenceType@Base 5.1.0beta - AB_Transaction_SetStatus@Base 4.0.0 - AB_Transaction_SetSubType@Base 4.0.0 - AB_Transaction_SetTextKey@Base 4.0.0 - AB_Transaction_SetTextKeyExt@Base 4.0.0 - AB_Transaction_SetTransactionCode@Base 4.0.0 - AB_Transaction_SetTransactionKey@Base 4.0.0 - AB_Transaction_SetTransactionText@Base 4.0.0 - AB_Transaction_SetType@Base 4.0.0 - AB_Transaction_SetUniqueId@Base 4.0.0 - AB_Transaction_SetUnitId@Base 4.0.0 - AB_Transaction_SetUnitIdNameSpace@Base 4.0.0 - AB_Transaction_SetUnitPrice@Base 4.0.0 - AB_Transaction_SetUnits@Base 4.0.0 - AB_Transaction_SetValue@Base 4.0.0 - AB_Transaction_SetValutaDate@Base 4.0.0 - AB_Transaction_Status_fromString@Base 4.0.0 - AB_Transaction_Status_toString@Base 4.0.0 - AB_Transaction_SubType_fromString@Base 4.0.0 - AB_Transaction_SubType_toString@Base 4.0.0 - AB_Transaction_Type_fromString@Base 4.0.0 - AB_Transaction_Type_toString@Base 4.0.0 - AB_Transaction_WriteToFile@Base 5.3.1beta - AB_Transaction_dup@Base 4.0.0 - AB_Transaction_free@Base 4.0.0 - AB_Transaction_fromDb@Base 4.0.0 - AB_Transaction_new@Base 4.0.0 - AB_Transaction_toDb@Base 4.0.0 - AB_USERQUEUE__INHERIT_GETLIST@Base 4.99.18 - AB_USERQUEUE__INHERIT_ISOFTYPE@Base 4.99.18 - AB_USERQUEUE__INHERIT_SETDATA@Base 4.99.18 - AB_USERQUEUE__INHERIT_UNLINK@Base 4.99.18 - AB_USER__INHERIT_GETLIST@Base 4.0.0 - AB_USER__INHERIT_ISOFTYPE@Base 4.0.0 - AB_USER__INHERIT_SETDATA@Base 4.0.0 - AB_USER__INHERIT_UNLINK@Base 4.0.0 - AB_UserQueue_AddJob@Base 4.99.18 - AB_UserQueue_Attach@Base 4.99.18 - AB_UserQueue_FindAccountQueue@Base 4.99.18 - AB_UserQueue_GetAccountQueueList@Base 4.99.18 - AB_UserQueue_GetUser@Base 4.99.18 - AB_UserQueue_List_Add@Base 4.99.18 - AB_UserQueue_List_AddList@Base 4.99.18 - AB_UserQueue_List_Clear@Base 4.99.18 - AB_UserQueue_List_Del@Base 4.99.18 - AB_UserQueue_List_First@Base 4.99.18 - AB_UserQueue_List_GetCount@Base 4.99.18 - AB_UserQueue_List_HasElement@Base 4.99.18 - AB_UserQueue_List_Insert@Base 4.99.18 - AB_UserQueue_List_Last@Base 4.99.18 - AB_UserQueue_List_Next@Base 4.99.18 - AB_UserQueue_List_Previous@Base 4.99.18 - AB_UserQueue_List_SetSortFn@Base 5.0.10 - AB_UserQueue_List_Sort@Base 5.0.10 - AB_UserQueue_List_dup@Base 4.99.18 - AB_UserQueue_List_free@Base 4.99.18 - AB_UserQueue_List_new@Base 4.99.18 - AB_UserQueue_SetAccountQueueList@Base 4.99.18 - AB_UserQueue_SetUser@Base 4.99.18 - AB_UserQueue_dup@Base 4.99.18 - AB_UserQueue_free@Base 4.99.18 - AB_UserQueue_new@Base 4.99.18 - AB_UserTypePageDialog_GetBanking@Base 4.99.18 - AB_UserTypePageDialog_GetSelectedType@Base 4.99.18 - AB_UserTypePageDialog_SetSelectedType@Base 4.99.18 - AB_UserTypePageDialog_new@Base 4.99.18 - AB_User_Attach@Base 4.0.0 - AB_User_GetBackendName@Base 4.0.0 - AB_User_GetBankCode@Base 4.0.0 - AB_User_GetBanking@Base 4.0.0 - AB_User_GetCountry@Base 4.0.0 - AB_User_GetCustomerId@Base 4.0.0 - AB_User_GetDbId@Base 4.0.0 - AB_User_GetFileLock@Base 4.0.0 - AB_User_GetLastSessionId@Base 4.0.0 - AB_User_GetProvider@Base 4.0.0 - AB_User_GetUniqueId@Base 4.0.0 - AB_User_GetUserId@Base 4.0.0 - AB_User_GetUserName@Base 4.0.0 - AB_User_IsModified@Base 4.0.0 - AB_User_List2Iterator_Data@Base 4.0.0 - AB_User_List2Iterator_GetLinkCount@Base 4.0.0 - AB_User_List2Iterator_IncLinkCount@Base 4.0.0 - AB_User_List2Iterator_Next@Base 4.0.0 - AB_User_List2Iterator_Previous@Base 4.0.0 - AB_User_List2Iterator_free@Base 4.0.0 - AB_User_List2Iterator_new@Base 4.0.0 - AB_User_List2_Clear@Base 4.0.0 - AB_User_List2_Contains@Base 4.0.0 - AB_User_List2_Dump@Base 4.0.0 - AB_User_List2_Erase@Base 4.0.0 - AB_User_List2_FindIter@Base 4.0.0 - AB_User_List2_First@Base 4.0.0 - AB_User_List2_ForEach@Base 4.0.0 - AB_User_List2_GetBack@Base 4.0.0 - AB_User_List2_GetFront@Base 4.0.0 - AB_User_List2_GetSize@Base 4.0.0 - AB_User_List2_IsEmpty@Base 4.0.0 - AB_User_List2_Last@Base 4.0.0 - AB_User_List2_PopBack@Base 4.0.0 - AB_User_List2_PopFront@Base 4.0.0 - AB_User_List2_PushBack@Base 4.0.0 - AB_User_List2_PushFront@Base 4.0.0 - AB_User_List2_Remove@Base 4.0.0 - AB_User_List2_Unshare@Base 4.0.0 - AB_User_List2_dup@Base 4.0.0 - AB_User_List2_free@Base 4.0.0 - AB_User_List2_freeAll@Base 4.0.0 - AB_User_List2_new@Base 4.0.0 - AB_User_ReadDb@Base 4.0.0 - AB_User_SetBackendName@Base 4.0.0 - AB_User_SetBankCode@Base 4.0.0 - AB_User_SetBanking@Base 4.0.0 - AB_User_SetCountry@Base 4.0.0 - AB_User_SetCustomerId@Base 4.0.0 - AB_User_SetDbId@Base 4.0.0 - AB_User_SetFileLock@Base 4.0.0 - AB_User_SetLastSessionId@Base 4.0.0 - AB_User_SetModified@Base 4.0.0 - AB_User_SetUniqueId@Base 4.0.0 - AB_User_SetUserId@Base 4.0.0 - AB_User_SetUserName@Base 4.0.0 - AB_User_free@Base 4.0.0 - AB_User_toDb@Base 4.0.0 - AB_Value_AddValue@Base 4.0.0 - AB_Value_Compare@Base 4.0.0 - AB_Value_Denom@Base 5.0.5 - AB_Value_DivValue@Base 4.0.0 - AB_Value_Dump@Base 4.0.0 - AB_Value_Equal@Base 5.0.5 - AB_Value_GetCurrency@Base 4.0.0 - AB_Value_GetNumDenomString@Base 4.0.0 - AB_Value_GetValueAsDouble@Base 4.0.0 - AB_Value_IsNegative@Base 4.0.0 - AB_Value_IsPositive@Base 4.0.0 - AB_Value_IsZero@Base 4.0.0 - AB_Value_List_Add@Base 4.0.0 - AB_Value_List_AddList@Base 4.0.0 - AB_Value_List_Clear@Base 4.0.0 - AB_Value_List_Del@Base 4.0.0 - AB_Value_List_First@Base 4.0.0 - AB_Value_List_GetCount@Base 4.0.0 - AB_Value_List_HasElement@Base 4.0.0 - AB_Value_List_Insert@Base 4.0.0 - AB_Value_List_Last@Base 4.0.0 - AB_Value_List_Next@Base 4.0.0 - AB_Value_List_Previous@Base 4.0.0 - AB_Value_List_SetSortFn@Base 5.0.10 - AB_Value_List_Sort@Base 5.0.10 - AB_Value_List_dup@Base 4.0.0 - AB_Value_List_free@Base 4.0.0 - AB_Value_List_new@Base 4.0.0 - AB_Value_MultValue@Base 4.0.0 - AB_Value_Negate@Base 4.0.0 - AB_Value_Num@Base 5.0.5 - AB_Value_SetCurrency@Base 4.0.0 - AB_Value_SetValueFromDouble@Base 4.0.0 - AB_Value_SetZero@Base 4.0.0 - AB_Value_SubValue@Base 4.0.0 - AB_Value_dup@Base 4.0.0 - AB_Value_free@Base 4.0.0 - AB_Value_fromDb@Base 4.0.0 - AB_Value_fromDouble@Base 4.0.0 - AB_Value_fromInt@Base 5.0.5 - AB_Value_fromString@Base 4.0.0 - AB_Value_new@Base 4.0.0 - AB_Value_toDb@Base 4.0.0 - AB_Value_toDbFloat@Base 4.0.0 - AB_Value_toHbciString@Base 5.4.0beta - AB_Value_toHumanReadableString2@Base 4.0.0 - AB_Value_toHumanReadableString@Base 4.0.0 - AB_Value_toString@Base 4.0.0 - AH_ImExporter_DbFromIso8859_1ToUtf8@Base 4.0.0 - Ab_HttpSession_AddLog@Base 4.0.0 -libaqnone.so.34 libaqbanking34 #MINVER# -* Build-Depends-Package: libaqbanking34-dev, libaqbanking-dev - AN_Provider_new@Base 4.0.0 diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35-dbg.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking35-dbg.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking35-dbg.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35-dbg.lintian-overrides 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,3 @@ +# upstream increments the version number for every release, i.e. release +# candidates have lower version numbers than the expected final release. +rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35.docs libaqbanking-5.6.1beta/debian/libaqbanking35.docs --- libaqbanking-5.4.3beta/debian/libaqbanking35.docs 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35.docs 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35.install libaqbanking-5.6.1beta/debian/libaqbanking35.install --- libaqbanking-5.4.3beta/debian/libaqbanking35.install 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35.install 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/libaqbanking.so.* +usr/lib/libaqnone.so.* diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking35.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking35.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35.lintian-overrides 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,3 @@ +# upstream increments the version number for every release, i.e. release +# candidates have lower version numbers than the expected final release. +rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.dir libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.dir --- libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.dir 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.dir 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/aqbanking/plugins/35 diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.docs libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.docs --- libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.docs 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.docs 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.install libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.install --- libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.install 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.install 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/aqbanking/plugins diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking35-plugins.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35-plugins.lintian-overrides 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,3 @@ +# upstream increments the version number for every release, i.e. release +# candidates have lower version numbers than the expected final release. +rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking35.symbols libaqbanking-5.6.1beta/debian/libaqbanking35.symbols --- libaqbanking-5.4.3beta/debian/libaqbanking35.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking35.symbols 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,1818 @@ +libaqbanking.so.35 libaqbanking35 #MINVER# +* Build-Depends-Package: libaqbanking-dev + AB_ACCOUNTQUEUE__INHERIT_GETLIST@Base 4.99.18 + AB_ACCOUNTQUEUE__INHERIT_ISOFTYPE@Base 4.99.18 + AB_ACCOUNTQUEUE__INHERIT_SETDATA@Base 4.99.18 + AB_ACCOUNTQUEUE__INHERIT_UNLINK@Base 4.99.18 + AB_ACCOUNT__INHERIT_GETLIST@Base 4.0.0 + AB_ACCOUNT__INHERIT_ISOFTYPE@Base 4.0.0 + AB_ACCOUNT__INHERIT_SETDATA@Base 4.0.0 + AB_ACCOUNT__INHERIT_UNLINK@Base 4.0.0 + AB_AccountQueue_AddJob@Base 4.99.18 + AB_AccountQueue_Attach@Base 4.99.18 + AB_AccountQueue_FindJobQueue@Base 4.99.18 + AB_AccountQueue_GetAccount@Base 4.99.18 + AB_AccountQueue_GetJobQueueList@Base 4.99.18 + AB_AccountQueue_List_Add@Base 4.99.18 + AB_AccountQueue_List_AddList@Base 4.99.18 + AB_AccountQueue_List_Clear@Base 4.99.18 + AB_AccountQueue_List_Del@Base 4.99.18 + AB_AccountQueue_List_First@Base 4.99.18 + AB_AccountQueue_List_GetCount@Base 4.99.18 + AB_AccountQueue_List_HasElement@Base 4.99.18 + AB_AccountQueue_List_Insert@Base 4.99.18 + AB_AccountQueue_List_Last@Base 4.99.18 + AB_AccountQueue_List_Next@Base 4.99.18 + AB_AccountQueue_List_Previous@Base 4.99.18 + AB_AccountQueue_List_SetSortFn@Base 5.0.10 + AB_AccountQueue_List_Sort@Base 5.0.10 + AB_AccountQueue_List_dup@Base 4.99.18 + AB_AccountQueue_List_free@Base 4.99.18 + AB_AccountQueue_List_new@Base 4.99.18 + AB_AccountQueue_SetAccount@Base 4.99.18 + AB_AccountQueue_SetJobQueueList@Base 4.99.18 + AB_AccountQueue_dup@Base 4.99.18 + AB_AccountQueue_free@Base 4.99.18 + AB_AccountQueue_new@Base 4.99.18 + AB_AccountStatus_GetBankLine@Base 4.0.0 + AB_AccountStatus_GetBookedBalance@Base 4.0.0 + AB_AccountStatus_GetDisposable@Base 4.0.0 + AB_AccountStatus_GetDisposed@Base 4.0.0 + AB_AccountStatus_GetNotedBalance@Base 4.0.0 + AB_AccountStatus_GetTime@Base 4.0.0 + AB_AccountStatus_List2Iterator_Data@Base 4.0.0 + AB_AccountStatus_List2Iterator_GetLinkCount@Base 4.0.0 + AB_AccountStatus_List2Iterator_IncLinkCount@Base 4.0.0 + AB_AccountStatus_List2Iterator_Next@Base 4.0.0 + AB_AccountStatus_List2Iterator_Previous@Base 4.0.0 + AB_AccountStatus_List2Iterator_free@Base 4.0.0 + AB_AccountStatus_List2Iterator_new@Base 4.0.0 + AB_AccountStatus_List2_Clear@Base 4.0.0 + AB_AccountStatus_List2_Contains@Base 4.0.0 + AB_AccountStatus_List2_Dump@Base 4.0.0 + AB_AccountStatus_List2_Erase@Base 4.0.0 + AB_AccountStatus_List2_FindIter@Base 4.0.0 + AB_AccountStatus_List2_First@Base 4.0.0 + AB_AccountStatus_List2_ForEach@Base 4.0.0 + AB_AccountStatus_List2_GetBack@Base 4.0.0 + AB_AccountStatus_List2_GetFront@Base 4.0.0 + AB_AccountStatus_List2_GetSize@Base 4.0.0 + AB_AccountStatus_List2_IsEmpty@Base 4.0.0 + AB_AccountStatus_List2_Last@Base 4.0.0 + AB_AccountStatus_List2_PopBack@Base 4.0.0 + AB_AccountStatus_List2_PopFront@Base 4.0.0 + AB_AccountStatus_List2_PushBack@Base 4.0.0 + AB_AccountStatus_List2_PushFront@Base 4.0.0 + AB_AccountStatus_List2_Remove@Base 4.0.0 + AB_AccountStatus_List2_Unshare@Base 4.0.0 + AB_AccountStatus_List2_dup@Base 4.0.0 + AB_AccountStatus_List2_free@Base 4.0.0 + AB_AccountStatus_List2_freeAll@Base 4.0.0 + AB_AccountStatus_List2_new@Base 4.0.0 + AB_AccountStatus_SetBankLine@Base 4.0.0 + AB_AccountStatus_SetBookedBalance@Base 4.0.0 + AB_AccountStatus_SetDisposable@Base 4.0.0 + AB_AccountStatus_SetDisposed@Base 4.0.0 + AB_AccountStatus_SetNotedBalance@Base 4.0.0 + AB_AccountStatus_SetTime@Base 4.0.0 + AB_AccountStatus_dup@Base 4.0.0 + AB_AccountStatus_free@Base 4.0.0 + AB_AccountStatus_fromDb@Base 4.0.0 + AB_AccountStatus_new@Base 4.0.0 + AB_AccountStatus_toDb@Base 4.0.0 + AB_Account_GetAccountName@Base 4.0.0 + AB_Account_GetAccountNumber@Base 4.0.0 + AB_Account_GetAccountType@Base 4.0.0 + AB_Account_GetBIC@Base 4.0.0 + AB_Account_GetBackendName@Base 4.0.0 + AB_Account_GetBankCode@Base 4.0.0 + AB_Account_GetBankName@Base 4.0.0 + AB_Account_GetBanking@Base 4.0.0 + AB_Account_GetCountry@Base 4.0.0 + AB_Account_GetCurrency@Base 4.0.0 + AB_Account_GetFirstSelectedUser@Base 4.0.0 + AB_Account_GetFirstUser@Base 4.0.0 + AB_Account_GetIBAN@Base 4.0.0 + AB_Account_GetOwnerName@Base 4.0.0 + AB_Account_GetProvider@Base 4.0.0 + AB_Account_GetSelectedUsers@Base 4.0.0 + AB_Account_GetSubAccountId@Base 5.0.1 + AB_Account_GetUniqueId@Base 4.0.0 + AB_Account_GetUsers@Base 4.0.0 + AB_Account_List2Iterator_Data@Base 4.0.0 + AB_Account_List2Iterator_GetLinkCount@Base 4.0.0 + AB_Account_List2Iterator_IncLinkCount@Base 4.0.0 + AB_Account_List2Iterator_Next@Base 4.0.0 + AB_Account_List2Iterator_Previous@Base 4.0.0 + AB_Account_List2Iterator_free@Base 4.0.0 + AB_Account_List2Iterator_new@Base 4.0.0 + AB_Account_List2_Clear@Base 4.0.0 + AB_Account_List2_Contains@Base 4.0.0 + AB_Account_List2_Dump@Base 4.0.0 + AB_Account_List2_Erase@Base 4.0.0 + AB_Account_List2_FindIter@Base 4.0.0 + AB_Account_List2_First@Base 4.0.0 + AB_Account_List2_ForEach@Base 4.0.0 + AB_Account_List2_FreeAll@Base 4.0.0 + AB_Account_List2_GetAccountByUniqueId@Base 5.4.0beta + AB_Account_List2_GetBack@Base 4.0.0 + AB_Account_List2_GetFront@Base 4.0.0 + AB_Account_List2_GetSize@Base 4.0.0 + AB_Account_List2_IsEmpty@Base 4.0.0 + AB_Account_List2_Last@Base 4.0.0 + AB_Account_List2_PopBack@Base 4.0.0 + AB_Account_List2_PopFront@Base 4.0.0 + AB_Account_List2_PushBack@Base 4.0.0 + AB_Account_List2_PushFront@Base 4.0.0 + AB_Account_List2_Remove@Base 4.0.0 + AB_Account_List2_Unshare@Base 4.0.0 + AB_Account_List2_dup@Base 4.0.0 + AB_Account_List2_free@Base 4.0.0 + AB_Account_List2_new@Base 4.0.0 + AB_Account_SetAccountName@Base 4.0.0 + AB_Account_SetAccountNumber@Base 4.0.0 + AB_Account_SetAccountType@Base 4.0.0 + AB_Account_SetBIC@Base 4.0.0 + AB_Account_SetBankCode@Base 4.0.0 + AB_Account_SetBankName@Base 4.0.0 + AB_Account_SetCountry@Base 4.0.0 + AB_Account_SetCurrency@Base 4.0.0 + AB_Account_SetIBAN@Base 4.0.0 + AB_Account_SetOwnerName@Base 4.0.0 + AB_Account_SetSelectedUser@Base 4.0.0 + AB_Account_SetSelectedUsers@Base 4.0.0 + AB_Account_SetSubAccountId@Base 5.0.1 + AB_Account_SetUniqueId@Base 4.0.0 + AB_Account_SetUser@Base 4.0.0 + AB_Account_SetUsers@Base 4.0.0 + AB_Account_free@Base 4.0.0 + AB_BANKINFO_PLUGIN__INHERIT_GETLIST@Base 4.0.0 + AB_BANKINFO_PLUGIN__INHERIT_ISOFTYPE@Base 4.0.0 + AB_BANKINFO_PLUGIN__INHERIT_SETDATA@Base 4.0.0 + AB_BANKINFO_PLUGIN__INHERIT_UNLINK@Base 4.0.0 + AB_BANKING__INHERIT_GETLIST@Base 4.0.0 + AB_BANKING__INHERIT_ISOFTYPE@Base 4.0.0 + AB_BANKING__INHERIT_SETDATA@Base 4.0.0 + AB_BANKING__INHERIT_UNLINK@Base 4.0.0 + AB_Balance_GetTime@Base 4.0.0 + AB_Balance_GetValue@Base 4.0.0 + AB_Balance_SetValue@Base 4.0.0 + AB_Balance_dup@Base 4.0.0 + AB_Balance_free@Base 4.0.0 + AB_Balance_fromDb@Base 4.0.0 + AB_Balance_new@Base 4.0.0 + AB_Balance_toDb@Base 4.0.0 + AB_BankInfoPlugin_Attach@Base 4.0.0 + AB_BankInfoPlugin_CheckAccount@Base 4.0.0 + AB_BankInfoPlugin_GetBankInfo@Base 4.0.0 + AB_BankInfoPlugin_GetBankInfoByTemplate@Base 4.0.0 + AB_BankInfoPlugin_GetCountry@Base 4.0.0 + AB_BankInfoPlugin_List2Iterator_Data@Base 4.0.0 + AB_BankInfoPlugin_List2Iterator_GetLinkCount@Base 4.0.0 + AB_BankInfoPlugin_List2Iterator_IncLinkCount@Base 4.0.0 + AB_BankInfoPlugin_List2Iterator_Next@Base 4.0.0 + AB_BankInfoPlugin_List2Iterator_Previous@Base 4.0.0 + AB_BankInfoPlugin_List2Iterator_free@Base 4.0.0 + AB_BankInfoPlugin_List2Iterator_new@Base 4.0.0 + AB_BankInfoPlugin_List2_Clear@Base 4.0.0 + AB_BankInfoPlugin_List2_Contains@Base 4.0.0 + AB_BankInfoPlugin_List2_Dump@Base 4.0.0 + AB_BankInfoPlugin_List2_Erase@Base 4.0.0 + AB_BankInfoPlugin_List2_FindIter@Base 4.0.0 + AB_BankInfoPlugin_List2_First@Base 4.0.0 + AB_BankInfoPlugin_List2_ForEach@Base 4.0.0 + AB_BankInfoPlugin_List2_GetBack@Base 4.0.0 + AB_BankInfoPlugin_List2_GetFront@Base 4.0.0 + AB_BankInfoPlugin_List2_GetSize@Base 4.0.0 + AB_BankInfoPlugin_List2_IsEmpty@Base 4.0.0 + AB_BankInfoPlugin_List2_Last@Base 4.0.0 + AB_BankInfoPlugin_List2_PopBack@Base 4.0.0 + AB_BankInfoPlugin_List2_PopFront@Base 4.0.0 + AB_BankInfoPlugin_List2_PushBack@Base 4.0.0 + AB_BankInfoPlugin_List2_PushFront@Base 4.0.0 + AB_BankInfoPlugin_List2_Remove@Base 4.0.0 + AB_BankInfoPlugin_List2_Unshare@Base 4.0.0 + AB_BankInfoPlugin_List2_dup@Base 4.0.0 + AB_BankInfoPlugin_List2_free@Base 4.0.0 + AB_BankInfoPlugin_List2_new@Base 4.0.0 + AB_BankInfoPlugin_List_Add@Base 4.0.0 + AB_BankInfoPlugin_List_AddList@Base 4.0.0 + AB_BankInfoPlugin_List_Clear@Base 4.0.0 + AB_BankInfoPlugin_List_Del@Base 4.0.0 + AB_BankInfoPlugin_List_First@Base 4.0.0 + AB_BankInfoPlugin_List_GetCount@Base 4.0.0 + AB_BankInfoPlugin_List_HasElement@Base 4.0.0 + AB_BankInfoPlugin_List_Insert@Base 4.0.0 + AB_BankInfoPlugin_List_Last@Base 4.0.0 + AB_BankInfoPlugin_List_Next@Base 4.0.0 + AB_BankInfoPlugin_List_Previous@Base 4.0.0 + AB_BankInfoPlugin_List_SetSortFn@Base 5.0.10 + AB_BankInfoPlugin_List_Sort@Base 5.0.10 + AB_BankInfoPlugin_List_free@Base 4.0.0 + AB_BankInfoPlugin_List_new@Base 4.0.0 + AB_BankInfoPlugin_SetCheckAccountFn@Base 4.0.0 + AB_BankInfoPlugin_SetGetBankInfoByTemplateFn@Base 4.0.0 + AB_BankInfoPlugin_SetGetBankInfoFn@Base 4.0.0 + AB_BankInfoPlugin_free@Base 4.0.0 + AB_BankInfoPlugin_new@Base 4.0.0 + AB_BankInfoService_Attach@Base 4.0.0 + AB_BankInfoService_GetAddress@Base 4.0.0 + AB_BankInfoService_GetAux1@Base 4.0.0 + AB_BankInfoService_GetAux2@Base 4.0.0 + AB_BankInfoService_GetAux3@Base 4.0.0 + AB_BankInfoService_GetAux4@Base 4.0.0 + AB_BankInfoService_GetHversion@Base 4.99.18 + AB_BankInfoService_GetMode@Base 4.0.0 + AB_BankInfoService_GetPversion@Base 4.0.0 + AB_BankInfoService_GetSuffix@Base 4.0.0 + AB_BankInfoService_GetType@Base 4.0.0 + AB_BankInfoService_GetUserFlags@Base 4.99.18 + AB_BankInfoService_IsModified@Base 4.0.0 + AB_BankInfoService_List2Iterator_Data@Base 4.0.0 + AB_BankInfoService_List2Iterator_GetLinkCount@Base 4.0.0 + AB_BankInfoService_List2Iterator_IncLinkCount@Base 4.0.0 + AB_BankInfoService_List2Iterator_Next@Base 4.0.0 + AB_BankInfoService_List2Iterator_Previous@Base 4.0.0 + AB_BankInfoService_List2Iterator_free@Base 4.0.0 + AB_BankInfoService_List2Iterator_new@Base 4.0.0 + AB_BankInfoService_List2_Clear@Base 4.0.0 + AB_BankInfoService_List2_Contains@Base 4.0.0 + AB_BankInfoService_List2_Dump@Base 4.0.0 + AB_BankInfoService_List2_Erase@Base 4.0.0 + AB_BankInfoService_List2_FindIter@Base 4.0.0 + AB_BankInfoService_List2_First@Base 4.0.0 + AB_BankInfoService_List2_ForEach@Base 4.0.0 + AB_BankInfoService_List2_GetBack@Base 4.0.0 + AB_BankInfoService_List2_GetFront@Base 4.0.0 + AB_BankInfoService_List2_GetSize@Base 4.0.0 + AB_BankInfoService_List2_IsEmpty@Base 4.0.0 + AB_BankInfoService_List2_Last@Base 4.0.0 + AB_BankInfoService_List2_PopBack@Base 4.0.0 + AB_BankInfoService_List2_PopFront@Base 4.0.0 + AB_BankInfoService_List2_PushBack@Base 4.0.0 + AB_BankInfoService_List2_PushFront@Base 4.0.0 + AB_BankInfoService_List2_Remove@Base 4.0.0 + AB_BankInfoService_List2_Unshare@Base 4.0.0 + AB_BankInfoService_List2_dup@Base 4.0.0 + AB_BankInfoService_List2_free@Base 4.0.0 + AB_BankInfoService_List2_freeAll@Base 4.0.0 + AB_BankInfoService_List2_new@Base 4.0.0 + AB_BankInfoService_List_Add@Base 4.0.0 + AB_BankInfoService_List_AddList@Base 4.0.0 + AB_BankInfoService_List_Clear@Base 4.0.0 + AB_BankInfoService_List_Del@Base 4.0.0 + AB_BankInfoService_List_First@Base 4.0.0 + AB_BankInfoService_List_GetCount@Base 4.0.0 + AB_BankInfoService_List_HasElement@Base 4.0.0 + AB_BankInfoService_List_Insert@Base 4.0.0 + AB_BankInfoService_List_Last@Base 4.0.0 + AB_BankInfoService_List_Next@Base 4.0.0 + AB_BankInfoService_List_Previous@Base 4.0.0 + AB_BankInfoService_List_SetSortFn@Base 5.0.10 + AB_BankInfoService_List_Sort@Base 5.0.10 + AB_BankInfoService_List_dup@Base 4.0.0 + AB_BankInfoService_List_free@Base 4.0.0 + AB_BankInfoService_List_new@Base 4.0.0 + AB_BankInfoService_ReadDb@Base 4.0.0 + AB_BankInfoService_SetAddress@Base 4.0.0 + AB_BankInfoService_SetAux1@Base 4.0.0 + AB_BankInfoService_SetAux2@Base 4.0.0 + AB_BankInfoService_SetAux3@Base 4.0.0 + AB_BankInfoService_SetAux4@Base 4.0.0 + AB_BankInfoService_SetHversion@Base 4.99.18 + AB_BankInfoService_SetMode@Base 4.0.0 + AB_BankInfoService_SetModified@Base 4.0.0 + AB_BankInfoService_SetPversion@Base 4.0.0 + AB_BankInfoService_SetSuffix@Base 4.0.0 + AB_BankInfoService_SetType@Base 4.0.0 + AB_BankInfoService_SetUserFlags@Base 4.99.18 + AB_BankInfoService_dup@Base 4.0.0 + AB_BankInfoService_free@Base 4.0.0 + AB_BankInfoService_fromDb@Base 4.0.0 + AB_BankInfoService_new@Base 4.0.0 + AB_BankInfoService_toDb@Base 4.0.0 + AB_BankInfo_Attach@Base 4.0.0 + AB_BankInfo_GetBankId@Base 4.0.0 + AB_BankInfo_GetBankName@Base 4.0.0 + AB_BankInfo_GetBic@Base 4.0.0 + AB_BankInfo_GetBranchId@Base 4.0.0 + AB_BankInfo_GetCity@Base 4.0.0 + AB_BankInfo_GetCountry@Base 4.0.0 + AB_BankInfo_GetEmail@Base 4.0.0 + AB_BankInfo_GetFax@Base 4.0.0 + AB_BankInfo_GetLocation@Base 4.0.0 + AB_BankInfo_GetPhone@Base 4.0.0 + AB_BankInfo_GetRegion@Base 4.0.0 + AB_BankInfo_GetServices@Base 4.0.0 + AB_BankInfo_GetStreet@Base 4.0.0 + AB_BankInfo_GetWebsite@Base 4.0.0 + AB_BankInfo_GetZipcode@Base 4.0.0 + AB_BankInfo_IsModified@Base 4.0.0 + AB_BankInfo_List2Iterator_Data@Base 4.0.0 + AB_BankInfo_List2Iterator_GetLinkCount@Base 4.0.0 + AB_BankInfo_List2Iterator_IncLinkCount@Base 4.0.0 + AB_BankInfo_List2Iterator_Next@Base 4.0.0 + AB_BankInfo_List2Iterator_Previous@Base 4.0.0 + AB_BankInfo_List2Iterator_free@Base 4.0.0 + AB_BankInfo_List2Iterator_new@Base 4.0.0 + AB_BankInfo_List2_Clear@Base 4.0.0 + AB_BankInfo_List2_Contains@Base 4.0.0 + AB_BankInfo_List2_Dump@Base 4.0.0 + AB_BankInfo_List2_Erase@Base 4.0.0 + AB_BankInfo_List2_FindIter@Base 4.0.0 + AB_BankInfo_List2_First@Base 4.0.0 + AB_BankInfo_List2_ForEach@Base 4.0.0 + AB_BankInfo_List2_GetBack@Base 4.0.0 + AB_BankInfo_List2_GetFront@Base 4.0.0 + AB_BankInfo_List2_GetSize@Base 4.0.0 + AB_BankInfo_List2_IsEmpty@Base 4.0.0 + AB_BankInfo_List2_Last@Base 4.0.0 + AB_BankInfo_List2_PopBack@Base 4.0.0 + AB_BankInfo_List2_PopFront@Base 4.0.0 + AB_BankInfo_List2_PushBack@Base 4.0.0 + AB_BankInfo_List2_PushFront@Base 4.0.0 + AB_BankInfo_List2_Remove@Base 4.0.0 + AB_BankInfo_List2_Unshare@Base 4.0.0 + AB_BankInfo_List2_dup@Base 4.0.0 + AB_BankInfo_List2_free@Base 4.0.0 + AB_BankInfo_List2_freeAll@Base 4.0.0 + AB_BankInfo_List2_new@Base 4.0.0 + AB_BankInfo_List_Add@Base 4.0.0 + AB_BankInfo_List_AddList@Base 4.0.0 + AB_BankInfo_List_Clear@Base 4.0.0 + AB_BankInfo_List_Del@Base 4.0.0 + AB_BankInfo_List_First@Base 4.0.0 + AB_BankInfo_List_GetCount@Base 4.0.0 + AB_BankInfo_List_HasElement@Base 4.0.0 + AB_BankInfo_List_Insert@Base 4.0.0 + AB_BankInfo_List_Last@Base 4.0.0 + AB_BankInfo_List_Next@Base 4.0.0 + AB_BankInfo_List_Previous@Base 4.0.0 + AB_BankInfo_List_SetSortFn@Base 5.0.10 + AB_BankInfo_List_Sort@Base 5.0.10 + AB_BankInfo_List_dup@Base 4.0.0 + AB_BankInfo_List_free@Base 4.0.0 + AB_BankInfo_List_new@Base 4.0.0 + AB_BankInfo_ReadDb@Base 4.0.0 + AB_BankInfo_SetBankId@Base 4.0.0 + AB_BankInfo_SetBankName@Base 4.0.0 + AB_BankInfo_SetBic@Base 4.0.0 + AB_BankInfo_SetBranchId@Base 4.0.0 + AB_BankInfo_SetCity@Base 4.0.0 + AB_BankInfo_SetCountry@Base 4.0.0 + AB_BankInfo_SetEmail@Base 4.0.0 + AB_BankInfo_SetFax@Base 4.0.0 + AB_BankInfo_SetLocation@Base 4.0.0 + AB_BankInfo_SetModified@Base 4.0.0 + AB_BankInfo_SetPhone@Base 4.0.0 + AB_BankInfo_SetRegion@Base 4.0.0 + AB_BankInfo_SetServices@Base 4.0.0 + AB_BankInfo_SetStreet@Base 4.0.0 + AB_BankInfo_SetWebsite@Base 4.0.0 + AB_BankInfo_SetZipcode@Base 4.0.0 + AB_BankInfo_dup@Base 4.0.0 + AB_BankInfo_free@Base 4.0.0 + AB_BankInfo_fromDb@Base 4.0.0 + AB_BankInfo_new@Base 4.0.0 + AB_BankInfo_toDb@Base 4.0.0 + AB_Banking_AddAccount@Base 4.0.0 + AB_Banking_AddUser@Base 4.0.0 + AB_Banking_BeginExclUseAccount@Base 4.0.0 + AB_Banking_BeginExclUseUser@Base 4.0.0 + AB_Banking_CheckAccount@Base 4.0.0 + AB_Banking_CheckCryptToken@Base 4.0.0 + AB_Banking_CheckIban@Base 4.0.0 + AB_Banking_ClearCryptTokenList@Base 4.0.0 + AB_Banking_CreateAccount@Base 4.0.0 + AB_Banking_CreateUser@Base 4.0.0 + AB_Banking_DeleteAccount@Base 4.0.0 + AB_Banking_DeleteUser@Base 4.0.0 + AB_Banking_EndExclUseAccount@Base 4.0.0 + AB_Banking_EndExclUseUser@Base 4.0.0 + AB_Banking_ExecuteJobs@Base 4.0.0 + AB_Banking_ExecutionProgress@Base 4.0.0 + AB_Banking_ExportToBuffer@Base 4.1.0 + AB_Banking_ExportToFile@Base 4.99.2 + AB_Banking_ExportToFileWithProfile@Base 4.99.2 + AB_Banking_ExportWithProfile@Base 4.0.0 + AB_Banking_FillGapsInImExporterContext@Base 4.0.0 + AB_Banking_FillGapsInTransaction@Base 5.2.0beta + AB_Banking_FindAccount@Base 4.0.0 + AB_Banking_FindAccounts@Base 4.0.0 + AB_Banking_FindCountryByCode@Base 4.0.0 + AB_Banking_FindCountryByLocalName@Base 4.0.0 + AB_Banking_FindCountryByName@Base 4.0.0 + AB_Banking_FindCountryByNumeric@Base 4.0.0 + AB_Banking_FindDebugger@Base 4.0.0 + AB_Banking_FindFirstAccountOfUser@Base 4.0.0 + AB_Banking_FindUser@Base 4.0.0 + AB_Banking_FindUsers@Base 4.0.0 + AB_Banking_FindWizard@Base 4.0.0 + AB_Banking_Fini@Base 4.0.0 + AB_Banking_GetAccount@Base 4.0.0 + AB_Banking_GetAccountByAlias@Base 4.0.0 + AB_Banking_GetAccountByCodeAndNumber@Base 4.0.0 + AB_Banking_GetAccountByIban@Base 4.0.0 + AB_Banking_GetAccounts@Base 4.0.0 + AB_Banking_GetActiveProviders@Base 4.0.0 + AB_Banking_GetAppName@Base 4.0.0 + AB_Banking_GetAppUserDataDir@Base 4.0.0 + AB_Banking_GetBankInfo@Base 4.0.0 + AB_Banking_GetBankInfoByTemplate@Base 4.0.0 + AB_Banking_GetCert@Base 4.99.20 + AB_Banking_GetCryptToken@Base 4.0.0 + AB_Banking_GetDebuggerDescrs@Base 4.0.0 + AB_Banking_GetEscapedAppName@Base 4.0.0 + AB_Banking_GetGlobalDataDirs@Base 4.0.0 + AB_Banking_GetGlobalSysconfDirs@Base 4.0.0 + AB_Banking_GetImExporter@Base 4.0.0 + AB_Banking_GetImExporterDescrs@Base 4.0.0 + AB_Banking_GetImExporterProfile@Base 4.99.2 + AB_Banking_GetImExporterProfiles@Base 4.0.0 + AB_Banking_GetNewUserDialog@Base 4.99.18 + AB_Banking_GetProvider@Base 4.0.0 + AB_Banking_GetProviderDescrs@Base 4.0.0 + AB_Banking_GetProviderUserDataDir@Base 4.0.0 + AB_Banking_GetSharedDataDir@Base 4.0.0 + AB_Banking_GetUniqueId@Base 4.0.0 + AB_Banking_GetUser@Base 4.0.0 + AB_Banking_GetUserData@Base 4.0.0 + AB_Banking_GetUserDataDir@Base 4.0.0 + AB_Banking_GetUsers@Base 4.0.0 + AB_Banking_GetVersion@Base 4.0.0 + AB_Banking_GetWizardDescrs@Base 4.0.0 + AB_Banking_HasConf2@Base 4.0.0 + AB_Banking_HasConf3@Base 4.0.0 + AB_Banking_HasConf4@Base 4.0.0 + AB_Banking_ImportBuffer@Base 4.99.2 + AB_Banking_ImportConf2@Base 4.0.0 + AB_Banking_ImportConf3@Base 4.0.0 + AB_Banking_ImportFileWithProfile@Base 4.2.6 + AB_Banking_ImportWithProfile@Base 4.0.0 + AB_Banking_Init@Base 4.0.0 + AB_Banking_ListCountriesByLocalName@Base 4.0.0 + AB_Banking_ListCountriesByName@Base 4.0.0 + AB_Banking_LoadAppConfig@Base 4.0.0 + AB_Banking_LoadPluginConfig@Base 4.0.0 + AB_Banking_LoadSharedConfig@Base 4.0.0 + AB_Banking_LockAppConfig@Base 4.0.0 + AB_Banking_LockPluginConfig@Base 4.0.0 + AB_Banking_LockSharedConfig@Base 4.0.0 + AB_Banking_MakeGermanIban@Base 5.2.0beta + AB_Banking_OnlineFini@Base 4.0.0 + AB_Banking_OnlineInit@Base 4.0.0 + AB_Banking_SaveAccountConfig@Base 4.2.0 + AB_Banking_SaveAppConfig@Base 4.0.0 + AB_Banking_SaveLocalImExporterProfile@Base 4.2.6 + AB_Banking_SavePluginConfig@Base 4.0.0 + AB_Banking_SaveSharedConfig@Base 4.0.0 + AB_Banking_SaveUserConfig@Base 4.2.0 + AB_Banking_SetAccountAlias@Base 4.0.0 + AB_Banking_SetUserData@Base 4.0.0 + AB_Banking_UnlockAppConfig@Base 4.0.0 + AB_Banking_UnlockPluginConfig@Base 4.0.0 + AB_Banking_UnlockSharedConfig@Base 4.0.0 + AB_Banking_free@Base 4.0.0 + AB_Banking_new@Base 4.0.0 + AB_CellPhoneProduct_Attach@Base 4.0.0 + AB_CellPhoneProduct_GetAllowFreeValue@Base 4.0.0 + AB_CellPhoneProduct_GetId@Base 4.0.0 + AB_CellPhoneProduct_GetMaximumValue@Base 4.0.0 + AB_CellPhoneProduct_GetMinimumValue@Base 4.0.0 + AB_CellPhoneProduct_GetProductName@Base 4.0.0 + AB_CellPhoneProduct_GetProviderName@Base 4.0.0 + AB_CellPhoneProduct_GetValues@Base 4.0.0 + AB_CellPhoneProduct_IsModified@Base 4.0.0 + AB_CellPhoneProduct_List2Iterator_Data@Base 4.0.0 + AB_CellPhoneProduct_List2Iterator_GetLinkCount@Base 4.0.0 + AB_CellPhoneProduct_List2Iterator_IncLinkCount@Base 4.0.0 + AB_CellPhoneProduct_List2Iterator_Next@Base 4.0.0 + AB_CellPhoneProduct_List2Iterator_Previous@Base 4.0.0 + AB_CellPhoneProduct_List2Iterator_free@Base 4.0.0 + AB_CellPhoneProduct_List2Iterator_new@Base 4.0.0 + AB_CellPhoneProduct_List2_Clear@Base 4.0.0 + AB_CellPhoneProduct_List2_Contains@Base 4.0.0 + AB_CellPhoneProduct_List2_Dump@Base 4.0.0 + AB_CellPhoneProduct_List2_Erase@Base 4.0.0 + AB_CellPhoneProduct_List2_FindIter@Base 4.0.0 + AB_CellPhoneProduct_List2_First@Base 4.0.0 + AB_CellPhoneProduct_List2_ForEach@Base 4.0.0 + AB_CellPhoneProduct_List2_GetBack@Base 4.0.0 + AB_CellPhoneProduct_List2_GetFront@Base 4.0.0 + AB_CellPhoneProduct_List2_GetSize@Base 4.0.0 + AB_CellPhoneProduct_List2_IsEmpty@Base 4.0.0 + AB_CellPhoneProduct_List2_Last@Base 4.0.0 + AB_CellPhoneProduct_List2_PopBack@Base 4.0.0 + AB_CellPhoneProduct_List2_PopFront@Base 4.0.0 + AB_CellPhoneProduct_List2_PushBack@Base 4.0.0 + AB_CellPhoneProduct_List2_PushFront@Base 4.0.0 + AB_CellPhoneProduct_List2_Remove@Base 4.0.0 + AB_CellPhoneProduct_List2_Unshare@Base 4.0.0 + AB_CellPhoneProduct_List2_dup@Base 4.0.0 + AB_CellPhoneProduct_List2_free@Base 4.0.0 + AB_CellPhoneProduct_List2_freeAll@Base 4.0.0 + AB_CellPhoneProduct_List2_new@Base 4.0.0 + AB_CellPhoneProduct_List_Add@Base 4.0.0 + AB_CellPhoneProduct_List_AddList@Base 4.0.0 + AB_CellPhoneProduct_List_Clear@Base 4.0.0 + AB_CellPhoneProduct_List_Del@Base 4.0.0 + AB_CellPhoneProduct_List_First@Base 4.0.0 + AB_CellPhoneProduct_List_GetCount@Base 4.0.0 + AB_CellPhoneProduct_List_HasElement@Base 4.0.0 + AB_CellPhoneProduct_List_Insert@Base 4.0.0 + AB_CellPhoneProduct_List_Last@Base 4.0.0 + AB_CellPhoneProduct_List_Next@Base 4.0.0 + AB_CellPhoneProduct_List_Previous@Base 4.0.0 + AB_CellPhoneProduct_List_SetSortFn@Base 5.0.10 + AB_CellPhoneProduct_List_Sort@Base 5.0.10 + AB_CellPhoneProduct_List_dup@Base 4.0.0 + AB_CellPhoneProduct_List_free@Base 4.0.0 + AB_CellPhoneProduct_List_new@Base 4.0.0 + AB_CellPhoneProduct_ReadDb@Base 4.0.0 + AB_CellPhoneProduct_SetAllowFreeValue@Base 4.0.0 + AB_CellPhoneProduct_SetId@Base 4.0.0 + AB_CellPhoneProduct_SetMaximumValue@Base 4.0.0 + AB_CellPhoneProduct_SetMinimumValue@Base 4.0.0 + AB_CellPhoneProduct_SetModified@Base 4.0.0 + AB_CellPhoneProduct_SetProductName@Base 4.0.0 + AB_CellPhoneProduct_SetProviderName@Base 4.0.0 + AB_CellPhoneProduct_SetValues@Base 4.0.0 + AB_CellPhoneProduct_dup@Base 4.0.0 + AB_CellPhoneProduct_free@Base 4.0.0 + AB_CellPhoneProduct_fromDb@Base 4.0.0 + AB_CellPhoneProduct_new@Base 4.0.0 + AB_CellPhoneProduct_toDb@Base 4.0.0 + AB_Country_ConstList2Iterator_Data@Base 4.0.0 + AB_Country_ConstList2Iterator_Next@Base 4.0.0 + AB_Country_ConstList2Iterator_Previous@Base 4.0.0 + AB_Country_ConstList2Iterator_free@Base 4.0.0 + AB_Country_ConstList2Iterator_new@Base 4.0.0 + AB_Country_ConstList2_Clear@Base 4.0.0 + AB_Country_ConstList2_Contains@Base 4.0.0 + AB_Country_ConstList2_FindIter@Base 4.0.0 + AB_Country_ConstList2_First@Base 4.0.0 + AB_Country_ConstList2_ForEach@Base 4.0.0 + AB_Country_ConstList2_GetBack@Base 4.0.0 + AB_Country_ConstList2_GetFront@Base 4.0.0 + AB_Country_ConstList2_GetSize@Base 4.0.0 + AB_Country_ConstList2_IsEmpty@Base 4.0.0 + AB_Country_ConstList2_Last@Base 4.0.0 + AB_Country_ConstList2_PopBack@Base 4.0.0 + AB_Country_ConstList2_PopFront@Base 4.0.0 + AB_Country_ConstList2_PushBack@Base 4.0.0 + AB_Country_ConstList2_PushFront@Base 4.0.0 + AB_Country_ConstList2_Remove@Base 4.0.0 + AB_Country_ConstList2_free@Base 4.0.0 + AB_Country_ConstList2_new@Base 4.0.0 + AB_Country_GetCode@Base 4.0.0 + AB_Country_GetCurrencyCode@Base 4.0.0 + AB_Country_GetCurrencyName@Base 4.0.0 + AB_Country_GetLocalCurrencyName@Base 4.0.0 + AB_Country_GetLocalName@Base 4.0.0 + AB_Country_GetName@Base 4.0.0 + AB_Country_GetNumericCode@Base 4.0.0 + AB_EditAccountDialog_new@Base 4.99.2 + AB_EditUserDialog_new@Base 4.99.2 + AB_EuTransferInfo_Attach@Base 4.0.0 + AB_EuTransferInfo_GetCountryCode@Base 4.0.0 + AB_EuTransferInfo_GetFieldLimits@Base 4.0.0 + AB_EuTransferInfo_GetLimitForeignValue@Base 4.0.0 + AB_EuTransferInfo_GetLimitLocalValue@Base 4.0.0 + AB_EuTransferInfo_IsModified@Base 4.0.0 + AB_EuTransferInfo_List2Iterator_Data@Base 4.0.0 + AB_EuTransferInfo_List2Iterator_GetLinkCount@Base 4.0.0 + AB_EuTransferInfo_List2Iterator_IncLinkCount@Base 4.0.0 + AB_EuTransferInfo_List2Iterator_Next@Base 4.0.0 + AB_EuTransferInfo_List2Iterator_Previous@Base 4.0.0 + AB_EuTransferInfo_List2Iterator_free@Base 4.0.0 + AB_EuTransferInfo_List2Iterator_new@Base 4.0.0 + AB_EuTransferInfo_List2_Clear@Base 4.0.0 + AB_EuTransferInfo_List2_Contains@Base 4.0.0 + AB_EuTransferInfo_List2_Dump@Base 4.0.0 + AB_EuTransferInfo_List2_Erase@Base 4.0.0 + AB_EuTransferInfo_List2_FindIter@Base 4.0.0 + AB_EuTransferInfo_List2_First@Base 4.0.0 + AB_EuTransferInfo_List2_ForEach@Base 4.0.0 + AB_EuTransferInfo_List2_GetBack@Base 4.0.0 + AB_EuTransferInfo_List2_GetFront@Base 4.0.0 + AB_EuTransferInfo_List2_GetSize@Base 4.0.0 + AB_EuTransferInfo_List2_IsEmpty@Base 4.0.0 + AB_EuTransferInfo_List2_Last@Base 4.0.0 + AB_EuTransferInfo_List2_PopBack@Base 4.0.0 + AB_EuTransferInfo_List2_PopFront@Base 4.0.0 + AB_EuTransferInfo_List2_PushBack@Base 4.0.0 + AB_EuTransferInfo_List2_PushFront@Base 4.0.0 + AB_EuTransferInfo_List2_Remove@Base 4.0.0 + AB_EuTransferInfo_List2_Unshare@Base 4.0.0 + AB_EuTransferInfo_List2_dup@Base 4.0.0 + AB_EuTransferInfo_List2_free@Base 4.0.0 + AB_EuTransferInfo_List2_freeAll@Base 4.0.0 + AB_EuTransferInfo_List2_new@Base 4.0.0 + AB_EuTransferInfo_List_Add@Base 4.0.0 + AB_EuTransferInfo_List_AddList@Base 4.0.0 + AB_EuTransferInfo_List_Clear@Base 4.0.0 + AB_EuTransferInfo_List_Del@Base 4.0.0 + AB_EuTransferInfo_List_First@Base 4.0.0 + AB_EuTransferInfo_List_GetCount@Base 4.0.0 + AB_EuTransferInfo_List_HasElement@Base 4.0.0 + AB_EuTransferInfo_List_Insert@Base 4.0.0 + AB_EuTransferInfo_List_Last@Base 4.0.0 + AB_EuTransferInfo_List_Next@Base 4.0.0 + AB_EuTransferInfo_List_Previous@Base 4.0.0 + AB_EuTransferInfo_List_SetSortFn@Base 5.0.10 + AB_EuTransferInfo_List_Sort@Base 5.0.10 + AB_EuTransferInfo_List_dup@Base 4.0.0 + AB_EuTransferInfo_List_free@Base 4.0.0 + AB_EuTransferInfo_List_new@Base 4.0.0 + AB_EuTransferInfo_ReadDb@Base 4.0.0 + AB_EuTransferInfo_SetCountryCode@Base 4.0.0 + AB_EuTransferInfo_SetFieldLimits@Base 4.0.0 + AB_EuTransferInfo_SetLimitForeignValue@Base 4.0.0 + AB_EuTransferInfo_SetLimitLocalValue@Base 4.0.0 + AB_EuTransferInfo_SetModified@Base 4.0.0 + AB_EuTransferInfo_dup@Base 4.0.0 + AB_EuTransferInfo_free@Base 4.0.0 + AB_EuTransferInfo_fromDb@Base 4.0.0 + AB_EuTransferInfo_new@Base 4.0.0 + AB_EuTransferInfo_toDb@Base 4.0.0 + AB_Gui_Extend@Base 4.1.0 + AB_Gui_Unextend@Base 4.1.0 + AB_Gui_new@Base 4.1.0 + AB_HttpSession_ClearLog@Base 4.0.0 + AB_HttpSession_GetLog@Base 4.0.0 + AB_HttpSession_GetProvider@Base 4.0.0 + AB_HttpSession_GetUser@Base 4.0.0 + AB_HttpSession_new@Base 4.0.0 + AB_IMEXPORTER__INHERIT_GETLIST@Base 4.0.0 + AB_IMEXPORTER__INHERIT_ISOFTYPE@Base 4.0.0 + AB_IMEXPORTER__INHERIT_SETDATA@Base 4.0.0 + AB_IMEXPORTER__INHERIT_UNLINK@Base 4.0.0 + AB_ImExporterAccountInfo_AddAccountStatus@Base 4.0.0 + AB_ImExporterAccountInfo_AddDatedTransfer@Base 4.0.0 + AB_ImExporterAccountInfo_AddNotedTransaction@Base 4.0.0 + AB_ImExporterAccountInfo_AddStandingOrder@Base 4.0.0 + AB_ImExporterAccountInfo_AddTransaction@Base 4.0.0 + AB_ImExporterAccountInfo_AddTransfer@Base 4.0.0 + AB_ImExporterAccountInfo_ClearTransactions@Base 4.2.7 + AB_ImExporterAccountInfo_FillFromAccount@Base 4.0.0 + AB_ImExporterAccountInfo_GetAccountId@Base 4.0.0 + AB_ImExporterAccountInfo_GetAccountName@Base 4.0.0 + AB_ImExporterAccountInfo_GetAccountNumber@Base 4.0.0 + AB_ImExporterAccountInfo_GetBankCode@Base 4.0.0 + AB_ImExporterAccountInfo_GetBankName@Base 4.0.0 + AB_ImExporterAccountInfo_GetBic@Base 4.0.0 + AB_ImExporterAccountInfo_GetCurrency@Base 4.0.0 + AB_ImExporterAccountInfo_GetDatedTransferCount@Base 4.0.0 + AB_ImExporterAccountInfo_GetDescription@Base 4.0.0 + AB_ImExporterAccountInfo_GetFirstAccountStatus@Base 4.0.0 + AB_ImExporterAccountInfo_GetFirstDatedTransfer@Base 4.0.0 + AB_ImExporterAccountInfo_GetFirstNotedTransaction@Base 4.0.0 + AB_ImExporterAccountInfo_GetFirstStandingOrder@Base 4.0.0 + AB_ImExporterAccountInfo_GetFirstTransaction@Base 4.0.0 + AB_ImExporterAccountInfo_GetFirstTransfer@Base 4.0.0 + AB_ImExporterAccountInfo_GetIban@Base 4.0.0 + AB_ImExporterAccountInfo_GetNextAccountStatus@Base 4.0.0 + AB_ImExporterAccountInfo_GetNextDatedTransfer@Base 4.0.0 + AB_ImExporterAccountInfo_GetNextNotedTransaction@Base 4.0.0 + AB_ImExporterAccountInfo_GetNextStandingOrder@Base 4.0.0 + AB_ImExporterAccountInfo_GetNextTransaction@Base 4.0.0 + AB_ImExporterAccountInfo_GetNextTransfer@Base 4.0.0 + AB_ImExporterAccountInfo_GetNotedTransactionCount@Base 4.0.0 + AB_ImExporterAccountInfo_GetOwner@Base 4.0.0 + AB_ImExporterAccountInfo_GetStandingOrderCount@Base 4.0.0 + AB_ImExporterAccountInfo_GetTransactionCount@Base 4.0.0 + AB_ImExporterAccountInfo_GetTransferCount@Base 4.0.0 + AB_ImExporterAccountInfo_GetType@Base 4.0.0 + AB_ImExporterAccountInfo_List_Add@Base 4.0.0 + AB_ImExporterAccountInfo_List_AddList@Base 4.0.0 + AB_ImExporterAccountInfo_List_Clear@Base 4.0.0 + AB_ImExporterAccountInfo_List_Del@Base 4.0.0 + AB_ImExporterAccountInfo_List_First@Base 4.0.0 + AB_ImExporterAccountInfo_List_GetCount@Base 4.0.0 + AB_ImExporterAccountInfo_List_HasElement@Base 4.0.0 + AB_ImExporterAccountInfo_List_Insert@Base 4.0.0 + AB_ImExporterAccountInfo_List_Last@Base 4.0.0 + AB_ImExporterAccountInfo_List_Next@Base 4.0.0 + AB_ImExporterAccountInfo_List_Previous@Base 4.0.0 + AB_ImExporterAccountInfo_List_SetSortFn@Base 5.0.10 + AB_ImExporterAccountInfo_List_Sort@Base 5.0.10 + AB_ImExporterAccountInfo_List_free@Base 4.0.0 + AB_ImExporterAccountInfo_List_new@Base 4.0.0 + AB_ImExporterAccountInfo_SetAccountId@Base 4.0.0 + AB_ImExporterAccountInfo_SetAccountName@Base 4.0.0 + AB_ImExporterAccountInfo_SetAccountNumber@Base 4.0.0 + AB_ImExporterAccountInfo_SetBankCode@Base 4.0.0 + AB_ImExporterAccountInfo_SetBankName@Base 4.0.0 + AB_ImExporterAccountInfo_SetBic@Base 4.0.0 + AB_ImExporterAccountInfo_SetCurrency@Base 4.0.0 + AB_ImExporterAccountInfo_SetDescription@Base 4.0.0 + AB_ImExporterAccountInfo_SetIban@Base 4.0.0 + AB_ImExporterAccountInfo_SetOwner@Base 4.0.0 + AB_ImExporterAccountInfo_SetType@Base 4.0.0 + AB_ImExporterAccountInfo_TransactionsForEach@Base 4.0.0 + AB_ImExporterAccountInfo_dup@Base 4.0.0 + AB_ImExporterAccountInfo_free@Base 4.0.0 + AB_ImExporterAccountInfo_new@Base 4.0.0 + AB_ImExporterContext_AccountInfoForEach@Base 4.0.0 + AB_ImExporterContext_AddAccountInfo@Base 4.0.0 + AB_ImExporterContext_AddContext@Base 4.0.0 + AB_ImExporterContext_AddDatedTransfer@Base 4.0.0 + AB_ImExporterContext_AddLog@Base 4.0.0 + AB_ImExporterContext_AddMessage@Base 4.0.0 + AB_ImExporterContext_AddSecurity@Base 4.0.0 + AB_ImExporterContext_AddStandingOrder@Base 4.0.0 + AB_ImExporterContext_AddTransaction@Base 4.0.0 + AB_ImExporterContext_AddTransfer@Base 4.0.0 + AB_ImExporterContext_Clear@Base 4.2.6 + AB_ImExporterContext_ClearLog@Base 4.0.0 + AB_ImExporterContext_FindAccountInfo@Base 4.0.0 + AB_ImExporterContext_FindAccountInfoByIban@Base 5.1.0beta + AB_ImExporterContext_FindSecurity@Base 4.0.0 + AB_ImExporterContext_GetAccountInfo@Base 4.0.0 + AB_ImExporterContext_GetAccountInfoByIban@Base 5.1.0beta + AB_ImExporterContext_GetAccountInfoCount@Base 4.0.0 + AB_ImExporterContext_GetFirstAccountInfo@Base 4.0.0 + AB_ImExporterContext_GetFirstMessage@Base 4.0.0 + AB_ImExporterContext_GetFirstSecurity@Base 4.0.0 + AB_ImExporterContext_GetLog@Base 4.0.0 + AB_ImExporterContext_GetNextAccountInfo@Base 4.0.0 + AB_ImExporterContext_GetNextMessage@Base 4.0.0 + AB_ImExporterContext_GetNextSecurity@Base 4.0.0 + AB_ImExporterContext_ReadDb@Base 4.0.0 + AB_ImExporterContext_WriteContext@Base 5.3.1beta + AB_ImExporterContext_free@Base 4.0.0 + AB_ImExporterContext_fromDb@Base 4.0.0 + AB_ImExporterContext_new@Base 4.0.0 + AB_ImExporterContext_toDb@Base 4.0.0 + AB_ImExporter_AddFlags@Base 4.2.6 + AB_ImExporter_CheckFile@Base 4.0.0 + AB_ImExporter_DateFromString@Base 4.0.0 + AB_ImExporter_DbFromIso8859_1ToUtf8@Base 4.0.0 + AB_ImExporter_DtaToUtf8@Base 4.0.0 + AB_ImExporter_Export@Base 4.0.0 + AB_ImExporter_ExportToBuffer@Base 4.1.0 + AB_ImExporter_ExportToFile@Base 4.99.2 + AB_ImExporter_GetBanking@Base 4.0.0 + AB_ImExporter_GetEditProfileDialog@Base 4.2.6 + AB_ImExporter_GetFlags@Base 4.2.6 + AB_ImExporter_GetName@Base 4.0.0 + AB_ImExporter_Import@Base 4.0.0 + AB_ImExporter_ImportBuffer@Base 4.0.0 + AB_ImExporter_ImportFile@Base 4.0.0 + AB_ImExporter_Iso8859_1ToUtf8@Base 4.0.0 + AB_ImExporter_List_Add@Base 4.0.0 + AB_ImExporter_List_AddList@Base 4.0.0 + AB_ImExporter_List_Clear@Base 4.0.0 + AB_ImExporter_List_Del@Base 4.0.0 + AB_ImExporter_List_First@Base 4.0.0 + AB_ImExporter_List_GetCount@Base 4.0.0 + AB_ImExporter_List_HasElement@Base 4.0.0 + AB_ImExporter_List_Insert@Base 4.0.0 + AB_ImExporter_List_Last@Base 4.0.0 + AB_ImExporter_List_Next@Base 4.0.0 + AB_ImExporter_List_Previous@Base 4.0.0 + AB_ImExporter_List_SetSortFn@Base 5.0.10 + AB_ImExporter_List_Sort@Base 5.0.10 + AB_ImExporter_List_free@Base 4.0.0 + AB_ImExporter_List_new@Base 4.0.0 + AB_ImExporter_SetCheckFileFn@Base 4.0.0 + AB_ImExporter_SetExportFn@Base 4.0.0 + AB_ImExporter_SetFlags@Base 4.2.6 + AB_ImExporter_SetGetEditProfileDialogFn@Base 4.2.6 + AB_ImExporter_SetImportFn@Base 4.0.0 + AB_ImExporter_SubFlags@Base 4.2.6 + AB_ImExporter_Utf8ToDta@Base 4.0.0 + AB_ImExporter_free@Base 4.0.0 + AB_ImExporter_new@Base 4.0.0 + AB_ImporterDialog_new@Base 4.2.6 + AB_JOBQUEUE__INHERIT_GETLIST@Base 4.99.18 + AB_JOBQUEUE__INHERIT_ISOFTYPE@Base 4.99.18 + AB_JOBQUEUE__INHERIT_SETDATA@Base 4.99.18 + AB_JOBQUEUE__INHERIT_UNLINK@Base 4.99.18 + AB_JobCreateDatedTransfer_GetFieldLimits@Base 4.0.0 + AB_JobCreateDatedTransfer_GetTransaction@Base 4.0.0 + AB_JobCreateDatedTransfer_SetFieldLimits@Base 4.0.0 + AB_JobCreateDatedTransfer_SetTransaction@Base 4.0.0 + AB_JobCreateDatedTransfer_new@Base 4.0.0 + AB_JobCreateStandingOrder_GetFieldLimits@Base 4.0.0 + AB_JobCreateStandingOrder_GetTransaction@Base 4.0.0 + AB_JobCreateStandingOrder_SetFieldLimits@Base 4.0.0 + AB_JobCreateStandingOrder_SetTransaction@Base 4.0.0 + AB_JobCreateStandingOrder_new@Base 4.0.0 + AB_JobDeleteDatedTransfer_GetFieldLimits@Base 4.0.0 + AB_JobDeleteDatedTransfer_GetTransaction@Base 4.0.0 + AB_JobDeleteDatedTransfer_SetFieldLimits@Base 4.0.0 + AB_JobDeleteDatedTransfer_SetTransaction@Base 4.0.0 + AB_JobDeleteDatedTransfer_new@Base 4.0.0 + AB_JobDeleteStandingOrder_GetFieldLimits@Base 4.0.0 + AB_JobDeleteStandingOrder_GetTransaction@Base 4.0.0 + AB_JobDeleteStandingOrder_SetFieldLimits@Base 4.0.0 + AB_JobDeleteStandingOrder_SetTransaction@Base 4.0.0 + AB_JobDeleteStandingOrder_new@Base 4.0.0 + AB_JobEuTransfer_FindCountryInfo@Base 4.0.0 + AB_JobEuTransfer_GetChargeWhom@Base 4.0.0 + AB_JobEuTransfer_GetCountryInfoList@Base 4.0.0 + AB_JobEuTransfer_GetIbanAllowed@Base 4.0.0 + AB_JobEuTransfer_GetTransaction@Base 4.0.0 + AB_JobEuTransfer_SetChargeWhom@Base 4.0.0 + AB_JobEuTransfer_SetCountryInfoList@Base 4.0.0 + AB_JobEuTransfer_SetIbanAllowed@Base 4.0.0 + AB_JobEuTransfer_SetTransaction@Base 4.0.0 + AB_JobEuTransfer_new@Base 4.0.0 + AB_JobGetBalance_GetAccountStatus@Base 4.0.0 + AB_JobGetBalance_new@Base 4.0.0 + AB_JobGetDatedTransfers_GetDatedTransfers@Base 4.0.0 + AB_JobGetDatedTransfers_new@Base 4.0.0 + AB_JobGetStandingOrders_GetStandingOrders@Base 4.0.0 + AB_JobGetStandingOrders_new@Base 4.0.0 + AB_JobGetTransactions_GetAccountStatusList@Base 4.0.0 + AB_JobGetTransactions_GetFromTime@Base 4.0.0 + AB_JobGetTransactions_GetMaxStoreDays@Base 4.0.0 + AB_JobGetTransactions_GetToTime@Base 4.0.0 + AB_JobGetTransactions_GetTransactions@Base 4.0.0 + AB_JobGetTransactions_SetFromTime@Base 4.0.0 + AB_JobGetTransactions_SetMaxStoreDays@Base 4.0.0 + AB_JobGetTransactions_SetToTime@Base 4.0.0 + AB_JobGetTransactions_new@Base 4.0.0 + AB_JobInternalTransfer_GetFieldLimits@Base 4.0.0 + AB_JobInternalTransfer_GetTransaction@Base 4.0.0 + AB_JobInternalTransfer_SetFieldLimits@Base 4.0.0 + AB_JobInternalTransfer_SetTransaction@Base 4.0.0 + AB_JobInternalTransfer_new@Base 4.0.0 + AB_JobLoadCellPhone_GetCellPhoneProduct@Base 4.0.0 + AB_JobLoadCellPhone_GetCellPhoneProductList@Base 4.0.0 + AB_JobLoadCellPhone_GetPhoneNumber@Base 4.0.0 + AB_JobLoadCellPhone_GetValue@Base 4.0.0 + AB_JobLoadCellPhone_SetCellPhoneProduct@Base 4.0.0 + AB_JobLoadCellPhone_SetPhoneNumber@Base 4.0.0 + AB_JobLoadCellPhone_SetProductList@Base 4.0.0 + AB_JobLoadCellPhone_SetValue@Base 4.0.0 + AB_JobLoadCellPhone_new@Base 4.0.0 + AB_JobModifyDatedTransfer_GetFieldLimits@Base 4.0.0 + AB_JobModifyDatedTransfer_GetTransaction@Base 4.0.0 + AB_JobModifyDatedTransfer_SetFieldLimits@Base 4.0.0 + AB_JobModifyDatedTransfer_SetTransaction@Base 4.0.0 + AB_JobModifyDatedTransfer_new@Base 4.0.0 + AB_JobModifyStandingOrder_GetFieldLimits@Base 4.0.0 + AB_JobModifyStandingOrder_GetTransaction@Base 4.0.0 + AB_JobModifyStandingOrder_SetFieldLimits@Base 4.0.0 + AB_JobModifyStandingOrder_SetTransaction@Base 4.0.0 + AB_JobModifyStandingOrder_new@Base 4.0.0 + AB_JobQueue_Attach@Base 4.99.18 + AB_JobQueue_GetJobList@Base 4.99.18 + AB_JobQueue_GetJobType@Base 4.99.18 + AB_JobQueue_List_Add@Base 4.99.18 + AB_JobQueue_List_AddList@Base 4.99.18 + AB_JobQueue_List_Clear@Base 4.99.18 + AB_JobQueue_List_Del@Base 4.99.18 + AB_JobQueue_List_First@Base 4.99.18 + AB_JobQueue_List_GetCount@Base 4.99.18 + AB_JobQueue_List_HasElement@Base 4.99.18 + AB_JobQueue_List_Insert@Base 4.99.18 + AB_JobQueue_List_Last@Base 4.99.18 + AB_JobQueue_List_Next@Base 4.99.18 + AB_JobQueue_List_Previous@Base 4.99.18 + AB_JobQueue_List_SetSortFn@Base 5.0.10 + AB_JobQueue_List_Sort@Base 5.0.10 + AB_JobQueue_List_dup@Base 4.99.18 + AB_JobQueue_List_free@Base 4.99.18 + AB_JobQueue_List_new@Base 4.99.18 + AB_JobQueue_SetJobList@Base 4.99.18 + AB_JobQueue_SetJobType@Base 4.99.18 + AB_JobQueue_dup@Base 4.99.18 + AB_JobQueue_free@Base 4.99.18 + AB_JobQueue_new@Base 4.99.18 + AB_JobSepaCreateStandingOrder_new@Base 5.3.2beta + AB_JobSepaDebitNote_GetFieldLimits@Base 4.0.0 + AB_JobSepaDebitNote_GetTransaction@Base 4.0.0 + AB_JobSepaDebitNote_SetFieldLimits@Base 4.0.0 + AB_JobSepaDebitNote_SetTransaction@Base 4.0.0 + AB_JobSepaDebitNote_new@Base 4.0.0 + AB_JobSepaFlashDebitNote_new@Base 5.5.1 + AB_JobSepaGetStandingOrders_new@Base 5.5.1 + AB_JobSepaTransfer_GetFieldLimits@Base 4.0.0 + AB_JobSepaTransfer_GetTransaction@Base 4.0.0 + AB_JobSepaTransfer_SetFieldLimits@Base 4.0.0 + AB_JobSepaTransfer_SetTransaction@Base 4.0.0 + AB_JobSepaTransfer_new@Base 4.0.0 + AB_JobSingleDebitNote_GetFieldLimits@Base 4.0.0 + AB_JobSingleDebitNote_GetTransaction@Base 4.0.0 + AB_JobSingleDebitNote_SetFieldLimits@Base 4.0.0 + AB_JobSingleDebitNote_SetTransaction@Base 4.0.0 + AB_JobSingleDebitNote_new@Base 4.0.0 + AB_JobSingleTransfer_GetFieldLimits@Base 4.0.0 + AB_JobSingleTransfer_GetTransaction@Base 4.0.0 + AB_JobSingleTransfer_SetFieldLimits@Base 4.0.0 + AB_JobSingleTransfer_SetTransaction@Base 4.0.0 + AB_JobSingleTransfer_new@Base 4.0.0 + AB_Job_Attach@Base 4.0.0 + AB_Job_Char2Status@Base 4.0.0 + AB_Job_Char2Type@Base 4.0.0 + AB_Job_CheckAvailability@Base 4.0.0 + AB_Job_DateFromDb@Base 4.0.0 + AB_Job_DateOnlyFromDb@Base 4.0.0 + AB_Job_DateOnlyToDb@Base 4.0.0 + AB_Job_DateToDb@Base 4.0.0 + AB_Job_GetAccount@Base 4.0.0 + AB_Job_GetAppData@Base 4.0.0 + AB_Job_GetCreatedBy@Base 4.0.0 + AB_Job_GetFieldLimits@Base 5.3.1beta + AB_Job_GetIdForProvider@Base 4.0.0 + AB_Job_GetJobId@Base 4.0.0 + AB_Job_GetLastStatusChange@Base 4.0.0 + AB_Job_GetLogs@Base 4.0.0 + AB_Job_GetProviderData@Base 4.0.0 + AB_Job_GetResultText@Base 4.0.0 + AB_Job_GetStatus@Base 4.0.0 + AB_Job_GetTransaction@Base 5.3.1beta + AB_Job_GetType@Base 4.0.0 + AB_Job_GetUsedTan@Base 4.0.0 + AB_Job_List2Iterator_Data@Base 4.0.0 + AB_Job_List2Iterator_GetLinkCount@Base 4.0.0 + AB_Job_List2Iterator_IncLinkCount@Base 4.0.0 + AB_Job_List2Iterator_Next@Base 4.0.0 + AB_Job_List2Iterator_Previous@Base 4.0.0 + AB_Job_List2Iterator_free@Base 4.0.0 + AB_Job_List2Iterator_new@Base 4.0.0 + AB_Job_List2_Clear@Base 4.0.0 + AB_Job_List2_ClearAll@Base 4.0.0 + AB_Job_List2_Contains@Base 4.0.0 + AB_Job_List2_Dump@Base 4.0.0 + AB_Job_List2_Erase@Base 4.0.0 + AB_Job_List2_FindIter@Base 4.0.0 + AB_Job_List2_First@Base 4.0.0 + AB_Job_List2_ForEach@Base 4.0.0 + AB_Job_List2_FreeAll@Base 4.0.0 + AB_Job_List2_GetBack@Base 4.0.0 + AB_Job_List2_GetFront@Base 4.0.0 + AB_Job_List2_GetSize@Base 4.0.0 + AB_Job_List2_IsEmpty@Base 4.0.0 + AB_Job_List2_Last@Base 4.0.0 + AB_Job_List2_PopBack@Base 4.0.0 + AB_Job_List2_PopFront@Base 4.0.0 + AB_Job_List2_PushBack@Base 4.0.0 + AB_Job_List2_PushFront@Base 4.0.0 + AB_Job_List2_Remove@Base 4.0.0 + AB_Job_List2_Unshare@Base 4.0.0 + AB_Job_List2_dup@Base 4.0.0 + AB_Job_List2_free@Base 4.0.0 + AB_Job_List2_new@Base 4.0.0 + AB_Job_Log@Base 4.0.0 + AB_Job_LogRaw@Base 4.0.0 + AB_Job_SetFieldLimits@Base 5.3.1beta + AB_Job_SetIdForProvider@Base 4.0.0 + AB_Job_SetResultText@Base 4.0.0 + AB_Job_SetStatus@Base 4.0.0 + AB_Job_SetTransaction@Base 5.3.1beta + AB_Job_SetUsedTan@Base 4.0.0 + AB_Job_Status2Char@Base 4.0.0 + AB_Job_Type2Char@Base 4.0.0 + AB_Job_Type2LocalChar@Base 4.0.0 + AB_Job_free@Base 4.0.0 + AB_Message_Attach@Base 4.0.0 + AB_Message_GetAccountId@Base 5.0.6 + AB_Message_GetDateReceived@Base 4.0.0 + AB_Message_GetSubject@Base 4.0.0 + AB_Message_GetText@Base 4.0.0 + AB_Message_GetUserId@Base 5.0.6 + AB_Message_IsModified@Base 4.0.0 + AB_Message_List2Iterator_Data@Base 4.0.0 + AB_Message_List2Iterator_GetLinkCount@Base 4.0.0 + AB_Message_List2Iterator_IncLinkCount@Base 4.0.0 + AB_Message_List2Iterator_Next@Base 4.0.0 + AB_Message_List2Iterator_Previous@Base 4.0.0 + AB_Message_List2Iterator_free@Base 4.0.0 + AB_Message_List2Iterator_new@Base 4.0.0 + AB_Message_List2_Clear@Base 4.0.0 + AB_Message_List2_Contains@Base 4.0.0 + AB_Message_List2_Dump@Base 4.0.0 + AB_Message_List2_Erase@Base 4.0.0 + AB_Message_List2_FindIter@Base 4.0.0 + AB_Message_List2_First@Base 4.0.0 + AB_Message_List2_ForEach@Base 4.0.0 + AB_Message_List2_GetBack@Base 4.0.0 + AB_Message_List2_GetFront@Base 4.0.0 + AB_Message_List2_GetSize@Base 4.0.0 + AB_Message_List2_IsEmpty@Base 4.0.0 + AB_Message_List2_Last@Base 4.0.0 + AB_Message_List2_PopBack@Base 4.0.0 + AB_Message_List2_PopFront@Base 4.0.0 + AB_Message_List2_PushBack@Base 4.0.0 + AB_Message_List2_PushFront@Base 4.0.0 + AB_Message_List2_Remove@Base 4.0.0 + AB_Message_List2_Unshare@Base 4.0.0 + AB_Message_List2_dup@Base 4.0.0 + AB_Message_List2_free@Base 4.0.0 + AB_Message_List2_freeAll@Base 4.0.0 + AB_Message_List2_new@Base 4.0.0 + AB_Message_List_Add@Base 4.0.0 + AB_Message_List_AddList@Base 4.0.0 + AB_Message_List_Clear@Base 4.0.0 + AB_Message_List_Del@Base 4.0.0 + AB_Message_List_First@Base 4.0.0 + AB_Message_List_GetCount@Base 4.0.0 + AB_Message_List_HasElement@Base 4.0.0 + AB_Message_List_Insert@Base 4.0.0 + AB_Message_List_Last@Base 4.0.0 + AB_Message_List_Next@Base 4.0.0 + AB_Message_List_Previous@Base 4.0.0 + AB_Message_List_SetSortFn@Base 5.0.10 + AB_Message_List_Sort@Base 5.0.10 + AB_Message_List_dup@Base 4.0.0 + AB_Message_List_free@Base 4.0.0 + AB_Message_List_new@Base 4.0.0 + AB_Message_ReadDb@Base 4.0.0 + AB_Message_SetAccountId@Base 5.0.6 + AB_Message_SetDateReceived@Base 4.0.0 + AB_Message_SetModified@Base 4.0.0 + AB_Message_SetSubject@Base 4.0.0 + AB_Message_SetText@Base 4.0.0 + AB_Message_SetUserId@Base 5.0.6 + AB_Message_dup@Base 4.0.0 + AB_Message_free@Base 4.0.0 + AB_Message_fromDb@Base 4.0.0 + AB_Message_new@Base 4.0.0 + AB_Message_toDb@Base 4.0.0 + AB_MsgEngine_new@Base 4.0.0 + AB_NewAccountDialog_GetAccount@Base 4.99.2 + AB_NewAccountDialog_SetAccount@Base 4.99.2 + AB_NewAccountDialog_new@Base 4.99.2 + AB_NewUserDialog_GetBanking@Base 4.99.2 + AB_NewUserDialog_GetUser@Base 4.99.2 + AB_NewUserDialog_SetUser@Base 4.99.2 + AB_NewUserDialog_new@Base 4.99.2 + AB_PROVIDER__INHERIT_GETLIST@Base 4.0.0 + AB_PROVIDER__INHERIT_ISOFTYPE@Base 4.0.0 + AB_PROVIDER__INHERIT_SETDATA@Base 4.0.0 + AB_PROVIDER__INHERIT_UNLINK@Base 4.0.0 + AB_Pin_GetHash@Base 4.0.0 + AB_Pin_GetStatus@Base 4.0.0 + AB_Pin_GetToken@Base 4.0.0 + AB_Pin_GetValue@Base 4.0.0 + AB_Pin_SetHash@Base 4.0.0 + AB_Pin_SetStatus@Base 4.0.0 + AB_Pin_SetToken@Base 4.0.0 + AB_Pin_SetValue@Base 4.0.0 + AB_Plugin_BankInfo_Factory@Base 4.0.0 + AB_Plugin_BankInfo_SetFactoryFn@Base 4.0.0 + AB_Plugin_BankInfo_new@Base 4.0.0 + AB_Plugin_ImExporter_Factory@Base 4.0.0 + AB_Plugin_ImExporter_SetFactoryFn@Base 4.0.0 + AB_Plugin_ImExporter_new@Base 4.0.0 + AB_Plugin_Provider_Factory@Base 4.0.0 + AB_Plugin_Provider_SetFactoryFn@Base 4.0.0 + AB_Plugin_Provider_new@Base 4.0.0 + AB_ProviderGetUserTypeDialog@Base 4.99.18 + AB_Provider_AddFlags@Base 4.99.2 + AB_Provider_AddJob@Base 4.0.0 + AB_Provider_Execute@Base 4.0.0 + AB_Provider_ExtendAccount@Base 4.0.0 + AB_Provider_ExtendUser@Base 4.0.0 + AB_Provider_Fini@Base 4.0.0 + AB_Provider_GetBanking@Base 4.0.0 + AB_Provider_GetEditAccountDialog@Base 4.99.2 + AB_Provider_GetEditUserDialog@Base 4.99.2 + AB_Provider_GetEscapedName@Base 4.0.0 + AB_Provider_GetFlags@Base 4.0.0 + AB_Provider_GetName@Base 4.0.0 + AB_Provider_GetNewAccountDialog@Base 4.99.2 + AB_Provider_GetNewUserDialog@Base 4.99.2 + AB_Provider_GetUserDataDir@Base 4.0.0 + AB_Provider_Init@Base 4.0.0 + AB_Provider_IsInit@Base 4.0.0 + AB_Provider_ResetQueue@Base 4.0.0 + AB_Provider_SetAddJobFn@Base 4.0.0 + AB_Provider_SetExecuteFn@Base 4.0.0 + AB_Provider_SetExtendAccountFn@Base 4.0.0 + AB_Provider_SetExtendUserFn@Base 4.0.0 + AB_Provider_SetFiniFn@Base 4.0.0 + AB_Provider_SetGetEditAccountDialogFn@Base 4.99.2 + AB_Provider_SetGetEditUserDialogFn@Base 4.99.2 + AB_Provider_SetGetNewAccountDialogFn@Base 4.99.2 + AB_Provider_SetGetNewUserDialogFn@Base 4.99.2 + AB_Provider_SetGetUserTypeDialogFn@Base 4.99.18 + AB_Provider_SetInitFn@Base 4.0.0 + AB_Provider_SetResetQueueFn@Base 4.0.0 + AB_Provider_SetUpdateFn@Base 4.0.0 + AB_Provider_SetUpdateJobFn@Base 4.0.0 + AB_Provider_Update@Base 4.0.0 + AB_Provider_UpdateJob@Base 4.0.0 + AB_Provider_new@Base 4.0.0 + AB_QUEUE__INHERIT_GETLIST@Base 4.99.18 + AB_QUEUE__INHERIT_ISOFTYPE@Base 4.99.18 + AB_QUEUE__INHERIT_SETDATA@Base 4.99.18 + AB_QUEUE__INHERIT_UNLINK@Base 4.99.18 + AB_Queue_AddJob@Base 4.99.18 + AB_Queue_Attach@Base 4.99.18 + AB_Queue_FindFirstJobLikeThis@Base 4.99.18 + AB_Queue_FindUserQueue@Base 4.99.18 + AB_Queue_GetUserQueueList@Base 4.99.18 + AB_Queue_SetUserQueueList@Base 4.99.18 + AB_Queue_copy@Base 5.1.0beta + AB_Queue_dup@Base 4.99.18 + AB_Queue_free@Base 4.99.18 + AB_Queue_new@Base 4.99.18 + AB_Security_Attach@Base 4.0.0 + AB_Security_GetName@Base 4.0.0 + AB_Security_GetNameSpace@Base 4.0.0 + AB_Security_GetTickerSymbol@Base 4.0.0 + AB_Security_GetUniqueId@Base 4.0.0 + AB_Security_GetUnitPriceDate@Base 4.0.0 + AB_Security_GetUnitPriceValue@Base 4.0.0 + AB_Security_GetUnits@Base 4.0.0 + AB_Security_IsModified@Base 4.0.0 + AB_Security_List2Iterator_Data@Base 4.0.0 + AB_Security_List2Iterator_GetLinkCount@Base 4.0.0 + AB_Security_List2Iterator_IncLinkCount@Base 4.0.0 + AB_Security_List2Iterator_Next@Base 4.0.0 + AB_Security_List2Iterator_Previous@Base 4.0.0 + AB_Security_List2Iterator_free@Base 4.0.0 + AB_Security_List2Iterator_new@Base 4.0.0 + AB_Security_List2_Clear@Base 4.0.0 + AB_Security_List2_Contains@Base 4.0.0 + AB_Security_List2_Dump@Base 4.0.0 + AB_Security_List2_Erase@Base 4.0.0 + AB_Security_List2_FindIter@Base 4.0.0 + AB_Security_List2_First@Base 4.0.0 + AB_Security_List2_ForEach@Base 4.0.0 + AB_Security_List2_GetBack@Base 4.0.0 + AB_Security_List2_GetFront@Base 4.0.0 + AB_Security_List2_GetSize@Base 4.0.0 + AB_Security_List2_IsEmpty@Base 4.0.0 + AB_Security_List2_Last@Base 4.0.0 + AB_Security_List2_PopBack@Base 4.0.0 + AB_Security_List2_PopFront@Base 4.0.0 + AB_Security_List2_PushBack@Base 4.0.0 + AB_Security_List2_PushFront@Base 4.0.0 + AB_Security_List2_Remove@Base 4.0.0 + AB_Security_List2_Unshare@Base 4.0.0 + AB_Security_List2_dup@Base 4.0.0 + AB_Security_List2_free@Base 4.0.0 + AB_Security_List2_freeAll@Base 4.0.0 + AB_Security_List2_new@Base 4.0.0 + AB_Security_List_Add@Base 4.0.0 + AB_Security_List_AddList@Base 4.0.0 + AB_Security_List_Clear@Base 4.0.0 + AB_Security_List_Del@Base 4.0.0 + AB_Security_List_First@Base 4.0.0 + AB_Security_List_GetCount@Base 4.0.0 + AB_Security_List_HasElement@Base 4.0.0 + AB_Security_List_Insert@Base 4.0.0 + AB_Security_List_Last@Base 4.0.0 + AB_Security_List_Next@Base 4.0.0 + AB_Security_List_Previous@Base 4.0.0 + AB_Security_List_SetSortFn@Base 5.0.10 + AB_Security_List_Sort@Base 5.0.10 + AB_Security_List_dup@Base 4.0.0 + AB_Security_List_free@Base 4.0.0 + AB_Security_List_new@Base 4.0.0 + AB_Security_ReadDb@Base 4.0.0 + AB_Security_SetModified@Base 4.0.0 + AB_Security_SetName@Base 4.0.0 + AB_Security_SetNameSpace@Base 4.0.0 + AB_Security_SetTickerSymbol@Base 4.0.0 + AB_Security_SetUniqueId@Base 4.0.0 + AB_Security_SetUnitPriceDate@Base 4.0.0 + AB_Security_SetUnitPriceValue@Base 4.0.0 + AB_Security_SetUnits@Base 4.0.0 + AB_Security_dup@Base 4.0.0 + AB_Security_free@Base 4.0.0 + AB_Security_fromDb@Base 4.0.0 + AB_Security_new@Base 4.0.0 + AB_Security_toDb@Base 4.0.0 + AB_SelectBackend@Base 4.99.2 + AB_SelectBackendDialog_GetSelectedProvider@Base 4.99.2 + AB_SelectBackendDialog_SetSelectedProvider@Base 4.99.2 + AB_SelectBackendDialog_new@Base 4.99.2 + AB_SelectBankInfoDialog_GetSelectedBankInfo@Base 4.99.2 + AB_SelectBankInfoDialog_new@Base 4.99.2 + AB_SetupDialog_new@Base 4.99.2 + AB_SetupNewUserDialog_new@Base 4.99.18 + AB_TRANSACTION__INHERIT_GETLIST@Base 4.0.0 + AB_TRANSACTION__INHERIT_ISOFTYPE@Base 4.0.0 + AB_TRANSACTION__INHERIT_SETDATA@Base 4.0.0 + AB_TRANSACTION__INHERIT_UNLINK@Base 4.0.0 + AB_TextKeyDescr_Attach@Base 4.0.0 + AB_TextKeyDescr_GetDescr@Base 4.0.0 + AB_TextKeyDescr_GetName@Base 4.0.0 + AB_TextKeyDescr_GetValue@Base 4.0.0 + AB_TextKeyDescr_IsModified@Base 4.0.0 + AB_TextKeyDescr_List2Iterator_Data@Base 4.0.0 + AB_TextKeyDescr_List2Iterator_GetLinkCount@Base 4.0.0 + AB_TextKeyDescr_List2Iterator_IncLinkCount@Base 4.0.0 + AB_TextKeyDescr_List2Iterator_Next@Base 4.0.0 + AB_TextKeyDescr_List2Iterator_Previous@Base 4.0.0 + AB_TextKeyDescr_List2Iterator_free@Base 4.0.0 + AB_TextKeyDescr_List2Iterator_new@Base 4.0.0 + AB_TextKeyDescr_List2_Clear@Base 4.0.0 + AB_TextKeyDescr_List2_Contains@Base 4.0.0 + AB_TextKeyDescr_List2_Dump@Base 4.0.0 + AB_TextKeyDescr_List2_Erase@Base 4.0.0 + AB_TextKeyDescr_List2_FindIter@Base 4.0.0 + AB_TextKeyDescr_List2_First@Base 4.0.0 + AB_TextKeyDescr_List2_ForEach@Base 4.0.0 + AB_TextKeyDescr_List2_GetBack@Base 4.0.0 + AB_TextKeyDescr_List2_GetFront@Base 4.0.0 + AB_TextKeyDescr_List2_GetSize@Base 4.0.0 + AB_TextKeyDescr_List2_IsEmpty@Base 4.0.0 + AB_TextKeyDescr_List2_Last@Base 4.0.0 + AB_TextKeyDescr_List2_PopBack@Base 4.0.0 + AB_TextKeyDescr_List2_PopFront@Base 4.0.0 + AB_TextKeyDescr_List2_PushBack@Base 4.0.0 + AB_TextKeyDescr_List2_PushFront@Base 4.0.0 + AB_TextKeyDescr_List2_Remove@Base 4.0.0 + AB_TextKeyDescr_List2_Unshare@Base 4.0.0 + AB_TextKeyDescr_List2_dup@Base 4.0.0 + AB_TextKeyDescr_List2_free@Base 4.0.0 + AB_TextKeyDescr_List2_freeAll@Base 4.0.0 + AB_TextKeyDescr_List2_new@Base 4.0.0 + AB_TextKeyDescr_List_Add@Base 4.0.0 + AB_TextKeyDescr_List_AddList@Base 4.0.0 + AB_TextKeyDescr_List_Clear@Base 4.0.0 + AB_TextKeyDescr_List_Del@Base 4.0.0 + AB_TextKeyDescr_List_First@Base 4.0.0 + AB_TextKeyDescr_List_GetCount@Base 4.0.0 + AB_TextKeyDescr_List_HasElement@Base 4.0.0 + AB_TextKeyDescr_List_Insert@Base 4.0.0 + AB_TextKeyDescr_List_Last@Base 4.0.0 + AB_TextKeyDescr_List_Next@Base 4.0.0 + AB_TextKeyDescr_List_Previous@Base 4.0.0 + AB_TextKeyDescr_List_SetSortFn@Base 5.0.10 + AB_TextKeyDescr_List_Sort@Base 5.0.10 + AB_TextKeyDescr_List_dup@Base 4.0.0 + AB_TextKeyDescr_List_free@Base 4.0.0 + AB_TextKeyDescr_List_new@Base 4.0.0 + AB_TextKeyDescr_ReadDb@Base 4.0.0 + AB_TextKeyDescr_SetDescr@Base 4.0.0 + AB_TextKeyDescr_SetModified@Base 4.0.0 + AB_TextKeyDescr_SetName@Base 4.0.0 + AB_TextKeyDescr_SetValue@Base 4.0.0 + AB_TextKeyDescr_dup@Base 4.0.0 + AB_TextKeyDescr_free@Base 4.0.0 + AB_TextKeyDescr_fromDb@Base 4.0.0 + AB_TextKeyDescr_new@Base 4.0.0 + AB_TextKeyDescr_toDb@Base 4.0.0 + AB_TransactionLimits_AddValuesCycleMonth@Base 4.0.0 + AB_TransactionLimits_AddValuesCycleWeek@Base 4.0.0 + AB_TransactionLimits_AddValuesExecutionDayMonth@Base 4.0.0 + AB_TransactionLimits_AddValuesExecutionDayWeek@Base 4.0.0 + AB_TransactionLimits_AddValuesTextKey@Base 4.0.0 + AB_TransactionLimits_Attach@Base 4.0.0 + AB_TransactionLimits_ClearValuesCycleMonth@Base 4.0.0 + AB_TransactionLimits_ClearValuesCycleWeek@Base 4.0.0 + AB_TransactionLimits_ClearValuesExecutionDayMonth@Base 4.0.0 + AB_TransactionLimits_ClearValuesExecutionDayWeek@Base 4.0.0 + AB_TransactionLimits_ClearValuesTextKey@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeCycle@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeExecutionDay@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeFirstExecutionDate@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeLastExecutionDate@Base 4.0.0 + AB_TransactionLimits_GetAllowChangePeriod@Base 4.0.0 + AB_TransactionLimits_GetAllowChangePurpose@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeRecipientAccount@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeRecipientName@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeTextKey@Base 4.0.0 + AB_TransactionLimits_GetAllowChangeValue@Base 4.0.0 + AB_TransactionLimits_GetAllowMonthly@Base 4.0.0 + AB_TransactionLimits_GetAllowWeekly@Base 4.0.0 + AB_TransactionLimits_GetMaxLenBankReference@Base 4.0.0 + AB_TransactionLimits_GetMaxLenCustomerReference@Base 4.0.0 + AB_TransactionLimits_GetMaxLenLocalAccountNumber@Base 4.0.0 + AB_TransactionLimits_GetMaxLenLocalBankCode@Base 4.0.0 + AB_TransactionLimits_GetMaxLenLocalName@Base 4.0.0 + AB_TransactionLimits_GetMaxLenLocalSuffix@Base 4.0.0 + AB_TransactionLimits_GetMaxLenPurpose@Base 4.0.0 + AB_TransactionLimits_GetMaxLenRemoteAccountNumber@Base 4.0.0 + AB_TransactionLimits_GetMaxLenRemoteBankCode@Base 4.0.0 + AB_TransactionLimits_GetMaxLenRemoteIban@Base 4.0.0 + AB_TransactionLimits_GetMaxLenRemoteName@Base 4.0.0 + AB_TransactionLimits_GetMaxLenRemoteSuffix@Base 4.0.0 + AB_TransactionLimits_GetMaxLenTextKey@Base 4.0.0 + AB_TransactionLimits_GetMaxLinesPurpose@Base 4.0.0 + AB_TransactionLimits_GetMaxLinesRemoteName@Base 4.0.0 + AB_TransactionLimits_GetMaxValueSetupTime@Base 4.0.0 + AB_TransactionLimits_GetMaxValueSetupTimeFinal@Base 5.3.3beta + AB_TransactionLimits_GetMaxValueSetupTimeFirst@Base 5.3.3beta + AB_TransactionLimits_GetMaxValueSetupTimeOnce@Base 5.3.3beta + AB_TransactionLimits_GetMaxValueSetupTimeRecurring@Base 5.3.3beta + AB_TransactionLimits_GetMinLenBankReference@Base 4.0.0 + AB_TransactionLimits_GetMinLenCustomerReference@Base 4.0.0 + AB_TransactionLimits_GetMinLenLocalAccountNumber@Base 4.0.0 + AB_TransactionLimits_GetMinLenLocalBankCode@Base 4.0.0 + AB_TransactionLimits_GetMinLenLocalName@Base 4.0.0 + AB_TransactionLimits_GetMinLenLocalSuffix@Base 4.0.0 + AB_TransactionLimits_GetMinLenPurpose@Base 4.0.0 + AB_TransactionLimits_GetMinLenRemoteAccountNumber@Base 4.0.0 + AB_TransactionLimits_GetMinLenRemoteBankCode@Base 4.0.0 + AB_TransactionLimits_GetMinLenRemoteIban@Base 4.0.0 + AB_TransactionLimits_GetMinLenRemoteName@Base 4.0.0 + AB_TransactionLimits_GetMinLenRemoteSuffix@Base 4.0.0 + AB_TransactionLimits_GetMinLenTextKey@Base 4.0.0 + AB_TransactionLimits_GetMinLinesPurpose@Base 4.0.0 + AB_TransactionLimits_GetMinLinesRemoteName@Base 4.0.0 + AB_TransactionLimits_GetMinValueSetupTime@Base 4.0.0 + AB_TransactionLimits_GetMinValueSetupTimeFinal@Base 5.3.3beta + AB_TransactionLimits_GetMinValueSetupTimeFirst@Base 5.3.3beta + AB_TransactionLimits_GetMinValueSetupTimeOnce@Base 5.3.3beta + AB_TransactionLimits_GetMinValueSetupTimeRecurring@Base 5.3.3beta + AB_TransactionLimits_GetNeedDate@Base 5.3.2beta + AB_TransactionLimits_GetTextKeys@Base 4.0.0 + AB_TransactionLimits_GetValuesCycleMonth@Base 4.0.0 + AB_TransactionLimits_GetValuesCycleWeek@Base 4.0.0 + AB_TransactionLimits_GetValuesExecutionDayMonth@Base 4.0.0 + AB_TransactionLimits_GetValuesExecutionDayWeek@Base 4.0.0 + AB_TransactionLimits_GetValuesTextKey@Base 4.0.0 + AB_TransactionLimits_HasValuesCycleMonth@Base 4.0.0 + AB_TransactionLimits_HasValuesCycleWeek@Base 4.0.0 + AB_TransactionLimits_HasValuesExecutionDayMonth@Base 4.0.0 + AB_TransactionLimits_HasValuesExecutionDayWeek@Base 4.0.0 + AB_TransactionLimits_HasValuesTextKey@Base 4.0.0 + AB_TransactionLimits_IsModified@Base 4.0.0 + AB_TransactionLimits_List2Iterator_Data@Base 4.0.0 + AB_TransactionLimits_List2Iterator_GetLinkCount@Base 4.0.0 + AB_TransactionLimits_List2Iterator_IncLinkCount@Base 4.0.0 + AB_TransactionLimits_List2Iterator_Next@Base 4.0.0 + AB_TransactionLimits_List2Iterator_Previous@Base 4.0.0 + AB_TransactionLimits_List2Iterator_free@Base 4.0.0 + AB_TransactionLimits_List2Iterator_new@Base 4.0.0 + AB_TransactionLimits_List2_Clear@Base 4.0.0 + AB_TransactionLimits_List2_Contains@Base 4.0.0 + AB_TransactionLimits_List2_Dump@Base 4.0.0 + AB_TransactionLimits_List2_Erase@Base 4.0.0 + AB_TransactionLimits_List2_FindIter@Base 4.0.0 + AB_TransactionLimits_List2_First@Base 4.0.0 + AB_TransactionLimits_List2_ForEach@Base 4.0.0 + AB_TransactionLimits_List2_GetBack@Base 4.0.0 + AB_TransactionLimits_List2_GetFront@Base 4.0.0 + AB_TransactionLimits_List2_GetSize@Base 4.0.0 + AB_TransactionLimits_List2_IsEmpty@Base 4.0.0 + AB_TransactionLimits_List2_Last@Base 4.0.0 + AB_TransactionLimits_List2_PopBack@Base 4.0.0 + AB_TransactionLimits_List2_PopFront@Base 4.0.0 + AB_TransactionLimits_List2_PushBack@Base 4.0.0 + AB_TransactionLimits_List2_PushFront@Base 4.0.0 + AB_TransactionLimits_List2_Remove@Base 4.0.0 + AB_TransactionLimits_List2_Unshare@Base 4.0.0 + AB_TransactionLimits_List2_dup@Base 4.0.0 + AB_TransactionLimits_List2_free@Base 4.0.0 + AB_TransactionLimits_List2_freeAll@Base 4.0.0 + AB_TransactionLimits_List2_new@Base 4.0.0 + AB_TransactionLimits_List_Add@Base 4.0.0 + AB_TransactionLimits_List_AddList@Base 4.0.0 + AB_TransactionLimits_List_Clear@Base 4.0.0 + AB_TransactionLimits_List_Del@Base 4.0.0 + AB_TransactionLimits_List_First@Base 4.0.0 + AB_TransactionLimits_List_GetCount@Base 4.0.0 + AB_TransactionLimits_List_HasElement@Base 4.0.0 + AB_TransactionLimits_List_Insert@Base 4.0.0 + AB_TransactionLimits_List_Last@Base 4.0.0 + AB_TransactionLimits_List_Next@Base 4.0.0 + AB_TransactionLimits_List_Previous@Base 4.0.0 + AB_TransactionLimits_List_SetSortFn@Base 5.0.10 + AB_TransactionLimits_List_Sort@Base 5.0.10 + AB_TransactionLimits_List_dup@Base 4.0.0 + AB_TransactionLimits_List_free@Base 4.0.0 + AB_TransactionLimits_List_new@Base 4.0.0 + AB_TransactionLimits_ReadDb@Base 4.0.0 + AB_TransactionLimits_RemoveValuesCycleMonth@Base 4.0.0 + AB_TransactionLimits_RemoveValuesCycleWeek@Base 4.0.0 + AB_TransactionLimits_RemoveValuesExecutionDayMonth@Base 4.0.0 + AB_TransactionLimits_RemoveValuesExecutionDayWeek@Base 4.0.0 + AB_TransactionLimits_RemoveValuesTextKey@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeCycle@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeExecutionDay@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeFirstExecutionDate@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeLastExecutionDate@Base 4.0.0 + AB_TransactionLimits_SetAllowChangePeriod@Base 4.0.0 + AB_TransactionLimits_SetAllowChangePurpose@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeRecipientAccount@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeRecipientName@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeTextKey@Base 4.0.0 + AB_TransactionLimits_SetAllowChangeValue@Base 4.0.0 + AB_TransactionLimits_SetAllowMonthly@Base 4.0.0 + AB_TransactionLimits_SetAllowWeekly@Base 4.0.0 + AB_TransactionLimits_SetMaxLenBankReference@Base 4.0.0 + AB_TransactionLimits_SetMaxLenCustomerReference@Base 4.0.0 + AB_TransactionLimits_SetMaxLenLocalAccountNumber@Base 4.0.0 + AB_TransactionLimits_SetMaxLenLocalBankCode@Base 4.0.0 + AB_TransactionLimits_SetMaxLenLocalName@Base 4.0.0 + AB_TransactionLimits_SetMaxLenLocalSuffix@Base 4.0.0 + AB_TransactionLimits_SetMaxLenPurpose@Base 4.0.0 + AB_TransactionLimits_SetMaxLenRemoteAccountNumber@Base 4.0.0 + AB_TransactionLimits_SetMaxLenRemoteBankCode@Base 4.0.0 + AB_TransactionLimits_SetMaxLenRemoteIban@Base 4.0.0 + AB_TransactionLimits_SetMaxLenRemoteName@Base 4.0.0 + AB_TransactionLimits_SetMaxLenRemoteSuffix@Base 4.0.0 + AB_TransactionLimits_SetMaxLenTextKey@Base 4.0.0 + AB_TransactionLimits_SetMaxLinesPurpose@Base 4.0.0 + AB_TransactionLimits_SetMaxLinesRemoteName@Base 4.0.0 + AB_TransactionLimits_SetMaxValueSetupTime@Base 4.0.0 + AB_TransactionLimits_SetMaxValueSetupTimeFinal@Base 5.3.3beta + AB_TransactionLimits_SetMaxValueSetupTimeFirst@Base 5.3.3beta + AB_TransactionLimits_SetMaxValueSetupTimeOnce@Base 5.3.3beta + AB_TransactionLimits_SetMaxValueSetupTimeRecurring@Base 5.3.3beta + AB_TransactionLimits_SetMinLenBankReference@Base 4.0.0 + AB_TransactionLimits_SetMinLenCustomerReference@Base 4.0.0 + AB_TransactionLimits_SetMinLenLocalAccountNumber@Base 4.0.0 + AB_TransactionLimits_SetMinLenLocalBankCode@Base 4.0.0 + AB_TransactionLimits_SetMinLenLocalName@Base 4.0.0 + AB_TransactionLimits_SetMinLenLocalSuffix@Base 4.0.0 + AB_TransactionLimits_SetMinLenPurpose@Base 4.0.0 + AB_TransactionLimits_SetMinLenRemoteAccountNumber@Base 4.0.0 + AB_TransactionLimits_SetMinLenRemoteBankCode@Base 4.0.0 + AB_TransactionLimits_SetMinLenRemoteIban@Base 4.0.0 + AB_TransactionLimits_SetMinLenRemoteName@Base 4.0.0 + AB_TransactionLimits_SetMinLenRemoteSuffix@Base 4.0.0 + AB_TransactionLimits_SetMinLenTextKey@Base 4.0.0 + AB_TransactionLimits_SetMinLinesPurpose@Base 4.0.0 + AB_TransactionLimits_SetMinLinesRemoteName@Base 4.0.0 + AB_TransactionLimits_SetMinValueSetupTime@Base 4.0.0 + AB_TransactionLimits_SetMinValueSetupTimeFinal@Base 5.3.3beta + AB_TransactionLimits_SetMinValueSetupTimeFirst@Base 5.3.3beta + AB_TransactionLimits_SetMinValueSetupTimeOnce@Base 5.3.3beta + AB_TransactionLimits_SetMinValueSetupTimeRecurring@Base 5.3.3beta + AB_TransactionLimits_SetModified@Base 4.0.0 + AB_TransactionLimits_SetNeedDate@Base 5.3.2beta + AB_TransactionLimits_SetTextKeys@Base 4.0.0 + AB_TransactionLimits_SetValuesCycleMonth@Base 4.0.0 + AB_TransactionLimits_SetValuesCycleWeek@Base 4.0.0 + AB_TransactionLimits_SetValuesExecutionDayMonth@Base 4.0.0 + AB_TransactionLimits_SetValuesExecutionDayWeek@Base 4.0.0 + AB_TransactionLimits_SetValuesTextKey@Base 4.0.0 + AB_TransactionLimits_dup@Base 4.0.0 + AB_TransactionLimits_free@Base 4.0.0 + AB_TransactionLimits_fromDb@Base 4.0.0 + AB_TransactionLimits_new@Base 4.0.0 + AB_TransactionLimits_toDb@Base 4.0.0 + AB_Transaction_AddCategory@Base 4.0.0 + AB_Transaction_AddPurpose@Base 4.0.0 + AB_Transaction_AddRemoteName@Base 4.0.0 + AB_Transaction_Attach@Base 4.0.0 + AB_Transaction_Charge_fromString@Base 4.0.0 + AB_Transaction_Charge_toString@Base 4.0.0 + AB_Transaction_CheckDateAgainstLimits@Base 5.3.1beta + AB_Transaction_CheckDateAgainstSequenceLimits@Base 5.3.3beta + AB_Transaction_CheckFirstExecutionDateAgainstLimits@Base 5.3.1beta + AB_Transaction_CheckForSepaConformity@Base 5.3.1beta + AB_Transaction_CheckNamesAgainstLimits@Base 5.3.1beta + AB_Transaction_CheckPurposeAgainstLimits@Base 5.3.1beta + AB_Transaction_CheckRecurrenceAgainstLimits@Base 5.3.1beta + AB_Transaction_CheckTextKeyAgainstLimits@Base 5.3.1beta + AB_Transaction_ClearCategory@Base 4.0.0 + AB_Transaction_ClearPurpose@Base 4.0.0 + AB_Transaction_ClearRemoteName@Base 4.0.0 + AB_Transaction_Compare@Base 4.0.0 + AB_Transaction_FillLocalFromAccount@Base 4.0.0 + AB_Transaction_GetBankReference@Base 4.0.0 + AB_Transaction_GetCategory@Base 4.0.0 + AB_Transaction_GetCharge@Base 4.0.0 + AB_Transaction_GetCommission@Base 4.0.0 +#MISSING: 5.5.1# AB_Transaction_GetCreditorIdentifier@Base 4.2.3+svn.r1797 + AB_Transaction_GetCreditorSchemeId@Base 5.0.31beta + AB_Transaction_GetCustomerReference@Base 4.0.0 + AB_Transaction_GetCycle@Base 4.0.0 + AB_Transaction_GetDate@Base 4.0.0 + AB_Transaction_GetEndToEndReference@Base 4.2.3+svn.r1797 + AB_Transaction_GetExecutionDay@Base 4.0.0 + AB_Transaction_GetFees@Base 4.0.0 + AB_Transaction_GetFiId@Base 4.0.0 + AB_Transaction_GetFirstExecutionDate@Base 4.0.0 + AB_Transaction_GetGroupId@Base 4.0.0 + AB_Transaction_GetIdForApplication@Base 4.0.0 + AB_Transaction_GetLastExecutionDate@Base 4.0.0 + AB_Transaction_GetLocalAccountNumber@Base 4.0.0 + AB_Transaction_GetLocalBankCode@Base 4.0.0 + AB_Transaction_GetLocalBic@Base 4.0.0 + AB_Transaction_GetLocalBranchId@Base 4.0.0 + AB_Transaction_GetLocalCountry@Base 4.0.0 + AB_Transaction_GetLocalIban@Base 4.0.0 + AB_Transaction_GetLocalName@Base 4.0.0 + AB_Transaction_GetLocalSuffix@Base 4.0.0 + AB_Transaction_GetMandateDate@Base 5.0.31beta + AB_Transaction_GetMandateDebitorName@Base 5.0.31beta + AB_Transaction_GetMandateId@Base 5.0.31beta +#MISSING: 5.5.1# AB_Transaction_GetMandateReference@Base 4.2.3+svn.r1797 + AB_Transaction_GetNextExecutionDate@Base 4.0.0 + AB_Transaction_GetOriginalCreditorName@Base 5.0.31beta + AB_Transaction_GetOriginalCreditorSchemeId@Base 5.0.31beta + AB_Transaction_GetOriginalMandateId@Base 5.0.31beta + AB_Transaction_GetOriginatorIdentifier@Base 4.2.3+svn.r1797 + AB_Transaction_GetPeriod@Base 4.0.0 + AB_Transaction_GetPrimanota@Base 4.0.0 + AB_Transaction_GetPurpose@Base 4.0.0 + AB_Transaction_GetRemoteAccountNumber@Base 4.0.0 + AB_Transaction_GetRemoteAddrCity@Base 4.0.0 + AB_Transaction_GetRemoteAddrStreet@Base 4.0.0 + AB_Transaction_GetRemoteAddrZipcode@Base 4.0.0 + AB_Transaction_GetRemoteBankCode@Base 4.0.0 + AB_Transaction_GetRemoteBankLocation@Base 4.0.0 + AB_Transaction_GetRemoteBankName@Base 4.0.0 + AB_Transaction_GetRemoteBic@Base 4.0.0 + AB_Transaction_GetRemoteBranchId@Base 4.0.0 + AB_Transaction_GetRemoteCountry@Base 4.0.0 + AB_Transaction_GetRemoteIban@Base 4.0.0 + AB_Transaction_GetRemoteName@Base 4.0.0 + AB_Transaction_GetRemotePhone@Base 4.0.0 + AB_Transaction_GetRemoteSuffix@Base 4.0.0 + AB_Transaction_GetSequenceType@Base 5.1.0beta + AB_Transaction_GetStatus@Base 4.0.0 + AB_Transaction_GetSubType@Base 4.0.0 + AB_Transaction_GetTextKey@Base 4.0.0 + AB_Transaction_GetTextKeyExt@Base 4.0.0 + AB_Transaction_GetTransactionCode@Base 4.0.0 + AB_Transaction_GetTransactionKey@Base 4.0.0 + AB_Transaction_GetTransactionText@Base 4.0.0 + AB_Transaction_GetType@Base 4.0.0 + AB_Transaction_GetUniqueId@Base 4.0.0 + AB_Transaction_GetUnitId@Base 4.0.0 + AB_Transaction_GetUnitIdNameSpace@Base 4.0.0 + AB_Transaction_GetUnitPrice@Base 4.0.0 + AB_Transaction_GetUnits@Base 4.0.0 + AB_Transaction_GetValue@Base 4.0.0 + AB_Transaction_GetValutaDate@Base 4.0.0 + AB_Transaction_HasCategory@Base 4.0.0 + AB_Transaction_HasPurpose@Base 4.0.0 + AB_Transaction_HasRemoteName@Base 4.0.0 + AB_Transaction_IsModified@Base 4.0.0 + AB_Transaction_List2Iterator_Data@Base 4.0.0 + AB_Transaction_List2Iterator_GetLinkCount@Base 4.0.0 + AB_Transaction_List2Iterator_IncLinkCount@Base 4.0.0 + AB_Transaction_List2Iterator_Next@Base 4.0.0 + AB_Transaction_List2Iterator_Previous@Base 4.0.0 + AB_Transaction_List2Iterator_free@Base 4.0.0 + AB_Transaction_List2Iterator_new@Base 4.0.0 + AB_Transaction_List2_Clear@Base 4.0.0 + AB_Transaction_List2_Contains@Base 4.0.0 + AB_Transaction_List2_Dump@Base 4.0.0 + AB_Transaction_List2_Erase@Base 4.0.0 + AB_Transaction_List2_FindIter@Base 4.0.0 + AB_Transaction_List2_First@Base 4.0.0 + AB_Transaction_List2_ForEach@Base 4.0.0 + AB_Transaction_List2_GetBack@Base 4.0.0 + AB_Transaction_List2_GetFront@Base 4.0.0 + AB_Transaction_List2_GetSize@Base 4.0.0 + AB_Transaction_List2_IsEmpty@Base 4.0.0 + AB_Transaction_List2_Last@Base 4.0.0 + AB_Transaction_List2_PopBack@Base 4.0.0 + AB_Transaction_List2_PopFront@Base 4.0.0 + AB_Transaction_List2_PushBack@Base 4.0.0 + AB_Transaction_List2_PushFront@Base 4.0.0 + AB_Transaction_List2_Remove@Base 4.0.0 + AB_Transaction_List2_Unshare@Base 4.0.0 + AB_Transaction_List2_dup@Base 4.0.0 + AB_Transaction_List2_free@Base 4.0.0 + AB_Transaction_List2_freeAll@Base 4.0.0 + AB_Transaction_List2_new@Base 4.0.0 + AB_Transaction_List_Add@Base 5.3.1beta + AB_Transaction_List_AddList@Base 5.3.1beta + AB_Transaction_List_Clear@Base 5.3.1beta + AB_Transaction_List_Del@Base 5.3.1beta + AB_Transaction_List_First@Base 5.3.1beta + AB_Transaction_List_GetCount@Base 5.3.1beta + AB_Transaction_List_HasElement@Base 5.3.1beta + AB_Transaction_List_Insert@Base 5.3.1beta + AB_Transaction_List_Last@Base 5.3.1beta + AB_Transaction_List_Next@Base 5.3.1beta + AB_Transaction_List_Previous@Base 5.3.1beta + AB_Transaction_List_SetSortFn@Base 5.3.1beta + AB_Transaction_List_Sort@Base 5.3.1beta + AB_Transaction_List_dup@Base 5.3.1beta + AB_Transaction_List_free@Base 5.3.1beta + AB_Transaction_List_new@Base 5.3.1beta + AB_Transaction_Period_fromString@Base 4.0.0 + AB_Transaction_Period_toString@Base 4.0.0 + AB_Transaction_ReadDb@Base 4.0.0 + AB_Transaction_RemoveCategory@Base 4.0.0 + AB_Transaction_RemovePurpose@Base 4.0.0 + AB_Transaction_RemoveRemoteName@Base 4.0.0 + AB_Transaction_SequenceType_fromString@Base 5.1.0beta + AB_Transaction_SequenceType_toString@Base 5.1.0beta + AB_Transaction_SetBankReference@Base 4.0.0 + AB_Transaction_SetCategory@Base 4.0.0 + AB_Transaction_SetCharge@Base 4.0.0 + AB_Transaction_SetCommission@Base 4.0.0 +#MISSING: 5.5.1# AB_Transaction_SetCreditorIdentifier@Base 4.2.3+svn.r1797 + AB_Transaction_SetCreditorSchemeId@Base 5.0.31beta + AB_Transaction_SetCustomerReference@Base 4.0.0 + AB_Transaction_SetCycle@Base 4.0.0 + AB_Transaction_SetDate@Base 4.0.0 + AB_Transaction_SetEndToEndReference@Base 4.2.3+svn.r1797 + AB_Transaction_SetExecutionDay@Base 4.0.0 + AB_Transaction_SetFees@Base 4.0.0 + AB_Transaction_SetFiId@Base 4.0.0 + AB_Transaction_SetFirstExecutionDate@Base 4.0.0 + AB_Transaction_SetGroupId@Base 4.0.0 + AB_Transaction_SetIdForApplication@Base 4.0.0 + AB_Transaction_SetLastExecutionDate@Base 4.0.0 + AB_Transaction_SetLocalAccountNumber@Base 4.0.0 + AB_Transaction_SetLocalBankCode@Base 4.0.0 + AB_Transaction_SetLocalBic@Base 4.0.0 + AB_Transaction_SetLocalBranchId@Base 4.0.0 + AB_Transaction_SetLocalCountry@Base 4.0.0 + AB_Transaction_SetLocalIban@Base 4.0.0 + AB_Transaction_SetLocalName@Base 4.0.0 + AB_Transaction_SetLocalSuffix@Base 4.0.0 + AB_Transaction_SetMandateDate@Base 5.0.31beta + AB_Transaction_SetMandateDebitorName@Base 5.0.31beta + AB_Transaction_SetMandateId@Base 5.0.31beta +#MISSING: 5.5.1# AB_Transaction_SetMandateReference@Base 4.2.3+svn.r1797 + AB_Transaction_SetModified@Base 4.0.0 + AB_Transaction_SetNextExecutionDate@Base 4.0.0 + AB_Transaction_SetOriginalCreditorName@Base 5.0.31beta + AB_Transaction_SetOriginalCreditorSchemeId@Base 5.0.31beta + AB_Transaction_SetOriginalMandateId@Base 5.0.31beta + AB_Transaction_SetOriginatorIdentifier@Base 4.2.3+svn.r1797 + AB_Transaction_SetPeriod@Base 4.0.0 + AB_Transaction_SetPrimanota@Base 4.0.0 + AB_Transaction_SetPurpose@Base 4.0.0 + AB_Transaction_SetRemoteAccountNumber@Base 4.0.0 + AB_Transaction_SetRemoteAddrCity@Base 4.0.0 + AB_Transaction_SetRemoteAddrStreet@Base 4.0.0 + AB_Transaction_SetRemoteAddrZipcode@Base 4.0.0 + AB_Transaction_SetRemoteBankCode@Base 4.0.0 + AB_Transaction_SetRemoteBankLocation@Base 4.0.0 + AB_Transaction_SetRemoteBankName@Base 4.0.0 + AB_Transaction_SetRemoteBic@Base 4.0.0 + AB_Transaction_SetRemoteBranchId@Base 4.0.0 + AB_Transaction_SetRemoteCountry@Base 4.0.0 + AB_Transaction_SetRemoteIban@Base 4.0.0 + AB_Transaction_SetRemoteName@Base 4.0.0 + AB_Transaction_SetRemotePhone@Base 4.0.0 + AB_Transaction_SetRemoteSuffix@Base 4.0.0 + AB_Transaction_SetSequenceType@Base 5.1.0beta + AB_Transaction_SetStatus@Base 4.0.0 + AB_Transaction_SetSubType@Base 4.0.0 + AB_Transaction_SetTextKey@Base 4.0.0 + AB_Transaction_SetTextKeyExt@Base 4.0.0 + AB_Transaction_SetTransactionCode@Base 4.0.0 + AB_Transaction_SetTransactionKey@Base 4.0.0 + AB_Transaction_SetTransactionText@Base 4.0.0 + AB_Transaction_SetType@Base 4.0.0 + AB_Transaction_SetUniqueId@Base 4.0.0 + AB_Transaction_SetUnitId@Base 4.0.0 + AB_Transaction_SetUnitIdNameSpace@Base 4.0.0 + AB_Transaction_SetUnitPrice@Base 4.0.0 + AB_Transaction_SetUnits@Base 4.0.0 + AB_Transaction_SetValue@Base 4.0.0 + AB_Transaction_SetValutaDate@Base 4.0.0 + AB_Transaction_Status_fromString@Base 4.0.0 + AB_Transaction_Status_toString@Base 4.0.0 + AB_Transaction_SubType_fromString@Base 4.0.0 + AB_Transaction_SubType_toString@Base 4.0.0 + AB_Transaction_Type_fromString@Base 4.0.0 + AB_Transaction_Type_toString@Base 4.0.0 + AB_Transaction_WriteToFile@Base 5.3.1beta + AB_Transaction_dup@Base 4.0.0 + AB_Transaction_free@Base 4.0.0 + AB_Transaction_fromDb@Base 4.0.0 + AB_Transaction_new@Base 4.0.0 + AB_Transaction_toDb@Base 4.0.0 + AB_USERQUEUE__INHERIT_GETLIST@Base 4.99.18 + AB_USERQUEUE__INHERIT_ISOFTYPE@Base 4.99.18 + AB_USERQUEUE__INHERIT_SETDATA@Base 4.99.18 + AB_USERQUEUE__INHERIT_UNLINK@Base 4.99.18 + AB_USER__INHERIT_GETLIST@Base 4.0.0 + AB_USER__INHERIT_ISOFTYPE@Base 4.0.0 + AB_USER__INHERIT_SETDATA@Base 4.0.0 + AB_USER__INHERIT_UNLINK@Base 4.0.0 + AB_UserQueue_AddJob@Base 4.99.18 + AB_UserQueue_Attach@Base 4.99.18 + AB_UserQueue_FindAccountQueue@Base 4.99.18 + AB_UserQueue_GetAccountQueueList@Base 4.99.18 + AB_UserQueue_GetUser@Base 4.99.18 + AB_UserQueue_List_Add@Base 4.99.18 + AB_UserQueue_List_AddList@Base 4.99.18 + AB_UserQueue_List_Clear@Base 4.99.18 + AB_UserQueue_List_Del@Base 4.99.18 + AB_UserQueue_List_First@Base 4.99.18 + AB_UserQueue_List_GetCount@Base 4.99.18 + AB_UserQueue_List_HasElement@Base 4.99.18 + AB_UserQueue_List_Insert@Base 4.99.18 + AB_UserQueue_List_Last@Base 4.99.18 + AB_UserQueue_List_Next@Base 4.99.18 + AB_UserQueue_List_Previous@Base 4.99.18 + AB_UserQueue_List_SetSortFn@Base 5.0.10 + AB_UserQueue_List_Sort@Base 5.0.10 + AB_UserQueue_List_dup@Base 4.99.18 + AB_UserQueue_List_free@Base 4.99.18 + AB_UserQueue_List_new@Base 4.99.18 + AB_UserQueue_SetAccountQueueList@Base 4.99.18 + AB_UserQueue_SetUser@Base 4.99.18 + AB_UserQueue_dup@Base 4.99.18 + AB_UserQueue_free@Base 4.99.18 + AB_UserQueue_new@Base 4.99.18 + AB_UserTypePageDialog_GetBanking@Base 4.99.18 + AB_UserTypePageDialog_GetSelectedType@Base 4.99.18 + AB_UserTypePageDialog_SetSelectedType@Base 4.99.18 + AB_UserTypePageDialog_new@Base 4.99.18 + AB_User_Attach@Base 4.0.0 + AB_User_GetBackendName@Base 4.0.0 + AB_User_GetBankCode@Base 4.0.0 + AB_User_GetBanking@Base 4.0.0 + AB_User_GetCountry@Base 4.0.0 + AB_User_GetCustomerId@Base 4.0.0 + AB_User_GetDbId@Base 4.0.0 + AB_User_GetFileLock@Base 4.0.0 + AB_User_GetLastSessionId@Base 4.0.0 + AB_User_GetProvider@Base 4.0.0 + AB_User_GetUniqueId@Base 4.0.0 + AB_User_GetUserId@Base 4.0.0 + AB_User_GetUserName@Base 4.0.0 + AB_User_IsModified@Base 4.0.0 + AB_User_List2Iterator_Data@Base 4.0.0 + AB_User_List2Iterator_GetLinkCount@Base 4.0.0 + AB_User_List2Iterator_IncLinkCount@Base 4.0.0 + AB_User_List2Iterator_Next@Base 4.0.0 + AB_User_List2Iterator_Previous@Base 4.0.0 + AB_User_List2Iterator_free@Base 4.0.0 + AB_User_List2Iterator_new@Base 4.0.0 + AB_User_List2_Clear@Base 4.0.0 + AB_User_List2_Contains@Base 4.0.0 + AB_User_List2_Dump@Base 4.0.0 + AB_User_List2_Erase@Base 4.0.0 + AB_User_List2_FindIter@Base 4.0.0 + AB_User_List2_First@Base 4.0.0 + AB_User_List2_ForEach@Base 4.0.0 + AB_User_List2_GetBack@Base 4.0.0 + AB_User_List2_GetFront@Base 4.0.0 + AB_User_List2_GetSize@Base 4.0.0 + AB_User_List2_IsEmpty@Base 4.0.0 + AB_User_List2_Last@Base 4.0.0 + AB_User_List2_PopBack@Base 4.0.0 + AB_User_List2_PopFront@Base 4.0.0 + AB_User_List2_PushBack@Base 4.0.0 + AB_User_List2_PushFront@Base 4.0.0 + AB_User_List2_Remove@Base 4.0.0 + AB_User_List2_Unshare@Base 4.0.0 + AB_User_List2_dup@Base 4.0.0 + AB_User_List2_free@Base 4.0.0 + AB_User_List2_freeAll@Base 4.0.0 + AB_User_List2_new@Base 4.0.0 + AB_User_ReadDb@Base 4.0.0 + AB_User_SetBackendName@Base 4.0.0 + AB_User_SetBankCode@Base 4.0.0 + AB_User_SetBanking@Base 4.0.0 + AB_User_SetCountry@Base 4.0.0 + AB_User_SetCustomerId@Base 4.0.0 + AB_User_SetDbId@Base 4.0.0 + AB_User_SetFileLock@Base 4.0.0 + AB_User_SetLastSessionId@Base 4.0.0 + AB_User_SetModified@Base 4.0.0 + AB_User_SetUniqueId@Base 4.0.0 + AB_User_SetUserId@Base 4.0.0 + AB_User_SetUserName@Base 4.0.0 + AB_User_free@Base 4.0.0 + AB_User_toDb@Base 4.0.0 + AB_Value_AddValue@Base 4.0.0 + AB_Value_Compare@Base 4.0.0 + AB_Value_Denom@Base 5.0.5 + AB_Value_DivValue@Base 4.0.0 + AB_Value_Dump@Base 4.0.0 + AB_Value_Equal@Base 5.0.5 + AB_Value_GetCurrency@Base 4.0.0 + AB_Value_GetNumDenomString@Base 4.0.0 + AB_Value_GetValueAsDouble@Base 4.0.0 + AB_Value_IsNegative@Base 4.0.0 + AB_Value_IsPositive@Base 4.0.0 + AB_Value_IsZero@Base 4.0.0 + AB_Value_List_Add@Base 4.0.0 + AB_Value_List_AddList@Base 4.0.0 + AB_Value_List_Clear@Base 4.0.0 + AB_Value_List_Del@Base 4.0.0 + AB_Value_List_First@Base 4.0.0 + AB_Value_List_GetCount@Base 4.0.0 + AB_Value_List_HasElement@Base 4.0.0 + AB_Value_List_Insert@Base 4.0.0 + AB_Value_List_Last@Base 4.0.0 + AB_Value_List_Next@Base 4.0.0 + AB_Value_List_Previous@Base 4.0.0 + AB_Value_List_SetSortFn@Base 5.0.10 + AB_Value_List_Sort@Base 5.0.10 + AB_Value_List_dup@Base 4.0.0 + AB_Value_List_free@Base 4.0.0 + AB_Value_List_new@Base 4.0.0 + AB_Value_MultValue@Base 4.0.0 + AB_Value_Negate@Base 4.0.0 + AB_Value_Num@Base 5.0.5 + AB_Value_SetCurrency@Base 4.0.0 + AB_Value_SetValueFromDouble@Base 4.0.0 + AB_Value_SetZero@Base 4.0.0 + AB_Value_SubValue@Base 4.0.0 + AB_Value_dup@Base 4.0.0 + AB_Value_free@Base 4.0.0 + AB_Value_fromDb@Base 4.0.0 + AB_Value_fromDouble@Base 4.0.0 + AB_Value_fromInt@Base 5.0.5 + AB_Value_fromString@Base 4.0.0 + AB_Value_new@Base 4.0.0 + AB_Value_toDb@Base 4.0.0 + AB_Value_toDbFloat@Base 4.0.0 + AB_Value_toHbciString@Base 5.4.0beta + AB_Value_toHumanReadableString2@Base 4.0.0 + AB_Value_toHumanReadableString@Base 4.0.0 + AB_Value_toString@Base 4.0.0 + AH_ImExporter_DbFromIso8859_1ToUtf8@Base 4.0.0 + Ab_HttpSession_AddLog@Base 4.0.0 +libaqnone.so.35 libaqbanking35 #MINVER# +* Build-Depends-Package: libaqbanking-dev + AN_Provider_new@Base 4.0.0 diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking-dev.docs libaqbanking-5.6.1beta/debian/libaqbanking-dev.docs --- libaqbanking-5.4.3beta/debian/libaqbanking-dev.docs 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking-dev.docs 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,4 @@ +AUTHORS +NEWS +doc/02-CODING +doc/03-APPS diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking-dev.install libaqbanking-5.6.1beta/debian/libaqbanking-dev.install --- libaqbanking-5.4.3beta/debian/libaqbanking-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking-dev.install 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,7 @@ +usr/bin/*-config +usr/share/aclocal +usr/include/* +usr/lib/*.so +usr/lib/pkgconfig +debian/debhelper/dh_aqbanking /usr/bin +debian/debhelper/aqbanking.pm /usr/share/perl5/Debian/Debhelper/Sequence diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking-dev.lintian-overrides libaqbanking-5.6.1beta/debian/libaqbanking-dev.lintian-overrides --- libaqbanking-5.4.3beta/debian/libaqbanking-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking-dev.lintian-overrides 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,3 @@ +# upstream increments the version number for every release, i.e. release +# candidates have lower version numbers than the expected final release. +rc-version-greater-than-expected-version diff -Nru libaqbanking-5.4.3beta/debian/libaqbanking-dev.manpages libaqbanking-5.6.1beta/debian/libaqbanking-dev.manpages --- libaqbanking-5.4.3beta/debian/libaqbanking-dev.manpages 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqbanking-dev.manpages 2015-06-05 19:13:36.000000000 +0000 @@ -0,0 +1,2 @@ +debian/doc/aqbanking-config.1 +debian/doc/dh_aqbanking.1 diff -Nru libaqbanking-5.4.3beta/debian/libaqebics0.symbols libaqbanking-5.6.1beta/debian/libaqebics0.symbols --- libaqbanking-5.4.3beta/debian/libaqebics0.symbols 2014-01-19 19:33:05.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqebics0.symbols 2015-06-05 19:13:36.000000000 +0000 @@ -1,5 +1,5 @@ libaqebics.so.0 libaqebics0 #MINVER# -* Build-Depends-Package: libaqbanking34-dev, libaqbanking-dev +* Build-Depends-Package: libaqbanking-dev EBC_Account_AddFlags@Base 5.3.2beta EBC_Account_Flags_fromDb@Base 5.3.2beta EBC_Account_Flags_toDb@Base 5.3.2beta diff -Nru libaqbanking-5.4.3beta/debian/libaqhbci22.symbols libaqbanking-5.6.1beta/debian/libaqhbci22.symbols --- libaqbanking-5.4.3beta/debian/libaqhbci22.symbols 2014-01-18 22:50:40.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqhbci22.symbols 2015-06-05 19:13:36.000000000 +0000 @@ -1,5 +1,5 @@ libaqhbci.so.22 libaqhbci22 #MINVER# -* Build-Depends-Package: libaqbanking34-dev, libaqbanking-dev +* Build-Depends-Package: libaqbanking-dev AH_Account_AddFlags@Base 4.1.8 AH_Account_Flags_fromDb@Base 4.1.8 AH_Account_Flags_toDb@Base 4.1.8 @@ -195,6 +195,8 @@ AH_User_GetPeerId@Base 4.1.8 AH_User_GetRdhType@Base 4.1.8 AH_User_GetSelectedTanMethod@Base 4.1.8 + AH_User_GetSepaDebitNoteProfile@Base 5.5.1 + AH_User_GetSepaTransferProfile@Base 5.5.1 AH_User_GetServerUrl@Base 4.1.8 AH_User_GetStatus@Base 4.1.8 AH_User_GetSystemId@Base 4.1.8 @@ -222,6 +224,8 @@ AH_User_SetPeerId@Base 4.1.8 AH_User_SetRdhType@Base 4.1.8 AH_User_SetSelectedTanMethod@Base 4.1.8 + AH_User_SetSepaDebitNoteProfile@Base 5.5.1 + AH_User_SetSepaTransferProfile@Base 5.5.1 AH_User_SetServerUrl@Base 4.1.8 AH_User_SetStatus@Base 4.1.8 AH_User_SetSystemId@Base 4.1.8 diff -Nru libaqbanking-5.4.3beta/debian/libaqofxconnect7.symbols libaqbanking-5.6.1beta/debian/libaqofxconnect7.symbols --- libaqbanking-5.4.3beta/debian/libaqofxconnect7.symbols 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqofxconnect7.symbols 2015-06-05 19:13:36.000000000 +0000 @@ -1,5 +1,5 @@ libaqofxconnect.so.7 libaqofxconnect7 #MINVER# -* Build-Depends-Package: libaqbanking34-dev, libaqbanking-dev +* Build-Depends-Package: libaqbanking-dev AO_ACCOUNT__INHERIT_ID@Base 4.0.0 AO_Account_Extend@Base 4.0.0 AO_Account_GetDebitAllowed@Base 4.0.0 @@ -233,6 +233,7 @@ OH_InstituteData_SetUrl@Base 4.99.20 OH_InstituteData_SubFlags@Base 4.99.20 OH_InstituteData_WriteDb@Base 4.99.20 + OH_InstituteData_copy@Base 5.5.1 OH_InstituteData_dup@Base 4.99.20 OH_InstituteData_free@Base 4.99.20 OH_InstituteData_fromDb@Base 4.99.20 @@ -292,6 +293,7 @@ OH_InstituteSpec_SetId@Base 4.99.20 OH_InstituteSpec_SetName@Base 4.99.20 OH_InstituteSpec_WriteDb@Base 4.99.20 + OH_InstituteSpec_copy@Base 5.5.1 OH_InstituteSpec_dup@Base 4.99.20 OH_InstituteSpec_free@Base 4.99.20 OH_InstituteSpec_fromDb@Base 4.99.20 diff -Nru libaqbanking-5.4.3beta/debian/libaqpaypal2.symbols libaqbanking-5.6.1beta/debian/libaqpaypal2.symbols --- libaqbanking-5.4.3beta/debian/libaqpaypal2.symbols 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/libaqpaypal2.symbols 2015-06-05 19:13:36.000000000 +0000 @@ -1,5 +1,5 @@ libaqpaypal.so.0 libaqpaypal2 #MINVER# -* Build-Depends-Package: libaqbanking34-dev, libaqbanking-dev +* Build-Depends-Package: libaqbanking-dev APY_EDITUSER_DIALOG__INHERIT_ID@Base 5.0.1 APY_EditUserDialog_AddFlags@Base 5.0.1 APY_EditUserDialog_Fini@Base 5.0.1 diff -Nru libaqbanking-5.4.3beta/debian/patches/01_bug_750046_fix_AH_Provider_SendDtazv_signature libaqbanking-5.6.1beta/debian/patches/01_bug_750046_fix_AH_Provider_SendDtazv_signature --- libaqbanking-5.4.3beta/debian/patches/01_bug_750046_fix_AH_Provider_SendDtazv_signature 2014-06-15 20:46:48.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/patches/01_bug_750046_fix_AH_Provider_SendDtazv_signature 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -Description: Fix shadowing local declaration of and bad parameters for function AH_Provider_SendDtazv - aqbanking-cli used a local declaration of function AH_Provider_SendDtazv that - is used at compile time. It shadows the real one from libaqhbci that is used at - link time. This would not matter if the types of both functions match, but they - do not match. - . - I fixed this by dumping the local declaration from aqbanking-cli. Instead I - included the ones from libaqhbci that are also used at linktime. The function - AH_Provider_SendDtazv from libaqhbci has an additional parameter - 'withProgress' that was added in upstream SVN revision 1860. Prior to this - change the function used a hard-coded 1 instead of the new parameter. So I - figured that 1 is the correct value to restore the intended behavior. -Author: Micha Lenk -Origin: upstream, SVN rev. 2591 and 2592 -Bug-Debian: http://bugs.debian.org/750046 -Reviewed-By: Micha Lenk - #include -@@ -34,20 +37,6 @@ - #endif - - --/* this is a more or less secret job which is not declared in AqHBCI, so -- * we must do it here. The AQHBCI_API makes this file import that symbol -- * from the libaqhbci library. -- */ --AQHBCI_API --int AH_Provider_SendDtazv(AB_PROVIDER *pro, -- AB_ACCOUNT *a, -- AB_IMEXPORTER_CONTEXT *ctx, -- const uint8_t *dataPtr, -- uint32_t dataLen, -- int nounmount, -- uint32_t guiid); -- -- - static int _incrementUniqueId(AB_ACCOUNT *a, const char *path) { - GWEN_BUFFER *pbuf; - const char *s; -@@ -371,7 +360,7 @@ int sendDtazv(AB_BANKING *ab, - rv=AH_Provider_SendDtazv(pro, a, ctx, - (const uint8_t*)GWEN_Buffer_GetStart(dtazv), - GWEN_Buffer_GetUsedBytes(dtazv), -- 1, 0); -+ 1, 1, 0); - /* write ctx file */ - if (ctxFile) { - GWEN_DB_NODE *dbCtx; diff -Nru libaqbanking-5.4.3beta/debian/patches/series libaqbanking-5.6.1beta/debian/patches/series --- libaqbanking-5.4.3beta/debian/patches/series 2014-06-15 20:40:31.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01_bug_750046_fix_AH_Provider_SendDtazv_signature diff -Nru libaqbanking-5.4.3beta/debian/rules libaqbanking-5.6.1beta/debian/rules --- libaqbanking-5.4.3beta/debian/rules 2014-01-27 19:23:53.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/rules 2015-06-05 19:13:36.000000000 +0000 @@ -1,9 +1,5 @@ #!/usr/bin/make -f -# let aqbanking benefit from symbol visibility feature of gcc -# this explicit setting is needed because the corresponding test in -# configure.ac checks for the basename of the called $CC binary. -CC=gcc ifneq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS))) DEB_BUILD_APIDOC=0 else @@ -17,8 +13,14 @@ DPKG_GENSYMBOLS_CHECK_LEVEL ?= 4 export DPKG_GENSYMBOLS_CHECK_LEVEL +# Support reproducible builds by force generated timestamps to in UTC. +# This is used by the command 'date' called within ./configure +TZ=UTC +export TZ + override_dh_auto_configure: dh_auto_configure --max-parallel=1 -- \ + --with-build-datetime="$(shell dpkg-parsechangelog -c1 -S date)" \ --with-backends="aqnone aqhbci aqofxconnect aqebics" \ $(shell dpkg-buildflags --export=configure) @@ -51,7 +53,7 @@ $(CURDIR)/debian/tmp/usr/share/doc/aqebics/aqebics-tool/README.aqebics-tool.txt override_dh_strip: - dh_strip --dbg-package=libaqbanking34-dbg + dh_strip --dbg-package=libaqbanking35-dbg override_dh_makeshlibs: dh_makeshlibs -a -X/usr/lib/aqbanking/plugins/ diff -Nru libaqbanking-5.4.3beta/debian/watch libaqbanking-5.6.1beta/debian/watch --- libaqbanking-5.4.3beta/debian/watch 2014-01-18 22:49:00.000000000 +0000 +++ libaqbanking-5.6.1beta/debian/watch 2015-06-05 19:13:36.000000000 +0000 @@ -1,4 +1,4 @@ version=3 opts=filenamemangle=s/.*\&dummy=(.*)/lib$1/ \ http://www.aquamaniac.de/sites/download/packages.php \ - /sites/download/download.php\?package=03\&.*\&dummy=aqbanking-([\d.]*[a-z]*\d*).tar.gz debian uupdate + /sites/download/download.php\?package=03\&.*\&dummy=aqbanking-([\d.]*).tar.gz debian uupdate diff -Nru libaqbanking-5.4.3beta/depcomp libaqbanking-5.6.1beta/depcomp --- libaqbanking-5.4.3beta/depcomp 2012-09-19 23:43:36.000000000 +0000 +++ libaqbanking-5.6.1beta/depcomp 2014-01-02 19:14:59.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + 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 + # 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 if test "$depmode" = msvc7msys; then - # This is just like msvc7 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=msvc7 + # This is just like msvc7 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=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru libaqbanking-5.4.3beta/doc/Makefile.in libaqbanking-5.6.1beta/doc/Makefile.in --- libaqbanking-5.4.3beta/doc/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/doc/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,6 +93,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -73,10 +112,12 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -165,6 +206,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -375,11 +417,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -515,15 +557,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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 maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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 \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/i18nsources libaqbanking-5.6.1beta/i18nsources --- libaqbanking-5.4.3beta/i18nsources 2014-04-17 20:57:36.000000000 +0000 +++ libaqbanking-5.6.1beta/i18nsources 2015-06-01 16:31:42.000000000 +0000 @@ -38,6 +38,7 @@ src/libs/aqbanking/jobs/jobsingledebitnote.c src/libs/aqbanking/jobs/jobsepatransfer.c src/libs/aqbanking/jobs/jobsepadebitnote.c +src/libs/aqbanking/jobs/jobsepaflashdebitnote.c src/libs/aqbanking/jobs/jobcreatesto.c src/libs/aqbanking/jobs/jobmodifysto.c src/libs/aqbanking/jobs/jobdeletesto.c @@ -48,6 +49,7 @@ src/libs/aqbanking/jobs/jobeutransfer.c src/libs/aqbanking/jobs/jobloadcellphone.c src/libs/aqbanking/jobs/jobsepacreatesto.c +src/libs/aqbanking/jobs/jobsepagetstandingorders.c src/libs/aqbanking/gui/abgui.c src/libs/aqbanking/dialogs/dlg_importer.c src/libs/aqbanking/dialogs/dlg_selectbankinfo.c @@ -156,23 +158,26 @@ src/plugins/backends/aqhbci/plugin/joblayer/jobqueue.c src/plugins/backends/aqhbci/plugin/joblayer/result.c src/plugins/backends/aqhbci/plugin/joblayer/tanmethod.c -src/plugins/backends/aqhbci/plugin/accountjobs/accountjob.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c -src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.c +src/plugins/backends/aqhbci/plugin/ajobs/accountjob.c +src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.c +src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.c +src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.c +src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.c +src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.c +src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.c +src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.c +src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.c +src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c src/plugins/backends/aqhbci/plugin/applayer/adminjobs.c src/plugins/backends/aqhbci/plugin/applayer/outbox.c src/plugins/backends/aqhbci/plugin/applayer/hhd.c diff -Nru libaqbanking-5.4.3beta/install-sh libaqbanking-5.6.1beta/install-sh --- libaqbanking-5.4.3beta/install-sh 2012-09-19 23:43:36.000000000 +0000 +++ libaqbanking-5.6.1beta/install-sh 2014-01-02 19:14:59.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff -Nru libaqbanking-5.4.3beta/ltmain.sh libaqbanking-5.6.1beta/ltmain.sh --- libaqbanking-5.4.3beta/ltmain.sh 2012-11-27 16:36:15.000000000 +0000 +++ libaqbanking-5.6.1beta/ltmain.sh 2014-02-11 12:58:49.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 diff -Nru libaqbanking-5.4.3beta/m4/libtool.m4 libaqbanking-5.6.1beta/m4/libtool.m4 --- libaqbanking-5.4.3beta/m4/libtool.m4 2012-11-27 16:36:15.000000000 +0000 +++ libaqbanking-5.6.1beta/m4/libtool.m4 2014-02-11 12:58:49.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru libaqbanking-5.4.3beta/m4/Makefile.in libaqbanking-5.6.1beta/m4/Makefile.in --- libaqbanking-5.4.3beta/m4/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/m4/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,6 +93,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -73,10 +112,12 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -165,6 +206,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -389,11 +431,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -529,15 +571,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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 maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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 \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/Makefile.am libaqbanking-5.6.1beta/Makefile.am --- libaqbanking-5.4.3beta/Makefile.am 2011-02-13 20:36:57.000000000 +0000 +++ libaqbanking-5.6.1beta/Makefile.am 2014-08-03 21:06:06.000000000 +0000 @@ -32,6 +32,9 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = aqbanking.pc +cmakeconfigdir = $(libdir)/cmake/aqbanking-$(AQBANKING_VERSION_MAJOR).$(AQBANKING_VERSION_MINOR) +cmakeconfig_DATA = aqbanking-config.cmake aqbanking-config-version.cmake + listdoc.h: $(gwenhywfar_bindir)/mklistdoc -I $(gwenhywfar_headers) -v `find $(aqbanking_symlinkdir) -name '*.h' ` >listdoc.h diff -Nru libaqbanking-5.4.3beta/Makefile.in libaqbanking-5.6.1beta/Makefile.in --- libaqbanking-5.4.3beta/Makefile.in 2014-04-17 20:57:27.000000000 +0000 +++ libaqbanking-5.6.1beta/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,15 +82,17 @@ host_triplet = @host@ @IF_MAKE_I18N_FILES_TRUE@am__append_1 = $(I18NCATALOGS) subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_aclocal_DATA) \ - $(iheader_HEADERS) $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/aqbanking-config.in.in \ - $(srcdir)/aqbanking.iss.in $(srcdir)/aqbanking.pc.in \ - $(srcdir)/aqbanking.spec.in $(srcdir)/config.h.in \ - $(srcdir)/mksymlinks.sh.in $(srcdir)/system.h.in \ - $(srcdir)/version.h.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ - install-sh ltmain.sh missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/mksymlinks.sh.in \ + $(srcdir)/Doxyfile.in $(srcdir)/aqbanking-config.in.in \ + $(srcdir)/aqbanking.pc.in $(srcdir)/aqbanking.spec.in \ + $(srcdir)/aqbanking.iss.in $(srcdir)/version.h.in \ + $(srcdir)/system.h.in $(srcdir)/aqbanking-config.cmake.in \ + $(srcdir)/aqbanking-config-version.cmake.in \ + $(dist_aclocal_DATA) $(iheader_HEADERS) COPYING TODO compile \ + config.guess config.sub depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -79,7 +108,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = mksymlinks.sh Doxyfile aqbanking-config.in \ - aqbanking.pc aqbanking.spec aqbanking.iss version.h system.h + aqbanking.pc aqbanking.spec aqbanking.iss version.h system.h \ + aqbanking-config.cmake aqbanking-config-version.cmake CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -108,33 +138,69 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)" \ - "$(DESTDIR)$(idatadir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(iheaderdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cmakeconfigdir)" \ + "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(idatadir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(iheaderdir)" SCRIPTS = $(bin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(dist_aclocal_DATA) $(idata_DATA) $(pkgconfig_DATA) +DATA = $(cmakeconfig_DATA) $(dist_aclocal_DATA) $(idata_DATA) \ + $(pkgconfig_DATA) HEADERS = $(iheader_HEADERS) 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 +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -144,6 +210,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -171,6 +238,7 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -178,6 +246,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -266,6 +335,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -459,6 +529,8 @@ $(BUILT_SOURCES) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = aqbanking.pc +cmakeconfigdir = $(libdir)/cmake/aqbanking-$(AQBANKING_VERSION_MAJOR).$(AQBANKING_VERSION_MINOR) +cmakeconfig_DATA = aqbanking-config.cmake aqbanking-config-version.cmake # Rule for using the Inno Setup compiler. The path to iscc.exe is set # manually here for now. @@ -544,8 +616,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -573,6 +645,10 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ system.h: $(top_builddir)/config.status $(srcdir)/system.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ +aqbanking-config.cmake: $(top_builddir)/config.status $(srcdir)/aqbanking-config.cmake.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +aqbanking-config-version.cmake: $(top_builddir)/config.status $(srcdir)/aqbanking-config-version.cmake.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ @@ -617,6 +693,27 @@ distclean-libtool: -rm -f libtool config.lt +install-cmakeconfigDATA: $(cmakeconfig_DATA) + @$(NORMAL_INSTALL) + @list='$(cmakeconfig_DATA)'; test -n "$(cmakeconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(cmakeconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(cmakeconfigdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cmakeconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(cmakeconfigdir)" || exit $$?; \ + done + +uninstall-cmakeconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(cmakeconfig_DATA)'; test -n "$(cmakeconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(cmakeconfigdir)'; $(am__uninstall_files_from_dir) install-dist_aclocalDATA: $(dist_aclocal_DATA) @$(NORMAL_INSTALL) @list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ @@ -703,22 +800,25 @@ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -733,57 +833,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -799,12 +854,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -816,15 +866,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -833,9 +879,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -906,40 +974,42 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -950,8 +1020,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -963,18 +1031,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(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-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -997,7 +1066,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_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' @@ -1033,7 +1102,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(idatadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(iheaderdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cmakeconfigdir)" "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(idatadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(iheaderdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1093,8 +1162,9 @@ info-am: -install-data-am: install-data-local install-dist_aclocalDATA \ - install-idataDATA install-iheaderHEADERS install-pkgconfigDATA +install-data-am: install-cmakeconfigDATA install-data-local \ + install-dist_aclocalDATA install-idataDATA \ + install-iheaderHEADERS install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -1140,22 +1210,23 @@ ps-am: -uninstall-am: uninstall-binSCRIPTS uninstall-dist_aclocalDATA \ - uninstall-idataDATA uninstall-iheaderHEADERS uninstall-local \ +uninstall-am: uninstall-binSCRIPTS uninstall-cmakeconfigDATA \ + uninstall-dist_aclocalDATA uninstall-idataDATA \ + uninstall-iheaderHEADERS uninstall-local \ uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install 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-hook dist-lzip 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-binSCRIPTS install-data \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip 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-binSCRIPTS install-cmakeconfigDATA install-data \ install-data-am install-data-local install-dist_aclocalDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-idataDATA \ @@ -1164,8 +1235,8 @@ 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 uninstall-binSCRIPTS \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binSCRIPTS uninstall-cmakeconfigDATA \ uninstall-dist_aclocalDATA uninstall-idataDATA \ uninstall-iheaderHEADERS uninstall-local \ uninstall-pkgconfigDATA diff -Nru libaqbanking-5.4.3beta/missing libaqbanking-5.6.1beta/missing --- libaqbanking-5.4.3beta/missing 2012-09-19 23:43:36.000000000 +0000 +++ libaqbanking-5.6.1beta/missing 2014-01-02 19:14:59.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; 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). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - 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 - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - 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 - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - 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 - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - 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 - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru libaqbanking-5.4.3beta/po/de.po libaqbanking-5.6.1beta/po/de.po --- libaqbanking-5.4.3beta/po/de.po 2014-03-01 19:23:25.000000000 +0000 +++ libaqbanking-5.6.1beta/po/de.po 2014-10-12 13:40:15.000000000 +0000 @@ -7,8 +7,8 @@ "Project-Id-Version: aqbanking\n" "Report-Msgid-Bugs-To: aqbanking-user@lists.aqbanking.de\n" "POT-Creation-Date: 2013-03-11 21:50+0100\n" -"PO-Revision-Date: 2013-03-29 21:56+0100\n" -"Last-Translator: Christian Stimming \n" +"PO-Revision-Date: 2014-09-21 17:32+0200\n" +"Last-Translator: Mechtilde \n" "Language-Team: Deutsch \n" "Language: de_DE\n" "MIME-Version: 1.0\n" @@ -4411,11 +4411,11 @@ "html>We are now ready to create the user and retrieve the account list.\n" "Click the NEXT button to proceed or ABORT to abort." msgstr "" -"

Es ist nun alles vorbereitet um den Benutzer anzulegen und die " -"Kontenliste abzurufen.

Klicken Sie auf Weiter um fortzusetzen " -"oder Abbrechen zum abbrechen.

Es ist nun alles vorbereitet " +"

Es ist nun alles vorbereitet, um den Benutzer anzulegen und die " +"Kontenliste abzurufen.

Klicken Sie auf Weiter, um fortzusetzen " +"oder Abbrechen zum abbrechen.

Es ist nun alles vorbereitet, " "um den Benutzer anzulegen und die Kontenliste abzurufen.\n" -"Klicken Sie auf WEITER um fortzusetzen oder ABBRECHEN zum abbrechen." +"Klicken Sie auf WEITER, um fortzusetzen oder ABBRECHEN zum abbrechen." #: src/plugins/backends/aqhbci/plugin/dialogs/dlg_pintan.c:507 #: src/plugins/backends/aqhbci/plugin/dialogs/dlg_pintan.c:928 diff -Nru libaqbanking-5.4.3beta/po/Makefile.in libaqbanking-5.6.1beta/po/Makefile.in --- libaqbanking-5.4.3beta/po/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/po/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = po -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,6 +93,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -73,10 +112,12 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -165,6 +206,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -375,11 +417,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -515,15 +557,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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 maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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 \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/README libaqbanking-5.6.1beta/README --- libaqbanking-5.4.3beta/README 2010-12-19 02:34:11.000000000 +0000 +++ libaqbanking-5.6.1beta/README 2015-05-17 07:37:03.000000000 +0000 @@ -323,7 +323,8 @@ This variable stores the loglevel to be used for AqBanking. Possible values are: emergency, alert, critical, error, warning, notice, -info, debug and verbous. +info, debug and verbous. Each following log level includes the previous +one. 7.2. AQBANKING_STORE_JOBLOGS diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/backendsupport/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/backendsupport/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/backendsupport/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/backendsupport/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs/aqbanking/backendsupport -DIST_COMMON = $(dist_typedata_DATA) $(iheader_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(dist_typedata_DATA) $(iheader_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -76,19 +103,44 @@ ab_queue.lo am_libabbesupport_la_OBJECTS = $(am__objects_1) libabbesupport_la_OBJECTS = $(am_libabbesupport_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libabbesupport_la_SOURCES) DIST_SOURCES = $(libabbesupport_la_SOURCES) am__can_run_installinfo = \ @@ -126,12 +178,30 @@ am__installdirs = "$(DESTDIR)$(typedatadir)" "$(DESTDIR)$(iheaderdir)" DATA = $(dist_typedata_DATA) HEADERS = $(iheader_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -220,6 +290,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -482,14 +553,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libabbesupport.la: $(libabbesupport_la_OBJECTS) $(libabbesupport_la_DEPENDENCIES) $(EXTRA_libabbesupport_la_DEPENDENCIES) - $(LINK) $(libabbesupport_la_OBJECTS) $(libabbesupport_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libabbesupport_la_OBJECTS) $(libabbesupport_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -503,25 +577,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ab_userqueue.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -571,26 +645,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -602,15 +665,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -619,6 +678,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -764,21 +838,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_typedataDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iheaderHEADERS install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-dist_typedataDATA \ - uninstall-iheaderHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_typedataDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iheaderHEADERS install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ + uninstall-dist_typedataDATA uninstall-iheaderHEADERS built_sources: $(typedata_sources) diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/banking.c libaqbanking-5.6.1beta/src/libs/aqbanking/banking.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/banking.c 2014-03-01 19:22:51.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/banking.c 2015-01-07 20:22:48.000000000 +0000 @@ -491,10 +491,9 @@ uniqueId=GWEN_DB_GetIntValue(db, accountId, 0, 0); GWEN_DB_Group_free(dbData); if (!uniqueId) { - /* should not happen anyway */ - DBG_ERROR(AQBANKING_LOGDOMAIN, - "Account has no unique id assigned to the alias [%s].", - accountId); + DBG_INFO(AQBANKING_LOGDOMAIN, + "Account has no unique id assigned to the alias [%s].", + accountId); return NULL; } diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/banking_imex.c libaqbanking-5.6.1beta/src/libs/aqbanking/banking_imex.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/banking_imex.c 2014-01-07 20:10:20.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/banking_imex.c 2014-09-21 21:41:06.000000000 +0000 @@ -789,6 +789,14 @@ const char *name; name=GWEN_DB_GetCharValue(dbProfile, "name", 0, 0); + if (!name) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "No element \"name\" found in group \"%s\" of file \"%s\" (watch out: --profileFile most probably does not work)", + GWEN_DB_GroupName(dbProfile), + profileFile); + GWEN_DB_Group_free(dbProfiles); + return GWEN_ERROR_NOT_FOUND; + } assert(name); if (strcasecmp(name, profileName)==0) break; diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/banking_init.c libaqbanking-5.6.1beta/src/libs/aqbanking/banking_init.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/banking_init.c 2014-01-26 14:49:09.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/banking_init.c 2015-01-07 20:19:52.000000000 +0000 @@ -46,6 +46,7 @@ "aqbanking", 0, GWEN_LoggerType_Console, GWEN_LoggerFacility_User); + GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Notice); } s=getenv("AQBANKING_LOGLEVEL"); @@ -55,8 +56,6 @@ ll=GWEN_Logger_Name2Level(s); GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, ll); } - else - GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Notice); DBG_INFO(AQBANKING_LOGDOMAIN, "AqBanking v" diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/dialogs/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/dialogs/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/dialogs/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/dialogs/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs/aqbanking/dialogs -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -78,19 +105,44 @@ dlg_usertype_page.lo dlg_setup_newuser.lo \ dlg_usertype_pagedefault.lo libabdialogs_la_OBJECTS = $(am_libabdialogs_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libabdialogs_la_SOURCES) DIST_SOURCES = $(libabdialogs_la_SOURCES) am__can_run_installinfo = \ @@ -128,12 +180,30 @@ am__installdirs = "$(DESTDIR)$(dlgdatadir)" "$(DESTDIR)$(iheaderdir)" DATA = $(dlgdata_DATA) HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -222,6 +292,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -487,14 +558,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libabdialogs.la: $(libabdialogs_la_OBJECTS) $(libabdialogs_la_DEPENDENCIES) $(EXTRA_libabdialogs_la_DEPENDENCIES) - $(LINK) $(libabdialogs_la_OBJECTS) $(libabdialogs_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libabdialogs_la_OBJECTS) $(libabdialogs_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -515,25 +589,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlg_usertype_pagedefault.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -583,26 +657,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -614,15 +677,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -631,6 +690,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -775,19 +849,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dlgdataDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dlgdataDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-iheaderHEADERS install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-dlgdataDATA uninstall-iheaderHEADERS diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/gui/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/gui/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/gui/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/gui/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs/aqbanking/gui -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -73,19 +100,44 @@ libabgui_la_LIBADD = am_libabgui_la_OBJECTS = abgui.lo libabgui_la_OBJECTS = $(am_libabgui_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libabgui_la_SOURCES) DIST_SOURCES = $(libabgui_la_SOURCES) am__can_run_installinfo = \ @@ -122,12 +174,30 @@ } am__installdirs = "$(DESTDIR)$(iheaderdir)" HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -216,6 +286,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -437,14 +508,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libabgui.la: $(libabgui_la_OBJECTS) $(libabgui_la_DEPENDENCIES) $(EXTRA_libabgui_la_DEPENDENCIES) - $(LINK) $(libabgui_la_OBJECTS) $(libabgui_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libabgui_la_OBJECTS) $(libabgui_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -455,25 +529,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abgui.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -502,26 +576,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -533,15 +596,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -550,6 +609,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -694,19 +768,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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-iheaderHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iheaderHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iheaderHEADERS sources: diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/job.c libaqbanking-5.6.1beta/src/libs/aqbanking/job.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/job.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/job.c 2014-08-03 16:07:47.000000000 +0000 @@ -241,23 +241,28 @@ const char *s; switch(i) { - case AB_Job_TypeGetBalance: s="getbalance"; break; - case AB_Job_TypeGetTransactions: s="gettransactions"; break; - case AB_Job_TypeTransfer: s="transfer"; break; - case AB_Job_TypeDebitNote: s="debitnote"; break; - case AB_Job_TypeEuTransfer: s="eutransfer"; break; - case AB_Job_TypeGetStandingOrders: s="getstandingorders"; break; - case AB_Job_TypeGetDatedTransfers: s="getdatedtransfers"; break; - case AB_Job_TypeCreateStandingOrder: s="createstandingorder"; break; - case AB_Job_TypeModifyStandingOrder: s="modifystandingorder"; break; - case AB_Job_TypeDeleteStandingOrder: s="deletestandingorder"; break; - case AB_Job_TypeCreateDatedTransfer: s="createdatedtransfer"; break; - case AB_Job_TypeModifyDatedTransfer: s="modifydatedtransfer"; break; - case AB_Job_TypeDeleteDatedTransfer: s="deletedatedtransfer"; break; - case AB_Job_TypeInternalTransfer: s="internaltransfer"; break; - case AB_Job_TypeLoadCellPhone: s="loadCellPhone"; break; - case AB_Job_TypeSepaTransfer: s="sepaTransfer"; break; - case AB_Job_TypeSepaDebitNote: s="sepaDebitNote"; break; + case AB_Job_TypeGetBalance: s="getbalance"; break; + case AB_Job_TypeGetTransactions: s="gettransactions"; break; + case AB_Job_TypeTransfer: s="transfer"; break; + case AB_Job_TypeDebitNote: s="debitnote"; break; + case AB_Job_TypeEuTransfer: s="eutransfer"; break; + case AB_Job_TypeGetStandingOrders: s="getstandingorders"; break; + case AB_Job_TypeGetDatedTransfers: s="getdatedtransfers"; break; + case AB_Job_TypeCreateStandingOrder: s="createstandingorder"; break; + case AB_Job_TypeModifyStandingOrder: s="modifystandingorder"; break; + case AB_Job_TypeDeleteStandingOrder: s="deletestandingorder"; break; + case AB_Job_TypeCreateDatedTransfer: s="createdatedtransfer"; break; + case AB_Job_TypeModifyDatedTransfer: s="modifydatedtransfer"; break; + case AB_Job_TypeDeleteDatedTransfer: s="deletedatedtransfer"; break; + case AB_Job_TypeInternalTransfer: s="internaltransfer"; break; + case AB_Job_TypeLoadCellPhone: s="loadCellPhone"; break; + case AB_Job_TypeSepaTransfer: s="sepaTransfer"; break; + case AB_Job_TypeSepaDebitNote: s="sepaDebitNote"; break; + case AB_Job_TypeSepaCreateStandingOrder: s="sepaCreateStandingOrder"; break; + case AB_Job_TypeSepaModifyStandingOrder: s="sepaModifyStandingOrder"; break; + case AB_Job_TypeSepaDeleteStandingOrder: s="sepaDeleteStandingOrder"; break; + case AB_Job_TypeSepaFlashDebitNote: s="sepaFlashDebitNote"; break; + case AB_Job_TypeSepaGetStandingOrders: s="sepaGetStandingOrders"; break; default: case AB_Job_TypeUnknown: s="unknown"; break; } @@ -271,23 +276,29 @@ const char *s; switch(i) { - case AB_Job_TypeGetBalance: s=I18N("Get Balance"); break; - case AB_Job_TypeGetTransactions: s=I18N("Get Transactions"); break; - case AB_Job_TypeTransfer: s=I18N("Transfer"); break; - case AB_Job_TypeDebitNote: s=I18N("Debit Note"); break; - case AB_Job_TypeEuTransfer: s=I18N("EU Transfer"); break; - case AB_Job_TypeGetStandingOrders: s=I18N("Get Standing Orders"); break; - case AB_Job_TypeGetDatedTransfers: s=I18N("Get Dated Transfers"); break; - case AB_Job_TypeCreateStandingOrder: s=I18N("Create Standing Order"); break; - case AB_Job_TypeModifyStandingOrder: s=I18N("Modify Standing Order"); break; - case AB_Job_TypeDeleteStandingOrder: s=I18N("Delete Standing Order"); break; - case AB_Job_TypeCreateDatedTransfer: s=I18N("Create Dated Transfer"); break; - case AB_Job_TypeModifyDatedTransfer: s=I18N("Modify Dated Transfer"); break; - case AB_Job_TypeDeleteDatedTransfer: s=I18N("Delete Dated Transfer"); break; - case AB_Job_TypeInternalTransfer: s=I18N("Internal Transfer"); break; - case AB_Job_TypeLoadCellPhone: s=I18N("Load Cellphone"); break; - case AB_Job_TypeSepaTransfer: s=I18N("SEPA Transfer"); break; - case AB_Job_TypeSepaDebitNote: s=I18N("SEPA Debit Note"); break; + case AB_Job_TypeGetBalance: s=I18N("Get Balance"); break; + case AB_Job_TypeGetTransactions: s=I18N("Get Transactions"); break; + case AB_Job_TypeTransfer: s=I18N("Transfer"); break; + case AB_Job_TypeDebitNote: s=I18N("Debit Note"); break; + case AB_Job_TypeEuTransfer: s=I18N("EU Transfer"); break; + case AB_Job_TypeGetStandingOrders: s=I18N("Get Standing Orders"); break; + case AB_Job_TypeGetDatedTransfers: s=I18N("Get Dated Transfers"); break; + case AB_Job_TypeCreateStandingOrder: s=I18N("Create Standing Order"); break; + case AB_Job_TypeModifyStandingOrder: s=I18N("Modify Standing Order"); break; + case AB_Job_TypeDeleteStandingOrder: s=I18N("Delete Standing Order"); break; + case AB_Job_TypeCreateDatedTransfer: s=I18N("Create Dated Transfer"); break; + case AB_Job_TypeModifyDatedTransfer: s=I18N("Modify Dated Transfer"); break; + case AB_Job_TypeDeleteDatedTransfer: s=I18N("Delete Dated Transfer"); break; + case AB_Job_TypeInternalTransfer: s=I18N("Internal Transfer"); break; + case AB_Job_TypeLoadCellPhone: s=I18N("Load Cellphone"); break; + case AB_Job_TypeSepaTransfer: s=I18N("SEPA Transfer"); break; + case AB_Job_TypeSepaDebitNote: s=I18N("SEPA Debit Note"); break; + + case AB_Job_TypeSepaCreateStandingOrder: s=I18N("SEPA Create Standing Order"); break; + case AB_Job_TypeSepaModifyStandingOrder: s=I18N("SEPA Modify Standing Order"); break; + case AB_Job_TypeSepaDeleteStandingOrder: s=I18N("SEPA Delete Standing Order"); break; + case AB_Job_TypeSepaFlashDebitNote: s=I18N("SEPA Flash Debit Note"); break; + case AB_Job_TypeSepaGetStandingOrders: s=I18N("SEPA Get Standing Orders"); break; default: case AB_Job_TypeUnknown: s=I18N("unknown"); break; } diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/job.h libaqbanking-5.6.1beta/src/libs/aqbanking/job.h --- libaqbanking-5.4.3beta/src/libs/aqbanking/job.h 2013-12-30 21:46:06.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/job.h 2014-08-03 16:28:39.000000000 +0000 @@ -193,7 +193,13 @@ /** modifies an existing standing order (SEPA) */ AB_Job_TypeSepaModifyStandingOrder, /** deletes an existing standing order (SEPA) */ - AB_Job_TypeSepaDeleteStandingOrder + AB_Job_TypeSepaDeleteStandingOrder, + + /** SEPA debit note with shortest possible setup time */ + AB_Job_TypeSepaFlashDebitNote, + + /** get SEPA standing orders */ + AB_Job_TypeSepaGetStandingOrders, } AB_JOB_TYPE; diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.c libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.c 2014-07-23 20:29:51.000000000 +0000 @@ -0,0 +1,25 @@ +/*************************************************************************** + begin : Sat Apr 26 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * This file is part of the project "AqBanking". * + * Please see toplevel file COPYING of that project for license details. * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepaflashdebitnote.h" +#include "job_l.h" + + + +AB_JOB *AB_JobSepaFlashDebitNote_new(AB_ACCOUNT *a){ + return AB_Job_new(AB_Job_TypeSepaFlashDebitNote, a); +} + + diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.h libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.h --- libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepaflashdebitnote.h 2014-07-23 20:29:51.000000000 +0000 @@ -0,0 +1,42 @@ +/*************************************************************************** + begin : Sat Apr 26 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * This file is part of the project "AqBanking". * + * Please see toplevel file COPYING of that project for license details. * + ***************************************************************************/ + + +#ifndef AQBANKING_JOBSEPAFLASHDEBITNOTE_H +#define AQBANKING_JOBSEPAFLASHDEBITNOTE_H + + +#include + +/** @addtogroup G_AB_JOBS_XFER_SEPA_FLASH_DEBITNOTE + * + * This is a SEPA debitnote with very low setup time. This means the date of the execution + * is requested be shorter than for normal SEPA debit notes. + */ +/*@{*/ + + +#ifdef __cplusplus +extern "C" { +#endif + + +AQBANKING_API +AB_JOB *AB_JobSepaFlashDebitNote_new(AB_ACCOUNT *a); + + +#ifdef __cplusplus +} +#endif + +/*@}*/ /* defgroup */ + +#endif + diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.c libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.c 2014-08-03 17:14:54.000000000 +0000 @@ -0,0 +1,26 @@ +/*************************************************************************** + begin : Sun Aug 03 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * This file is part of the project "AqBanking". * + * Please see toplevel file COPYING of that project for license details. * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepagetstandingorders.h" +#include "job_l.h" + + + +AB_JOB *AB_JobSepaGetStandingOrders_new(AB_ACCOUNT *a){ + return AB_Job_new(AB_Job_TypeSepaGetStandingOrders, a); +} + + + diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.h libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.h --- libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepagetstandingorders.h 2014-08-03 17:13:33.000000000 +0000 @@ -0,0 +1,42 @@ +/*************************************************************************** + begin : Sun Aug 03 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * This file is part of the project "AqBanking". * + * Please see toplevel file COPYING of that project for license details. * + ***************************************************************************/ + + +#ifndef AQBANKING_JOBSEPAGETSTANDINGORDERS_H +#define AQBANKING_JOBSEPAGETSTANDINGORDERS_H + + +#include + +/** @addtogroup G_AB_JOBS_XFER_SEPA_STANDINGORDERS + * + * This job requests active SEPA standing orders. + */ +/*@{*/ + + +#ifdef __cplusplus +extern "C" { +#endif + + +AQBANKING_API +AB_JOB *AB_JobSepaGetStandingOrders_new(AB_ACCOUNT *a); + + + +#ifdef __cplusplus +} +#endif + +/*@}*/ /* defgroup */ + +#endif /* AQBANKING_JOBSEPAGETSTANDINGORDERS_H */ + diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/Makefile.am libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.am --- libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/Makefile.am 2014-01-15 20:47:54.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.am 2014-08-03 17:15:43.000000000 +0000 @@ -51,6 +51,7 @@ jobsepatransfer_be.h \ jobsepadebitnote.h \ jobsepadebitnote_be.h \ + jobsepaflashdebitnote.h \ jobgetdatedtransfers.h \ jobgetdatedtransfers_be.h \ jobcreatesto.h \ @@ -70,7 +71,8 @@ jobeutransfer.h \ jobeutransfer_be.h \ jobloadcellphone.h \ - jobloadcellphone_be.h + jobloadcellphone_be.h \ + jobsepagetstandingorders.h libjobs_la_SOURCES=\ jobgetbalance.c \ @@ -81,6 +83,7 @@ jobsingledebitnote.c \ jobsepatransfer.c \ jobsepadebitnote.c \ + jobsepaflashdebitnote.c \ jobcreatesto.c \ jobmodifysto.c \ jobdeletesto.c \ @@ -90,7 +93,8 @@ jobinternaltransfer.c \ jobeutransfer.c \ jobloadcellphone.c \ - jobsepacreatesto.c + jobsepacreatesto.c \ + jobsepagetstandingorders.c diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/jobs/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs/aqbanking/jobs -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -74,25 +101,50 @@ am_libjobs_la_OBJECTS = jobgetbalance.lo jobgettransactions.lo \ jobgetstandingorders.lo jobgetdatedtransfers.lo \ jobsingletransfer.lo jobsingledebitnote.lo jobsepatransfer.lo \ - jobsepadebitnote.lo jobcreatesto.lo jobmodifysto.lo \ - jobdeletesto.lo jobcreatedatedtransfer.lo \ + jobsepadebitnote.lo jobsepaflashdebitnote.lo jobcreatesto.lo \ + jobmodifysto.lo jobdeletesto.lo jobcreatedatedtransfer.lo \ jobmodifydatedtransfer.lo jobdeletedatedtransfer.lo \ jobinternaltransfer.lo jobeutransfer.lo jobloadcellphone.lo \ - jobsepacreatesto.lo + jobsepacreatesto.lo jobsepagetstandingorders.lo libjobs_la_OBJECTS = $(am_libjobs_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libjobs_la_SOURCES) DIST_SOURCES = $(libjobs_la_SOURCES) am__can_run_installinfo = \ @@ -129,12 +181,30 @@ } am__installdirs = "$(DESTDIR)$(iheaderdir)" HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -223,6 +293,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -442,6 +513,7 @@ jobsepatransfer_be.h \ jobsepadebitnote.h \ jobsepadebitnote_be.h \ + jobsepaflashdebitnote.h \ jobgetdatedtransfers.h \ jobgetdatedtransfers_be.h \ jobcreatesto.h \ @@ -461,7 +533,8 @@ jobeutransfer.h \ jobeutransfer_be.h \ jobloadcellphone.h \ - jobloadcellphone_be.h + jobloadcellphone_be.h \ + jobsepagetstandingorders.h libjobs_la_SOURCES = \ jobgetbalance.c \ @@ -472,6 +545,7 @@ jobsingledebitnote.c \ jobsepatransfer.c \ jobsepadebitnote.c \ + jobsepaflashdebitnote.c \ jobcreatesto.c \ jobmodifysto.c \ jobdeletesto.c \ @@ -481,7 +555,8 @@ jobinternaltransfer.c \ jobeutransfer.c \ jobloadcellphone.c \ - jobsepacreatesto.c + jobsepacreatesto.c \ + jobsepagetstandingorders.c all: all-am @@ -520,14 +595,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libjobs.la: $(libjobs_la_OBJECTS) $(libjobs_la_DEPENDENCIES) $(EXTRA_libjobs_la_DEPENDENCIES) - $(LINK) $(libjobs_la_OBJECTS) $(libjobs_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libjobs_la_OBJECTS) $(libjobs_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -550,30 +628,32 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobmodifysto.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepacreatesto.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitnote.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepaflashdebitnote.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepagetstandingorders.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepatransfer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsingledebitnote.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsingletransfer.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -602,26 +682,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -633,15 +702,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -650,6 +715,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -794,19 +874,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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-iheaderHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iheaderHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iheaderHEADERS sources: diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,8 +83,9 @@ noinst_PROGRAMS = testlib$(EXEEXT) ab_value_test$(EXEEXT) TESTS = testlib$(EXEEXT) ab_value_test$(EXEEXT) subdir = src/libs/aqbanking -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) \ + $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -110,9 +138,14 @@ country.lo imexporter.lo job.lo provider.lo msgengine.lo \ httpsession.lo libaqbanking_la_OBJECTS = $(am_libaqbanking_la_OBJECTS) -libaqbanking_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libaqbanking_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libaqbanking_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libaqbanking_la_LDFLAGS) $(LDFLAGS) \ + -o $@ PROGRAMS = $(noinst_PROGRAMS) am_ab_value_test_OBJECTS = ab-value-test.$(OBJEXT) ab_value_test_OBJECTS = $(am_ab_value_test_OBJECTS) @@ -120,30 +153,52 @@ am_testlib_OBJECTS = testlib.$(OBJEXT) testlib_OBJECTS = $(am_testlib_OBJECTS) testlib_DEPENDENCIES = libaqbanking.la $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libaqbanking_la_SOURCES) $(ab_value_test_SOURCES) \ $(testlib_SOURCES) DIST_SOURCES = $(libaqbanking_la_SOURCES) $(ab_value_test_SOURCES) \ $(testlib_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -152,13 +207,207 @@ HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) 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 +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -189,6 +438,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -285,6 +535,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -545,7 +796,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -576,6 +827,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -602,14 +854,17 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libaqbanking.la: $(libaqbanking_la_OBJECTS) $(libaqbanking_la_DEPENDENCIES) $(EXTRA_libaqbanking_la_DEPENDENCIES) - $(libaqbanking_la_LINK) -rpath $(libdir) $(libaqbanking_la_OBJECTS) $(libaqbanking_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libaqbanking_la_LINK) -rpath $(libdir) $(libaqbanking_la_OBJECTS) $(libaqbanking_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -619,12 +874,14 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + ab_value_test$(EXEEXT): $(ab_value_test_OBJECTS) $(ab_value_test_DEPENDENCIES) $(EXTRA_ab_value_test_DEPENDENCIES) @rm -f ab_value_test$(EXEEXT) - $(LINK) $(ab_value_test_OBJECTS) $(ab_value_test_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(ab_value_test_OBJECTS) $(ab_value_test_LDADD) $(LIBS) + testlib$(EXEEXT): $(testlib_OBJECTS) $(testlib_DEPENDENCIES) $(EXTRA_testlib_DEPENDENCIES) @rm -f testlib$(EXEEXT) - $(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -645,25 +902,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testlib.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -693,22 +950,25 @@ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -723,57 +983,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -789,12 +1004,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -806,15 +1016,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -823,102 +1029,194 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @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=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testlib.log: testlib$(EXEEXT) + @p='testlib$(EXEEXT)'; \ + b='testlib'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +ab_value_test.log: ab_value_test$(EXEEXT) + @p='ab_value_test$(EXEEXT)'; \ + b='ab_value_test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1004,6 +1302,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -1085,13 +1386,12 @@ uninstall-am: uninstall-iheaderHEADERS uninstall-libLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -1102,7 +1402,7 @@ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + recheck tags tags-am uninstall uninstall-am \ uninstall-iheaderHEADERS uninstall-libLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/testlib.c libaqbanking-5.6.1beta/src/libs/aqbanking/testlib.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/testlib.c 2014-02-13 18:49:04.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/testlib.c 2014-10-12 13:40:15.000000000 +0000 @@ -212,7 +212,7 @@ } rv=AB_Banking_CheckIban(GWEN_Buffer_GetStart(tbuf)); - if (rv<0) { + if (rv != 0) { fprintf(stderr, "Bad IBAN (%s)\n", GWEN_Buffer_GetStart(tbuf)); return 2; } diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/typemaker2/c/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/typemaker2/c/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/typemaker2/c/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/typemaker2/c/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs/aqbanking/typemaker2/c -DIST_COMMON = $(dist_typedata_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_typedata_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(typedatadir)" DATA = $(dist_typedata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -434,11 +476,11 @@ @list='$(dist_typedata_DATA)'; test -n "$(typedatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(typedatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -577,16 +619,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_typedataDATA \ - 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 maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_typedataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_typedataDATA 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-dist_typedataDATA sources: diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/typemaker2/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/typemaker2/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/typemaker2/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/typemaker2/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs/aqbanking/typemaker2 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/types/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbanking/types/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbanking/types/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/types/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs/aqbanking/types -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -76,19 +103,44 @@ transaction.lo transactionfns.lo transactionlimits.lo user.lo \ userfns.lo value.lo cellphoneproduct.lo security.lo message.lo libtypes_la_OBJECTS = $(am_libtypes_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtypes_la_SOURCES) DIST_SOURCES = $(libtypes_la_SOURCES) am__can_run_installinfo = \ @@ -125,12 +177,30 @@ } am__installdirs = "$(DESTDIR)$(iheaderdir)" HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -219,6 +289,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -505,14 +576,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtypes.la: $(libtypes_la_OBJECTS) $(libtypes_la_DEPENDENCIES) $(EXTRA_libtypes_la_DEPENDENCIES) - $(LINK) $(libtypes_la_OBJECTS) $(libtypes_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libtypes_la_OBJECTS) $(libtypes_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -538,25 +612,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/value.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -585,26 +659,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -616,15 +679,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -633,6 +692,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -777,19 +851,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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-iheaderHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iheaderHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iheaderHEADERS types: $(typefiles) diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction.c libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction.c 2014-08-12 18:58:42.000000000 +0000 @@ -390,10 +390,6 @@ free(st->bankReference); if (st->endToEndReference) free(st->endToEndReference); - if (st->mandateReference) - free(st->mandateReference); - if (st->creditorIdentifier) - free(st->creditorIdentifier); if (st->originatorIdentifier) free(st->originatorIdentifier); if (st->transactionText) @@ -489,10 +485,8 @@ st->remoteSuffix=strdup(d->remoteSuffix); if (d->remoteIban) st->remoteIban=strdup(d->remoteIban); - if (d->remoteName) { - GWEN_StringList_free(st->remoteName); + if (d->remoteName) st->remoteName=GWEN_StringList_dup(d->remoteName); - } if (d->remoteBic) st->remoteBic=strdup(d->remoteBic); st->uniqueId=d->uniqueId; @@ -516,10 +510,6 @@ st->bankReference=strdup(d->bankReference); if (d->endToEndReference) st->endToEndReference=strdup(d->endToEndReference); - if (d->mandateReference) - st->mandateReference=strdup(d->mandateReference); - if (d->creditorIdentifier) - st->creditorIdentifier=strdup(d->creditorIdentifier); if (d->originatorIdentifier) st->originatorIdentifier=strdup(d->originatorIdentifier); st->transactionCode=d->transactionCode; @@ -529,14 +519,10 @@ st->primanota=strdup(d->primanota); if (d->fiId) st->fiId=strdup(d->fiId); - if (d->purpose) { - GWEN_StringList_free(st->purpose); + if (d->purpose) st->purpose=GWEN_StringList_dup(d->purpose); - } - if (d->category) { - GWEN_StringList_free(st->category); + if (d->category) st->category=GWEN_StringList_dup(d->category); - } st->period=d->period; st->cycle=d->cycle; st->executionDay=d->executionDay; @@ -691,12 +677,6 @@ if (st->endToEndReference) if (GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, "endToEndReference", st->endToEndReference)) return -1; - if (st->mandateReference) - if (GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, "mandateReference", st->mandateReference)) - return -1; - if (st->creditorIdentifier) - if (GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, "creditorIdentifier", st->creditorIdentifier)) - return -1; if (st->originatorIdentifier) if (GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, "originatorIdentifier", st->originatorIdentifier)) return -1; @@ -901,8 +881,6 @@ AB_Transaction_SetCustomerReference(st, GWEN_DB_GetCharValue(db, "customerReference", 0, 0)); AB_Transaction_SetBankReference(st, GWEN_DB_GetCharValue(db, "bankReference", 0, 0)); AB_Transaction_SetEndToEndReference(st, GWEN_DB_GetCharValue(db, "endToEndReference", 0, 0)); - AB_Transaction_SetMandateReference(st, GWEN_DB_GetCharValue(db, "mandateReference", 0, 0)); - AB_Transaction_SetCreditorIdentifier(st, GWEN_DB_GetCharValue(db, "creditorIdentifier", 0, 0)); AB_Transaction_SetOriginatorIdentifier(st, GWEN_DB_GetCharValue(db, "originatorIdentifier", 0, 0)); AB_Transaction_SetTransactionCode(st, GWEN_DB_GetIntValue(db, "transactionCode", 0, 0)); AB_Transaction_SetTransactionText(st, GWEN_DB_GetCharValue(db, "transactionText", 0, 0)); @@ -1660,46 +1638,6 @@ st->_modified=1; } - - - -const char *AB_Transaction_GetMandateReference(const AB_TRANSACTION *st) { - assert(st); - return st->mandateReference; -} - - -void AB_Transaction_SetMandateReference(AB_TRANSACTION *st, const char *d) { - assert(st); - if (st->mandateReference) - free(st->mandateReference); - if (d && *d) - st->mandateReference=strdup(d); - else - st->mandateReference=0; - st->_modified=1; -} - - - - -const char *AB_Transaction_GetCreditorIdentifier(const AB_TRANSACTION *st) { - assert(st); - return st->creditorIdentifier; -} - - -void AB_Transaction_SetCreditorIdentifier(AB_TRANSACTION *st, const char *d) { - assert(st); - if (st->creditorIdentifier) - free(st->creditorIdentifier); - if (d && *d) - st->creditorIdentifier=strdup(d); - else - st->creditorIdentifier=0; - st->_modified=1; -} - diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/types/transactionfns.c libaqbanking-5.6.1beta/src/libs/aqbanking/types/transactionfns.c --- libaqbanking-5.4.3beta/src/libs/aqbanking/types/transactionfns.c 2014-03-01 20:15:47.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/types/transactionfns.c 2014-07-23 20:29:51.000000000 +0000 @@ -21,6 +21,7 @@ #include #include +#include @@ -694,14 +695,14 @@ * other than "A"-"Z", "a"-"z" and "0"-"9". * We don't use isalnum here because I'm not sure how that function handles UTF-8 chars with umlauts... */ -static int _checkStringForAlNum(const char *s) { +static int _checkStringForAlNum(const char *s, int lcase) { assert(s); while(*s) { unsigned char c=*s; - if (!((c>='A' && c<='Z') || - (c>='a' && c<='z') || - (c>='0' && c<='9'))) { + if (!((c>='0' && c<='9') || + (c>='A' && c<='Z') || + (lcase && c>='a' && c<='z'))) { DBG_ERROR(AQBANKING_LOGDOMAIN, "Invalid character in string: '%c'", c); return GWEN_ERROR_BAD_DATA; } @@ -724,7 +725,7 @@ DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing or empty local IBAN in transaction"); return GWEN_ERROR_BAD_DATA; } - rv=_checkStringForAlNum(s); + rv=_checkStringForAlNum(s, 1); if (rv<0) { DBG_ERROR(AQBANKING_LOGDOMAIN, "Invalid character in local IBAN"); return rv; @@ -735,7 +736,7 @@ DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing or empty local BIC in transaction"); return GWEN_ERROR_BAD_DATA; } - rv=_checkStringForAlNum(s); + rv=_checkStringForAlNum(s, 0); if (rv<0) { DBG_ERROR(AQBANKING_LOGDOMAIN, "Invalid character in local BIC"); return rv; @@ -746,7 +747,7 @@ DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing or empty remote IBAN in transaction"); return GWEN_ERROR_BAD_DATA; } - rv=_checkStringForAlNum(s); + rv=_checkStringForAlNum(s, 1); if (rv<0) { DBG_ERROR(AQBANKING_LOGDOMAIN, "Invalid character in remote IBAN"); return rv; @@ -754,13 +755,18 @@ s=AB_Transaction_GetRemoteBic(t); if (!(s && *s)) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing or empty remote BIC in transaction"); - return GWEN_ERROR_BAD_DATA; + if (strncmp(AB_Transaction_GetLocalIban(t), + AB_Transaction_GetRemoteIban(t), 2)) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing or empty remote BIC in transaction"); + return GWEN_ERROR_BAD_DATA; + } } - rv=_checkStringForAlNum(s); - if (rv<0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Invalid character in remote BIC"); - return rv; + else { + rv=_checkStringForAlNum(s, 0); + if (rv<0) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "Invalid character in remote BIC"); + return rv; + } } diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction.h libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction.h --- libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction.h 2014-01-18 13:04:12.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction.h 2014-08-12 18:58:42.000000000 +0000 @@ -311,24 +311,6 @@ get it with @ref AB_Transaction_GetEndToEndReference

-@anchor AB_TRANSACTION_MandateReference -

MandateReference

-

-This is a reference provided by the issuer of a SEPA transfer.

-

-Set this property with @ref AB_Transaction_SetMandateReference, -get it with @ref AB_Transaction_GetMandateReference -

- -@anchor AB_TRANSACTION_CreditorIdentifier -

CreditorIdentifier

-

-Used for SEPA transfers.

-

-Set this property with @ref AB_Transaction_SetCreditorIdentifier, -get it with @ref AB_Transaction_GetCreditorIdentifier -

- @anchor AB_TRANSACTION_OriginatorIdentifier

OriginatorIdentifier

@@ -659,7 +641,7 @@ @anchor AB_TRANSACTION_SequenceType

SequenceType

-Sequence type of the debit (on-time, first, recurring).

+Sequence type of the debit (one-time, first, recurring).

Set this property with @ref AB_Transaction_SetSequenceType, get it with @ref AB_Transaction_GetSequenceType @@ -1172,24 +1154,6 @@ AQBANKING_API void AB_Transaction_SetEndToEndReference(AB_TRANSACTION *el, const char *d); /** -* Returns the property @ref AB_TRANSACTION_MandateReference -*/ -AQBANKING_API const char *AB_Transaction_GetMandateReference(const AB_TRANSACTION *el); -/** -* Set the property @ref AB_TRANSACTION_MandateReference -*/ -AQBANKING_API void AB_Transaction_SetMandateReference(AB_TRANSACTION *el, const char *d); - -/** -* Returns the property @ref AB_TRANSACTION_CreditorIdentifier -*/ -AQBANKING_API const char *AB_Transaction_GetCreditorIdentifier(const AB_TRANSACTION *el); -/** -* Set the property @ref AB_TRANSACTION_CreditorIdentifier -*/ -AQBANKING_API void AB_Transaction_SetCreditorIdentifier(AB_TRANSACTION *el, const char *d); - -/** * Returns the property @ref AB_TRANSACTION_OriginatorIdentifier */ AQBANKING_API const char *AB_Transaction_GetOriginatorIdentifier(const AB_TRANSACTION *el); diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction_l.h libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction_l.h --- libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction_l.h 2014-01-18 13:04:12.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction_l.h 2014-08-12 18:58:41.000000000 +0000 @@ -118,8 +118,6 @@ - - /*@}*/ /** @name Additional Information for Standing Orders diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction_p.h libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction_p.h --- libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction_p.h 2014-01-18 13:04:12.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction_p.h 2014-08-12 18:58:41.000000000 +0000 @@ -44,8 +44,6 @@ char *customerReference; char *bankReference; char *endToEndReference; - char *mandateReference; - char *creditorIdentifier; char *originatorIdentifier; int transactionCode; char *transactionText; @@ -144,8 +142,6 @@ - - diff -Nru libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction.xml libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction.xml --- libaqbanking-5.4.3beta/src/libs/aqbanking/types/transaction.xml 2014-01-18 13:04:02.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbanking/types/transaction.xml 2014-10-12 13:40:15.000000000 +0000 @@ -631,22 +631,22 @@ once - One-time operation. + One-time operation, OOFF. first - First operation with more following. + First operation with more following, FRST. following - Following operation (not the first). + Following operation (not the first), RCUR. final - Final operation (last). + Final operation (last), FNAL. Only used if it is known that this is the final one. @@ -875,6 +875,7 @@ This is a reference provided by the issuer of a SEPA transfer. + Used for SEPA transfers. @@ -1093,7 +1095,7 @@ - Sequence type of the debit (on-time, first, recurring). + Sequence type of the debit (one-time, first, recurring). diff -Nru libaqbanking-5.4.3beta/src/libs/aqbankingpp/Makefile.in libaqbanking-5.6.1beta/src/libs/aqbankingpp/Makefile.in --- libaqbanking-5.4.3beta/src/libs/aqbankingpp/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/aqbankingpp/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,8 +83,9 @@ noinst_PROGRAMS = testlibcc$(EXEEXT) TESTS = testlibcc$(EXEEXT) subdir = src/libs/aqbankingpp -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) \ + $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -106,26 +134,52 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libaqbankingpp_la_OBJECTS = libaqbankingpp_la-stringlist.lo libaqbankingpp_la_OBJECTS = $(am_libaqbankingpp_la_OBJECTS) -libaqbankingpp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libaqbankingpp_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libaqbankingpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libaqbankingpp_la_LDFLAGS) \ + $(LDFLAGS) -o $@ PROGRAMS = $(noinst_PROGRAMS) am_testlibcc_OBJECTS = testlibcc.$(OBJEXT) testlibcc_OBJECTS = $(am_testlibcc_OBJECTS) testlibcc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libaqbankingpp_la_SOURCES) $(testlibcc_SOURCES) DIST_SOURCES = $(libaqbankingpp_la_SOURCES) $(testlibcc_SOURCES) am__can_run_installinfo = \ @@ -134,14 +188,207 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -230,6 +477,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -429,7 +677,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj +.SUFFIXES: .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -460,6 +708,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -486,14 +735,17 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libaqbankingpp.la: $(libaqbankingpp_la_OBJECTS) $(libaqbankingpp_la_DEPENDENCIES) $(EXTRA_libaqbankingpp_la_DEPENDENCIES) - $(libaqbankingpp_la_LINK) -rpath $(libdir) $(libaqbankingpp_la_OBJECTS) $(libaqbankingpp_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libaqbankingpp_la_LINK) -rpath $(libdir) $(libaqbankingpp_la_OBJECTS) $(libaqbankingpp_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -503,9 +755,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + testlibcc$(EXEEXT): $(testlibcc_OBJECTS) $(testlibcc_DEPENDENCIES) $(EXTRA_testlibcc_DEPENDENCIES) @rm -f testlibcc$(EXEEXT) - $(CXXLINK) $(testlibcc_OBJECTS) $(testlibcc_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(testlibcc_OBJECTS) $(testlibcc_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -517,32 +770,32 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testlibcc.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< libaqbankingpp_la-stringlist.lo: stringlist.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libaqbankingpp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libaqbankingpp_la-stringlist.lo -MD -MP -MF $(DEPDIR)/libaqbankingpp_la-stringlist.Tpo -c -o libaqbankingpp_la-stringlist.lo `test -f 'stringlist.cpp' || echo '$(srcdir)/'`stringlist.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libaqbankingpp_la-stringlist.Tpo $(DEPDIR)/libaqbankingpp_la-stringlist.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='stringlist.cpp' object='libaqbankingpp_la-stringlist.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libaqbankingpp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libaqbankingpp_la-stringlist.lo -MD -MP -MF $(DEPDIR)/libaqbankingpp_la-stringlist.Tpo -c -o libaqbankingpp_la-stringlist.lo `test -f 'stringlist.cpp' || echo '$(srcdir)/'`stringlist.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libaqbankingpp_la-stringlist.Tpo $(DEPDIR)/libaqbankingpp_la-stringlist.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='stringlist.cpp' object='libaqbankingpp_la-stringlist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libaqbankingpp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libaqbankingpp_la-stringlist.lo `test -f 'stringlist.cpp' || echo '$(srcdir)/'`stringlist.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libaqbankingpp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libaqbankingpp_la-stringlist.lo `test -f 'stringlist.cpp' || echo '$(srcdir)/'`stringlist.cpp mostlyclean-libtool: -rm -f *.lo @@ -571,26 +824,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -602,15 +844,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -619,102 +857,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @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=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testlibcc.log: testlibcc$(EXEEXT) + @p='testlibcc$(EXEEXT)'; \ + b='testlibcc'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -774,6 +1097,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -857,21 +1183,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-iheaderHEADERS install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iheaderHEADERS \ - uninstall-libLTLIBRARIES + recheck tags tags-am uninstall uninstall-am \ + uninstall-iheaderHEADERS uninstall-libLTLIBRARIES sources: diff -Nru libaqbanking-5.4.3beta/src/libs/Makefile.in libaqbanking-5.6.1beta/src/libs/Makefile.in --- libaqbanking-5.4.3beta/src/libs/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/libs/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/libs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/Makefile.in libaqbanking-5.6.1beta/src/Makefile.in --- libaqbanking-5.4.3beta/src/Makefile.in 2014-04-17 20:57:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/Makefile.in 2015-06-01 16:31:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqebics/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqebics/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqebics/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqebics/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqebics -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -418,22 +480,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -448,57 +513,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -514,12 +534,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -531,15 +546,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -548,6 +559,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -709,22 +735,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/client/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/client/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/client/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/client/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,8 +82,8 @@ host_triplet = @host@ noinst_PROGRAMS = testlib$(EXEEXT) subdir = src/plugins/backends/aqebics/plugin/client -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -76,23 +103,48 @@ am_libclient_la_OBJECTS = account.lo user.lo context.lo dialog.lo \ provider.lo queues.lo libclient_la_OBJECTS = $(am_libclient_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = PROGRAMS = $(noinst_PROGRAMS) testlib_SOURCES = testlib.c testlib_OBJECTS = testlib.$(OBJEXT) testlib_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libclient_la_SOURCES) testlib.c DIST_SOURCES = $(libclient_la_SOURCES) testlib.c am__can_run_installinfo = \ @@ -129,12 +181,30 @@ } am__installdirs = "$(DESTDIR)$(iheaderdir)" HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -223,6 +293,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -498,14 +569,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libclient.la: $(libclient_la_OBJECTS) $(libclient_la_DEPENDENCIES) $(EXTRA_libclient_la_DEPENDENCIES) - $(LINK) $(libclient_la_OBJECTS) $(libclient_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libclient_la_OBJECTS) $(libclient_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -515,9 +589,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + testlib$(EXEEXT): $(testlib_OBJECTS) $(testlib_DEPENDENCIES) $(EXTRA_testlib_DEPENDENCIES) @rm -f testlib$(EXEEXT) - $(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -534,25 +609,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -581,26 +656,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -612,15 +676,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -629,6 +689,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -773,19 +848,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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 \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-iheaderHEADERS diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/dialogs/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/dialogs/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/dialogs/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/dialogs/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqebics/plugin/dialogs -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -75,19 +102,44 @@ am_libdialogs_la_OBJECTS = dlg_edituser.lo dlg_newkeyfile.lo \ dlg_user_special.lo libdialogs_la_OBJECTS = $(am_libdialogs_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libdialogs_la_SOURCES) DIST_SOURCES = $(libdialogs_la_SOURCES) am__can_run_installinfo = \ @@ -125,12 +177,30 @@ am__installdirs = "$(DESTDIR)$(dlgdatadir)" DATA = $(dlgdata_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -219,6 +289,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -448,14 +519,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libdialogs.la: $(libdialogs_la_OBJECTS) $(libdialogs_la_DEPENDENCIES) $(EXTRA_libdialogs_la_DEPENDENCIES) - $(LINK) $(libdialogs_la_OBJECTS) $(libdialogs_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libdialogs_la_OBJECTS) $(libdialogs_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -468,25 +542,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlg_user_special.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -515,26 +589,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dlgdatadir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -546,15 +609,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -563,6 +622,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,19 +781,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dlgdataDATA 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 maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dlgdataDATA 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 maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dlgdataDATA + tags tags-am uninstall uninstall-am uninstall-dlgdataDATA types: $(typefiles) diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,9 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqebics/plugin -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/aqebics.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/aqebics.xml.in $(top_srcdir)/depcomp \ + $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -106,7 +133,11 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_aqebics_la_OBJECTS = aqebics-plugin.lo aqebics_la_OBJECTS = $(am_aqebics_la_OBJECTS) -aqebics_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +aqebics_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(aqebics_la_LDFLAGS) $(LDFLAGS) -o $@ libaqebics_la_DEPENDENCIES = msg/libmsg.la dialogs/libdialogs.la \ @@ -114,28 +145,50 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libaqebics_la_OBJECTS = dummy.lo libaqebics_la_OBJECTS = $(am_libaqebics_la_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(aqebics_la_SOURCES) $(libaqebics_la_SOURCES) DIST_SOURCES = $(aqebics_la_SOURCES) $(libaqebics_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -145,9 +198,29 @@ HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -180,6 +253,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -268,6 +342,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -504,6 +579,7 @@ $(am__aclocal_m4_deps): aqebics.xml: $(top_builddir)/config.status $(srcdir)/aqebics.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -530,12 +606,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ @@ -562,16 +641,20 @@ clean-pluginLTLIBRARIES: -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(plugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + aqebics.la: $(aqebics_la_OBJECTS) $(aqebics_la_DEPENDENCIES) $(EXTRA_aqebics_la_DEPENDENCIES) - $(aqebics_la_LINK) -rpath $(plugindir) $(aqebics_la_OBJECTS) $(aqebics_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(aqebics_la_LINK) -rpath $(plugindir) $(aqebics_la_OBJECTS) $(aqebics_la_LIBADD) $(LIBS) + libaqebics.la: $(libaqebics_la_OBJECTS) $(libaqebics_la_DEPENDENCIES) $(EXTRA_libaqebics_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libaqebics_la_OBJECTS) $(libaqebics_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libaqebics_la_OBJECTS) $(libaqebics_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -583,25 +666,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -652,22 +735,25 @@ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -682,57 +768,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -748,12 +789,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -765,15 +801,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -782,6 +814,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -952,17 +999,16 @@ uninstall-am: uninstall-iheaderHEADERS uninstall-libLTLIBRARIES \ uninstall-pluginDATA uninstall-pluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-pluginLTLIBRARIES \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir 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 \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ install-pluginDATA install-pluginLTLIBRARIES install-ps \ @@ -970,9 +1016,9 @@ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-iheaderHEADERS uninstall-libLTLIBRARIES \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES + tags tags-am uninstall uninstall-am uninstall-iheaderHEADERS \ + uninstall-libLTLIBRARIES uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/msg/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/msg/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqebics/plugin/msg/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqebics/plugin/msg/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,8 +82,8 @@ host_triplet = @host@ noinst_PROGRAMS = testlib$(EXEEXT) subdir = src/plugins/backends/aqebics/plugin/msg -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -75,25 +102,50 @@ libmsg_la_LIBADD = am_libmsg_la_OBJECTS = keys.lo msg.lo xml.lo zip.lo eu.lo libmsg_la_OBJECTS = $(am_libmsg_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = PROGRAMS = $(noinst_PROGRAMS) am_testlib_OBJECTS = testlib.$(OBJEXT) testlib_OBJECTS = $(am_testlib_OBJECTS) am__DEPENDENCIES_1 = testlib_DEPENDENCIES = libmsg.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libmsg_la_SOURCES) $(testlib_SOURCES) DIST_SOURCES = $(libmsg_la_SOURCES) $(testlib_SOURCES) am__can_run_installinfo = \ @@ -102,12 +154,30 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -427,14 +498,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libmsg.la: $(libmsg_la_OBJECTS) $(libmsg_la_DEPENDENCIES) $(EXTRA_libmsg_la_DEPENDENCIES) - $(LINK) $(libmsg_la_OBJECTS) $(libmsg_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libmsg_la_OBJECTS) $(libmsg_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -444,9 +518,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + testlib$(EXEEXT): $(testlib_OBJECTS) $(testlib_DEPENDENCIES) $(EXTRA_testlib_DEPENDENCIES) @rm -f testlib$(EXEEXT) - $(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -462,25 +537,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zip.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -488,26 +563,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -519,15 +583,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -536,6 +596,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -678,19 +753,19 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir 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 maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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 \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am check-local: testlib$(EXEEXT) diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqebics/tools/aqebics-tool/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqebics/tools/aqebics-tool/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqebics/tools/aqebics-tool/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqebics/tools/aqebics-tool/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,8 +82,8 @@ host_triplet = @host@ bin_PROGRAMS = aqebics-tool$(EXEEXT) subdir = src/plugins/backends/aqebics/tools/aqebics-tool -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -86,19 +113,44 @@ am__DEPENDENCIES_1 = aqebics_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(aqebics_tool_SOURCES) DIST_SOURCES = $(aqebics_tool_SOURCES) am__can_run_installinfo = \ @@ -135,12 +187,30 @@ } DATA = $(idata_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -229,6 +299,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -480,10 +551,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -504,7 +577,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -517,9 +591,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + aqebics-tool$(EXEEXT): $(aqebics_tool_OBJECTS) $(aqebics_tool_DEPENDENCIES) $(EXTRA_aqebics_tool_DEPENDENCIES) @rm -f aqebics-tool$(EXEEXT) - $(LINK) $(aqebics_tool_OBJECTS) $(aqebics_tool_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(aqebics_tool_OBJECTS) $(aqebics_tool_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -552,25 +627,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -599,26 +674,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(idatadir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -630,15 +694,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -647,6 +707,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -790,19 +865,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-idataDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-idataDATA +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-idataDATA install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-idataDATA sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqebics/tools/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqebics/tools/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqebics/tools/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqebics/tools/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqebics/tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -418,22 +480,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -448,57 +513,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -514,12 +534,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -531,15 +546,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -548,6 +559,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -709,22 +735,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob.c 2013-12-31 00:13:18.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,222 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "accountjob_p.h" -#include "aqhbci_l.h" -#include "job_l.h" -#include -#include -#include -#include - -#include -#include -#include - - - -GWEN_INHERIT(AH_JOB, AH_ACCOUNTJOB); - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_AccountJob_new(const char *name, - AB_USER *u, - AB_ACCOUNT *account){ - AH_ACCOUNTJOB *aj; - AH_JOB *j; - GWEN_DB_NODE *dbArgs; - const char *s; - int jobVersion=0; - - assert(name); - assert(u); - assert(account); - - if (!(AH_Account_GetFlags(account) & AH_BANK_FLAGS_KTV2)) { - int maxVer=0; - - /* no account suffix, so we try to determine the highest usable - * version of the job which still doesn't need the suffix - */ - if (strcasecmp(name, "JobGetTransactions")==0) - maxVer=4; - else if (strcasecmp(name, "JobGetBalance")==0) - maxVer=4; - else if (strcasecmp(name, "JobSingleTransfer")==0) - maxVer=3; - else if (strcasecmp(name, "JobSingleDebitNote")==0) - maxVer=3; - else if (strcasecmp(name, "JobInternalTransfer")==0 || - strcasecmp(name, "JobLoadCellPhone")==0) - /* this job needs a suffix, so if there is none you don't get it */ - maxVer=-1; - else if (strcasecmp(name, "JobGetDatedTransfers")==0) - maxVer=1; - else if (strcasecmp(name, "JobCreateDatedTransfer")==0) - maxVer=2; - else if (strcasecmp(name, "JobModifyDatedTransfer")==0) - maxVer=2; - else if (strcasecmp(name, "JobDeleteDatedTransfer")==0) - maxVer=1; - else if (strcasecmp(name, "JobCreateStandingOrder")==0) - maxVer=2; - else if (strcasecmp(name, "JobModifyStandingOrder")==0) - maxVer=2; - else if (strcasecmp(name, "JobDeleteStandingOrder")==0) - maxVer=1; - if (maxVer==-1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "This job needs an account suffix, but your bank didn't provide one. " - "Therefore this job is not supported with your account."); - GWEN_Gui_ProgressLog(0, - GWEN_LoggerLevel_Error, - I18N("This job needs an account suffix, but your bank did not provide one. " - "Therefore this job is not supported with your account.\n" - "Setting a higher HBCI version in the user settings might fix " - "the problem.")); - return NULL; - } - if (maxVer>0) { - jobVersion=AH_Job_GetMaxVersionUpUntil(name, u, maxVer); - if (jobVersion<1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No job [%s] below version %d, falling back to 0", name, maxVer); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Warning, - "No version for job [%s] up to %d found, falling back to 0", name, maxVer); - jobVersion=0; - } - else { - DBG_INFO(AQHBCI_LOGDOMAIN, "Reducing version of job [%s] to %d", name, jobVersion); - } - } - } - - j=AH_Job_new(name, u, AB_Account_GetAccountNumber(account), jobVersion); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_ACCOUNTJOB, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_ACCOUNTJOB, j, aj, AH_AccountJob_FreeData); - aj->account=account; - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - s=AB_Account_GetAccountNumber(account); - if (s && *s) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "accountId", s); - - s=AB_Account_GetSubAccountId(account); - if (s && *s) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "accountSubId", s); - - s=AB_Account_GetBankCode(account); - if (s && *s) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "bankCode", s); - - GWEN_DB_SetIntValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "country", 280); - - /* new for SEPA jobs */ - s=AB_Account_GetIBAN(account); - if (s && *s) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "iban", s); - - s=AB_Account_GetBIC(account); - if (s && *s) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "bic", s); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AB_ACCOUNT *AH_AccountJob_GetAccount(const AH_JOB *j){ - AH_ACCOUNTJOB *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_ACCOUNTJOB, j); - assert(aj); - - return aj->account; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_AccountJob_FreeData(void *bp, void *p) { - AH_ACCOUNTJOB *aj; - - aj=(AH_ACCOUNTJOB*)p; - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_AccountJob_IsAccountJob(const AH_JOB *j) { - return GWEN_INHERIT_ISOFTYPE(AH_JOB, AH_ACCOUNTJOB, j); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_AccountJob_AddCurrentTime(GWEN_BUFFER *buf) { - GWEN_TIME *t; - int hours, mins, secs; - char numbuf[16]; - - t=GWEN_CurrentTime(); - assert(t); - if (GWEN_Time_GetBrokenDownTime(t, &hours, &mins, &secs)) { - GWEN_Time_free(t); - return -1; - } - snprintf(numbuf, sizeof(numbuf), "%02d%02d%02d", hours, mins, secs); - GWEN_Buffer_AppendString(buf, numbuf); - GWEN_Time_free(t); - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_AccountJob_AddCurrentDate(GWEN_BUFFER *buf) { - GWEN_TIME *t; - int year, month, day; - char numbuf[16]; - - t=GWEN_CurrentTime(); - assert(t); - if (GWEN_Time_GetBrokenDownDate(t, &day, &month, &year)) { - GWEN_Time_free(t); - return -1; - } - snprintf(numbuf, sizeof(numbuf), "%04d%02d%02d", year, month, day); - GWEN_Buffer_AppendString(buf, numbuf); - GWEN_Time_free(t); - return 0; -} - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_l.h 2011-11-27 22:30:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_ACCOUNTJOBS_L_H -#define AH_ACCOUNTJOBS_L_H - - -#include "job_l.h" -#include -#include - - -AH_JOB *AH_AccountJob_new(const char *name, - AB_USER *u, - AB_ACCOUNT *account); -int AH_AccountJob_IsAccountJob(const AH_JOB *j); - -AB_ACCOUNT *AH_AccountJob_GetAccount(const AH_JOB *j); - -int AH_AccountJob_AddCurrentTime(GWEN_BUFFER *buf); -int AH_AccountJob_AddCurrentDate(GWEN_BUFFER *buf); - - -#endif /* AH_ACCOUNTJOBS_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_p.h 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/accountjob_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_ACCOUNTJOBS_P_H -#define AH_ACCOUNTJOBS_P_H - - -#include "accountjob_l.h" - - -typedef struct AH_ACCOUNTJOB AH_ACCOUNTJOB; -struct AH_ACCOUNTJOB { - AB_ACCOUNT *account; -}; - - -static void GWENHYWFAR_CB AH_AccountJob_FreeData(void *bp, void *p); - - - - -#endif /* AH_ACCOUNTJOBS_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatedatedxfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatedatedxfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatedatedxfer.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatedatedxfer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatesto.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatesto.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatesto.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobcreatesto.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,244 +0,0 @@ - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletedatedxfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletedatedxfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletedatedxfer.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletedatedxfer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletesto.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletesto.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletesto.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobdeletesto.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,187 +0,0 @@ - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.c 2014-03-01 19:23:07.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,782 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobeutransfer_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - - -GWEN_INHERIT(AH_JOB, AH_JOB_EUTRANSFER); - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_EuTransfer_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_EuTransferBase_new(u, account, 1); - if (j!=NULL) - AH_Job_SetChallengeClass(j, 20); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_EuTransferBase_new(AB_USER *u, - AB_ACCOUNT *account, - int isTransfer) { - AH_JOB *j; - AH_JOB_EUTRANSFER *aj; - GWEN_DB_NODE *dbArgs; - - j=AH_AccountJob_new("JobEuTransfer", - u, account); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_EUTRANSFER, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_EUTRANSFER, j, aj, - AH_Job_EuTransfer_FreeData); - aj->isTransfer=isTransfer; - /* overwrite some virtual functions */ - AH_Job_SetProcessFn(j, AH_Job_EuTransfer_Process); - AH_Job_SetExchangeFn(j, AH_Job_EuTransfer_Exchange); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_EuTransfer_FreeData(void *bp, void *p){ - AH_JOB_EUTRANSFER *aj; - - aj=(AH_JOB_EUTRANSFER*)p; - - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_EuTransfer_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_EUTRANSFER *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_EUTRANSFER, j); - assert(aj); - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing %s", - "JobEuTransfer"); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_EuTransfer__ValidateTransfer(AB_JOB *bj, - AH_JOB *mj, - AB_TRANSACTION *t) { - const GWEN_STRINGLIST *sl; - int maxn; - int maxs; - int n; - const char *s; - AH_JOB_EUTRANSFER *aj; - const AB_EUTRANSFER_INFO *ei=0; - const AB_TRANSACTION_LIMITS *lim=0; - - assert(mj); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_EUTRANSFER, mj); - assert(aj); - - /* get country info (check for IBAN) */ - s=AB_Transaction_GetRemoteIban(t); - if (s) { - char cnt[3]; - - if (AB_JobEuTransfer_GetIbanAllowed(bj)) { - memmove(cnt, s, 2); - cnt[2]=0; - ei=AB_JobEuTransfer_FindCountryInfo(bj, cnt); - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "IBAN not allowed for this account"); - return GWEN_ERROR_INVALID; - } - } - else { - s=AB_Transaction_GetRemoteCountry(t); - if (!s) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "remote country code not set"); - return GWEN_ERROR_INVALID; - } - ei=AB_JobEuTransfer_FindCountryInfo(bj, s); - } - - if (ei) - lim=AB_EuTransferInfo_GetFieldLimits(ei); - - /* check purpose */ - if (lim) { - maxn=AB_TransactionLimits_GetMaxLinesPurpose(lim); - if (maxn==-1) - maxn=1; - maxs=AB_TransactionLimits_GetMaxLenPurpose(lim); - if (maxs==-1) - maxs=27; - } - else { - maxn=1; - maxs=27; - } - - sl=AB_Transaction_GetPurpose(t); - n=0; - if (sl) { - GWEN_STRINGLISTENTRY *se; - GWEN_STRINGLIST *nsl; - const char *p; - - nsl=GWEN_StringList_new(); - se=GWEN_StringList_FirstEntry(sl); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p && *p) { - char *np; - int l; - GWEN_BUFFER *tbuf; - - n++; - if (maxn!=-1 && n>maxn) { - DBG_WARN(AQHBCI_LOGDOMAIN, - "Too many purpose lines (%d>%d), cutting off", n, maxn); - break; - } - tbuf=GWEN_Buffer_new(0, maxs, 0, 1); - AB_ImExporter_Utf8ToDta(p, -1, tbuf); - l=GWEN_Buffer_GetUsedBytes(tbuf); - if (l>maxs) { - DBG_WARN(AQHBCI_LOGDOMAIN, - "Too many chars in line %d (%d>27), cutting off", n, l); - l=maxs; - } - np=(char*)malloc(l+1); - memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); - GWEN_Buffer_free(tbuf); - /* let string list take the newly alllocated string */ - GWEN_StringList_AppendString(nsl, np, 1, 0); - } - se=GWEN_StringListEntry_Next(se); - } /* while */ - AB_Transaction_SetPurpose(t, nsl); - } - - /* check remote name */ - maxn=1; - if (lim) { - maxn=AB_TransactionLimits_GetMaxLinesRemoteName(lim); - if (maxn==-1) - maxn=1; - maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); - if (maxs==-1) - maxs=27; - } - else { - maxs=27; - } - sl=AB_Transaction_GetRemoteName(t); - n=0; - if (sl) { - GWEN_STRINGLISTENTRY *se; - GWEN_STRINGLIST *nsl; - const char *p; - - nsl=GWEN_StringList_new(); - se=GWEN_StringList_FirstEntry(sl); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p && *p) { - char *np; - int l; - GWEN_BUFFER *tbuf; - - n++; - if (maxn!=-1 && n>maxn) { - DBG_WARN(AQHBCI_LOGDOMAIN, - "Too many remote name lines (%d>%d), cutting off", - n, maxn); - break; - } - tbuf=GWEN_Buffer_new(0, maxs, 0, 1); - AB_ImExporter_Utf8ToDta(p, -1, tbuf); - l=GWEN_Buffer_GetUsedBytes(tbuf); - if (l>maxs) { - DBG_WARN(AQHBCI_LOGDOMAIN, - "Too many chars in line %d (%d>27), cutting off", n, l); - l=maxs; - } - np=(char*)malloc(l+1); - memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); - GWEN_Buffer_free(tbuf); - /* let string list take the newly alllocated string */ - GWEN_StringList_AppendString(nsl, np, 1, 0); - } - se=GWEN_StringListEntry_Next(se); - } /* while */ - AB_Transaction_SetRemoteName(t, nsl); - } - - /* check local name */ - s=AB_Transaction_GetLocalName(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local name, filling in"); - a=AB_Job_GetAccount(bj); - assert(a); - s=AB_Account_GetOwnerName(a); - if (!s) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "No owner name in account, giving up"); - return GWEN_ERROR_INVALID; - } - AB_Transaction_SetLocalName(t, s); - } - - s=AB_Transaction_GetLocalName(t); - if (s) { - int l; - GWEN_BUFFER *tbuf; - - if (lim) { - maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); - if (maxs==-1) - maxs=27; - } - else { - maxs=27; - } - - tbuf=GWEN_Buffer_new(0, maxs, 0, 1); - AB_ImExporter_Utf8ToDta(s, -1, tbuf); - l=GWEN_Buffer_GetUsedBytes(tbuf); - if (l>maxs) { - DBG_WARN(AQHBCI_LOGDOMAIN, - "Too many chars in local name (%d>27), cutting off", l); - GWEN_Buffer_Crop(tbuf, 0, maxs); - } - AB_Transaction_SetLocalName(t, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - - /* check local bank code */ - s=AB_Transaction_GetLocalBankCode(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local bank code, filling in"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetBankCode(a); - assert(s); - AB_Transaction_SetLocalBankCode(t, s); - } - - /* check local account number */ - s=AB_Transaction_GetLocalAccountNumber(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local account number, filling in"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetAccountNumber(a); - assert(s); - AB_Transaction_SetLocalAccountNumber(t, s); - } - - /* check local account suffix */ - s=AB_Transaction_GetLocalSuffix(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_INFO(AQHBCI_LOGDOMAIN, - "No local suffix, filling in (if possible)"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetSubAccountId(a); - if (s && *s) - AB_Transaction_SetLocalSuffix(t, s); - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_EuTransfer_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_EUTRANSFER *aj; - AB_BANKING *ab; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_EUTRANSFER, j); - assert(aj); - - ab=AB_Account_GetBanking(AB_Job_GetAccount(bj)); - assert(ab); - - if (AB_Job_GetType(bj)!=AB_Job_TypeEuTransfer) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Not a %s job job", - "EuTransfer"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: { - GWEN_DB_NODE *dbParams; - GWEN_DB_NODE *dbT; - int i; - const char *s; - - dbParams=AH_Job_GetParams(j); - /*DBG_NOTICE(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - GWEN_DB_Dump(dbParams, stderr, 2);*/ - s=GWEN_DB_GetCharValue(dbParams, "IbanAllowed", 0, "N"); - AB_JobEuTransfer_SetIbanAllowed(bj, strcasecmp(s, "J")==0); - - dbT=GWEN_DB_FindFirstGroup(dbParams, "country"); - if (dbT) { - AB_EUTRANSFER_INFO_LIST *eil; - - eil=AB_EuTransferInfo_List_new(); - while(dbT) { - i=GWEN_DB_GetIntValue(dbT, "code", 0, 0); - if (i) { - const AB_COUNTRY *cnt; - AB_BANKING *ab; - - ab=AB_Account_GetBanking(AB_Job_GetAccount(bj)); - assert(ab); - cnt=AB_Banking_FindCountryByNumeric(ab, i); - if (cnt) { - AB_EUTRANSFER_INFO *ei; - const char *v, *cur; - AB_TRANSACTION_LIMITS *lim; - - ei=AB_EuTransferInfo_new(); - lim=AB_TransactionLimits_new(); - - AB_TransactionLimits_SetNeedDate(lim, -1); - - AB_EuTransferInfo_SetCountryCode(ei, AB_Country_GetCode(cnt)); - - i=GWEN_DB_GetIntValue(dbT, "MaxLenOurName", 0, -1); - AB_TransactionLimits_SetMaxLenLocalName(lim, i); - - i=GWEN_DB_GetIntValue(dbT, "MaxLenOtherName", 0, -1); - AB_TransactionLimits_SetMaxLenRemoteName(lim, i); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); - - i=GWEN_DB_GetIntValue(dbT, "MaxLenPurpose", 0, -1); - AB_TransactionLimits_SetMaxLenPurpose(lim, i); - AB_TransactionLimits_SetMaxLinesPurpose(lim, 1); - - v=GWEN_DB_GetCharValue(dbT, "LimitLocalValue", 0, 0); - cur=GWEN_DB_GetCharValue(dbT, "LimitLocalCurrency", 0, 0); - if (v) { - double dv; - - if (GWEN_Text_StringToDouble(v, &dv)) { - DBG_WARN(AQHBCI_LOGDOMAIN, "Bad value"); - } - else { - AB_VALUE *val; - - val=AB_Value_fromDouble(dv); - assert(val); - AB_Value_SetCurrency(val, cur); - AB_EuTransferInfo_SetLimitLocalValue(ei, val); - AB_Value_free(val); - } - } - - v=GWEN_DB_GetCharValue(dbT, "LimitForeignValue", 0, 0); - cur=GWEN_DB_GetCharValue(dbT, "LimitforeignCurrency", 0, 0); - if (v) { - double dv; - - if (GWEN_Text_StringToDouble(v, &dv)) { - DBG_WARN(AQHBCI_LOGDOMAIN, "Bad value"); - } - else { - AB_VALUE *val; - - val=AB_Value_fromDouble(dv); - assert(val); - AB_Value_SetCurrency(val, cur); - AB_EuTransferInfo_SetLimitForeignValue(ei, val); - AB_Value_free(val); - } - } - - /* set limits */ - AB_EuTransferInfo_SetFieldLimits(ei, lim); - - /* add country info */ - AB_EuTransferInfo_List_Add(ei, eil); - } /* if cnt */ - } /* if numeric country code given */ - dbT=GWEN_DB_FindNextGroup(dbT, "country"); - } /* while dbT */ - AB_JobEuTransfer_SetCountryInfoList(bj, eil); - } /* if countryInfo in params */ - - return 0; - } - - case AH_Job_ExchangeModeArgs: { - GWEN_DB_NODE *dbArgs; - const AB_TRANSACTION *ot; - const AB_VALUE *v; - - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - ot=AB_JobEuTransfer_GetTransaction(bj); - if (ot) { - GWEN_DB_NODE *dbT; - const char *p; - const GWEN_STRINGLIST *sl; - AB_TRANSACTION *t; - const AB_COUNTRY *cy=0; - int i; - - t=AB_Transaction_dup(ot); - assert(t); - if (AH_Job_EuTransfer__ValidateTransfer(bj, j, t)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Invalid transaction"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_INVALID; - } - - /* get remote country information */ - p=AB_Transaction_GetRemoteIban(t); - if (p) { - char cnt[3]; - - memmove(cnt, p, 2); - cnt[2]=0; - cy=AB_Banking_FindCountryByCode(ab, cnt); - } - else { - p=AB_Transaction_GetRemoteCountry(t); - if (!p) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "remote country code not set"); - return GWEN_ERROR_INVALID; - } - cy=AB_Banking_FindCountryByCode(ab, p); - } - if (!cy) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No country info available"); - return GWEN_ERROR_INVALID; - } - - /* store the validated transaction back into application job, - * to allow the application to recognize answers to this job later */ - AB_JobEuTransfer_SetTransaction(bj, t); - - dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, - "transaction"); - assert(dbT); - - /* store local account */ - GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/country", 280); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/bankCode", - AB_Transaction_GetLocalBankCode(t)); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/accountId", - AB_Transaction_GetLocalAccountNumber(t)); - - p=AB_Transaction_GetLocalSuffix(t); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/accountsubid", p); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourName", - AB_Transaction_GetLocalName(t)); - - p=AB_Transaction_GetRemoteIban(t); - if (p) { - /* store IBAN */ - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "iban", - p); - } - else { - const char *s; - - /* store remote account */ - if (cy) { - GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "otherAccount/country", - AB_Country_GetNumericCode(cy)); - } - - s=AB_Transaction_GetRemoteBankCode(t); - if (s) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "otherAccount/bankCode", - s); - s=AB_Transaction_GetRemoteAccountNumber(t); - if (s) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "otherAccount/accountId", - s); - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Remote account id not set"); - return GWEN_ERROR_INVALID; - } - } - - p=AB_Transaction_GetRemoteBankName(t); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "otherBankName", - p); - - - /* store remote name */ - sl=AB_Transaction_GetRemoteName(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - GWEN_DB_DeleteVar(dbT, "otherName"); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, - "otherName", p); - se=GWEN_StringListEntry_Next(se); - } /* while */ - } - - /* store value */ - v=AB_Transaction_GetValue(t); - if (v) { - GWEN_DB_NODE *dbV; - GWEN_BUFFER *nbuf; - char *p; - const char *s; - int l; - - dbV=GWEN_DB_GetGroup(dbT, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "value"); - assert(dbV); - - nbuf=GWEN_Buffer_new(0, 32, 0, 1); - if (GWEN_Text_DoubleToBuffer(AB_Value_GetValueAsDouble(v), - nbuf)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Buffer overflow"); - GWEN_Buffer_free(nbuf); - abort(); - } - - l=GWEN_Buffer_GetUsedBytes(nbuf); - if (!l) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); - GWEN_Buffer_free(nbuf); - abort(); - } - - /* replace "C" comma with "DE" comma, remove thousand's comma */ - p=GWEN_Buffer_GetStart(nbuf); - s=p; - while(*s) { - if (*s=='.') { - *p=','; - p++; - } - else if (*s!=',') { - *p=*s; - p++; - } - s++; - } /* while */ - *p=0; - - if (strchr(GWEN_Buffer_GetStart(nbuf), ',')) { - /* kill all trailing '0' behind the comma */ - p=GWEN_Buffer_GetStart(nbuf)+l; - while(l--) { - --p; - if (*p=='0') - *p=0; - else - break; - } - } - else - GWEN_Buffer_AppendString(nbuf, ","); - - /* store value */ - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, - "value", - GWEN_Buffer_GetStart(nbuf)); - GWEN_Buffer_free(nbuf); - - s=AB_Value_GetCurrency(v); - if (!s) - s="EUR"; - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, - "currency", s); - } /* if value */ - - /* store purpose */ - sl=AB_Transaction_GetPurpose(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - GWEN_DB_DeleteVar(dbT, "purpose"); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, - "purpose", p); - se=GWEN_StringListEntry_Next(se); - } /* while */ - } - - /* store "chargeWhom" */ - switch (AB_JobEuTransfer_GetChargeWhom(bj)) { - case AB_JobEuTransfer_ChargeWhom_Local: i=1; break; - case AB_JobEuTransfer_ChargeWhom_Remote: i=3; break; - case AB_JobEuTransfer_ChargeWhom_Share: i=2; break; - default: i=1; break; - } /* switch */ - GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "chargeWhom", i); - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - - - return 0; - } - - case AH_Job_ExchangeModeResults: { - AH_RESULT_LIST *rl; - AH_RESULT *r; - int has10; - int has20; - - rl=AH_Job_GetSegResults(j); - assert(rl); - - r=AH_Result_List_First(rl); - if (!r) { - DBG_INFO(AQHBCI_LOGDOMAIN, "No segment results"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - has10=0; - has20=0; - while(r) { - int rcode; - - rcode=AH_Result_GetCode(r); - DBG_INFO(AQHBCI_LOGDOMAIN, "Found job result: %d", rcode); - if (rcode<=19) - has10=1; - else if (rcode>=20 && rcode <=29) - has20=1; - r=AH_Result_List_Next(r); - } - - if (has20) { - AB_Job_SetStatus(bj, AB_Job_StatusFinished); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); - } - else if (has10) { - AB_Job_SetStatus(bj, AB_Job_StatusPending); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); - } - else { - DBG_INFO(AQHBCI_LOGDOMAIN, - "Can't determine the status (neither 0010 nor 0020)"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - return 0; - } - - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_l.h 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBEUTRANSFER_L_H -#define AH_JOBEUTRANSFER_L_H - - -#include "accountjob_l.h" - -#include - - -AH_JOB *AH_Job_EuTransfer_new(AB_USER *cu, AB_ACCOUNT *account); - - -#endif /* AH_JOBEUTRANSFER_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_p.h 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBEUTRANSFER_P_H -#define AH_JOBEUTRANSFER_P_H - - -#include "jobsingletransfer_l.h" -#include - - -typedef struct AH_JOB_EUTRANSFER AH_JOB_EUTRANSFER; -struct AH_JOB_EUTRANSFER { - int isTransfer; -}; -static void GWENHYWFAR_CB AH_Job_EuTransfer_FreeData(void *bp, void *p); -static int AH_Job_EuTransfer_Process(AH_JOB *j, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_EuTransfer_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - - -static int AH_Job_EuTransfer__ValidateTransfer(AB_JOB *bj, - AH_JOB *mj, - AB_TRANSACTION *t); - -static AH_JOB *AH_Job_EuTransferBase_new(AB_USER *u, - AB_ACCOUNT *account, - int isTransfer); - -#endif /* AH_JOBEUTRANSFER_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobeutransfer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.c 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id: jobmultitransfer.c 1309 2007-10-24 01:48:05Z martin $ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobforeignxferwh_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - - -GWEN_INHERIT(AH_JOB, AH_JOB_FOREIGNXFERWH); - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_ForeignTransferWH_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_FOREIGNXFERWH *aj; - GWEN_DB_NODE *dbArgs; - GWEN_DB_NODE *dbParams; - - j=AH_AccountJob_new("JobForeignTransferWH", u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 60); - - GWEN_NEW_OBJECT(AH_JOB_FOREIGNXFERWH, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_FOREIGNXFERWH, j, aj, - AH_Job_ForeignTransferWH_FreeData); - /* overwrite some virtual functions */ - AH_Job_SetProcessFn(j, AH_Job_ForeignTransferWH_Process); - AH_Job_SetExchangeFn(j, AH_Job_ForeignTransferWH_Exchange); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, - "bankCode", - AB_Account_GetBankCode(account)); - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, - "accountId", - AB_Account_GetAccountNumber(account)); - - dbParams=AH_Job_GetParams(j); - aj->maxTransfers=GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0); - if (aj->maxTransfers==0 || aj->maxTransfers>AH_JOBFOREIGNXFERWH_MAXTRANS) - aj->maxTransfers=AH_JOBFOREIGNXFERWH_MAXTRANS; - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_ForeignTransferWH_FreeData(void *bp, void *p){ - AH_JOB_FOREIGNXFERWH *aj; - - aj=(AH_JOB_FOREIGNXFERWH*)p; - - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_ForeignTransferWH_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_FOREIGNXFERWH *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_FOREIGNXFERWH, j); - assert(aj); - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobForeignTransferWH"); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_ForeignTransferWH_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - /* this function is not needed since there is no AB_Job for this */ - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_ForeignTransferWH_SetDtazv(AH_JOB *j, - const uint8_t *dataPtr, - uint32_t dataLen) { - GWEN_DB_NODE *dbArgs; - - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - GWEN_DB_SetBinValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, - "transfers", - dataPtr, dataLen); - - return 0; -} - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_l.h 2010-04-25 16:26:14.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id: jobgetbalance_p.h 1283 2007-07-25 14:28:36Z martin $ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOB_FOREIGNXFERWH_L_H -#define AH_JOB_FOREIGNXFERWH_L_H - - -#include "accountjob_l.h" - - -AH_JOB *AH_Job_ForeignTransferWH_new(AB_USER *u, AB_ACCOUNT *account); - -int AH_Job_ForeignTransferWH_SetDtazv(AH_JOB *j, - const uint8_t *dataPtr, - uint32_t dataLen); - - - -#endif /* AH_JOB_FOREIGNXFERWH_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_p.h 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOB_FOREIGNXFERWH_P_H -#define AH_JOB_FOREIGNXFERWH_P_H - - -#include "jobforeignxferwh_l.h" -#include - - -#define AH_JOBFOREIGNXFERWH_MAXTRANS 256 - - -typedef struct AH_JOB_FOREIGNXFERWH AH_JOB_FOREIGNXFERWH; -struct AH_JOB_FOREIGNXFERWH { - int maxTransfers; -}; - -static void GWENHYWFAR_CB AH_Job_ForeignTransferWH_FreeData(void *bp, - void *p); - -static int AH_Job_ForeignTransferWH_Process(AH_JOB *j, - AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_ForeignTransferWH_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - - - - -#endif /* AH_JOB_FOREIGNXFERWH_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobforeignxferwh.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,199 +0,0 @@ - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.c 2013-05-06 07:17:40.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,326 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobgetbalance_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "user_l.h" -#include -#include -#include - -#include -#include - -#include -#include -#include - - - -GWEN_INHERIT(AH_JOB, AH_JOB_GETBALANCE); - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_GetBalance_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_GETBALANCE *aj; - GWEN_DB_NODE *dbArgs; - int useCreditCardJob=0; - GWEN_DB_NODE *updgroup; - - //Check if we should use DKKKS - updgroup=AH_User_GetUpd(u); - assert(updgroup); - updgroup=GWEN_DB_GetGroup(updgroup, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - AB_Account_GetAccountNumber(account)); - if (updgroup) { - GWEN_DB_NODE *n; - - n=GWEN_DB_GetFirstGroup(updgroup); - while(n) { - if (strcasecmp(GWEN_DB_GetCharValue(n, "job", 0, ""), - "DKKKS")==0) { - useCreditCardJob = 1; - break; - } - n=GWEN_DB_GetNextGroup(n); - } /* while */ - } /* if updgroup for the given account found */ - - if(useCreditCardJob) - j=AH_AccountJob_new("JobGetBalanceCreditCard", u, account); - else - j=AH_AccountJob_new("JobGetBalance", u, account); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_GETBALANCE, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETBALANCE, j, aj, AH_Job_GetBalance_FreeData); - /* overwrite some virtual functions */ - AH_Job_SetProcessFn(j, AH_Job_GetBalance_Process); - AH_Job_SetExchangeFn(j, AH_Job_GetBalance_Exchange); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - if(useCreditCardJob) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "accountNumber", AB_Account_GetAccountNumber(account)); - else - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "allAccounts", "N"); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_GetBalance_FreeData(void *bp, void *p){ - AH_JOB_GETBALANCE *aj; - - aj=(AH_JOB_GETBALANCE*)p; - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AB_BALANCE *AH_Job_GetBalance__ReadBalance(GWEN_DB_NODE *dbT) { - GWEN_BUFFER *buf; - GWEN_TIME *t; - AB_VALUE *v1, *v2; - AB_BALANCE *bal; - const char *p; - - bal=0; - - /* read date and time */ - buf=GWEN_Buffer_new(0, 32, 0, 1); - p=GWEN_DB_GetCharValue(dbT, "date", 0, 0); - if (p) - GWEN_Buffer_AppendString(buf, p); - else { - AH_AccountJob_AddCurrentDate(buf); - } - p=GWEN_DB_GetCharValue(dbT, "time", 0, 0); - if (p) - GWEN_Buffer_AppendString(buf, p); - else { - AH_AccountJob_AddCurrentTime(buf); - } - t=GWEN_Time_fromString(GWEN_Buffer_GetStart(buf), "YYYYMMDDhhmmss"); - if (!t) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing date and time"); - } - GWEN_Buffer_free(buf); - - /* read value */ - v1=AB_Value_fromDb(dbT); - v2=0; - if (!v1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing value from DB"); - } - else { - p=GWEN_DB_GetCharValue(dbT, "debitMark", 0, 0); - if (p) { - if (strcasecmp(p, "D")==0 || - strcasecmp(p, "RC")==0) { - v2=AB_Value_dup(v1); - AB_Value_Negate(v2); - } - else if (strcasecmp(p, "C")==0 || - strcasecmp(p, "RD")==0) - v2=AB_Value_dup(v1); - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad debit mark \"%s\"", p); - v2=0; - } - } - if (v2) - bal=AB_Balance_new(v2, t); - else - bal=0; - } - - AB_Value_free(v2); - AB_Value_free(v1); - GWEN_Time_free(t); - - return bal; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetBalance_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETBALANCE *aj; - GWEN_DB_NODE *dbResponses; - GWEN_DB_NODE *dbCurr; - int rv; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetBalance"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETBALANCE, j); - assert(aj); - - dbResponses=AH_Job_GetResponses(j); - assert(dbResponses); - - /* search for "Balance" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbBalance; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbBalance=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/balance"); - if (!dbBalance) - dbBalance=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/balancecreditcard"); - if (dbBalance) { - AB_ACCOUNT_STATUS *acst; - GWEN_DB_NODE *dbT; - AB_ACCOUNT *a; - AB_IMEXPORTER_ACCOUNTINFO *ai; - - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Got a balance"); - if (GWEN_Logger_GetLevel(0)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbBalance, 2); - - acst=AB_AccountStatus_new(); - - /* read booked balance */ - dbT=GWEN_DB_GetGroup(dbBalance, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "booked"); - if (dbT) { - AB_BALANCE *bal; - - bal=AH_Job_GetBalance__ReadBalance(dbT); - if (bal) { - AB_AccountStatus_SetBookedBalance(acst, bal); - AB_AccountStatus_SetTime(acst, AB_Balance_GetTime(bal)); - AB_Balance_free(bal); - } - } - - /* read noted balance */ - dbT=GWEN_DB_GetGroup(dbBalance, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "noted"); - if (dbT) { - AB_BALANCE *bal; - - bal=AH_Job_GetBalance__ReadBalance(dbT); - if (bal) { - AB_AccountStatus_SetNotedBalance(acst, bal); - if (AB_AccountStatus_GetTime(acst)==NULL) - AB_AccountStatus_SetTime(acst, AB_Balance_GetTime(bal)); - AB_Balance_free(bal); - } - } - - /* read credit Line */ - dbT=GWEN_DB_GetGroup(dbBalance, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "creditLine"); - if (dbT) { - AB_VALUE *v; - - v=AB_Value_fromDb(dbT); - if (!v) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing value from DB"); - } - else { - AB_AccountStatus_SetBankLine(acst, v); - } - AB_Value_free(v); - } - - a=AH_AccountJob_GetAccount(j); - assert(a); - ai=AB_ImExporterContext_GetAccountInfo(ctx, - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a)); - assert(ai); - - /* add new account status */ - AB_ImExporterAccountInfo_AddAccountStatus(ai, acst); - break; /* break loop, we found the balance */ - } /* if "Balance" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetBalance_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETBALANCE *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETBALANCE, j); - assert(aj); - - if (AB_Job_GetType(bj)!=AB_Job_TypeGetBalance) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetBalance job"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "No params to exchange"); - return 0; - case AH_Job_ExchangeModeArgs: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "No arguments to exchange"); - return 0; - case AH_Job_ExchangeModeResults: - return 0; - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_l.h 2010-04-25 16:26:14.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETBALANCE_L_H -#define AH_JOBGETBALANCE_L_H - - -#include "accountjob_l.h" -#include - - -AH_JOB *AH_Job_GetBalance_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBGETBALANCE_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_p.h 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETBALANCE_P_H -#define AH_JOBGETBALANCE_P_H - - -#include "jobgetbalance_l.h" -#include - - -typedef struct AH_JOB_GETBALANCE AH_JOB_GETBALANCE; -struct AH_JOB_GETBALANCE { - int dummy; -}; -static void GWENHYWFAR_CB AH_Job_GetBalance_FreeData(void *bp, void *p); -static int AH_Job_GetBalance_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_GetBalance_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - -static AB_BALANCE *AH_Job_GetBalance__ReadBalance(GWEN_DB_NODE *dbT); - - - -#endif /* AH_JOBGETBALANCE_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.xml 2013-05-06 07:13:31.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetbalance.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,367 +0,0 @@ - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.c 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobgetdatedxfers_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - - -GWEN_INHERIT(AH_JOB, AH_JOB_GETDATEDTRANSFERS); - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_GetDatedTransfers_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_GETDATEDTRANSFERS *aj; - GWEN_DB_NODE *dbArgs; - - j=AH_AccountJob_new("JobGetDatedTransfers", u, account); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_GETDATEDTRANSFERS, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETDATEDTRANSFERS, j, aj, - AH_Job_GetDatedTransfers_FreeData); - /* overwrite some virtual functions */ - AH_Job_SetProcessFn(j, AH_Job_GetDatedTransfers_Process); - AH_Job_SetExchangeFn(j, AH_Job_GetDatedTransfers_Exchange); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_GetDatedTransfers_FreeData(void *bp, void *p){ - AH_JOB_GETDATEDTRANSFERS *aj; - - aj=(AH_JOB_GETDATEDTRANSFERS*)p; - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetDatedTransfers_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETDATEDTRANSFERS *aj; - GWEN_DB_NODE *dbResponses; - GWEN_DB_NODE *dbCurr; - AB_ACCOUNT *a; - AB_IMEXPORTER_ACCOUNTINFO *ai; - int rv; - int i; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetDatedTransfers"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETDATEDTRANSFERS, j); - assert(aj); - - dbResponses=AH_Job_GetResponses(j); - assert(dbResponses); - - a=AH_AccountJob_GetAccount(j); - assert(a); - ai=AB_ImExporterContext_GetAccountInfo(ctx, - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a)); - assert(ai); - - /* search for "DatedTransfer" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/GetDatedTransfersResponse"); - if (dbXA) { - GWEN_DB_NODE *dbT; - AB_TRANSACTION *t; - const char *s; - - dbXA=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "datedTransfer"); - assert(dbXA); - - /* create transaction: raw */ - t=AB_Transaction_fromDb(dbXA); - assert(t); - - /* now work out some of the fields */ - - /* date */ - s=GWEN_DB_GetCharValue(dbXA, "xDate", 0, 0); - if (s && *s) { - GWEN_BUFFER *dbuf; - GWEN_TIME *ti; - - dbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Buffer_AppendString(dbuf, s); - GWEN_Buffer_AppendString(dbuf, "-12:00"); - ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), - "YYYYMMDD-hh:mm"); - assert(ti); - AB_Transaction_SetDate(t, ti); - GWEN_Time_free(ti); - } - - /* local account */ - dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "ouraccount"); - if (dbT) { - const AB_COUNTRY *cn; - - cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), - GWEN_DB_GetIntValue(dbT, - "country", 0, - 280)); - assert(cn); - AB_Transaction_SetLocalCountry(t, AB_Country_GetCode(cn)); - s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); - if (s && *s) - AB_Transaction_SetLocalBankCode(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); - if (s && *s) - AB_Transaction_SetLocalAccountNumber(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); - if (s && *s) - AB_Transaction_SetLocalSuffix(t, s); - } - - /* remote account */ - dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "otheraccount"); - if (dbT) { - const AB_COUNTRY *cn; - - cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), - GWEN_DB_GetIntValue(dbT, - "country", 0, - 280)); - assert(cn); - AB_Transaction_SetRemoteCountry(t, AB_Country_GetCode(cn)); - s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); - if (s && *s) - AB_Transaction_SetRemoteBankCode(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); - if (s && *s) - AB_Transaction_SetRemoteAccountNumber(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); - if (s && *s) - AB_Transaction_SetRemoteSuffix(t, s); - } - - /* remote name */ - AB_Transaction_ClearRemoteName(t); - for (i=0; ; i++) { - s=GWEN_DB_GetCharValue(dbXA, "otherName", i, 0); - if (s) { - if (*s) { - GWEN_BUFFER *dbuf; - - dbuf=GWEN_Buffer_new(0, 27, 0, 1); - AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); - AB_Transaction_AddRemoteName(t, GWEN_Buffer_GetStart(dbuf), 1); - GWEN_Buffer_free(dbuf); - } - } - else - break; - } - - /* purpose name */ - AB_Transaction_ClearPurpose(t); - for (i=0; ; i++) { - s=GWEN_DB_GetCharValue(dbXA, "purpose", i, 0); - if (s) { - if (*s) { - GWEN_BUFFER *dbuf; - - dbuf=GWEN_Buffer_new(0, 27, 0, 1); - AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); - AB_Transaction_AddPurpose(t, GWEN_Buffer_GetStart(dbuf), 0); - GWEN_Buffer_free(dbuf); - } - } - else - break; - } - - /* add to list */ - AB_ImExporterAccountInfo_AddDatedTransfer(ai, t); - } /* if "datedTransfer" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetDatedTransfers_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETDATEDTRANSFERS *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETDATEDTRANSFERS, j); - assert(aj); - - if (AB_Job_GetType(bj)!=AB_Job_TypeGetDatedTransfers) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetDatedTransfers job"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: - return 0; - - case AH_Job_ExchangeModeArgs: - return 0; - - case AH_Job_ExchangeModeResults: - return 0; - - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_l.h 2010-04-25 16:26:14.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETDATEDTRANSFERS_L_H -#define AH_JOBGETDATEDTRANSFERS_L_H - - -#include "accountjob_l.h" - - -AH_JOB *AH_Job_GetDatedTransfers_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBGETDATEDTRANSFERS_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_p.h 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETDATEDTRANSFERS_P_H -#define AH_JOBGETDATEDTRANSFERS_P_H - - -#include "jobgetdatedxfers_l.h" -#include - - -typedef struct AH_JOB_GETDATEDTRANSFERS AH_JOB_GETDATEDTRANSFERS; -struct AH_JOB_GETDATEDTRANSFERS { - int dummy; -}; -static void GWENHYWFAR_CB AH_Job_GetDatedTransfers_FreeData(void *bp, void *p); - -static int AH_Job_GetDatedTransfers_Process(AH_JOB *j, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_GetDatedTransfers_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - - -#endif /* AH_JOBGETDATEDTRANSFERS_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetdatedxfers.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,362 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobgetstandingorders_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - - -GWEN_INHERIT(AH_JOB, AH_JOB_GETSTANDINGORDERS); - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_GetStandingOrders_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_GETSTANDINGORDERS *aj; - GWEN_DB_NODE *dbArgs; - - j=AH_AccountJob_new("JobGetStandingOrders", u, account); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_GETSTANDINGORDERS, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETSTANDINGORDERS, j, aj, - AH_Job_GetStandingOrders_FreeData); - /* overwrite some virtual functions */ - AH_Job_SetProcessFn(j, AH_Job_GetStandingOrders_Process); - AH_Job_SetExchangeFn(j, AH_Job_GetStandingOrders_Exchange); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "allAccounts", "N"); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_GetStandingOrders_FreeData(void *bp, void *p){ - AH_JOB_GETSTANDINGORDERS *aj; - - aj=(AH_JOB_GETSTANDINGORDERS*)p; - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetStandingOrders_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETSTANDINGORDERS *aj; - GWEN_DB_NODE *dbResponses; - GWEN_DB_NODE *dbCurr; - int rv; - int i; - AB_ACCOUNT *a; - AB_IMEXPORTER_ACCOUNTINFO *ai; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetStandingOrders"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETSTANDINGORDERS, j); - assert(aj); - - dbResponses=AH_Job_GetResponses(j); - assert(dbResponses); - - a=AH_AccountJob_GetAccount(j); - assert(a); - ai=AB_ImExporterContext_GetAccountInfo(ctx, - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a)); - assert(ai); - - /* search for "StandingOrder" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/GetStandingOrdersResponse"); - if (dbXA) { - GWEN_DB_NODE *dbT; - AB_TRANSACTION *t; - const char *s; - - dbXA=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "standingOrder"); - assert(dbXA); - - /* create transaction: raw */ - t=AB_Transaction_fromDb(dbXA); - assert(t); - - /* now work out some of the fields */ - - /* date */ - s=GWEN_DB_GetCharValue(dbXA, "xDate", 0, 0); - if (s && *s) { - GWEN_BUFFER *dbuf; - GWEN_TIME *ti; - - dbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Buffer_AppendString(dbuf, s); - GWEN_Buffer_AppendString(dbuf, "-12:00"); - ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), - "YYYYMMDD-hh:mm"); - assert(ti); - AB_Transaction_SetDate(t, ti); - GWEN_Time_free(ti); - GWEN_Buffer_free(dbuf); - } - - /* firstExecutionDate */ - s=GWEN_DB_GetCharValue(dbXA, "special/xfirstExecutionDate", 0, 0); - if (s && *s) { - GWEN_BUFFER *dbuf; - GWEN_TIME *ti; - - dbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Buffer_AppendString(dbuf, s); - GWEN_Buffer_AppendString(dbuf, "-12:00"); - ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), - "YYYYMMDD-hh:mm"); - assert(ti); - AB_Transaction_SetFirstExecutionDate(t, ti); - GWEN_Time_free(ti); - GWEN_Buffer_free(dbuf); - } - - /* lastExecutionDate */ - s=GWEN_DB_GetCharValue(dbXA, "special/xlastExecutionDate", 0, 0); - if (s && *s) { - GWEN_BUFFER *dbuf; - GWEN_TIME *ti; - - dbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Buffer_AppendString(dbuf, s); - GWEN_Buffer_AppendString(dbuf, "-12:00"); - ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), - "YYYYMMDD-hh:mm"); - assert(ti); - AB_Transaction_SetLastExecutionDate(t, ti); - GWEN_Time_free(ti); - GWEN_Buffer_free(dbuf); - } - - /* nextExecutionDate */ - s=GWEN_DB_GetCharValue(dbXA, "xnextExecutionDate", 0, 0); - if (s && *s) { - GWEN_BUFFER *dbuf; - GWEN_TIME *ti; - - dbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Buffer_AppendString(dbuf, s); - GWEN_Buffer_AppendString(dbuf, "-12:00"); - ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), - "YYYYMMDD-hh:mm"); - assert(ti); - AB_Transaction_SetNextExecutionDate(t, ti); - GWEN_Time_free(ti); - GWEN_Buffer_free(dbuf); - } - - /* period */ - s=GWEN_DB_GetCharValue(dbXA, "special/xperiod", 0, 0); - if (s && *s) { - if (strcasecmp(s, "W")==0) - AB_Transaction_SetPeriod(t, AB_Transaction_PeriodWeekly); - else if (strcasecmp(s, "M")==0) - AB_Transaction_SetPeriod(t, AB_Transaction_PeriodMonthly); - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Unknown period \"%s\"", s); - abort(); - } - } - - /* cycle */ - i=GWEN_DB_GetIntValue(dbXA, "special/cycle", 0, 0); - AB_Transaction_SetCycle(t, i); - - /* execution day */ - i=GWEN_DB_GetIntValue(dbXA, "special/executionDay", 0, 0); - AB_Transaction_SetExecutionDay(t, i); - - /* local account */ - dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "ouraccount"); - if (dbT) { - const AB_COUNTRY *cn; - - cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), - GWEN_DB_GetIntValue(dbT, - "country", 0, - 280)); - assert(cn); - AB_Transaction_SetLocalCountry(t, AB_Country_GetCode(cn)); - s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); - if (s && *s) - AB_Transaction_SetLocalBankCode(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); - if (s && *s) - AB_Transaction_SetLocalAccountNumber(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); - if (s && *s) - AB_Transaction_SetLocalSuffix(t, s); - } - - /* remote account */ - dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "otheraccount"); - if (dbT) { - const AB_COUNTRY *cn; - - cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), - GWEN_DB_GetIntValue(dbT, - "country", 0, - 280)); - assert(cn); - AB_Transaction_SetRemoteCountry(t, AB_Country_GetCode(cn)); - s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); - if (s && *s) - AB_Transaction_SetRemoteBankCode(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); - if (s && *s) - AB_Transaction_SetRemoteAccountNumber(t, s); - s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); - if (s && *s) - AB_Transaction_SetRemoteSuffix(t, s); - } - - /* remote name */ - AB_Transaction_ClearRemoteName(t); - for (i=0; ; i++) { - s=GWEN_DB_GetCharValue(dbXA, "otherName", i, 0); - if (s) { - if (*s) { - GWEN_BUFFER *dbuf; - - dbuf=GWEN_Buffer_new(0, 27, 0, 1); - AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); - AB_Transaction_AddRemoteName(t, GWEN_Buffer_GetStart(dbuf), 1); - GWEN_Buffer_free(dbuf); - } - } - else - break; - } - - /* purpose name */ - AB_Transaction_ClearPurpose(t); - for (i=0; ; i++) { - s=GWEN_DB_GetCharValue(dbXA, "purpose", i, 0); - if (s) { - if (*s) { - GWEN_BUFFER *dbuf; - - dbuf=GWEN_Buffer_new(0, 27, 0, 1); - AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); - AB_Transaction_AddPurpose(t, GWEN_Buffer_GetStart(dbuf), 0); - GWEN_Buffer_free(dbuf); - } - } - else - break; - } - - /* add to list */ - AB_ImExporterAccountInfo_AddStandingOrder(ai, t); - } /* if "standingOrder" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetStandingOrders_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETSTANDINGORDERS *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETSTANDINGORDERS, j); - assert(aj); - - if (AB_Job_GetType(bj)!=AB_Job_TypeGetStandingOrders) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetStandingOrders job"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: - return 0; - - case AH_Job_ExchangeModeArgs: - return 0; - - case AH_Job_ExchangeModeResults: - return 0; - - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_l.h 2010-04-25 16:26:14.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETSTANDINGORDERS_L_H -#define AH_JOBGETSTANDINGORDERS_L_H - - -#include "accountjob_l.h" - -AH_JOB *AH_Job_GetStandingOrders_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBGETSTANDINGORDERS_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_p.h 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETSTANDINGORDERS_P_H -#define AH_JOBGETSTANDINGORDERS_P_H - - -#include "jobgetstandingorders_l.h" -#include - - -typedef struct AH_JOB_GETSTANDINGORDERS AH_JOB_GETSTANDINGORDERS; -struct AH_JOB_GETSTANDINGORDERS { - int dummy; -}; -static void GWENHYWFAR_CB AH_Job_GetStandingOrders_FreeData(void *bp, void *p); - -static int AH_Job_GetStandingOrders_Process(AH_JOB *j, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_GetStandingOrders_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - - -#endif /* AH_JOBGETSTANDINGORDERS_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgetstandingorders.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,357 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,647 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobgettransactions_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "user_l.h" -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include -#include -#include - - -GWEN_INHERIT(AH_JOB, AH_JOB_GETTRANSACTIONS); - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_GetTransactions_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_GETTRANSACTIONS *aj; - GWEN_DB_NODE *dbArgs; - - int useCreditCardJob = 0; - - //Check if we should use DKKKU - GWEN_DB_NODE *updgroup; - updgroup=AH_User_GetUpd(u); - assert(updgroup); - updgroup=GWEN_DB_GetGroup(updgroup, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - AB_Account_GetAccountNumber(account)); - if (updgroup) { - GWEN_DB_NODE *n; - n=GWEN_DB_GetFirstGroup(updgroup); - while(n) { - if (strcasecmp(GWEN_DB_GetCharValue(n, "job", 0, ""), - "DKKKU")==0) { - useCreditCardJob = 1; - break; - } - n=GWEN_DB_GetNextGroup(n); - } /* while */ - } /* if updgroup for the given account found */ - - if(useCreditCardJob) - j=AH_AccountJob_new("JobGetTransactionsCreditCard", u, account); - else - j=AH_AccountJob_new("JobGetTransactions", u, account); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_GETTRANSACTIONS, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j, aj, - AH_Job_GetTransactions_FreeData); - /* overwrite some virtual functions */ - if(useCreditCardJob) - AH_Job_SetProcessFn(j, AH_Job_GetTransactionsCreditCard_Process); - else - AH_Job_SetProcessFn(j, AH_Job_GetTransactions_Process); - - AH_Job_SetExchangeFn(j, AH_Job_GetTransactions_Exchange); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - if(useCreditCardJob) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "accountNumber", AB_Account_GetAccountNumber(account)); - else - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "allAccounts", "N"); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_GetTransactions_FreeData(void *bp, void *p){ - AH_JOB_GETTRANSACTIONS *aj; - - aj=(AH_JOB_GETTRANSACTIONS*)p; - - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetTransactions__ReadTransactions(AH_JOB *j, - AB_IMEXPORTER_ACCOUNTINFO *ai, - const char *docType, - int noted, - GWEN_BUFFER *buf){ - GWEN_DBIO *dbio; - GWEN_SYNCIO *sio; - int rv; - GWEN_DB_NODE *db; - GWEN_DB_NODE *dbDay; - GWEN_DB_NODE *dbParams; - AB_ACCOUNT *a; - AB_USER *u; - uint32_t progressId; - uint64_t cnt=0; - - a=AH_AccountJob_GetAccount(j); - assert(a); - u=AH_Job_GetUser(j); - assert(u); - - dbio=GWEN_DBIO_GetPlugin("swift"); - if (!dbio) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Plugin SWIFT is not found"); - GWEN_Gui_ProgressLog(0, - GWEN_LoggerLevel_Error, - I18N("Plugin \"SWIFT\" not found.")); - return AB_ERROR_PLUGIN_MISSING; - } - - GWEN_Buffer_Rewind(buf); - sio=GWEN_SyncIo_Memory_new(buf, 0); - - db=GWEN_DB_Group_new("transactions"); - dbParams=GWEN_DB_Group_new("params"); - GWEN_DB_SetCharValue(dbParams, GWEN_DB_FLAGS_OVERWRITE_VARS, - "type", docType); - if (AH_User_GetFlags(u) & AH_USER_FLAGS_KEEP_MULTIPLE_BLANKS) - GWEN_DB_SetIntValue(dbParams, GWEN_DB_FLAGS_OVERWRITE_VARS, - "keepMultipleBlanks", 1); - else - GWEN_DB_SetIntValue(dbParams, GWEN_DB_FLAGS_OVERWRITE_VARS, - "keepMultipleBlanks", 0); - - rv=GWEN_DBIO_Import(dbio, sio, - db, dbParams, - GWEN_PATH_FLAGS_CREATE_GROUP); - if (rv<0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Error parsing SWIFT %s (%d)", - docType, rv); - GWEN_DB_Group_free(dbParams); - GWEN_DB_Group_free(db); - GWEN_SyncIo_free(sio); - GWEN_DBIO_free(dbio); - return rv; - } - GWEN_DB_Group_free(dbParams); - GWEN_SyncIo_free(sio); - GWEN_DBIO_free(dbio); - - /* first count the groups */ - dbDay=GWEN_DB_FindFirstGroup(db, "day"); - while(dbDay) { - GWEN_DB_NODE *dbT; - - dbT=GWEN_DB_FindFirstGroup(dbDay, "transaction"); - while(dbT) { - cnt++; - dbT=GWEN_DB_FindNextGroup(dbT, "transaction"); - } /* while */ - dbDay=GWEN_DB_FindNextGroup(dbDay, "day"); - } /* while */ - - progressId=GWEN_Gui_ProgressStart(GWEN_GUI_PROGRESS_DELAY | - GWEN_GUI_PROGRESS_ALLOW_EMBED | - GWEN_GUI_PROGRESS_SHOW_PROGRESS | - GWEN_GUI_PROGRESS_SHOW_ABORT, - I18N("Importing transactions..."), - NULL, - cnt, - 0); - - /* add transactions to list */ - dbDay=GWEN_DB_FindFirstGroup(db, "day"); - while(dbDay) { - GWEN_DB_NODE *dbT; - - dbT=GWEN_DB_FindFirstGroup(dbDay, "transaction"); - while(dbT) { - AB_TRANSACTION *t; - - t=AB_Transaction_fromDb(dbT); - if (!t) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad transaction data:"); - GWEN_DB_Dump(dbT, 2); - } - else { - AB_Transaction_SetLocalBankCode(t, AB_User_GetBankCode(u)); - AB_Transaction_SetLocalAccountNumber(t, - AB_Account_GetAccountNumber(a)); - DBG_INFO(AQHBCI_LOGDOMAIN, "Adding transaction"); - if (noted) - AB_ImExporterAccountInfo_AddNotedTransaction(ai, t); - else - AB_ImExporterAccountInfo_AddTransaction(ai, t); - } - - if (GWEN_ERROR_USER_ABORTED== - GWEN_Gui_ProgressAdvance(progressId, GWEN_GUI_PROGRESS_ONE)) { - GWEN_Gui_ProgressEnd(progressId); - return GWEN_ERROR_USER_ABORTED; - } - - dbT=GWEN_DB_FindNextGroup(dbT, "transaction"); - } /* while */ - - /* read all endsaldos */ - if (!noted) { - dbT=GWEN_DB_FindFirstGroup(dbDay, "endSaldo"); - while (dbT) { - GWEN_DB_NODE *dbX; - GWEN_TIME *ti=0; - - dbX=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "date"); - if (dbX) - ti=GWEN_Time_fromDb(dbX); - dbX=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "value"); - if (dbX) { - AB_VALUE *v; - - v=AB_Value_fromDb(dbX); - if (v) { - AB_BALANCE *bal; - AB_ACCOUNT_STATUS *as; - - bal=AB_Balance_new(v, ti); - AB_Value_free(v); - as=AB_AccountStatus_new(); - if (ti) - AB_AccountStatus_SetTime(as, ti); - AB_AccountStatus_SetNotedBalance(as, bal); - AB_Balance_free(bal); - AB_ImExporterAccountInfo_AddAccountStatus(ai, as); - } - } - GWEN_Time_free(ti); - - dbT=GWEN_DB_FindNextGroup(dbT, "endSaldo"); - } /* while */ - } - - dbDay=GWEN_DB_FindNextGroup(dbDay, "day"); - } /* while */ - - GWEN_Gui_ProgressEnd(progressId); - - GWEN_DB_Group_free(db); - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetTransactions_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETTRANSACTIONS *aj; - AB_ACCOUNT *a; - AB_IMEXPORTER_ACCOUNTINFO *ai; - GWEN_DB_NODE *dbResponses; - GWEN_DB_NODE *dbCurr; - GWEN_BUFFER *tbooked; - GWEN_BUFFER *tnoted; - int rv; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetTransactions"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j); - assert(aj); - - tbooked=GWEN_Buffer_new(0, 1024, 0, 1); - tnoted=GWEN_Buffer_new(0, 1024, 0, 1); - - dbResponses=AH_Job_GetResponses(j); - assert(dbResponses); - - /* search for "Transactions" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - GWEN_Buffer_free(tbooked); - GWEN_Buffer_free(tnoted); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - GWEN_Buffer_free(tbooked); - GWEN_Buffer_free(tnoted); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/transactions"); - if (dbXA) { - const void *p; - unsigned int bs; - - if (GWEN_Logger_GetLevel(0)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbXA, 2); - p=GWEN_DB_GetBinValue(dbXA, "booked", 0, 0, 0, &bs); - if (p && bs) - GWEN_Buffer_AppendBytes(tbooked, p, bs); - p=GWEN_DB_GetBinValue(dbXA, "noted", 0, 0, 0, &bs); - if (p && bs) - GWEN_Buffer_AppendBytes(tnoted, p, bs); - } /* if "Transactions" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - - GWEN_Buffer_Rewind(tbooked); - GWEN_Buffer_Rewind(tnoted); - - /* now the buffers contain data to be parsed by DBIOs */ - a=AH_AccountJob_GetAccount(j); - assert(a); - ai=AB_ImExporterContext_GetAccountInfo(ctx, - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a)); - assert(ai); - AB_ImExporterAccountInfo_SetAccountId(ai, AB_Account_GetUniqueId(a)); - - /* read booked transactions */ - if (GWEN_Buffer_GetUsedBytes(tbooked)) { - if (getenv("AQHBCI_LOGBOOKED")) { - FILE *f; - - f=fopen("/tmp/booked.mt", "w+"); - if (f) { - if (fwrite(GWEN_Buffer_GetStart(tbooked), - GWEN_Buffer_GetUsedBytes(tbooked), 1, f)!=1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "fwrite: %s", strerror(errno)); - } - if (fclose(f)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "fclose: %s", strerror(errno)); - } - } - } - - if (AH_Job_GetTransactions__ReadTransactions(j, ai, "mt940", 0, tbooked)){ - GWEN_Buffer_free(tbooked); - GWEN_Buffer_free(tnoted); - DBG_INFO(AQHBCI_LOGDOMAIN, "Error parsing booked transactions"); - AH_Job_SetStatus(j, AH_JobStatusError); - return -1; - } - } - - /* read noted transactions */ - if (GWEN_Buffer_GetUsedBytes(tnoted)) { - if (getenv("AQHBCI_LOGNOTED")) { - FILE *f; - - f=fopen("/tmp/noted.mt", "w+"); - if (f) { - if (fwrite(GWEN_Buffer_GetStart(tnoted), - GWEN_Buffer_GetUsedBytes(tnoted), 1, f)!=1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "fwrite: %s", strerror(errno)); - } - if (fclose(f)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "fclose: %s", strerror(errno)); - } - } - } - - if (AH_Job_GetTransactions__ReadTransactions(j, ai, "mt942", 1, tnoted)) { - GWEN_Buffer_free(tbooked); - GWEN_Buffer_free(tnoted); - DBG_INFO(AQHBCI_LOGDOMAIN, "Error parsing noted transactions"); - AH_Job_SetStatus(j, AH_JobStatusError); - return -1; - } - } - - GWEN_Buffer_free(tbooked); - GWEN_Buffer_free(tnoted); - return 0; -} - -int AH_Job_GetTransactionsCreditCard_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETTRANSACTIONS *aj; - AB_ACCOUNT *a; - AB_IMEXPORTER_ACCOUNTINFO *ai; - AB_USER *u; - GWEN_DB_NODE *dbResponses; - GWEN_DB_NODE *dbCurr; - GWEN_BUFFER *tbooked; - GWEN_BUFFER *tnoted; - int rv; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetTransactionsCreditCard"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j); - assert(aj); - - tbooked=GWEN_Buffer_new(0, 1024, 0, 1); - tnoted=GWEN_Buffer_new(0, 1024, 0, 1); - - dbResponses=AH_Job_GetResponses(j); - assert(dbResponses); - DBG_INFO(AQHBCI_LOGDOMAIN, "Response:"); - GWEN_DB_Dump(dbResponses, 2); - DBG_INFO(AQHBCI_LOGDOMAIN, "Response end"); - - - a=AH_AccountJob_GetAccount(j); - assert(a); - ai=AB_ImExporterContext_GetAccountInfo(ctx, - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a)); - assert(ai); - AB_ImExporterAccountInfo_SetAccountId(ai, AB_Account_GetUniqueId(a)); - - u=AH_Job_GetUser(j); - assert(u); - - /* search for "Transactions" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - GWEN_Buffer_free(tbooked); - GWEN_Buffer_free(tnoted); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - GWEN_Buffer_free(tbooked); - GWEN_Buffer_free(tnoted); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/transactionscreditcard"); - if (dbXA) { - GWEN_DB_NODE *dbT; - GWEN_DB_NODE *dbV; - GWEN_TIME *date; - GWEN_TIME *valutaDate; - const char *p; - - dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "entries"); - while (dbT) { - AB_VALUE *v1; - AB_VALUE *v2; - GWEN_STRINGLIST* purpose; - AB_TRANSACTION *t; - - /* read date (Buchungsdatum) */ - p=GWEN_DB_GetCharValue(dbT, "date", 0, 0); - assert(p); - date=GWEN_Time_fromString(p, "YYYYMMDD"); - - /* read valutaData (Umsatzdatum) */ - p=GWEN_DB_GetCharValue(dbT, "valutaDate", 0, 0); - assert(p); - valutaDate=GWEN_Time_fromString(p, "YYYYMMDD"); - - /* read value */ - dbV=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "value"); - assert(dbV); - v1=AB_Value_fromDb(dbV); - v2=0; - if (!v1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing value from DB"); - } - else { - p=GWEN_DB_GetCharValue(dbT, "debitMark", 0, 0); - if (p) { - if (strcasecmp(p, "D")==0 || - strcasecmp(p, "RC")==0) { - v2=AB_Value_dup(v1); - AB_Value_Negate(v2); - } - else if (strcasecmp(p, "C")==0 || - strcasecmp(p, "RD")==0) - v2=AB_Value_dup(v1); - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad debit mark \"%s\"", p); - v2=0; - } - } - AB_Value_free(v1); - } - - /* read purpose */ - p=GWEN_DB_GetCharValue(dbT, "purpose", 0, 0); - assert(p); - purpose=GWEN_StringList_fromTabString(p, 0); - - /* read reference */ - p=GWEN_DB_GetCharValue(dbT, "reference", 0, 0); - assert(p); - GWEN_StringList_AppendString(purpose, p, 0, 0); - - t=AB_Transaction_new(); - AB_Transaction_SetLocalBankCode(t, AB_User_GetBankCode(u)); - AB_Transaction_SetLocalAccountNumber(t, AB_Account_GetAccountNumber(a)); - AB_Transaction_SetValutaDate(t, valutaDate); - AB_Transaction_SetDate(t, date); - AB_Transaction_SetValue(t, v2); - AB_Transaction_SetPurpose(t, purpose); - DBG_INFO(AQHBCI_LOGDOMAIN, "Adding transaction"); - AB_ImExporterAccountInfo_AddTransaction(ai, t); - - GWEN_StringList_free(purpose); - AB_Value_free(v2); - GWEN_Time_free(date); - GWEN_Time_free(valutaDate); - - dbT = GWEN_DB_FindNextGroup(dbT, "entries"); - } //while (dbT) - } //if (dbXA) - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_GetTransactions_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_GETTRANSACTIONS *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j); - assert(aj); - - if (AB_Job_GetType(bj)!=AB_Job_TypeGetTransactions) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetTransactions job"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: { - GWEN_DB_NODE *dbParams; - - dbParams=AH_Job_GetParams(j); - AB_JobGetTransactions_SetMaxStoreDays(bj, - GWEN_DB_GetIntValue(dbParams, - "storeDays", - 0, 0) - ); - return 0; - } - - case AH_Job_ExchangeModeArgs: { - const GWEN_TIME *ti; - - ti=AB_JobGetTransactions_GetFromTime(bj); - if (ti) { - int year, month, day; - char dbuf[16]; - GWEN_DB_NODE *dbArgs; - - dbArgs=AH_Job_GetArguments(j); - if (GWEN_Time_GetBrokenDownDate(ti, &day, &month, &year)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Internal error: bad fromTime"); - return GWEN_ERROR_INVALID; - } - snprintf(dbuf, sizeof(dbuf), "%04d%02d%02d", year, month+1, day); - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, - "fromDate", dbuf); - } - - ti=AB_JobGetTransactions_GetToTime(bj); - if (ti) { - int year, month, day; - char dbuf[16]; - GWEN_DB_NODE *dbArgs; - - dbArgs=AH_Job_GetArguments(j); - if (GWEN_Time_GetBrokenDownDate(ti, &day, &month, &year)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Internal error: bad toTime"); - return GWEN_ERROR_INVALID; - } - snprintf(dbuf, sizeof(dbuf), "%04d%02d%02d", year, month+1, day); - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, - "toDate", dbuf); - } - - return 0; - } - - case AH_Job_ExchangeModeResults: - return 0; - - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_l.h 2010-04-25 16:26:14.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETTRANSACTIONS_L_H -#define AH_JOBGETTRANSACTIONS_L_H - - -#include "accountjob_l.h" - -#include - - -AH_JOB *AH_Job_GetTransactions_new(AB_USER *u, - AB_ACCOUNT *account); - - -#endif /* AH_JOBGETTRANSACTIONS_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_p.h 2013-05-06 07:13:31.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBGETTRANSACTIONS_P_H -#define AH_JOBGETTRANSACTIONS_P_H - - -#include "jobgettransactions_l.h" -#include - - -typedef struct AH_JOB_GETTRANSACTIONS AH_JOB_GETTRANSACTIONS; -struct AH_JOB_GETTRANSACTIONS { - int dummy; -}; -static void GWENHYWFAR_CB AH_Job_GetTransactions_FreeData(void *bp, void *p); -static int AH_Job_GetTransactions_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_GetTransactionsCreditCard_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_GetTransactions_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - -static int - AH_Job_GetTransactions__ReadTransactions(AH_JOB *j, - AB_IMEXPORTER_ACCOUNTINFO *ai, - const char *docType, - int noted, - GWEN_BUFFER *buf); - - - -#endif /* AH_JOBGETTRANSACTIONS_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.xml 2013-05-24 17:49:38.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobgettransactions.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,568 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - %code - %version - N - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - %code - %version - N - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - N - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - N - - - - - - - - - - - %code - %version - N - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobinternaltransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobinternaltransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobinternaltransfer.xml 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobinternaltransfer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.c 2013-12-31 17:56:49.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,357 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobloadcellphone_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - - - -GWEN_INHERIT(AH_JOB, AH_JOB_LOADCELLPHONE); - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_LoadCellPhone_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_LOADCELLPHONE *aj; - GWEN_DB_NODE *dbArgs; - - j=AH_AccountJob_new("JobLoadCellPhone", u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 41); - - GWEN_NEW_OBJECT(AH_JOB_LOADCELLPHONE, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j, aj, - AH_Job_LoadCellPhone_FreeData); - /* overwrite some virtual functions */ - AH_Job_SetExchangeFn(j, AH_Job_LoadCellPhone_Exchange); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "allAccounts", "N"); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_LoadCellPhone_FreeData(void *bp, void *p){ - AH_JOB_LOADCELLPHONE *aj; - - aj=(AH_JOB_LOADCELLPHONE*)p; - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_LoadCellPhone_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AH_JOB_LOADCELLPHONE *aj; - GWEN_DB_NODE *dbParams; - GWEN_DB_NODE *dbProduct; - AB_CELLPHONE_PRODUCT_LIST *pl; - int i; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j); - assert(aj); - - dbParams=AH_Job_GetParams(j); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbParams, 2); - - /* read products */ - pl=AB_CellPhoneProduct_List_new(); - dbProduct=GWEN_DB_FindFirstGroup(dbParams, "product"); - while (dbProduct) { - AB_CELLPHONE_PRODUCT *cp; - char numbuf[16]; - const char *s; - - cp=AB_CellPhoneProduct_new(); - - i=GWEN_DB_GetIntValue(dbProduct, "Code", 0, -1); - snprintf(numbuf, sizeof(numbuf), "%d", i); - AB_CellPhoneProduct_SetId(cp, numbuf); - - i=GWEN_DB_GetIntValue(dbParams, "FreeValueAllowed", 0, 0); - AB_CellPhoneProduct_SetAllowFreeValue(cp, i); - - s=GWEN_DB_GetCharValue(dbProduct, "Name", 0, NULL); - if (s) - AB_CellPhoneProduct_SetProviderName(cp, s); - - s=GWEN_DB_GetCharValue(dbProduct, "ProductName", 0, NULL); - if (s) - AB_CellPhoneProduct_SetProductName(cp, s); - - s=GWEN_DB_GetCharValue(dbProduct, "MinimumValue", 0, NULL); - if (s) { - AB_VALUE *v; - - v=AB_Value_fromString(s); - if (v==NULL) { - DBG_INFO(GWEN_LOGDOMAIN, "Bad minimum value [%s]", s); - } - else { - AB_CellPhoneProduct_SetMinimumValue(cp, v); - AB_Value_free(v); - } - } - - s=GWEN_DB_GetCharValue(dbProduct, "MaximumValue", 0, NULL); - if (s) { - AB_VALUE *v; - - v=AB_Value_fromString(s); - if (v==NULL) { - DBG_INFO(GWEN_LOGDOMAIN, "Bad maximum value [%s]", s); - } - else { - AB_CellPhoneProduct_SetMaximumValue(cp, v); - AB_Value_free(v); - } - } - - s=GWEN_DB_GetCharValue(dbProduct, "ValueList", 0, NULL); - if (s) { - char *ns; - char *p; - AB_VALUE_LIST *vl; - - /* read value list */ - vl=AB_CellPhoneProduct_GetValues(cp); - ns=strdup(s); - p=ns; - while(*p) { - char *p0; - - p0=p; - p=strchr(p0, ';'); - if (p) - *p=0; - if (*p0) { - AB_VALUE *v; - - v=AB_Value_fromString(p0); - if (v) { - AB_Value_List_Add(v, vl); - } - else { - DBG_INFO(GWEN_LOGDOMAIN, "Bad value [%s]", p0); - } - } - if (p) - p++; - else - break; - } - } - AB_CellPhoneProduct_List_Add(cp, pl); - dbProduct=GWEN_DB_FindNextGroup(dbProduct, "product"); - } - - AB_JobLoadCellPhone_SetProductList(bj, pl); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_LoadCellPhone_ExchangeArgs(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AH_JOB_LOADCELLPHONE *aj; - GWEN_DB_NODE *dbArgs; - const AB_CELLPHONE_PRODUCT *cp; - const AB_VALUE *v; - const char *s; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j); - assert(aj); - - dbArgs=AH_Job_GetArguments(j); - - cp=AB_JobLoadCellPhone_GetCellPhoneProduct(bj); - if (cp==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No product"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - - /* cell phone card provider */ - s=AB_CellPhoneProduct_GetId(cp); - assert(s); - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, "ProviderCode", s); - - /* phone number */ - s=AB_JobLoadCellPhone_GetPhoneNumber(bj); - if (s==NULL || *s==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No phone number"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, "PhoneNumber", s); - - /* value */ - v=AB_JobLoadCellPhone_GetValue(bj); - if (v==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No value"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - else if (AB_Value_IsZero(v) || AB_Value_IsNegative(v)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad value"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_INVALID; - } - else { - GWEN_DB_NODE *dbV; - GWEN_BUFFER *nbuf; - char *p; - const char *s; - int l; - - dbV=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "value"); - assert(dbV); - - nbuf=GWEN_Buffer_new(0, 32, 0, 1); - if (GWEN_Text_DoubleToBuffer(AB_Value_GetValueAsDouble(v), - nbuf)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Buffer overflow"); - GWEN_Buffer_free(nbuf); - abort(); - } - - l=GWEN_Buffer_GetUsedBytes(nbuf); - if (!l) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); - GWEN_Buffer_free(nbuf); - abort(); - } - - /* replace "C" comma with "DE" comma, remove thousand's comma */ - p=GWEN_Buffer_GetStart(nbuf); - s=p; - while(*s) { - if (*s=='.') { - *p=','; - p++; - } - else if (*s!=',') { - *p=*s; - p++; - } - s++; - } /* while */ - *p=0; - - if (strchr(GWEN_Buffer_GetStart(nbuf), ',')) { - /* kill all trailing '0' behind the comma */ - p=GWEN_Buffer_GetStart(nbuf)+l; - while(l--) { - --p; - if (*p=='0') - *p=0; - else - break; - } - } - else - GWEN_Buffer_AppendString(nbuf, ","); - - /* store value */ - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, - "value", - GWEN_Buffer_GetStart(nbuf)); - GWEN_Buffer_free(nbuf); - - s=AB_Value_GetCurrency(v); - if (!s) - s="EUR"; - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, - "currency", s); - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_LoadCellPhone_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_LOADCELLPHONE *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j); - assert(aj); - - if (AB_Job_GetType(bj)!=AB_Job_TypeLoadCellPhone) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetLoadCellPhone job"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: - return AH_Job_LoadCellPhone_ExchangeParams(j, bj, ctx); - case AH_Job_ExchangeModeArgs: - return AH_Job_LoadCellPhone_ExchangeArgs(j, bj, ctx); - case AH_Job_ExchangeModeResults: - return 0; - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_l.h 2013-12-31 17:56:49.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBLOADCELLPHONE_L_H -#define AH_JOBLOADCELLPHONE_L_H - - -#include "accountjob_l.h" - - -AH_JOB *AH_Job_LoadCellPhone_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBLOADCELLPHONE_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_p.h 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2010 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBLOADCELLPHONE_P_H -#define AH_JOBLOADCELLPHONE_P_H - - -#include "jobloadcellphone_l.h" -#include - - -typedef struct AH_JOB_LOADCELLPHONE AH_JOB_LOADCELLPHONE; -struct AH_JOB_LOADCELLPHONE { - int dummy; -}; -static void GWENHYWFAR_CB AH_Job_LoadCellPhone_FreeData(void *bp, void *p); - -static int AH_Job_LoadCellPhone_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_LoadCellPhone_ExchangeArgs(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_LoadCellPhone_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - - -#endif /* AH_JOBLOADCELLPHONE_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobloadcellphone.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifydatedxfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifydatedxfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifydatedxfer.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifydatedxfer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,159 +0,0 @@ - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifysto.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifysto.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifysto.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmodifysto.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,283 +0,0 @@ - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.c 2014-01-15 21:17:19.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,797 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2011 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobmultitransfer_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - - -/*#define CHALLENGE_ADD_ONLY_PREKOMMA_VALUES*/ - -#define AH_MULTI_CHALLENGE_CLASS_HKSUB 12 -#define AH_MULTI_CHALLENGE_CLASS_HKSLA 19 - - - - -GWEN_INHERIT(AH_JOB, AH_JOB_MULTITRANSFER); - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_MultiTransfer_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_MultiTransferBase_new(u, account, 1); - if (j) - AH_Job_SetChallengeClass(j, AH_MULTI_CHALLENGE_CLASS_HKSUB); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_MultiDebitNote_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_MultiTransferBase_new(u, account, 0); - if (j) - AH_Job_SetChallengeClass(j, AH_MULTI_CHALLENGE_CLASS_HKSLA); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_MultiTransferBase_new(AB_USER *u, - AB_ACCOUNT *account, - int isTransfer) { - AH_JOB *j; - AH_JOB_MULTITRANSFER *aj; - GWEN_DB_NODE *dbArgs; - GWEN_DB_NODE *dbT; - GWEN_DB_NODE *dbParams; - const char *s; - int userMaxTrans; - int maxTransfers; - - j=AH_AccountJob_new(isTransfer?"JobMultiTransfer":"JobMultiDebitNote", - u, account); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_MULTITRANSFER, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j, aj, - AH_Job_MultiTransfer_FreeData); - aj->isTransfer=isTransfer; - aj->sumRemoteAccountId=AB_Value_new(); - aj->sumRemoteBankCode=AB_Value_new(); - aj->sumValues=AB_Value_new(); - - /* overwrite some virtual functions */ - AH_Job_SetProcessFn(j, AH_Job_MultiTransfer_Process); - AH_Job_SetExchangeFn(j, AH_Job_MultiTransfer_Exchange); - AH_Job_SetPrepareFn(j, AH_Job_MultiTransfer_Prepare); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_MultiTransfer_AddChallengeParams); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "transfers"); - assert(dbT); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "bankCode", - AB_Account_GetBankCode(account)); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "accountId", - AB_Account_GetAccountNumber(account)); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "currency", "EUR"); - s=AB_Account_GetOwnerName(account); - if (s) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "name", s); - else { - DBG_WARN(AQHBCI_LOGDOMAIN, - "No owner name for account, some banks don't accept this"); - } - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "type", - isTransfer?"transfer":"debitNote"); - - dbParams=AH_Job_GetParams(j); - if (isTransfer) - userMaxTrans=AH_User_GetMaxTransfersPerJob(u); - else - userMaxTrans=AH_User_GetMaxDebitNotesPerJob(u); - maxTransfers=GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0); - if (maxTransfers==0 || maxTransfers>userMaxTrans) - AH_Job_SetMaxTransfers(j, userMaxTrans); - else - AH_Job_SetMaxTransfers(j, maxTransfers); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_MultiTransfer_FreeData(void *bp, void *p){ - AH_JOB_MULTITRANSFER *aj; - - aj=(AH_JOB_MULTITRANSFER*)p; - - AB_Value_free(aj->sumValues); - AB_Value_free(aj->sumRemoteBankCode); - AB_Value_free(aj->sumRemoteAccountId); - - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_MultiTransfer_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_MULTITRANSFER *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); - assert(aj); - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing %s", - (aj->isTransfer)?"JobMultiTransfer":"JobMultiDebitNote"); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_MultiTransfer__ValidateTransfer(AB_JOB *bj, - AH_JOB *mj, - AB_TRANSACTION *t) { - const GWEN_STRINGLIST *sl; - int maxn; - int maxs; - int n; - const char *s; - AH_JOB_MULTITRANSFER *aj; - const AB_TRANSACTION_LIMITS *lim; - - assert(mj); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, mj); - assert(aj); - - lim=AB_Job_GetFieldLimits(bj); - - /* check purpose */ - if (lim) { - maxn=AB_TransactionLimits_GetMaxLinesPurpose(lim); - maxs=AB_TransactionLimits_GetMaxLenPurpose(lim); - } - else { - maxn=0; - maxs=0; - } - sl=AB_Transaction_GetPurpose(t); - n=0; - if (sl) { - GWEN_STRINGLISTENTRY *se; - const char *p; - - se=GWEN_StringList_FirstEntry(sl); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p && *p) { - int l; - GWEN_BUFFER *tbuf; - - n++; - if (maxn && n>maxn) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many purpose lines (%d>%d)", n, maxn); - return GWEN_ERROR_INVALID; - } - tbuf=GWEN_Buffer_new(0, maxs, 0, 1); - AB_ImExporter_Utf8ToDta(p, -1, tbuf); - l=GWEN_Buffer_GetUsedBytes(tbuf); - GWEN_Buffer_free(tbuf); - if (l>maxs) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many chars in purpose line %d (%d>%d)", n, l, maxs); - return GWEN_ERROR_INVALID; - } - } - se=GWEN_StringListEntry_Next(se); - } /* while */ - } - if (!n) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No purpose lines"); - return GWEN_ERROR_INVALID; - } - - /* check remote name */ - if (lim) { - maxn=AB_TransactionLimits_GetMaxLinesRemoteName(lim); - maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); - } - else { - maxn=0; - maxs=0; - } - sl=AB_Transaction_GetRemoteName(t); - n=0; - if (sl) { - GWEN_STRINGLISTENTRY *se; - const char *p; - - se=GWEN_StringList_FirstEntry(sl); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p && *p) { - int l; - GWEN_BUFFER *tbuf; - - n++; - if (maxn && n>maxn) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many remote name lines (%d>%d)", - n, maxn); - return GWEN_ERROR_INVALID; - } - tbuf=GWEN_Buffer_new(0, maxs, 0, 1); - AB_ImExporter_Utf8ToDta(p, -1, tbuf); - l=GWEN_Buffer_GetUsedBytes(tbuf); - GWEN_Buffer_free(tbuf); - if (l>maxs) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many chars in remote name line %d (%d>%d)", - n, l, maxs); - return GWEN_ERROR_INVALID; - } - } - se=GWEN_StringListEntry_Next(se); - } /* while */ - } - if (!n) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No remote name lines"); - return GWEN_ERROR_INVALID; - } - - /* check local name */ - s=AB_Transaction_GetLocalName(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local name, filling in"); - a=AB_Job_GetAccount(bj); - assert(a); - s=AB_Account_GetOwnerName(a); - if (!s) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "No owner name in account, giving up"); - return GWEN_ERROR_INVALID; - } - AB_Transaction_SetLocalName(t, s); - } - - /* check local bank code */ - s=AB_Transaction_GetLocalBankCode(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local bank code, filling in"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetBankCode(a); - assert(s); - AB_Transaction_SetLocalBankCode(t, s); - } - - /* check local account number */ - s=AB_Transaction_GetLocalAccountNumber(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local account number, filling in"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetAccountNumber(a); - assert(s); - AB_Transaction_SetLocalAccountNumber(t, s); - } - - /* check local account suffix */ - s=AB_Transaction_GetLocalSuffix(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_INFO(AQHBCI_LOGDOMAIN, - "No local suffix, filling in (if possible)"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetSubAccountId(a); - if (s && *s) - AB_Transaction_SetLocalSuffix(t, s); - } - - /* check text key */ - if (lim) { - if (GWEN_StringList_Count(AB_TransactionLimits_GetValuesTextKey(lim))){ - char numbuf[32]; - - n=AB_Transaction_GetTextKey(t); - if (n==0) { - if (aj->isTransfer) - n=51; /* "Ueberweisung" */ - else - n=5; /* "Lastschrift" */ - AB_Transaction_SetTextKey(t, n); - } - - snprintf(numbuf, sizeof(numbuf), "%d", n); - if (!AB_TransactionLimits_HasValuesTextKey(lim, numbuf)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Text key \"%s\" not supported by bank", - numbuf); - return GWEN_ERROR_INVALID; - } - } - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_MultiTransfer_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_MULTITRANSFER *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); - assert(aj); - - if ((aj->isTransfer && AB_Job_GetType(bj)!=AB_Job_TypeTransfer) || - (!aj->isTransfer && AB_Job_GetType(bj)!=AB_Job_TypeDebitNote)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Not a %s job job", - (aj->isTransfer)?"MultiTransfer":"MultiDebitNote"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: { - GWEN_DB_NODE *dbParams; - GWEN_DB_NODE *dbTk; - AB_TRANSACTION_LIMITS *lim; - int i; - - dbParams=AH_Job_GetParams(j); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbParams, 2); - /* read limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 27); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 2); - - AB_TransactionLimits_SetNeedDate(lim, -1); - - i=GWEN_DB_GetIntValue(dbParams, "maxpurposeLines", 0, 0); - AB_TransactionLimits_SetMaxLinesPurpose(lim, i); - - /* read text keys */ - dbTk=GWEN_DB_GetGroup(dbParams, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "textkey"); - if (dbTk) { - for (i=0; ; i++) { - int k; - char numbuf[16]; - - k=GWEN_DB_GetIntValue(dbTk, "key", i, -1); - if (k==-1) - break; - snprintf(numbuf, sizeof(numbuf), "%d", k); - AB_TransactionLimits_AddValuesTextKey(lim, numbuf, 1); - } - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesTextKey(lim), - 1, GWEN_StringList_SortModeInt); - } - - AB_Job_SetFieldLimits(bj, lim); - - return 0; - } - - case AH_Job_ExchangeModeArgs: { - GWEN_DB_NODE *dbArgs; - const AB_TRANSACTION *ot; - char groupIdBuf[10]; - - groupIdBuf[0]=0; - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - ot=AB_Job_GetTransaction(bj); - if (ot) { - GWEN_DB_NODE *dbT; - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - assert(t); - if (AH_Job_MultiTransfer__ValidateTransfer(bj, j, t)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Invalid transaction"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_INVALID; - } - AB_Transaction_SetGroupId(t, AH_Job_GetId(j)); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Setting groupID to %d", AH_Job_GetId(j)); - if (groupIdBuf[0]==0) { - snprintf(groupIdBuf, sizeof(groupIdBuf)-1, "%08d", AH_Job_GetId(j)); - groupIdBuf[sizeof(groupIdBuf)-1]=0; - } - - /* store the validated transaction back into application job, - * to allow the application to recognize answers to this job later */ - AB_Job_SetTransaction(bj, t); - - dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, - "transfers"); - assert(dbT); - /* store customer reference */ - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "custref", - groupIdBuf); - - dbT=GWEN_DB_GetGroup(dbT, GWEN_DB_FLAGS_DEFAULT, - "transactions"); - assert(dbT); - if (aj->isTransfer) - dbT=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_CREATE_GROUP, - "transfer"); - else - dbT=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_CREATE_GROUP, - "debitNote"); - assert(dbT); - - /* store transaction */ - if (AB_Transaction_toDb(t, dbT)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error storing transaction to db"); - AB_Transaction_free(t); - return GWEN_ERROR_BAD_DATA; - } - else { - const char *s; - char tbuf[11]; - AB_VALUE *tv; - - /* sum up account ids */ - s=AB_Transaction_GetRemoteAccountNumber(t); - assert(s); - tbuf[0]=0; - strncat(tbuf, s, 10); - tv=AB_Value_fromString(tbuf); - assert(tv); - AB_Value_AddValue(aj->sumRemoteAccountId, tv); - AB_Value_free(tv); - - /* sum up bank codes */ - s=AB_Transaction_GetRemoteBankCode(t); - assert(s); - tbuf[0]=0; - strncat(tbuf, s, 10); - tv=AB_Value_fromString(tbuf); - assert(tv); - AB_Value_AddValue(aj->sumRemoteBankCode, tv); - AB_Value_free(tv); - -#ifdef CHALLENGE_ADD_ONLY_PREKOMMA_VALUES - if (1) { - GWEN_BUFFER *tbuf; - char *p; - AB_VALUE *tv; - - tbuf=GWEN_Buffer_new(0, 32, 0, 1); - AB_Value_toHumanReadableString2(AB_Transaction_GetValue(t), - tbuf, 0, 0); - p=strchr(GWEN_Buffer_GetStart(tbuf), ','); - if (p) - *p=0; - tv=AB_Value_fromString(GWEN_Buffer_GetStart(tbuf)); - assert(tv); - AB_Value_AddValue(aj->sumValues, tv); - AB_Value_free(tv); - GWEN_Buffer_free(tbuf); - } -#else - AB_Value_AddValue(aj->sumValues, AB_Transaction_GetValue(t)); -#endif - } - AB_Transaction_free(t); - - AH_Job_IncTransferCount(j); - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - return 0; - } - - case AH_Job_ExchangeModeResults: { - AH_RESULT_LIST *rl; - AH_RESULT *r; - int has10; - int has20; - AB_TRANSACTION_STATUS tStatus; - - rl=AH_Job_GetSegResults(j); - assert(rl); - - r=AH_Result_List_First(rl); - if (!r) { - DBG_INFO(AQHBCI_LOGDOMAIN, "No segment results"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - has10=0; - has20=0; - while(r) { - int rcode; - - rcode=AH_Result_GetCode(r); - DBG_INFO(AQHBCI_LOGDOMAIN, "Found job result: %d", rcode); - if (rcode<=19) - has10=1; - else if (rcode>=20 && rcode <=29) - has20=1; - r=AH_Result_List_Next(r); - } - - if (has20) { - AB_Job_SetStatus(bj, AB_Job_StatusFinished); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); - } - else if (has10) { - AB_Job_SetStatus(bj, AB_Job_StatusPending); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); - } - else { - DBG_INFO(AQHBCI_LOGDOMAIN, - "Error status (neither 0010 nor 0020)"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - } - - if (has20) - tStatus=AB_Transaction_StatusAccepted; - else if (has10) - tStatus=AB_Transaction_StatusPending; - else - tStatus=AB_Transaction_StatusRejected; - - if (aj->isTransfer) { - const AB_TRANSACTION *ot; - - ot=AB_Job_GetTransaction(bj); - if (ot) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - AB_Transaction_SetStatus(t, tStatus); - AB_Transaction_SetType(t, AB_Transaction_TypeTransfer); - AB_ImExporterContext_AddTransfer(ctx, t); - } - } - else { - const AB_TRANSACTION *ot; - - ot=AB_Job_GetTransaction(bj); - if (ot) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - AB_Transaction_SetStatus(t, tStatus); - AB_Transaction_SetType(t, AB_Transaction_TypeDebitNote); - AB_ImExporterContext_AddTransfer(ctx, t); - } - } - - return 0; - } - - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode %d", m); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - -int AH_Job_MultiTransfer_Prepare(AH_JOB *j){ -#if 0 - /* this code should no longer be needed since we use - * AH_Job_MultiTransfer_AddChallengeParams now */ - - AH_JOB_MULTITRANSFER *aj; - GWEN_BUFFER *tbuf; - char *p; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "Prepare function called"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); - assert(aj); - - tbuf=GWEN_Buffer_new(0, 32, 0, 1); - - /* set challenge parameter */ - - /* add sum of account numbers */ - AB_Value_toHumanReadableString2(aj->sumRemoteAccountId, - tbuf, 0, 0); - p=strchr(GWEN_Buffer_GetStart(tbuf), '.'); - if (p) - *p=0; - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - /* add sum of bank codes */ - AB_Value_toHumanReadableString2(aj->sumRemoteBankCode, - tbuf, 0, 0); - p=strchr(GWEN_Buffer_GetStart(tbuf), '.'); - if (p) - *p=0; - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - - - GWEN_Buffer_free(tbuf); - - if (aj->sumValues) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Setting value"); - } - AH_Job_SetChallengeValue(j, aj->sumValues); - -#endif - - return 0; -} - - -int AH_Job_MultiTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { - AH_JOB_MULTITRANSFER *aj; - const char *s; - int tanVer=AH_JOB_TANVER_1_4; - char *p; - AB_ACCOUNT *acc=NULL; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); - assert(aj); - - s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); - if (s && *s && strncasecmp(s, "1.3", 3)==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); - tanVer=AH_JOB_TANVER_1_3; - } - - /* set challenge parameter */ - if (tanVer==AH_JOB_TANVER_1_4) { - GWEN_BUFFER *tbuf; - char numbuf[16]; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); - tbuf=GWEN_Buffer_new(0, 32, 0, 1); - - if (aj->isTransfer) - AH_Job_SetChallengeClass(j, 12); - else - AH_Job_SetChallengeClass(j, 19); - - /* P1: number of transfers */ - snprintf(numbuf, sizeof(numbuf)-1, "%d", AH_Job_GetTransferCount(j)); - numbuf[sizeof(numbuf)-1]=0; - AH_Job_AddChallengeParam(j, numbuf); - - /* P2: sum of amount */ - AH_Job_ValueToChallengeString(aj->sumValues, tbuf); - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - /* P3: local account number */ - acc=AH_AccountJob_GetAccount(j); - assert(acc); - s=AB_Account_GetAccountNumber(acc); - if (s && *s) { - int i; - - GWEN_Buffer_AppendString(tbuf, s); - i=10-strlen(s); - if (i>0) { - /* need to left-fill the account number with leading zeroes - * to a length of exactly 10 digits */ - GWEN_Buffer_Rewind(tbuf); - GWEN_Buffer_FillLeftWithBytes(tbuf, '0', i); - } - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No account number"); - GWEN_Buffer_free(tbuf); - return GWEN_ERROR_INVALID; - } - - /* add sum of account numbers */ - AB_Value_toHumanReadableString2(aj->sumRemoteAccountId, - tbuf, 0, 0); - p=strchr(GWEN_Buffer_GetStart(tbuf), '.'); - if (p) - *p=0; - /* only use first 10 digits */ - GWEN_Buffer_Crop(tbuf, 0, 10); - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - - /* done */ - GWEN_Buffer_free(tbuf); - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version 0x%02x for now", tanVer); - return GWEN_ERROR_INTERNAL; - } - - return 0; -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_l.h 2014-01-12 16:56:04.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBMULTITRANSFER_L_H -#define AH_JOBMULTITRANSFER_L_H - - -#include "accountjob_l.h" - -#include - - -AH_JOB *AH_Job_MultiTransfer_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_MultiDebitNote_new(AB_USER *cu, - AB_ACCOUNT *account); - - -#endif /* AH_JOBMULTITRANSFER_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_p.h 2014-01-12 16:56:04.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2009 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBMULTITRANSFER_P_H -#define AH_JOBMULTITRANSFER_P_H - - -#include "jobmultitransfer_l.h" -#include - - -typedef struct AH_JOB_MULTITRANSFER AH_JOB_MULTITRANSFER; -struct AH_JOB_MULTITRANSFER { - int isTransfer; - - AB_VALUE *sumRemoteAccountId; - AB_VALUE *sumRemoteBankCode; - AB_VALUE *sumValues; -}; -static void GWENHYWFAR_CB AH_Job_MultiTransfer_FreeData(void *bp, void *p); -static int AH_Job_MultiTransfer_Process(AH_JOB *j, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_MultiTransfer_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_MultiTransfer_Prepare(AH_JOB *j); - -static int AH_Job_MultiTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); - - -static int AH_Job_MultiTransfer__ValidateTransfer(AB_JOB *bj, - AH_JOB *mj, - AB_TRANSACTION *t); - -static AH_JOB *AH_Job_MultiTransferBase_new(AB_USER *u, - AB_ACCOUNT *account, - int isTransfer); - - -#endif /* AH_JOBMULTITRANSFER_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobmultitransfer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,503 +0,0 @@ - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - %code - %version - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c 2014-03-24 21:42:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,257 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobsepacor1datedsinglecreate_p.h" -#include "jobtransferbase_l.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "provider_l.h" -#include "hhd_l.h" -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SepaCor1DebitDatedSingleCreate_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - GWEN_DB_NODE *dbArgs; - - j=AH_Job_TransferBase_new("JobSepaCor1DebitDatedSingleCreate", - AB_Transaction_TypeSepaDebitNote, - AB_Transaction_SubTypeStandard, - u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 29); - - /* overwrite some virtual functions */ - AH_Job_SetPrepareFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_Prepare); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_AddChallengeParams); - - /* overwrite virtual functions of transferBase class */ - AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams); - AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - AH_Job_TransferBase_LoadSepaDescriptors(j); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AB_TRANSACTION_LIMITS *lim; - GWEN_DB_NODE *dbParams; - int i, i1, i2; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); - - dbParams=AH_Job_GetParams(j); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbParams, 2); - - /* set some default limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 35); - AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); - - AB_TransactionLimits_SetNeedDate(lim, 1); - - /* set info from BPD */ - i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); - AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); - AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); - - i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); - AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); - AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); - - /* combine into minimum values for older apps */ - i=(i1>i2)?i1:i2; - AB_TransactionLimits_SetMinValueSetupTime(lim, i); - - i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); - AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); - - i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); - AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); - - /* combine into minimum values for older apps */ - i=(i1 - - - -static int AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_SepaCor1DebitDatedSingleCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); -static int AH_Job_SepaCor1DebitDatedSingleCreate_Prepare(AH_JOB *j); - - - -#endif /* AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_P_H */ - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml 2014-03-24 20:48:52.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepacor1datedsinglecreate.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.c 2014-02-13 18:51:46.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,363 +0,0 @@ -/*************************************************************************** - begin : Wed Jan 08 2014 - copyright : (C) 2014 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobsepadebitdatedmulticreate_p.h" -#include "jobtransferbase_l.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "provider_l.h" -#include "hhd_l.h" -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - - - -GWEN_INHERIT(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT); - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SepaDebitDatedMultiCreate_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_CREATESEPAMULTIDEBIT *aj; - GWEN_DB_NODE *dbParams; - GWEN_DB_NODE *dbArgs; - const char *s; - - j=AH_Job_TransferBase_new("JobSepaDebitDatedMultiCreate", - AB_Transaction_TypeSepaDebitNote, - AB_Transaction_SubTypeStandard, - u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 32); - - GWEN_NEW_OBJECT(AH_JOB_CREATESEPAMULTIDEBIT, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT, j, aj, - AH_Job_SepaDebitDatedMultiCreate_FreeData); - - /* overwrite some virtual functions */ - AH_Job_SetPrepareFn(j, AH_Job_SepaDebitDatedMultiCreate_Prepare); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaDebitDatedMultiCreate_AddChallengeParams); - - /* overwrite virtual functions of transferBase class */ - AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaDebitDatedMultiCreate_ExchangeParams); - AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); - - /* get params */ - dbParams=AH_Job_GetParams(j); - assert(dbParams); - - AH_Job_SetMaxTransfers(j, GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0)); - - s=GWEN_DB_GetCharValue(dbParams, "sumFieldNeeded", 0, "j"); - if (s && toupper(*s)=='J') - aj->sumFieldNeeded=1; - else - aj->sumFieldNeeded=0; - - s=GWEN_DB_GetCharValue(dbParams, "singleBookingAllowed", 0, "j"); - if (s && toupper(*s)=='J') - aj->singleBookingAllowed=1; - else - aj->singleBookingAllowed=0; - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_SepaDebitDatedMultiCreate_FreeData(void *bp, void *p){ - AH_JOB_CREATESEPAMULTIDEBIT *aj; - - aj=(AH_JOB_CREATESEPAMULTIDEBIT*)p; - - free(aj->fiid); - AB_Value_free(aj->sumValues); - - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaDebitDatedMultiCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AH_JOB_CREATESEPAMULTIDEBIT *aj; - AB_TRANSACTION_LIMITS *lim; - GWEN_DB_NODE *dbParams; - int i, i1, i2; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT, j); - assert(aj); - - dbParams=AH_Job_GetParams(j); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbParams, 2); - - /* set some default limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 35); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 70); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); - AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); - - AB_TransactionLimits_SetNeedDate(lim, 1); - - /* set info from BPD */ - i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); - AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); - AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); - - i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); - AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); - AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); - - /* combine into minimum values for older apps */ - i=(i1>i2)?i1:i2; - AB_TransactionLimits_SetMinValueSetupTime(lim, i); - - i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); - AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); - - i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); - AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); - - /* combine into minimum values for older apps */ - i=(i1sumValues, - AB_Transaction_GetLocalIban(t), - AB_Transaction_GetDate(t)); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); - return GWEN_ERROR_INTERNAL; - } - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaDebitDatedMultiCreate_Prepare(AH_JOB *j) { - AH_JOB_CREATESEPAMULTIDEBIT *aj; - GWEN_DB_NODE *dbArgs; - AB_BANKING *ab; - AB_USER *u; - int rv; - const char *profileName=NULL; - const char *descriptor=NULL; - const char *s; - AB_TRANSACTION *t; - GWEN_BUFFER *dbuf; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfers"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT, j); - assert(aj); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - dbArgs=AH_Job_GetArguments(j); - - /* choose from HISPAS */ - /* first check for any descriptor for pain 008.002.02 */ - s=AH_User_FindSepaDescriptor(u, "*008.002.02*"); - if (s) { - profileName="008_002_02"; - descriptor=s; - } - if (!(descriptor && *descriptor)) { - /* look for pain 008.003.02 */ - s=AH_User_FindSepaDescriptor(u, "*008.003.02*"); - if (s) { - profileName="008_003_02"; - descriptor=s; - } - } - if (!(descriptor && *descriptor)) { - /* look for pain 008.001.01 */ - s=AH_User_FindSepaDescriptor(u, "*008.001.01*"); - if (s) { - profileName="008_001_01"; - descriptor=s; - } - } - - /* check for valid descriptor */ - if (!(descriptor && *descriptor)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No SEPA descriptor found, please update your SEPA account information"); - return GWEN_ERROR_GENERIC; - } - DBG_INFO(AQHBCI_LOGDOMAIN, "Using SEPA descriptor %s", descriptor); - - - /* calculate sum */ - AB_Value_free(aj->sumValues); - aj->sumValues=AB_Value_new(); - AB_Value_SetCurrency(aj->sumValues, "EUR"); - t=AH_Job_GetFirstTransfer(j); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - assert(t); /* debug */ - return GWEN_ERROR_INTERNAL; - } - while(t) { - const AB_VALUE *v; - - v=AB_Transaction_GetValue(t); - if (v) - AB_Value_AddValue(aj->sumValues, v); - t=AB_Transaction_List_Next(t); - } - - /* export transfers to SEPA */ - dbuf=GWEN_Buffer_new(0, 256, 0, 1); - rv=AH_Job_TransferBase_SepaExportTransactions(j, profileName, dbuf); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - GWEN_Buffer_free(dbuf); - return rv; - } - - /* store descriptor */ - GWEN_DB_SetCharValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "descriptor", - descriptor); - /* store transfer */ - GWEN_DB_SetBinValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "transfer", - GWEN_Buffer_GetStart(dbuf), - GWEN_Buffer_GetUsedBytes(dbuf)); - GWEN_Buffer_free(dbuf); - - /* set singleBookingAllowed */ - if (aj->singleBookingAllowed) - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, "singleBookingWanted", "J"); - else - GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, "singleBookingWanted", "N"); - - /* store sum value */ - if (aj->sumValues) { - GWEN_DB_NODE *dbV; - GWEN_BUFFER *nbuf; - const char *s; - - dbV=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "totalSum"); - assert(dbV); - - nbuf=GWEN_Buffer_new(0, 32, 0, 1); - AB_Value_toHbciString(aj->sumValues, nbuf); - if (GWEN_Buffer_GetUsedBytes(nbuf)<1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); - GWEN_Buffer_free(nbuf); - return GWEN_ERROR_BAD_DATA; - } - - /* store value */ - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, - "value", - GWEN_Buffer_GetStart(nbuf)); - GWEN_Buffer_free(nbuf); - - /* store currency */ - s=AB_Value_GetCurrency(aj->sumValues); - if (!s) - s="EUR"; - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, "currency", s); - } - return 0; -} - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_l.h 2014-01-12 16:56:04.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPADEBITDATEDMULTICREATE_L_H -#define AH_JOBSEPADEBITDATEDMULTICREATE_L_H - - -#include "accountjob_l.h" - - -AH_JOB *AH_Job_SepaDebitDatedMultiCreate_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBSEPADEBITDATEDMULTICREATE_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_p.h 2014-01-14 21:38:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPADEBITDATEDMULTICREATE_P_H -#define AH_JOBSEPADEBITDATEDMULTICREATE_P_H - - -#include "jobsepadebitdatedmulticreate_l.h" -#include -#include - - - -typedef struct AH_JOB_CREATESEPAMULTIDEBIT AH_JOB_CREATESEPAMULTIDEBIT; -struct AH_JOB_CREATESEPAMULTIDEBIT { - char *fiid; - - int sumFieldNeeded; - int singleBookingAllowed; - - AB_VALUE *sumValues; - char *localIban; - -}; -static void GWENHYWFAR_CB AH_Job_SepaDebitDatedMultiCreate_FreeData(void *bp, void *p); - -static int AH_Job_SepaDebitDatedMultiCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_SepaDebitDatedMultiCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); - -static int AH_Job_SepaDebitDatedMultiCreate_Prepare(AH_JOB *j); - - -#endif /* AH_JOBSEPADEBITDATEDMULTICREATE_P_H */ - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.xml 2014-01-17 21:52:05.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedmulticreate.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.c 2014-01-18 13:20:21.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobsepadebitdatedsinglecreate_p.h" -#include "jobtransferbase_l.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "provider_l.h" -#include "hhd_l.h" -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SepaDebitDatedSingleCreate_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - GWEN_DB_NODE *dbArgs; - - j=AH_Job_TransferBase_new("JobSepaDebitDatedSingleCreate", - AB_Transaction_TypeSepaDebitNote, - AB_Transaction_SubTypeStandard, - u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 29); - - /* overwrite some virtual functions */ - AH_Job_SetPrepareFn(j, AH_Job_SepaDebitDatedSingleCreate_Prepare); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaDebitDatedSingleCreate_AddChallengeParams); - - /* overwrite virtual functions of transferBase class */ - AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaDebitDatedSingleCreate_ExchangeParams); - AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaDebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AB_TRANSACTION_LIMITS *lim; - GWEN_DB_NODE *dbParams; - int i, i1, i2; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); - - dbParams=AH_Job_GetParams(j); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbParams, 2); - - /* set some default limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 35); - AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); - - AB_TransactionLimits_SetNeedDate(lim, 1); - - /* set info from BPD */ - i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); - AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); - AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); - - i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); - AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); - AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); - - /* combine into minimum values for older apps */ - i=(i1>i2)?i1:i2; - AB_TransactionLimits_SetMinValueSetupTime(lim, i); - - i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); - AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); - - i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); - AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); - - /* combine into minimum values for older apps */ - i=(i1 - - -static int AH_Job_SepaDebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_SepaDebitDatedSingleCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); -static int AH_Job_SepaDebitDatedSingleCreate_Prepare(AH_JOB *j); - - -#endif /* AH_JOBSEPADEBITDATEDSINGLECREATE_P_H */ - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.xml 2013-12-31 15:49:46.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitdatedsinglecreate.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.c 2014-01-15 21:12:07.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,223 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobsepadebitsingle_p.h" -#include "jobtransferbase_l.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "provider_l.h" -#include "hhd_l.h" -#include -#include -#include -#include - -#include - -#include -#include -#include - - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SepaDebitSingle_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - GWEN_DB_NODE *dbArgs; - - j=AH_Job_TransferBase_new("JobSepaDebitSingle", - AB_Transaction_TypeSepaDebitNote, - AB_Transaction_SubTypeStandard, - u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 17); - - /* overwrite some virtual functions */ - AH_Job_SetPrepareFn(j, AH_Job_SepaDebitSingle_Prepare); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaDebitSingle_AddChallengeParams); - - /* overwrite virtual functions of transferBase class */ - AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaDebitSingle_ExchangeParams); - AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaUndated); - - /* set some known arguments */ - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaDebitSingle_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AB_TRANSACTION_LIMITS *lim; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); - - /* set some default limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 35); - AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); - - AB_TransactionLimits_SetNeedDate(lim, -1); - - AB_Job_SetFieldLimits(bj, lim); - AB_TransactionLimits_free(lim); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaDebitSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { - const AB_TRANSACTION *t; - const char *s; - int tanVer=AH_JOB_TANVER_1_4; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); - - t=AH_Job_GetFirstTransfer(j); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); - return GWEN_ERROR_INVALID; - } - - s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); - if (s && *s && strncasecmp(s, "1.3", 3)==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); - tanVer=AH_JOB_TANVER_1_3; - } - - if (tanVer==AH_JOB_TANVER_1_4) { - int rv; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); - rv=AH_HHD14_AddChallengeParams_17(j, - AB_Transaction_GetValue(t), - AB_Transaction_GetRemoteIban(t)); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); - return GWEN_ERROR_INTERNAL; - } - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaDebitSingle_Prepare(AH_JOB *j) { - GWEN_DB_NODE *dbArgs; - AB_BANKING *ab; - AB_USER *u; - int rv; - const char *profileName=""; - const char *descriptor=""; - const char *s; - AB_TRANSACTION *t; - GWEN_BUFFER *dbuf; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfer"); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - dbArgs=AH_Job_GetArguments(j); - - /* choose from HISPAS */ - /* first check for any descriptor for pain 008.002.02 */ - s=AH_User_FindSepaDescriptor(u, "*008.002.02*"); - if (s) { - profileName="008_002_02"; - descriptor=s; - } - if (!(descriptor && *descriptor)) { - /* look for pain 008.003.02 */ - s=AH_User_FindSepaDescriptor(u, "*008.003.02*"); - if (s) { - profileName="008_003_02"; - descriptor=s; - } - } - if (!(descriptor && *descriptor)) { - /* look for pain 008.001.01 */ - s=AH_User_FindSepaDescriptor(u, "*008.001.01*"); - if (s) { - profileName="008_001_01"; - descriptor=s; - } - } - - /* check for valid descriptor */ - if (!(descriptor && *descriptor)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No SEPA descriptor found, please update your SEPA account information"); - return GWEN_ERROR_GENERIC; - } - DBG_INFO(AQHBCI_LOGDOMAIN, "Using SEPA descriptor %s", descriptor); - - - /* add transactions to ImExporter context */ - t=AH_Job_GetFirstTransfer(j); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - assert(t); /* debug */ - return GWEN_ERROR_INTERNAL; - } - - /* export transfers to SEPA */ - dbuf=GWEN_Buffer_new(0, 256, 0, 1); - rv=AH_Job_TransferBase_SepaExportTransactions(j, profileName, dbuf); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - GWEN_Buffer_free(dbuf); - return rv; - } - - /* store descriptor */ - GWEN_DB_SetCharValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "descriptor", - descriptor); - /* store transfer */ - GWEN_DB_SetBinValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "transfer", - GWEN_Buffer_GetStart(dbuf), - GWEN_Buffer_GetUsedBytes(dbuf)); - GWEN_Buffer_free(dbuf); - - return 0; -} - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_l.h 2013-12-31 16:48:07.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPADEBITSINGLE_L_H -#define AH_JOBSEPADEBITSINGLE_L_H - - -#include "accountjob_l.h" - - -AH_JOB *AH_Job_SepaDebitSingle_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBSEPADEBITSINGLE_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_p.h 2014-01-14 21:39:52.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPADEBITSINGLE_P_H -#define AH_JOBSEPADEBITSINGLE_P_H - - -#include "jobsepadebitsingle_l.h" - -#include - - -static int AH_Job_SepaDebitSingle_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_SepaDebitSingle_Prepare(AH_JOB *j); -static int AH_Job_SepaDebitSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); - - -#endif /* AH_JOBSEPADEBITSINGLE_P_H */ - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.xml 2014-01-15 21:04:27.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepadebitsingle.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.c 2014-02-03 20:41:34.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,432 +0,0 @@ -/*************************************************************************** - begin : Wed Jan 15 2014 - copyright : (C) 2014 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobsepastandingordercreate_p.h" -#include "jobtransferbase_l.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "provider_l.h" -#include "hhd_l.h" -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - - - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SepaStandingOrderCreate_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_TransferBase_new("JobSepaStandingOrderCreate", - AB_Transaction_TypeSepaTransfer, - AB_Transaction_SubTypeStandingOrder, - u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 35); - - /* overwrite some virtual functions */ - AH_Job_SetPrepareFn(j, AH_Job_SepaStandingOrderCreate_Prepare); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaStandingOrderCreate_AddChallengeParams); - - /* overwrite virtual functions of transferBase class */ - AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaStandingOrderCreate_ExchangeParams); - AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_SepaStandingOrderCreate_ExchangeArgs); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaStandingOrderCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AB_TRANSACTION_LIMITS *lim; - GWEN_DB_NODE *dbParams; - const char *s; - int i; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); - - dbParams=AH_Job_GetParams(j); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbParams, 2); - - /* set some default limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 35); - AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 70); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); - - /* get specific limits for creation of standing orders */ - s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusMonths", 0, 0); - if (s && *s) { - AB_TransactionLimits_SetAllowMonthly(lim, 1); - while(*s) { - char buf[3]; - const char *x; - - buf[2]=0; - strncpy(buf, s, 2); - x=buf; - if (*x=='0') - x++; - - AB_TransactionLimits_AddValuesCycleMonth(lim, x, 0); - s+=2; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleMonth(lim), - 1, GWEN_StringList_SortModeInt); - } - else - AB_TransactionLimits_SetAllowMonthly(lim, -1); - - s=GWEN_DB_GetCharValue(dbParams, "AllowedMonthDays", 0, 0); - if (s && *s) { - while(*s) { - char buf[3]; - const char *x; - - buf[2]=0; - strncpy(buf, s, 2); - x=buf; - if (*x=='0') - x++; - AB_TransactionLimits_AddValuesExecutionDayMonth(lim, x, 0); - s+=2; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayMonth(lim), - 1, GWEN_StringList_SortModeInt); - } - - s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusWeeks", 0, 0); - if (s && *s) { - AB_TransactionLimits_SetAllowWeekly(lim, 1); - while(*s) { - char buf[3]; - const char *x; - - buf[2]=0; - strncpy(buf, s, 2); - x=buf; - if (*x=='0') - x++; - AB_TransactionLimits_AddValuesCycleWeek(lim, x, 0); - s+=2; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleWeek(lim), - 1, GWEN_StringList_SortModeInt); - } - else - AB_TransactionLimits_SetAllowWeekly(lim, -1); - - s=GWEN_DB_GetCharValue(dbParams, "AllowedWeekDays", 0, 0); - if (s && *s) { - while(*s) { - char buf[2]; - const char *x; - - buf[0]=*s; - buf[1]=0; - x=buf; - if (*x=='0') - x++; - AB_TransactionLimits_AddValuesExecutionDayWeek(lim, x, 0); - s++; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayWeek(lim), - 1, GWEN_StringList_SortModeInt); - } - - i=GWEN_DB_GetIntValue(dbParams, "minDelay", 0, 0); - AB_TransactionLimits_SetMinValueSetupTime(lim, i); - - i=GWEN_DB_GetIntValue(dbParams, "maxDelay", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTime(lim, i); - - - AB_Job_SetFieldLimits(bj, lim); - AB_TransactionLimits_free(lim); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaStandingOrderCreate_ExchangeArgs(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { - const AB_TRANSACTION_LIMITS *lim=NULL; - AB_BANKING *ab; - const AB_TRANSACTION *t=NULL; - AB_TRANSACTION *tCopy=NULL; - int rv; - AB_USER *u; - uint32_t uflags; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - uflags=AH_User_GetFlags(u); - - /* get limits and transaction */ - lim=AB_Job_GetFieldLimits(bj); - t=AB_Job_GetTransaction(bj); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - return GWEN_ERROR_INVALID; - } - - /* DISABLED according to a discussion on aqbanking-user: - * The application should do this, not the library. - AB_Transaction_FillLocalFromAccount(t, a); */ - - /* validate transaction */ - rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckRecurrenceAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckFirstExecutionDateAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - - tCopy=AB_Transaction_dup(t); - - /* set group id so the application can now which transfers went together in one setting */ - AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); - - /* store validated transaction in job */ - AB_Job_SetTransaction(bj, tCopy); - - /* store copy of transaction for later */ - AH_Job_AddTransfer(j, tCopy); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaStandingOrderCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { - const AB_TRANSACTION *t; - const char *s; - int tanVer=AH_JOB_TANVER_1_4; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); - - t=AH_Job_GetFirstTransfer(j); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); - return GWEN_ERROR_INVALID; - } - - s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); - if (s && *s && strncasecmp(s, "1.3", 3)==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); - tanVer=AH_JOB_TANVER_1_3; - } - - if (tanVer==AH_JOB_TANVER_1_4) { - int rv; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); - rv=AH_HHD14_AddChallengeParams_35(j, - AB_Transaction_GetValue(t), - AB_Transaction_GetRemoteIban(t)); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); - return GWEN_ERROR_INTERNAL; - } - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaStandingOrderCreate_Prepare(AH_JOB *j) { - GWEN_DB_NODE *dbArgs; - AB_BANKING *ab; - AB_USER *u; - int rv; - const char *profileName=""; - const char *descriptor=""; - const GWEN_TIME *ti; - const char *s; - AB_TRANSACTION *t; - GWEN_BUFFER *dbuf; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfer"); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - dbArgs=AH_Job_GetArguments(j); - - /* choose from HISPAS */ - /* first check for any descriptor for pain 001.002.03 */ - s=AH_User_FindSepaDescriptor(u, "*001.002.03*"); - if (s) { - profileName="001_002_03"; - descriptor=s; - } - else { - /* look for pain 001.001.02 */ - s=AH_User_FindSepaDescriptor(u, "*001.001.02*"); - if (s) { - profileName="ccm"; - descriptor=s; - } - } - - /* check for valid descriptor */ - if (!(descriptor && *descriptor)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No SEPA descriptor found, please update your SEPA account information"); - return GWEN_ERROR_GENERIC; - } - DBG_INFO(AQHBCI_LOGDOMAIN, "Using SEPA descriptor %s", descriptor); - - - /* add transactions to ImExporter context */ - t=AH_Job_GetFirstTransfer(j); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - assert(t); /* debug */ - return GWEN_ERROR_INTERNAL; - } - - /* export transfers to SEPA */ - dbuf=GWEN_Buffer_new(0, 256, 0, 1); - rv=AH_Job_TransferBase_SepaExportTransactions(j, profileName, dbuf); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - GWEN_Buffer_free(dbuf); - return rv; - } - - /* store descriptor */ - GWEN_DB_SetCharValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "descriptor", - descriptor); - /* store transfer */ - GWEN_DB_SetBinValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "transfer", - GWEN_Buffer_GetStart(dbuf), - GWEN_Buffer_GetUsedBytes(dbuf)); - GWEN_Buffer_free(dbuf); - - /* first execution date */ - ti=AB_Transaction_GetFirstExecutionDate(t); - if (ti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Time_toString(ti, "YYYYMMDD", tbuf); - GWEN_DB_SetCharValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "details/xfirstExecutionDate", - GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Missing first execution date."); - } - - /* period */ - switch(AB_Transaction_GetPeriod(t)) { - case AB_Transaction_PeriodMonthly: s="M"; break; - case AB_Transaction_PeriodWeekly: s="W"; break; - default: - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unsupported period %d", - AB_Transaction_GetPeriod(t)); - return GWEN_ERROR_INVALID; - } - GWEN_DB_SetCharValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "details/xperiod", - s); - - /* cycle */ - GWEN_DB_SetIntValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "details/cycle", - AB_Transaction_GetCycle(t)); - - /* execution day */ - GWEN_DB_SetIntValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "details/executionDay", - AB_Transaction_GetExecutionDay(t)); - - return 0; -} - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_l.h 2014-01-15 20:51:29.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/*************************************************************************** - begin : Wed Jan 15 2014 - copyright : (C) 2014 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPASTANDINGORDERCREATE_L_H -#define AH_JOBSEPASTANDINGORDERCREATE_L_H - - -#include "accountjob_l.h" - - -AH_JOB *AH_Job_SepaStandingOrderCreate_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBSEPASTANDINGORDERCREATE_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_p.h 2014-01-15 20:59:43.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -/*************************************************************************** - begin : Wed Jan 15 2014 - copyright : (C) 2014 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPASTANDINGORDERCREATE_P_H -#define AH_JOBSEPASTANDINGORDERCREATE_P_H - - -#include "jobsepastandingordercreate_l.h" - -#include - - -static int AH_Job_SepaStandingOrderCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_SepaStandingOrderCreate_ExchangeArgs(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_SepaStandingOrderCreate_Prepare(AH_JOB *j); -static int AH_Job_SepaStandingOrderCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); - - -#endif /* AH_JOBSEPASTANDINGORDERCREATE_P_H */ - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.xml 2014-01-19 17:03:57.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingordercreate.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingorderget.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingorderget.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingorderget.xml 2014-01-17 21:55:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepastandingorderget.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - %code - %version - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.c 2014-01-15 21:12:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobsepaxfersingle_p.h" -#include "jobtransferbase_l.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "provider_l.h" -#include "hhd_l.h" -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - - - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SepaTransferSingle_new(AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_TransferBase_new("JobSepaTransferSingle", - AB_Transaction_TypeSepaTransfer, - AB_Transaction_SubTypeStandard, - u, account); - if (!j) - return 0; - - AH_Job_SetChallengeClass(j, 9); - - /* overwrite some virtual functions */ - AH_Job_SetPrepareFn(j, AH_Job_SepaTransferSingle_Prepare); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaTransferSingle_AddChallengeParams); - - /* overwrite virtual functions of transferBase class */ - AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaTransferSingle_ExchangeParams); - AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaUndated); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaTransferSingle_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx) { - AB_TRANSACTION_LIMITS *lim; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); - - /* set some default limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 35); - AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 70); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); - - AB_TransactionLimits_SetNeedDate(lim, -1); - - AB_Job_SetFieldLimits(bj, lim); - AB_TransactionLimits_free(lim); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaTransferSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { - const AB_TRANSACTION *t; - const char *s; - int tanVer=AH_JOB_TANVER_1_4; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); - - t=AH_Job_GetFirstTransfer(j); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); - return GWEN_ERROR_INVALID; - } - - s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); - if (s && *s && strncasecmp(s, "1.3", 3)==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); - tanVer=AH_JOB_TANVER_1_3; - } - - if (tanVer==AH_JOB_TANVER_1_4) { - int rv; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); - rv=AH_HHD14_AddChallengeParams_09(j, - AB_Transaction_GetValue(t), - AB_Transaction_GetRemoteIban(t)); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); - return GWEN_ERROR_INTERNAL; - } - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaTransferSingle_Prepare(AH_JOB *j) { - GWEN_DB_NODE *dbArgs; - AB_BANKING *ab; - AB_USER *u; - int rv; - const char *profileName=""; - const char *descriptor=""; - const char *s; - AB_TRANSACTION *t; - GWEN_BUFFER *dbuf; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfer"); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - dbArgs=AH_Job_GetArguments(j); - - /* choose from HISPAS */ - /* first check for any descriptor for pain 001.002.03 */ - s=AH_User_FindSepaDescriptor(u, "*001.002.03*"); - if (s) { - profileName="001_002_03"; - descriptor=s; - } - else { - /* look for pain 001.001.02 */ - s=AH_User_FindSepaDescriptor(u, "*001.001.02*"); - if (s) { - profileName="ccm"; - descriptor=s; - } - } - - /* check for valid descriptor */ - if (!(descriptor && *descriptor)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No SEPA descriptor found, please update your SEPA account information"); - return GWEN_ERROR_GENERIC; - } - DBG_INFO(AQHBCI_LOGDOMAIN, "Using SEPA descriptor %s", descriptor); - - - /* add transactions to ImExporter context */ - t=AH_Job_GetFirstTransfer(j); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - assert(t); /* debug */ - return GWEN_ERROR_INTERNAL; - } - - /* export transfers to SEPA */ - dbuf=GWEN_Buffer_new(0, 256, 0, 1); - rv=AH_Job_TransferBase_SepaExportTransactions(j, profileName, dbuf); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - GWEN_Buffer_free(dbuf); - return rv; - } - - /* store descriptor */ - GWEN_DB_SetCharValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "descriptor", - descriptor); - /* store transfer */ - GWEN_DB_SetBinValue(dbArgs, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "transfer", - GWEN_Buffer_GetStart(dbuf), - GWEN_Buffer_GetUsedBytes(dbuf)); - GWEN_Buffer_free(dbuf); - - return 0; -} - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_l.h 2013-12-31 16:02:43.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPAXFERSINGLE_L_H -#define AH_JOBSEPAXFERSINGLE_L_H - - -#include "accountjob_l.h" - - -AH_JOB *AH_Job_SepaTransferSingle_new(AB_USER *u, AB_ACCOUNT *account); - - -#endif /* AH_JOBSEPAXFERSINGLE_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_p.h 2014-01-14 21:38:49.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPAXFERSINGLE_P_H -#define AH_JOBSEPAXFERSINGLE_P_H - - -#include "jobsepaxfersingle_l.h" - -#include - - -static int AH_Job_SepaTransferSingle_ExchangeParams(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_SepaTransferSingle_Prepare(AH_JOB *j); -static int AH_Job_SepaTransferSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); - - -#endif /* AH_JOBSEPAXFERSINGLE_P_H */ - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.xml 2013-12-31 16:00:07.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsepaxfersingle.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingledebitnote.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingledebitnote.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingledebitnote.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingledebitnote.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,208 +0,0 @@ - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1869 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2011 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobsingletransfer_p.h" -#include "job_l.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - - -GWEN_INHERIT(AH_JOB, AH_JOB_SINGLETRANSFER); - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SingleTransfer_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, AB_Job_TypeTransfer); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SingleDebitNote_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, AB_Job_TypeDebitNote); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_CreateStandingOrder_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, - AB_Job_TypeCreateStandingOrder); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_ModifyStandingOrder_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, - AB_Job_TypeModifyStandingOrder); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_DeleteStandingOrder_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, - AB_Job_TypeDeleteStandingOrder); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_CreateDatedTransfer_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, - AB_Job_TypeCreateDatedTransfer); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_ModifyDatedTransfer_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, - AB_Job_TypeModifyDatedTransfer); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_DeleteDatedTransfer_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, - AB_Job_TypeDeleteDatedTransfer); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_InternalTransfer_new(AB_USER *u, - AB_ACCOUNT *account) { - AH_JOB *j; - - j=AH_Job_SingleTransferBase_new(u, account, - AB_Job_TypeInternalTransfer); - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_SingleTransferBase_new(AB_USER *u, - AB_ACCOUNT *account, - AB_JOB_TYPE jobType) { - AH_JOB *j; - AH_JOB_SINGLETRANSFER *aj; - - switch(jobType) { - case AB_Job_TypeTransfer: - j=AH_AccountJob_new("JobSingleTransfer", u, account); - break; - case AB_Job_TypeDebitNote: - j=AH_AccountJob_new("JobSingleDebitNote", u, account); - break; - case AB_Job_TypeCreateStandingOrder: - j=AH_AccountJob_new("JobCreateStandingOrder", u, account); - break; - case AB_Job_TypeModifyStandingOrder: - j=AH_AccountJob_new("JobModifyStandingOrder", u, account); - break; - case AB_Job_TypeDeleteStandingOrder: - j=AH_AccountJob_new("JobDeleteStandingOrder", u, account); - break; - case AB_Job_TypeCreateDatedTransfer: - j=AH_AccountJob_new("JobCreateDatedTransfer", u, account); - break; - case AB_Job_TypeModifyDatedTransfer: - j=AH_AccountJob_new("JobModifyDatedTransfer", u, account); - break; - case AB_Job_TypeDeleteDatedTransfer: - j=AH_AccountJob_new("JobDeleteDatedTransfer", u, account); - break; - case AB_Job_TypeInternalTransfer: - j=AH_AccountJob_new("JobInternalTransfer", u, account); - break; - default: - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unknown job type %d", jobType); - j=0; - } - - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_SINGLETRANSFER, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j, aj, - AH_Job_SingleTransfer_FreeData); - aj->jobType=jobType; - /* overwrite some virtual functions */ - AH_Job_SetProcessFn(j, AH_Job_SingleTransfer_Process); - AH_Job_SetExchangeFn(j, AH_Job_SingleTransfer_Exchange); - AH_Job_SetAddChallengeParamsFn(j, AH_Job_SingleTransfer_AddChallengeParams); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_SingleTransfer_FreeData(void *bp, void *p){ - AH_JOB_SINGLETRANSFER *aj; - - aj=(AH_JOB_SINGLETRANSFER*)p; - free(aj->fiid); - free(aj->oldFiid); - - AB_Transaction_free(aj->validatedTransaction); - - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -const char *AH_Job_SingleTransfer_GetFiid(AH_JOB *j) { - AH_JOB_SINGLETRANSFER *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); - assert(aj); - - return aj->fiid; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -const char *AH_Job_SingleTransfer_GetOldFiid(AH_JOB *j) { - AH_JOB_SINGLETRANSFER *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); - assert(aj); - - return aj->oldFiid; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SingleTransfer_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_SINGLETRANSFER *aj; - GWEN_DB_NODE *dbResponses; - GWEN_DB_NODE *dbCurr; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); - assert(aj); - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing %s", - AB_Job_Type2Char(aj->jobType)); - dbResponses=AH_Job_GetResponses(j); - assert(dbResponses); - - switch(aj->jobType) { - case AB_Job_TypeTransfer: - case AB_Job_TypeDebitNote: - case AB_Job_TypeDeleteStandingOrder: - case AB_Job_TypeDeleteDatedTransfer: - case AB_Job_TypeInternalTransfer: - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - int rv; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - break; - - case AB_Job_TypeCreateStandingOrder: - /* search for "CreateStandingOrderResponse" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - int rv; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/CreateStandingOrderResponse"); - if (dbXA) { - const char *s; - - s=GWEN_DB_GetCharValue(dbXA, "referenceId", 0, 0); - if (s) { - free(aj->fiid); - aj->fiid=strdup(s); - } - } /* if "standingOrderResponse" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - break; - - case AB_Job_TypeModifyStandingOrder: - /* search for "ModifyStandingOrderResponse" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - int rv; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/ModifyStandingOrderResponse"); - if (dbXA) { - const char *s; - - s=GWEN_DB_GetCharValue(dbXA, "referenceIdOld", 0, 0); - if (s) { - free(aj->oldFiid); - aj->oldFiid=strdup(s); - } - s=GWEN_DB_GetCharValue(dbXA, "referenceIdNew", 0, 0); - if (s) { - free(aj->fiid); - aj->fiid=strdup(s); - } - } /* if "standingOrderResponse" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - break; - - case AB_Job_TypeCreateDatedTransfer: - /* search for "CreateDatedTransferResponse" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - int rv; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/CreateDatedTransferResponse"); - if (dbXA) { - const char *s; - - s=GWEN_DB_GetCharValue(dbXA, "referenceId", 0, 0); - if (s) { - free(aj->fiid); - aj->fiid=strdup(s); - } - } /* if "standingOrderResponse" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - break; - - case AB_Job_TypeModifyDatedTransfer: - /* search for "ModifyDatedTransferResponse" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - GWEN_DB_NODE *dbXA; - int rv; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, - "data/ModifyDatedTransferResponse"); - if (dbXA) { - const char *s; - - s=GWEN_DB_GetCharValue(dbXA, "referenceIdOld", 0, 0); - if (s) { - free(aj->oldFiid); - aj->oldFiid=strdup(s); - } - s=GWEN_DB_GetCharValue(dbXA, "referenceIdNew", 0, 0); - if (s) { - free(aj->fiid); - aj->fiid=strdup(s); - } - } /* if "standingOrderResponse" */ - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - break; - - default: - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Unhandled job type %d", aj->jobType); - return -1; - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SingleTransfer__ValidateTransfer(AB_JOB *bj, - AH_JOB *mj, - AB_TRANSACTION *t) { - const GWEN_STRINGLIST *sl; - int maxn; - int maxs; - int n; - const char *s; - AH_JOB_SINGLETRANSFER *aj; - const AB_TRANSACTION_LIMITS *lim; - - assert(mj); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, mj); - assert(aj); - - lim=AB_Job_GetFieldLimits(bj); - - /* check purpose */ - if (lim) { - maxn=AB_TransactionLimits_GetMaxLinesPurpose(lim); - maxs=AB_TransactionLimits_GetMaxLenPurpose(lim); - } - else { - DBG_INFO(AQHBCI_LOGDOMAIN, "No transaction limits"); - maxn=0; - maxs=0; - } - sl=AB_Transaction_GetPurpose(t); - n=0; - if (sl) { - GWEN_STRINGLISTENTRY *se; - GWEN_STRINGLIST *nsl; - const char *p; - - nsl=GWEN_StringList_new(); - se=GWEN_StringList_FirstEntry(sl); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p && *p) { - char *np; - int l; - GWEN_BUFFER *tbuf; - - n++; - if (maxn && n>maxn) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many purpose lines (%d>%d)", n, maxn); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Too many purpose lines (%d>%d)"), - n, maxn); - GWEN_StringList_free(nsl); - return GWEN_ERROR_INVALID; - } - tbuf=GWEN_Buffer_new(0, maxs, 0, 1); - AB_ImExporter_Utf8ToDta(p, -1, tbuf); - GWEN_Text_CondenseBuffer(tbuf); - l=GWEN_Buffer_GetUsedBytes(tbuf); - if (maxs && l>maxs) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many chars in purpose line %d (%d>%d)", n, l, maxs); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Too many chars in purpose line %d (%d>%d)"), - n, l, maxs); - GWEN_StringList_free(nsl); - GWEN_Buffer_free(tbuf); - return GWEN_ERROR_INVALID; - } - np=(char*)malloc(l+1); - memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); - GWEN_Buffer_free(tbuf); - /* let string list take the newly alllocated string */ - GWEN_StringList_AppendString(nsl, np, 1, 0); - } - se=GWEN_StringListEntry_Next(se); - } /* while */ - AB_Transaction_SetPurpose(t, nsl); - GWEN_StringList_free(nsl); - } - if (!n) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No purpose lines"); - return GWEN_ERROR_INVALID; - } - - /* check remote name */ - if (lim) { - maxn=AB_TransactionLimits_GetMaxLinesRemoteName(lim); - maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); - } - else { - maxn=0; - maxs=0; - } - sl=AB_Transaction_GetRemoteName(t); - n=0; - if (sl) { - GWEN_STRINGLISTENTRY *se; - GWEN_STRINGLIST *nsl; - const char *p; - - nsl=GWEN_StringList_new(); - se=GWEN_StringList_FirstEntry(sl); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p && *p) { - char *np; - int l; - GWEN_BUFFER *tbuf; - - n++; - if (maxn && n>maxn) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many remote name lines (%d>%d)", - n, maxn); - GWEN_StringList_free(nsl); - return GWEN_ERROR_INVALID; - } - tbuf=GWEN_Buffer_new(0, maxs, 0, 1); - AB_ImExporter_Utf8ToDta(p, -1, tbuf); - GWEN_Text_CondenseBuffer(tbuf); - l=GWEN_Buffer_GetUsedBytes(tbuf); - if (l>maxs) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Too many chars in remote name line %d (%d>%d)", - n, l, maxs); - GWEN_StringList_free(nsl); - GWEN_Buffer_free(tbuf); - return GWEN_ERROR_INVALID; - } - np=(char*)malloc(l+1); - memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); - GWEN_Buffer_free(tbuf); - /* let string list take the newly alllocated string */ - GWEN_StringList_AppendString(nsl, np, 1, 0); - } - se=GWEN_StringListEntry_Next(se); - } /* while */ - AB_Transaction_SetRemoteName(t, nsl); - GWEN_StringList_free(nsl); - } - if (!n) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No remote name lines"); - return GWEN_ERROR_INVALID; - } - - /* check local name */ - s=AB_Transaction_GetLocalName(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_NOTICE(AQHBCI_LOGDOMAIN, - "No local name, filling in"); - a=AB_Job_GetAccount(bj); - assert(a); - s=AB_Account_GetOwnerName(a); - if (!s) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "No owner name in account, giving up"); - return GWEN_ERROR_INVALID; - } - AB_Transaction_SetLocalName(t, s); - } - - /* check local bank code */ - s=AB_Transaction_GetLocalBankCode(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local bank code, filling in"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetBankCode(a); - assert(s); - AB_Transaction_SetLocalBankCode(t, s); - } - - /* check local account number */ - s=AB_Transaction_GetLocalAccountNumber(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_WARN(AQHBCI_LOGDOMAIN, - "No local account number, filling in"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetAccountNumber(a); - assert(s); - AB_Transaction_SetLocalAccountNumber(t, s); - } - - /* check local account suffix */ - s=AB_Transaction_GetLocalSuffix(t); - if (!s) { - AB_ACCOUNT *a; - - DBG_INFO(AQHBCI_LOGDOMAIN, - "No local suffix, filling in (if possible)"); - a=AH_AccountJob_GetAccount(mj); - assert(a); - s=AB_Account_GetSubAccountId(a); - if (s && *s) - AB_Transaction_SetLocalSuffix(t, s); - } - - /* check text key */ - if (lim) { - if (GWEN_StringList_Count(AB_TransactionLimits_GetValuesTextKey(lim))){ - char numbuf[32]; - - n=AB_Transaction_GetTextKey(t); - if (n==0) { - switch(aj->jobType) { - case AB_Job_TypeDebitNote: - n=5; /* "Lastschrift" */ - break; - case AB_Job_TypeTransfer: - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - case AB_Job_TypeDeleteStandingOrder: - case AB_Job_TypeInternalTransfer: - default: - n=51; /* "Ueberweisung" */ - break; - } - AB_Transaction_SetTextKey(t, n); - } - - snprintf(numbuf, sizeof(numbuf), "%d", n); - if (!AB_TransactionLimits_HasValuesTextKey(lim, numbuf)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Text key \"%s\" not supported by bank", - numbuf); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Text key \"%d\" not supported by the bank"), - n); - return GWEN_ERROR_INVALID; - } - } - } - - if (lim) { - const GWEN_TIME *ti; - - switch(aj->jobType) { - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - case AB_Job_TypeDeleteStandingOrder: - /* additional checks for standing orders */ - - /* check period */ - if (AB_Transaction_GetPeriod(t)==AB_Transaction_PeriodMonthly) { - const GWEN_STRINGLIST *sl; - - /* check cycle */ - sl=AB_TransactionLimits_GetValuesCycleMonth(lim); - if (GWEN_StringList_Count(sl)){ - char numbuf[32]; - - n=AB_Transaction_GetCycle(t); - if (n==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "No cycle given"); - return GWEN_ERROR_INVALID; - } - - snprintf(numbuf, sizeof(numbuf), "%d", n); - if (!AB_TransactionLimits_HasValuesCycleMonth(lim, numbuf) && - !AB_TransactionLimits_HasValuesCycleMonth(lim, "0")) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Month day \"%s\" not supported by bank", - numbuf); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Month day \"%d\" not supported by bank"), - n); - return GWEN_ERROR_INVALID; - } - } - - /* check execution day */ - sl=AB_TransactionLimits_GetValuesExecutionDayMonth(lim); - if (GWEN_StringList_Count(sl)){ - char numbuf[32]; - - n=AB_Transaction_GetExecutionDay(t); - if (n==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "No execution day given"); - return GWEN_ERROR_INVALID; - } - - snprintf(numbuf, sizeof(numbuf), "%d", n); - if (!AB_TransactionLimits_HasValuesExecutionDayMonth(lim, numbuf) && - !AB_TransactionLimits_HasValuesExecutionDayMonth(lim, "0")) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Execution month day \"%s\" not supported by bank", - numbuf); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Execution month day \"%d\" not supported by bank"), - n); - return GWEN_ERROR_INVALID; - } - } /* if there are limits */ - } - else if (AB_Transaction_GetPeriod(t)==AB_Transaction_PeriodWeekly) { - const GWEN_STRINGLIST *sl; - - /* check cycle */ - sl=AB_TransactionLimits_GetValuesCycleWeek(lim); - if (GWEN_StringList_Count(sl)) { - char numbuf[32]; - - n=AB_Transaction_GetCycle(t); - if (n==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "No cycle given"); - return GWEN_ERROR_INVALID; - } - - snprintf(numbuf, sizeof(numbuf), "%d", n); - if (!AB_TransactionLimits_HasValuesCycleWeek(lim, numbuf) && - !AB_TransactionLimits_HasValuesCycleWeek(lim, "0")) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Week day \"%s\" not supported by bank", - numbuf); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Week day \"%d\" not supported by bank"), - n); - return GWEN_ERROR_INVALID; - } - } /* if there are limits */ - - /* check execution day */ - sl=AB_TransactionLimits_GetValuesExecutionDayWeek(lim); - if (GWEN_StringList_Count(sl)){ - char numbuf[32]; - - n=AB_Transaction_GetExecutionDay(t); - if (n==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "No execution day given"); - return GWEN_ERROR_INVALID; - } - - snprintf(numbuf, sizeof(numbuf), "%d", n); - if (!AB_TransactionLimits_HasValuesExecutionDayWeek(lim, numbuf) && - !AB_TransactionLimits_HasValuesExecutionDayWeek(lim, "0")) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Execution month day \"%s\" not supported by bank", - numbuf); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Execution month day \"%d\" not supported by bank"), - n); - return GWEN_ERROR_INVALID; - } - } /* if there are limits */ - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Unsupported period %d", AB_Transaction_GetPeriod(t)); - return GWEN_ERROR_INVALID; - } - - /* check setup times */ - ti=AB_Transaction_GetFirstExecutionDate(t); - if (ti && aj->jobType==AB_Job_TypeCreateStandingOrder) { - GWEN_TIME *currDate; - int dt; - - currDate=GWEN_CurrentTime(); - assert(currDate); - dt=((int)GWEN_Time_DiffSeconds(ti, currDate))/(60*60*24); - GWEN_Time_free(currDate); - - - /* check minimum setup time */ - n=AB_TransactionLimits_GetMinValueSetupTime(lim); - if (n && dtn) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Maximum setup time violated"); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Maximum setup time violated. " - "Dated transactions need to be at most %d days away"), - n); - return GWEN_ERROR_INVALID; - } - } - break; - - case AB_Job_TypeCreateDatedTransfer: - case AB_Job_TypeModifyDatedTransfer: - /* check setup times */ - ti=AB_Transaction_GetDate(t); - if (ti) { - GWEN_TIME *currDate; - int dt; - - currDate=GWEN_CurrentTime(); - assert(currDate); - dt=((int)GWEN_Time_DiffSeconds(ti, currDate))/(60*60*24); - GWEN_Time_free(currDate); - - /* check minimum setup time */ - n=AB_TransactionLimits_GetMinValueSetupTime(lim); - if (n && dtn) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Maximum setup time violated"); - GWEN_Gui_ProgressLog2(0, - GWEN_LoggerLevel_Error, - I18N("Maximum setup time violated. " - "Dated transactions need to be at most %d days away"), - n); - return GWEN_ERROR_INVALID; - } - } - break; - - case AB_Job_TypeDeleteDatedTransfer: - break; - - /* --------------- add more jobs here ---------------------- */ - - default: - break; - } /* switch */ - } - return 0; -} - - - -int AH_Job_SingleTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { - AH_JOB_SINGLETRANSFER *aj; - const AB_TRANSACTION *t; - const char *s; - int tanVer=AH_JOB_TANVER_1_4; - - DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); - assert(aj); - - t=aj->validatedTransaction; - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); - return GWEN_ERROR_INVALID; - } - - s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); - if (s && *s && strncasecmp(s, "1.3", 3)==0) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); - tanVer=AH_JOB_TANVER_1_3; - } - - if (tanVer==AH_JOB_TANVER_1_4) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); - - switch(aj->jobType) { - case AB_Job_TypeTransfer: - case AB_Job_TypeDebitNote: - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - case AB_Job_TypeDeleteStandingOrder: - { - const char *s; - const AB_VALUE *v; - - /* select challenge class (why the heck doesn't the bank derive this from the job??) */ - switch(aj->jobType) { - case AB_Job_TypeTransfer: - AH_Job_SetChallengeClass(j, 4); - break; - case AB_Job_TypeDebitNote: - AH_Job_SetChallengeClass(j, 15); - break; - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - case AB_Job_TypeDeleteStandingOrder: - AH_Job_SetChallengeClass(j, 34); - break; - default: - /* TSNH */ - break; - } - - /* P1: Betrag */ - v=AB_Transaction_GetValue(t); - if (v) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AH_Job_ValueToChallengeString(v, tbuf); - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - - /* P2: BLZ Zahler/Empfaenger */ - s=AB_Transaction_GetRemoteBankCode(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P3: Konto Zahler/Empfaenger */ - s=AB_Transaction_GetRemoteAccountNumber(t); - if (s && *s) { - int i; - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - GWEN_Buffer_AppendString(tbuf, s); - i=10-strlen(s); - if (i>0) { - /* need to left-fill the account number with leading zeroes - * to a length of exactly 10 digits */ - GWEN_Buffer_Rewind(tbuf); - GWEN_Buffer_FillLeftWithBytes(tbuf, '0', i); - } - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No account number"); - return GWEN_ERROR_INVALID; - } - -#if 0 /* don't provide more info than needed, more data=more trouble sources */ - /* P4: BLZ Absender (O) */ - s=AB_Transaction_GetLocalBankCode(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P5: Konto Absender (O) */ - s=AB_Transaction_GetLocalAccountNumber(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - if (aj->jobType==AB_Job_TypeTransfer) { - /* P6: Name Absender (O) */ - s=AB_Transaction_GetLocalName(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - } -#endif - - } - break; - - case AB_Job_TypeCreateDatedTransfer: - case AB_Job_TypeModifyDatedTransfer: - case AB_Job_TypeDeleteDatedTransfer: - { - const char *s; - const AB_VALUE *v; - const GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - - /* P1: Betrag */ - v=AB_Transaction_GetValue(t); - assert(v); - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(v, tbuf, 2, 0); /* TODO: currency needed?? */ - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - /* P2: BLZ Empfaenger */ - s=AB_Transaction_GetRemoteBankCode(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P3: Konto Empfaenger */ - s=AB_Transaction_GetRemoteAccountNumber(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P4: Termin (M) */ - ti=AB_Transaction_GetDate(t); - assert(ti); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - GWEN_Time_toString(ti, "YYYYMMDD", tbuf); - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - /* P5: BLZ Absender (O) */ - s=AB_Transaction_GetLocalBankCode(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P6: Konto Absender (O) */ - s=AB_Transaction_GetLocalAccountNumber(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P7: Name Absender (O) */ - s=AB_Transaction_GetLocalName(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - } - break; - - case AB_Job_TypeInternalTransfer: - { - const char *s; - const AB_VALUE *v; - GWEN_BUFFER *tbuf; - - AH_Job_SetChallengeClass(j, 5); - - /* P1: Betrag */ - v=AB_Transaction_GetValue(t); - assert(v); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(v, tbuf, 2, 0); /* TODO: currency needed?? */ - AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - /* P2: Konto Empfaenger */ - s=AB_Transaction_GetRemoteAccountNumber(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P3: Konto Absender (O) */ - s=AB_Transaction_GetLocalAccountNumber(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - - /* P4: Name Empfaenger (O) (we use the local name here instead, but it is the same as the remote name) */ - s=AB_Transaction_GetLocalName(t); - assert(s && *s); - AH_Job_AddChallengeParam(j, s); - } - break; - - default: - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Unhandled job type %d", aj->jobType); - return GWEN_ERROR_INVALID; - } /* switch */ - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); - return GWEN_ERROR_INTERNAL; - } - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SingleTransfer_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_SINGLETRANSFER *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); - assert(aj); - - if (aj->jobType!=AB_Job_GetType(bj)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Different job types"); - return GWEN_ERROR_INVALID; - } - - switch(m) { - case AH_Job_ExchangeModeParams: { - GWEN_DB_NODE *dbParams; - GWEN_DB_NODE *dbTk; - AB_TRANSACTION_LIMITS *lim; - const char *s; - int i; - - dbParams=AH_Job_GetParams(j); - DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); - if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) - GWEN_DB_Dump(dbParams, 2); - - /* read limits */ - lim=AB_TransactionLimits_new(); - AB_TransactionLimits_SetMaxLenPurpose(lim, 27); - AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); - AB_TransactionLimits_SetMaxLinesRemoteName(lim, 2); - - AB_TransactionLimits_SetNeedDate(lim, -1); - - i=GWEN_DB_GetIntValue(dbParams, "maxpurposeLines", 0, 0); - AB_TransactionLimits_SetMaxLinesPurpose(lim, i); - - /* read text keys */ - dbTk=GWEN_DB_GetGroup(dbParams, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "textkey"); - if (dbTk) { - for (i=0; ; i++) { - int k; - char numbuf[16]; - - k=GWEN_DB_GetIntValue(dbTk, "key", i, -1); - if (k==-1) - break; - snprintf(numbuf, sizeof(numbuf), "%d", k); - AB_TransactionLimits_AddValuesTextKey(lim, numbuf, 0); - } - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesTextKey(lim), - 1, GWEN_StringList_SortModeInt); - } - - /* some special limits for standing order jobs */ - switch(aj->jobType) { - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - case AB_Job_TypeDeleteStandingOrder: - s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusMonths", 0, 0); - if (s && *s) { - AB_TransactionLimits_SetAllowMonthly(lim, 1); - while(*s) { - char buf[3]; - const char *x; - - buf[2]=0; - strncpy(buf, s, 2); - x=buf; - if (*x=='0') - x++; - - AB_TransactionLimits_AddValuesCycleMonth(lim, x, 0); - s+=2; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleMonth(lim), - 1, GWEN_StringList_SortModeInt); - } - else - AB_TransactionLimits_SetAllowMonthly(lim, -1); - - s=GWEN_DB_GetCharValue(dbParams, "AllowedMonthDays", 0, 0); - if (s && *s) { - while(*s) { - char buf[3]; - const char *x; - - buf[2]=0; - strncpy(buf, s, 2); - x=buf; - if (*x=='0') - x++; - AB_TransactionLimits_AddValuesExecutionDayMonth(lim, x, 0); - s+=2; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayMonth(lim), - 1, GWEN_StringList_SortModeInt); - } - - s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusWeeks", 0, 0); - if (s && *s) { - AB_TransactionLimits_SetAllowWeekly(lim, 1); - while(*s) { - char buf[3]; - const char *x; - - buf[2]=0; - strncpy(buf, s, 2); - x=buf; - if (*x=='0') - x++; - AB_TransactionLimits_AddValuesCycleWeek(lim, x, 0); - s+=2; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleWeek(lim), - 1, GWEN_StringList_SortModeInt); - } - else - AB_TransactionLimits_SetAllowWeekly(lim, -1); - - s=GWEN_DB_GetCharValue(dbParams, "AllowedWeekDays", 0, 0); - if (s && *s) { - while(*s) { - char buf[2]; - const char *x; - - buf[0]=*s; - buf[1]=0; - x=buf; - if (*x=='0') - x++; - AB_TransactionLimits_AddValuesExecutionDayWeek(lim, x, 0); - s++; - } /* while */ - GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayWeek(lim), - 1, GWEN_StringList_SortModeInt); - } - - i=GWEN_DB_GetIntValue(dbParams, "minDelay", 0, 0); - AB_TransactionLimits_SetMinValueSetupTime(lim, i); - - i=GWEN_DB_GetIntValue(dbParams, "maxDelay", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTime(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgOtherAccount", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeRecipientAccount(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgOtherName", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeRecipientName(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgValue", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeValue(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgTextKey", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeTextKey(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgPurpose", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangePurpose(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgFirstDate", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeFirstExecutionDate(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgUnit", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangePeriod(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgTurnus", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeCycle(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgDay", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeExecutionDay(lim, i); - - s=GWEN_DB_GetCharValue(dbParams, "AllowChgLastDate", 0, ""); - if (*s=='J') i=1; - else if (*s=='N') i=-1; - else i=0; - AB_TransactionLimits_SetAllowChangeLastExecutionDate(lim, i); - break; - - case AB_Job_TypeCreateDatedTransfer: - case AB_Job_TypeModifyDatedTransfer: - AB_TransactionLimits_SetNeedDate(lim, 1); - i=GWEN_DB_GetIntValue(dbParams, "minDelay", 0, 0); - AB_TransactionLimits_SetMinValueSetupTime(lim, i); - - i=GWEN_DB_GetIntValue(dbParams, "maxDelay", 0, 0); - AB_TransactionLimits_SetMaxValueSetupTime(lim, i); - break; - - default: - break; - } - - /* store field limits */ - AB_Job_SetFieldLimits(bj, lim); - - AB_TransactionLimits_free(lim); - return 0; - } - - case AH_Job_ExchangeModeArgs: { - GWEN_DB_NODE *dbArgs; - const AB_TRANSACTION *ot; - const AB_VALUE *v; - - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - ot=AB_Job_GetTransaction(bj); - if (ot) { - GWEN_DB_NODE *dbT; - const char *p; - const GWEN_STRINGLIST *sl; - AB_TRANSACTION *t; - const GWEN_TIME *ti; - - t=AB_Transaction_dup(ot); - assert(t); - if (AH_Job_SingleTransfer__ValidateTransfer(bj, j, t)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Invalid transaction"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_INVALID; - } - /* store the validated transaction back into application job, - * to allow the application to recognize answers to this job later */ - AB_Job_SetTransaction(bj, t); - - /* preset challenge stuff */ - AH_Job_SetChallengeClass(j, 4); - AH_Job_SetChallengeValue(j, AB_Transaction_GetValue(t)); - - dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, - "transaction"); - assert(dbT); - - /* store transaction */ - GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/country", 280); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/bankCode", - AB_Transaction_GetLocalBankCode(t)); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/accountId", - AB_Transaction_GetLocalAccountNumber(t)); - - p=AB_Transaction_GetLocalSuffix(t); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "ourAccount/accountsubid", p); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "name", - AB_Transaction_GetLocalName(t)); - - GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "otherAccount/country", - 280); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "otherAccount/bankCode", - AB_Transaction_GetRemoteBankCode(t)); - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "otherAccount/accountId", - AB_Transaction_GetRemoteAccountNumber(t)); - - sl=AB_Transaction_GetRemoteName(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - GWEN_DB_DeleteVar(dbT, "otherName"); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, - "otherName", p); - se=GWEN_StringListEntry_Next(se); - } /* while */ - } - - v=AB_Transaction_GetValue(t); - if (v) { - GWEN_DB_NODE *dbV; - GWEN_BUFFER *nbuf; - char *p; - const char *s; - int l; - - dbV=GWEN_DB_GetGroup(dbT, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "value"); - assert(dbV); - - nbuf=GWEN_Buffer_new(0, 32, 0, 1); - if (GWEN_Text_DoubleToBuffer(AB_Value_GetValueAsDouble(v), - nbuf)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Buffer overflow"); - GWEN_Buffer_free(nbuf); - abort(); - } - - l=GWEN_Buffer_GetUsedBytes(nbuf); - if (!l) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); - GWEN_Buffer_free(nbuf); - abort(); - } - - /* replace "C" comma with "DE" comma, remove thousand's comma */ - p=GWEN_Buffer_GetStart(nbuf); - s=p; - while(*s) { - if (*s=='.') { - *p=','; - p++; - } - else if (*s!=',') { - *p=*s; - p++; - } - s++; - } /* while */ - *p=0; - - if (strchr(GWEN_Buffer_GetStart(nbuf), ',')) { - /* kill all trailing '0' behind the comma */ - p=GWEN_Buffer_GetStart(nbuf)+l; - while(l--) { - --p; - if (*p=='0') - *p=0; - else - break; - } - } - else - GWEN_Buffer_AppendString(nbuf, ","); - - /* store value */ - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, - "value", - GWEN_Buffer_GetStart(nbuf)); - GWEN_Buffer_free(nbuf); - - s=AB_Value_GetCurrency(v); - if (!s) - s="EUR"; - GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, - "currency", s); - } /* if value */ - - GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "textKey", - AB_Transaction_GetTextKey(t)); - - sl=AB_Transaction_GetPurpose(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - GWEN_DB_DeleteVar(dbT, "purpose"); - while(se) { - p=GWEN_StringListEntry_Data(se); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, - "purpose", p); - se=GWEN_StringListEntry_Next(se); - } /* while */ - } - - switch(aj->jobType) { - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - case AB_Job_TypeDeleteStandingOrder: - /* additional data for standing orders */ - - /* first execution date */ - ti=AB_Transaction_GetFirstExecutionDate(t); - if (ti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Time_toString(ti, "YYYYMMDD", tbuf); - GWEN_DB_SetCharValue(dbT, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "special/xfirstExecutionDate", - GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - -#if 0 - /* don't ever set lastExecutionDate */ - /* lastExecutionDate */ - ti=AB_Transaction_GetLastExecutionDate(t); - if (ti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Time_toString(ti, "YYYYMMDD", tbuf); - GWEN_DB_SetCharValue(dbT, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "special/xlastExecutionDate", - GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } -#endif - -#if 0 - /* don't ever set nextExecutionDate */ - if (aj->jobType==AB_Job_TypeCreateStandingOrder) { - /* nextExecutionDate */ - ti=AB_Transaction_GetNextExecutionDate(t); - if (ti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Time_toString(ti, "YYYYMMDD", tbuf); - GWEN_DB_SetCharValue(dbT, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "special/xnextExecutionDate", - GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - } -#endif - - /* period */ - switch(AB_Transaction_GetPeriod(t)) { - case AB_Transaction_PeriodMonthly: p="M"; break; - case AB_Transaction_PeriodWeekly: p="W"; break; - default: - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unsupported period %d", - AB_Transaction_GetPeriod(t)); - return GWEN_ERROR_INVALID; - } - GWEN_DB_SetCharValue(dbT, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "special/xperiod", - p); - - /* cycle */ - GWEN_DB_SetIntValue(dbT, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "special/cycle", - AB_Transaction_GetCycle(t)); - - /* execution day */ - GWEN_DB_SetIntValue(dbT, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "special/executionDay", - AB_Transaction_GetExecutionDay(t)); - - /* fiid */ - p=AB_Transaction_GetFiId(t); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "fiid", p); - break; - - case AB_Job_TypeCreateDatedTransfer: - case AB_Job_TypeModifyDatedTransfer: - case AB_Job_TypeDeleteDatedTransfer: - /* fiid */ - p=AB_Transaction_GetFiId(t); - if (p) - GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, - "fiid", p); - - /* date */ - ti=AB_Transaction_GetDate(t); - if (ti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 16, 0, 1); - GWEN_Time_toString(ti, "YYYYMMDD", tbuf); - GWEN_DB_SetCharValue(dbT, - GWEN_DB_FLAGS_OVERWRITE_VARS, - "xdate", - GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - - break; - - /* --------------- add more jobs here -------------- */ - - default: - break; - } /* switch */ - - /* store pointer to the validated transaction */ - aj->validatedTransaction=t; - } - else { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - return 0; - } - - case AH_Job_ExchangeModeResults: { - AH_RESULT_LIST *rl; - AH_RESULT *r; - int has10; - int has20; - const AB_TRANSACTION *ot; - AB_TRANSACTION_STATUS tStatus; - - rl=AH_Job_GetSegResults(j); - assert(rl); - - r=AH_Result_List_First(rl); - if (!r) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No segment results"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - /* return GWEN_ERROR_NO_DATA; */ - return 0; - } - has10=0; - has20=0; - while(r) { - int rcode; - - rcode=AH_Result_GetCode(r); - if (rcode <=19) - has10=1; - else if (rcode>=20 && rcode <=29) - has20=1; - r=AH_Result_List_Next(r); - } - - if (has20) { - AB_Job_SetStatus(bj, AB_Job_StatusFinished); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); - } - else if (has10) { - switch(aj->jobType) { - case AB_Job_TypeTransfer: - case AB_Job_TypeDebitNote: - case AB_Job_TypeInternalTransfer: - AB_Job_SetStatus(bj, AB_Job_StatusPending); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); - break; - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - case AB_Job_TypeDeleteStandingOrder: - case AB_Job_TypeCreateDatedTransfer: - case AB_Job_TypeModifyDatedTransfer: - case AB_Job_TypeDeleteDatedTransfer: - AB_Job_SetStatus(bj, AB_Job_StatusFinished); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); - break; - default: - DBG_ERROR(AQHBCI_LOGDOMAIN, "Unknown job type %d", aj->jobType); - abort(); - } - } - else { - DBG_INFO(AQHBCI_LOGDOMAIN, - "Error status (neither 0010 nor 0020)"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - } - - if (has20) - tStatus=AB_Transaction_StatusAccepted; - else if (has10) - tStatus=AB_Transaction_StatusPending; - else - tStatus=AB_Transaction_StatusRejected; - - switch(aj->jobType) { - case AB_Job_TypeTransfer: - ot=AB_Job_GetTransaction(bj); - if (ot) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - AB_Transaction_SetStatus(t, tStatus); - AB_Transaction_SetType(t, AB_Transaction_TypeTransfer); - AB_ImExporterContext_AddTransfer(ctx, t); - } - break; - - case AB_Job_TypeDebitNote: - ot=AB_Job_GetTransaction(bj); - if (ot) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - AB_Transaction_SetStatus(t, tStatus); - AB_Transaction_SetType(t, AB_Transaction_TypeDebitNote); - AB_ImExporterContext_AddTransfer(ctx, t); - } - break; - - case AB_Job_TypeInternalTransfer: - ot=AB_Job_GetTransaction(bj); - if (ot) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - AB_Transaction_SetStatus(t, tStatus); - AB_Transaction_SetType(t, AB_Transaction_TypeInternalTransfer); - AB_ImExporterContext_AddTransfer(ctx, t); - } - break; - - case AB_Job_TypeCreateStandingOrder: - case AB_Job_TypeModifyStandingOrder: - ot=AB_Job_GetTransaction(bj); - if (ot && aj->fiid) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - AB_Transaction_SetFiId(t, aj->fiid); - AB_Transaction_SetStatus(t, tStatus); - AB_Job_SetTransaction(bj, t); - AB_ImExporterContext_AddStandingOrder(ctx, t); - } - break; - - case AB_Job_TypeDeleteStandingOrder: - ot=AB_Job_GetTransaction(bj); - if (ot) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - switch(tStatus) { - case AB_Transaction_StatusAccepted: - AB_Transaction_SetStatus(t, AB_Transaction_StatusRevoked); - break; - case AB_Transaction_StatusPending: - AB_Transaction_SetStatus(t, AB_Transaction_StatusPending); - break; - case AB_Transaction_StatusRejected: - default: - /* don't modify status */ - break; - } - AB_Job_SetTransaction(bj, t); - AB_ImExporterContext_AddStandingOrder(ctx, t); - } - break; - - case AB_Job_TypeCreateDatedTransfer: - case AB_Job_TypeModifyDatedTransfer: - ot=AB_Job_GetTransaction(bj); - if (ot && aj->fiid) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - AB_Transaction_SetFiId(t, aj->fiid); - AB_Transaction_SetStatus(t, tStatus); - AB_Job_SetTransaction(bj, t); - AB_ImExporterContext_AddDatedTransfer(ctx, t); - } - break; - - case AB_Job_TypeDeleteDatedTransfer: - ot=AB_Job_GetTransaction(bj); - if (ot) { - AB_TRANSACTION *t; - - t=AB_Transaction_dup(ot); - switch(tStatus) { - case AB_Transaction_StatusAccepted: - AB_Transaction_SetStatus(t, AB_Transaction_StatusRevoked); - break; - case AB_Transaction_StatusPending: - AB_Transaction_SetStatus(t, AB_Transaction_StatusPending); - break; - case AB_Transaction_StatusRejected: - default: - /* don't modify status */ - break; - } - AB_Job_SetTransaction(bj, t); - AB_ImExporterContext_AddDatedTransfer(ctx, t); - } - break; - - default: - DBG_ERROR(AQHBCI_LOGDOMAIN, - "Unhandled job type %d", aj->jobType); - return -1; - } - - return 0; - } - - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ -} - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_l.h 2010-04-25 16:26:14.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ - begin : Mon Mar 01 2004 - copyright : (C) 2004 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSINGLETRANSFER_L_H -#define AH_JOBSINGLETRANSFER_L_H - - -#include "accountjob_l.h" - -#include - - -AH_JOB *AH_Job_SingleTransfer_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_SingleDebitNote_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_CreateStandingOrder_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_ModifyStandingOrder_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_DeleteStandingOrder_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_CreateDatedTransfer_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_ModifyDatedTransfer_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_DeleteDatedTransfer_new(AB_USER *u, - AB_ACCOUNT *account); - -AH_JOB *AH_Job_InternalTransfer_new(AB_USER *u, - AB_ACCOUNT *account); - - -const char *AH_Job_SingleTransfer_GetFiid(AH_JOB *j); - -const char *AH_Job_SingleTransfer_GetOldFiid(AH_JOB *j); - - -#endif /* AH_JOBSINGLETRANSFER_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_p.h 2011-12-29 07:31:55.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2011 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSINGLETRANSFER_P_H -#define AH_JOBSINGLETRANSFER_P_H - - -#include "jobsingletransfer_l.h" -#include - - -typedef struct AH_JOB_SINGLETRANSFER AH_JOB_SINGLETRANSFER; -struct AH_JOB_SINGLETRANSFER { - AB_JOB_TYPE jobType; - char *fiid; - char *oldFiid; - AB_TRANSACTION *validatedTransaction; -}; -static void GWENHYWFAR_CB AH_Job_SingleTransfer_FreeData(void *bp, void *p); -static int AH_Job_SingleTransfer_Process(AH_JOB *j, - AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_SingleTransfer_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - - -static int AH_Job_SingleTransfer__ValidateTransfer(AB_JOB *bj, - AH_JOB *mj, - AB_TRANSACTION *t); - -static AH_JOB *AH_Job_SingleTransferBase_new(AB_USER *u, - AB_ACCOUNT *account, - AB_JOB_TYPE jobType); - -static int AH_Job_SingleTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); - -#endif /* AH_JOBSINGLETRANSFER_P_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.xml 2008-10-03 16:41:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobsingletransfer.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,214 +0,0 @@ - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - %code - %version - - - - - - - - - - - - - %code - %version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c 2014-03-24 21:42:09.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,665 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# include -#endif - - -#include "jobtransferbase_p.h" -#include "aqhbci_l.h" -#include "accountjob_l.h" -#include "job_l.h" -#include "provider_l.h" -#include "hhd_l.h" -#include -#include -#include -#include - -#include - -#include -#include -#include - - - -GWEN_INHERIT(AH_JOB, AH_JOB_TRANSFERBASE); - - - - -/* --------------------------------------------------------------- FUNCTION */ -AH_JOB *AH_Job_TransferBase_new(const char *jobName, - AB_TRANSACTION_TYPE tt, - AB_TRANSACTION_SUBTYPE tst, - AB_USER *u, AB_ACCOUNT *account) { - AH_JOB *j; - AH_JOB_TRANSFERBASE *aj; - - j=AH_AccountJob_new(jobName, u, account); - if (!j) - return 0; - - GWEN_NEW_OBJECT(AH_JOB_TRANSFERBASE, aj); - GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j, aj, - AH_Job_TransferBase_FreeData); - - aj->transactionType=tt; - aj->transactionSubType=tst; - - /* overwrite some virtual functions */ - AH_Job_SetExchangeFn(j, AH_Job_TransferBase_Exchange); - AH_Job_SetProcessFn(j, AH_Job_TransferBase_Process); - - return j; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void GWENHYWFAR_CB AH_Job_TransferBase_FreeData(void *bp, void *p){ - AH_JOB_TRANSFERBASE *aj; - - aj=(AH_JOB_TRANSFERBASE*)p; - free(aj->fiid); - GWEN_StringList_free(aj->sepaDescriptors); - - GWEN_FREE_OBJECT(aj); -} - - - -/* --------------------------------------------------------------- FUNCTION */ -const char *AH_Job_TransferBase_GetFiid(const AH_JOB *j) { - AH_JOB_TRANSFERBASE *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - return aj->fiid; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_TransferBase_SepaExportTransactions(AH_JOB *j, const char *profileName, GWEN_BUFFER *destBuf) { - AH_JOB_TRANSFERBASE *aj; - GWEN_DB_NODE *dbArgs; - AB_BANKING *ab; - const AB_TRANSACTION *t=NULL; - int rv; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exporting transaction"); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - dbArgs=AH_Job_GetArguments(j); - assert(dbArgs); - - t=AH_Job_GetFirstTransfer(j); - if (t) { - /* set data in job */ - AB_IMEXPORTER_CONTEXT *ioc; - AB_TRANSACTION *cpy; - - /* add transfers as transactions for export (exporters only use transactions) */ - ioc=AB_ImExporterContext_new(); - while(t) { - cpy=AB_Transaction_dup(t); - AB_ImExporterContext_AddTransaction(ioc, cpy); - t=AB_Transaction_List_Next(t); - } - - rv=AB_Banking_ExportToBuffer(ab, ioc, "sepa", profileName, destBuf); - AB_ImExporterContext_free(ioc); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_TransferBase_ExchangeArgs_SepaUndated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { - const AB_TRANSACTION_LIMITS *lim=NULL; - AB_BANKING *ab; - const AB_TRANSACTION *t=NULL; - AB_TRANSACTION *tCopy=NULL; - int rv; - AB_USER *u; - uint32_t uflags; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - uflags=AH_User_GetFlags(u); - - /* get limits and transaction */ - lim=AB_Job_GetFieldLimits(bj); - t=AB_Job_GetTransaction(bj); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - return GWEN_ERROR_INVALID; - } - - /* DISABLED according to a discussion on aqbanking-user: - * The application should do this, not the library. - AB_Transaction_FillLocalFromAccount(t, a); */ - - /* validate transaction */ - rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - tCopy=AB_Transaction_dup(t); - - /* set group id so the application can now which transfers went together in one setting */ - AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); - - /* store validated transaction in job */ - AB_Job_SetTransaction(bj, tCopy); - - /* store copy of transaction for later */ - AH_Job_AddTransfer(j, tCopy); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_TransferBase_ExchangeArgs_SepaDated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { - const AB_TRANSACTION_LIMITS *lim=NULL; - AB_BANKING *ab; - const AB_TRANSACTION *t=NULL; - AB_TRANSACTION *tCopy=NULL; - int rv; - AB_USER *u; - uint32_t uflags; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - uflags=AH_User_GetFlags(u); - - /* get limits and transaction */ - lim=AB_Job_GetFieldLimits(bj); - t=AB_Job_GetTransaction(bj); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - return GWEN_ERROR_INVALID; - } - - /* DISABLED according to a discussion on aqbanking-user: - * The application should do this, not the library. - AB_Transaction_FillLocalFromAccount(t, a); */ - - /* validate transaction */ - rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckDateAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - - tCopy=AB_Transaction_dup(t); - - /* set group id so the application can now which transfers went together in one setting */ - AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); - - /* store validated transaction in job */ - AB_Job_SetTransaction(bj, tCopy); - - /* store copy of transaction for later */ - AH_Job_AddTransfer(j, tCopy); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { - const AB_TRANSACTION_LIMITS *lim=NULL; - AB_BANKING *ab; - const AB_TRANSACTION *t=NULL; - AB_TRANSACTION *tCopy=NULL; - int rv; - AB_USER *u; - uint32_t uflags; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); - - ab=AH_Job_GetBankingApi(j); - assert(ab); - - u=AH_Job_GetUser(j); - assert(u); - - uflags=AH_User_GetFlags(u); - - /* get limits and transaction */ - lim=AB_Job_GetFieldLimits(bj); - t=AB_Job_GetTransaction(bj); - if (t==NULL) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); - return GWEN_ERROR_INVALID; - } - - /* DISABLED according to a discussion on aqbanking-user: - * The application should do this, not the library. - AB_Transaction_FillLocalFromAccount(t, a); */ - - /* validate transaction */ - rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - rv=AB_Transaction_CheckDateAgainstSequenceLimits(t, lim); - if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); - return rv; - } - - - tCopy=AB_Transaction_dup(t); - - /* set group id so the application can now which transfers went together in one setting */ - AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); - - /* store validated transaction in job */ - AB_Job_SetTransaction(bj, tCopy); - - /* store copy of transaction for later */ - AH_Job_AddTransfer(j, tCopy); - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_TransferBase_ExchangeResults(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { - AH_JOB_TRANSFERBASE *aj; - AH_RESULT_LIST *rl; - AH_RESULT *r; - int has10; - int has20; - AB_TRANSACTION_STATUS tStatus; - const AB_TRANSACTION *t; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - rl=AH_Job_GetSegResults(j); - assert(rl); - - r=AH_Result_List_First(rl); - if (!r) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No segment results"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - return GWEN_ERROR_NO_DATA; - } - has10=0; - has20=0; - while(r) { - int rcode; - - rcode=AH_Result_GetCode(r); - if (rcode>=10 && rcode<=19) - has10=1; - else if (rcode>=20 && rcode <=29) - has20=1; - r=AH_Result_List_Next(r); - } - - if (has20) { - AB_Job_SetStatus(bj, AB_Job_StatusFinished); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); - } - else if (has10) { - AB_Job_SetStatus(bj, AB_Job_StatusPending); - DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); - } - else { - DBG_INFO(AQHBCI_LOGDOMAIN, - "Error status (neither 0010 nor 0020)"); - AB_Job_SetStatus(bj, AB_Job_StatusError); - } - - if (has20) - tStatus=AB_Transaction_StatusAccepted; - else if (has10) - tStatus=AB_Transaction_StatusPending; - else - tStatus=AB_Transaction_StatusRejected; - - t=AH_Job_GetFirstTransfer(j); - if (t) { - AB_TRANSACTION *cpy; - - cpy=AB_Transaction_dup(t); - AB_Transaction_SetFiId(cpy, aj->fiid); - AB_Transaction_SetStatus(cpy, tStatus); - AB_Transaction_SetType(cpy, aj->transactionType); - AB_Transaction_SetSubType(cpy, aj->transactionSubType); - - switch(aj->transactionType) { - case AB_Transaction_TypeUnknown: - case AB_Transaction_TypeTransaction: - AB_ImExporterContext_AddTransaction(ctx, cpy); /* takes over cpy */ - break; - - case AB_Transaction_TypeTransfer: - case AB_Transaction_TypeDebitNote: - case AB_Transaction_TypeEuTransfer: - case AB_Transaction_TypeSepaTransfer: - case AB_Transaction_TypeSepaDebitNote: - case AB_Transaction_TypeInternalTransfer: - if (aj->transactionSubType==AB_Transaction_SubTypeStandingOrder) - AB_ImExporterContext_AddStandingOrder(ctx, cpy); /* takes over cpy */ - else - AB_ImExporterContext_AddTransfer(ctx, cpy); /* takes over cpy */ - break; - } - - AB_Job_SetTransaction(bj, t); /* copies t */ - } - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_TransferBase_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx){ - AH_JOB_TRANSFERBASE *aj; - - DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - switch(m) { - case AH_Job_ExchangeModeParams: - if (aj->exchangeParamsFn) - return aj->exchangeParamsFn(j, bj, ctx); - break; - - case AH_Job_ExchangeModeArgs: - if (aj->exchangeArgsFn) - return aj->exchangeArgsFn(j, bj, ctx); - break; - - case AH_Job_ExchangeModeResults: - if (aj->exchangeResultsFn) - return aj->exchangeResultsFn(j, bj, ctx); - else - return AH_Job_TransferBase_ExchangeResults(j, bj, ctx); - break; - - default: - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); - return GWEN_ERROR_NOT_SUPPORTED; - } /* switch */ - - /* just ignore */ - DBG_ERROR(AQHBCI_LOGDOMAIN, "Exchange mode %d not implemented", m); - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -int AH_Job_TransferBase_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx) { - AH_JOB_TRANSFERBASE *aj; - GWEN_DB_NODE *dbResponses; - GWEN_DB_NODE *dbCurr; - const char *responseName; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - DBG_INFO(AQHBCI_LOGDOMAIN, "Processing"); - responseName=AH_Job_GetResponseName(j); - - dbResponses=AH_Job_GetResponses(j); - assert(dbResponses); - - /* search for "TransferBaseSingleResponse" */ - dbCurr=GWEN_DB_GetFirstGroup(dbResponses); - while(dbCurr) { - int rv; - - rv=AH_Job_CheckEncryption(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - rv=AH_Job_CheckSignature(j, dbCurr); - if (rv) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - AH_Job_SetStatus(j, AH_JobStatusError); - return rv; - } - - if (responseName && *responseName) { - GWEN_DB_NODE *dbXA; - - dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "data"); - if (dbXA) - dbXA=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, responseName); - if (dbXA) { - const char *s; - - s=GWEN_DB_GetCharValue(dbXA, "referenceId", 0, 0); - if (s) { - free(aj->fiid); - aj->fiid=strdup(s); - } - } - } - dbCurr=GWEN_DB_GetNextGroup(dbCurr); - } - - - return 0; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void AH_Job_TransferBase_SetExchangeParamsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f){ - AH_JOB_TRANSFERBASE *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - aj->exchangeParamsFn=f; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void AH_Job_TransferBase_SetExchangeArgsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f){ - AH_JOB_TRANSFERBASE *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - aj->exchangeArgsFn=f; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void AH_Job_TransferBase_SetExchangeResultsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f){ - AH_JOB_TRANSFERBASE *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - aj->exchangeResultsFn=f; -} - - - -/* --------------------------------------------------------------- FUNCTION */ -void AH_Job_TransferBase_LoadSepaDescriptors(AH_JOB *j){ - AH_JOB_TRANSFERBASE *aj; - GWEN_DB_NODE *dbParams; - GWEN_DB_NODE *dbT; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - /* get params */ - dbParams=AH_Job_GetParams(j); - assert(dbParams); - - if (aj->sepaDescriptors==NULL) - aj->sepaDescriptors=GWEN_StringList_new(); - else - GWEN_StringList_Clear(aj->sepaDescriptors); - - /* read supported SEPA formats */ - dbT=GWEN_DB_FindFirstGroup(dbParams, "SupportedSepaFormats"); - if (!dbT) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "No SEPA descriptor found"); - GWEN_DB_Dump(dbParams, 2); - } - while(dbT) { - int i; - - for (i=0; i<100; i++) { - const char *s; - - s=GWEN_DB_GetCharValue(dbT, "format", i, NULL); - if (! (s && *s)) - break; - GWEN_StringList_AppendString(aj->sepaDescriptors, s, 0, 1); - DBG_INFO(AQHBCI_LOGDOMAIN, - "Adding SEPA descriptor [%s] for GV %s", - s, AH_Job_GetName(j)); - } - - dbT=GWEN_DB_FindNextGroup(dbT, "SupportedSepaFormats"); - } -} - - - -/* --------------------------------------------------------------- FUNCTION */ -const char *AH_Job_TransferBase_FindSepaDescriptor(AH_JOB *j, const char *tmpl) { - AH_JOB_TRANSFERBASE *aj; - - assert(j); - aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); - assert(aj); - - if (aj->sepaDescriptors) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(aj->sepaDescriptors); - while(se) { - const char *s; - - s=GWEN_StringListEntry_Data(se); - if (s && *s && -1!=GWEN_Text_ComparePattern(s, tmpl, 1)) - return s; - - se=GWEN_StringListEntry_Next(se); - } - } - - return NULL; -} - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h 2014-03-24 21:40:50.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_l.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/*************************************************************************** - begin : Mon Mar 01 2004 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBTRANSFERBASE_L_H -#define AH_JOBTRANSFERBASE_L_H - - -#include "accountjob_l.h" - - -typedef int (*AH_JOB_TRANSFERBASE_EXCHANGE_FN)(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); - - -AH_JOB *AH_Job_TransferBase_new(const char *jobName, - AB_TRANSACTION_TYPE tt, - AB_TRANSACTION_SUBTYPE tst, - AB_USER *u, AB_ACCOUNT *account); - -const char *AH_Job_TransferBase_GetFiid(const AH_JOB *j); - - -void AH_Job_TransferBase_SetExchangeParamsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f); -void AH_Job_TransferBase_SetExchangeArgsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f); -void AH_Job_TransferBase_SetExchangeResultsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f); - - - - -int AH_Job_TransferBase_SepaExportTransactions(AH_JOB *j, const char *profileName, GWEN_BUFFER *destBuf); - -int AH_Job_TransferBase_ExchangeArgs_SepaDated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); -int AH_Job_TransferBase_ExchangeArgs_SepaUndated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); -int AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); - - -/** - * @name SEPA Descriptors - * For jobs which have their own list of supported SEPA formats in their BPD those can be handled here. - * Those jobs MUST call @ref AH_Job_TransferBase_LoadSepaDescriptors inside the constructor. - */ -/*@{*/ - -/** - * Load list of supported SEPA descriptors from the job's BPD. - */ -void AH_Job_TransferBase_LoadSepaDescriptors(AH_JOB *j); - -/** - * Find a SEPA descriptor in the internal list of supported SEPA descriptors read from the BPD. - */ -const char *AH_Job_TransferBase_FindSepaDescriptor(AH_JOB *j, const char *tmpl); - -/*@}*/ - - - -#endif /* AH_JOBTRANSFERBASE_L_H */ - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h 2014-03-24 21:29:30.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/jobtransferbase_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/*************************************************************************** - begin : Tue Dec 31 2013 - copyright : (C) 2004-2013 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBTRANSFERBASE_P_H -#define AH_JOBTRANSFERBASE_P_H - - -#include "jobtransferbase_l.h" -#include - - -typedef struct AH_JOB_TRANSFERBASE AH_JOB_TRANSFERBASE; -struct AH_JOB_TRANSFERBASE { - AB_TRANSACTION_TYPE transactionType; - AB_TRANSACTION_SUBTYPE transactionSubType; - char *fiid; - AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeParamsFn; - AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeArgsFn; - AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeResultsFn; - - GWEN_STRINGLIST *sepaDescriptors; - -}; -static void GWENHYWFAR_CB AH_Job_TransferBase_FreeData(void *bp, void *p); - -static int AH_Job_TransferBase_ExchangeResults(AH_JOB *j, AB_JOB *bj, - AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_TransferBase_Exchange(AH_JOB *j, AB_JOB *bj, - AH_JOB_EXCHANGE_MODE m, - AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_TransferBase_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); - - -#endif /* AH_JOBTRANSFERBASE_P_H */ - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am 2014-03-24 20:45:34.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ - -AM_CFLAGS=-DBUILDING_AQHBCI @visibility_cflags@ - -INCLUDES = -I$(aqbanking_symlinkdir) $(all_includes) \ - -I$(srcdir)/../joblayer \ - -I$(srcdir)/../msglayer \ - -I$(srcdir)/../banking \ - -I$(srcdir)/../applayer \ - -I$(srcdir)/.. - -noinst_LTLIBRARIES=libhbciaccjobs.la - -noinst_HEADERS=\ - accountjob_l.h \ - accountjob_p.h \ - jobgetbalance_l.h \ - jobgetbalance_p.h \ - jobgettransactions_l.h \ - jobgettransactions_p.h \ - jobgetstandingorders_l.h \ - jobgetstandingorders_p.h \ - jobgetdatedxfers_l.h \ - jobgetdatedxfers_p.h \ - jobsingletransfer_l.h \ - jobsingletransfer_p.h \ - jobeutransfer_l.h \ - jobeutransfer_p.h \ - jobmultitransfer_l.h \ - jobmultitransfer_p.h \ - jobforeignxferwh_l.h \ - jobforeignxferwh_p.h \ - jobloadcellphone_l.h \ - jobloadcellphone_p.h \ - jobsepadebitdatedsinglecreate_l.h \ - jobsepadebitdatedsinglecreate_p.h \ - jobsepadebitdatedmulticreate_l.h \ - jobsepadebitdatedmulticreate_p.h \ - jobsepaxfersingle_l.h \ - jobsepaxfersingle_p.h \ - jobsepadebitsingle_l.h \ - jobsepadebitsingle_p.h \ - jobsepacor1datedsinglecreate_l.h \ - jobsepacor1datedsinglecreate_p.h \ - jobtransferbase_l.h jobtransferbase_p.h \ - jobsepastandingordercreate_l.h jobsepastandingordercreate_p.h - -libhbciaccjobs_la_SOURCES=\ - accountjob.c \ - jobgetbalance.c \ - jobgettransactions.c \ - jobgetdatedxfers.c \ - jobgetstandingorders.c \ - jobsingletransfer.c \ - jobeutransfer.c \ - jobmultitransfer.c \ - jobforeignxferwh.c \ - jobloadcellphone.c \ - jobsepadebitdatedsinglecreate.c \ - jobsepadebitdatedmulticreate.c \ - jobsepaxfersingle.c \ - jobsepadebitsingle.c \ - jobsepacor1datedsinglecreate.c \ - jobtransferbase.c \ - jobsepastandingordercreate.c - - - -sources: - for f in $(libhbciaccjobs_la_SOURCES); do \ - echo $(subdir)/$$f >>$(top_srcdir)/i18nsources; \ - done - for d in $(SUBDIRS); do \ - $(MAKE) -C $$d sources; \ - done - -xmlfiles=\ - $(srcdir)/jobgetbalance.xml \ - $(srcdir)/jobgettransactions.xml \ - $(srcdir)/jobgetstandingorders.xml \ - $(srcdir)/jobsingletransfer.xml \ - $(srcdir)/jobsingledebitnote.xml \ - $(srcdir)/jobinternaltransfer.xml \ - $(srcdir)/jobeutransfer.xml \ - $(srcdir)/jobmultitransfer.xml \ - $(srcdir)/jobforeignxferwh.xml \ - $(srcdir)/jobcreatesto.xml \ - $(srcdir)/jobmodifysto.xml \ - $(srcdir)/jobdeletesto.xml \ - $(srcdir)/jobgetdatedxfers.xml \ - $(srcdir)/jobcreatedatedxfer.xml \ - $(srcdir)/jobmodifydatedxfer.xml \ - $(srcdir)/jobdeletedatedxfer.xml \ - $(srcdir)/jobloadcellphone.xml \ - $(srcdir)/jobsepadebitdatedsinglecreate.xml \ - $(srcdir)/jobsepadebitdatedmulticreate.xml \ - $(srcdir)/jobsepaxfersingle.xml \ - $(srcdir)/jobsepadebitsingle.xml \ - $(srcdir)/jobsepacor1datedsinglecreate.xml \ - $(srcdir)/jobsepastandingordercreate.xml \ - $(srcdir)/jobsepastandingorderget.xml - - -EXTRA_DIST=$(xmlfiles) - -accountjobs.xml: $(xmlfiles) - $(XMLMERGE) -v --compact -o $@ $(xmlfiles) - -all-local: accountjobs.xml - -CLEANFILES = accountjobs.xml diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/accountjobs/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,775 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@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 -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/plugins/backends/aqhbci/plugin/accountjobs -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ - $(top_srcdir)/m4/as-scrub-include.m4 \ - $(top_srcdir)/m4/distri.m4 $(top_srcdir)/m4/gwenhywfar.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/os.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libhbciaccjobs_la_LIBADD = -am_libhbciaccjobs_la_OBJECTS = accountjob.lo jobgetbalance.lo \ - jobgettransactions.lo jobgetdatedxfers.lo \ - jobgetstandingorders.lo jobsingletransfer.lo jobeutransfer.lo \ - jobmultitransfer.lo jobforeignxferwh.lo jobloadcellphone.lo \ - jobsepadebitdatedsinglecreate.lo \ - jobsepadebitdatedmulticreate.lo jobsepaxfersingle.lo \ - jobsepadebitsingle.lo jobsepacor1datedsinglecreate.lo \ - jobtransferbase.lo jobsepastandingordercreate.lo -libhbciaccjobs_la_OBJECTS = $(am_libhbciaccjobs_la_OBJECTS) -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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libhbciaccjobs_la_SOURCES) -DIST_SOURCES = $(libhbciaccjobs_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ -AMTAR = @AMTAR@ -AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ -AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ -AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ -AQBANKING_SO_EFFECTIVE = @AQBANKING_SO_EFFECTIVE@ -AQBANKING_SO_REVISION = @AQBANKING_SO_REVISION@ -AQBANKING_VERSION_BUILD = @AQBANKING_VERSION_BUILD@ -AQBANKING_VERSION_FULL_STRING = @AQBANKING_VERSION_FULL_STRING@ -AQBANKING_VERSION_MAJOR = @AQBANKING_VERSION_MAJOR@ -AQBANKING_VERSION_MINOR = @AQBANKING_VERSION_MINOR@ -AQBANKING_VERSION_PATCHLEVEL = @AQBANKING_VERSION_PATCHLEVEL@ -AQBANKING_VERSION_RELEASE_STRING = @AQBANKING_VERSION_RELEASE_STRING@ -AQBANKING_VERSION_STRING = @AQBANKING_VERSION_STRING@ -AQBANKING_VERSION_TAG = @AQBANKING_VERSION_TAG@ -AQEBICS_CFLAGS = @AQEBICS_CFLAGS@ -AQEBICS_LIBS = @AQEBICS_LIBS@ -AQEBICS_SO_AGE = @AQEBICS_SO_AGE@ -AQEBICS_SO_CURRENT = @AQEBICS_SO_CURRENT@ -AQEBICS_SO_EFFECTIVE = @AQEBICS_SO_EFFECTIVE@ -AQEBICS_SO_REVISION = @AQEBICS_SO_REVISION@ -AQEBICS_VERSION_BUILD = @AQEBICS_VERSION_BUILD@ -AQEBICS_VERSION_FULL_STRING = @AQEBICS_VERSION_FULL_STRING@ -AQEBICS_VERSION_MAJOR = @AQEBICS_VERSION_MAJOR@ -AQEBICS_VERSION_MINOR = @AQEBICS_VERSION_MINOR@ -AQEBICS_VERSION_PATCHLEVEL = @AQEBICS_VERSION_PATCHLEVEL@ -AQEBICS_VERSION_RELEASE_STRING = @AQEBICS_VERSION_RELEASE_STRING@ -AQEBICS_VERSION_STRING = @AQEBICS_VERSION_STRING@ -AQEBICS_VERSION_TAG = @AQEBICS_VERSION_TAG@ -AQHBCI_SO_AGE = @AQHBCI_SO_AGE@ -AQHBCI_SO_CURRENT = @AQHBCI_SO_CURRENT@ -AQHBCI_SO_EFFECTIVE = @AQHBCI_SO_EFFECTIVE@ -AQHBCI_SO_REVISION = @AQHBCI_SO_REVISION@ -AQHBCI_VERSION_BUILD = @AQHBCI_VERSION_BUILD@ -AQHBCI_VERSION_FULL_STRING = @AQHBCI_VERSION_FULL_STRING@ -AQHBCI_VERSION_MAJOR = @AQHBCI_VERSION_MAJOR@ -AQHBCI_VERSION_MINOR = @AQHBCI_VERSION_MINOR@ -AQHBCI_VERSION_PATCHLEVEL = @AQHBCI_VERSION_PATCHLEVEL@ -AQHBCI_VERSION_RELEASE_STRING = @AQHBCI_VERSION_RELEASE_STRING@ -AQHBCI_VERSION_STRING = @AQHBCI_VERSION_STRING@ -AQHBCI_VERSION_TAG = @AQHBCI_VERSION_TAG@ -AQOFXCONNECT_SO_AGE = @AQOFXCONNECT_SO_AGE@ -AQOFXCONNECT_SO_CURRENT = @AQOFXCONNECT_SO_CURRENT@ -AQOFXCONNECT_SO_EFFECTIVE = @AQOFXCONNECT_SO_EFFECTIVE@ -AQOFXCONNECT_SO_REVISION = @AQOFXCONNECT_SO_REVISION@ -AQOFXCONNECT_VERSION_BUILD = @AQOFXCONNECT_VERSION_BUILD@ -AQOFXCONNECT_VERSION_FULL_STRING = @AQOFXCONNECT_VERSION_FULL_STRING@ -AQOFXCONNECT_VERSION_MAJOR = @AQOFXCONNECT_VERSION_MAJOR@ -AQOFXCONNECT_VERSION_MINOR = @AQOFXCONNECT_VERSION_MINOR@ -AQOFXCONNECT_VERSION_PATCHLEVEL = @AQOFXCONNECT_VERSION_PATCHLEVEL@ -AQOFXCONNECT_VERSION_RELEASE_STRING = @AQOFXCONNECT_VERSION_RELEASE_STRING@ -AQOFXCONNECT_VERSION_STRING = @AQOFXCONNECT_VERSION_STRING@ -AQOFXCONNECT_VERSION_TAG = @AQOFXCONNECT_VERSION_TAG@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATETIME = @DATETIME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOXYGEN_DEFINE = @DOXYGEN_DEFINE@ -DOXYGEN_FILE_PATTERNS = @DOXYGEN_FILE_PATTERNS@ -DOXYGEN_INPUT = @DOXYGEN_INPUT@ -DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -GTK2_CFLAGS = @GTK2_CFLAGS@ -GTK2_LIBS = @GTK2_LIBS@ -GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ -GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ -HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ -HAVE_I18N = @HAVE_I18N@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_DLL_TARGET = @INSTALL_DLL_TARGET@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBXML_CFLAGS = @LIBXML_CFLAGS@ -LIBXML_LIBS = @LIBXML_LIBS@ -LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ -LIBXSLT_LIBS = @LIBXSLT_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MAKE_DLL_TARGET = @MAKE_DLL_TARGET@ -MAKE_I18N_FILES = @MAKE_I18N_FILES@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_SUPPORTS_QT = @MSGFMT_SUPPORTS_QT@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OSYSTEM = @OSYSTEM@ -OS_TYPE = @OS_TYPE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -STRIPALL = @STRIPALL@ -TUTORIALS = @TUTORIALS@ -USE_DOT = @USE_DOT@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -XMLMERGE = @XMLMERGE@ -XMLSEC_CFLAGS = @XMLSEC_CFLAGS@ -XMLSEC_LIBS = @XMLSEC_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -aq_distrib_name = @aq_distrib_name@ -aq_distrib_tag = @aq_distrib_tag@ -aq_distrib_version = @aq_distrib_version@ -aqbanking_backends = @aqbanking_backends@ -aqbanking_cfg_searchdir = @aqbanking_cfg_searchdir@ -aqbanking_data_searchdir = @aqbanking_data_searchdir@ -aqbanking_headerdir = @aqbanking_headerdir@ -aqbanking_headerdir_am = @aqbanking_headerdir_am@ -aqbanking_includes = @aqbanking_includes@ -aqbanking_internal_libs = @aqbanking_internal_libs@ -aqbanking_ldflags = @aqbanking_ldflags@ -aqbanking_libs = @aqbanking_libs@ -aqbanking_locale_searchdir = @aqbanking_locale_searchdir@ -aqbanking_modules = @aqbanking_modules@ -aqbanking_pkgdatadir = @aqbanking_pkgdatadir@ -aqbanking_plugin_searchdir = @aqbanking_plugin_searchdir@ -aqbanking_plugindir = @aqbanking_plugindir@ -aqbanking_plugins_backends_dirs = @aqbanking_plugins_backends_dirs@ -aqbanking_plugins_bankinfo_dirs = @aqbanking_plugins_bankinfo_dirs@ -aqbanking_plugins_imexporters_dirs = @aqbanking_plugins_imexporters_dirs@ -aqbanking_plugins_parsers_dirs = @aqbanking_plugins_parsers_dirs@ -aqbanking_symlinkdir = @aqbanking_symlinkdir@ -aqbanking_sys_is_windows = @aqbanking_sys_is_windows@ -aqbankingpp_modules = @aqbankingpp_modules@ -aqebics_datadir = @aqebics_datadir@ -aqebics_includes = @aqebics_includes@ -aqebics_internal_libs = @aqebics_internal_libs@ -aqebics_ldflags = @aqebics_ldflags@ -aqebics_libs = @aqebics_libs@ -aqhbci_datadir = @aqhbci_datadir@ -aqhbci_includes = @aqhbci_includes@ -aqhbci_internal_libs = @aqhbci_internal_libs@ -aqhbci_ldflags = @aqhbci_ldflags@ -aqhbci_libs = @aqhbci_libs@ -aqofxconnect_includes = @aqofxconnect_includes@ -aqofxconnect_internal_libs = @aqofxconnect_internal_libs@ -aqofxconnect_libs = @aqofxconnect_libs@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -docpath = @docpath@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gmp_libs = @gmp_libs@ -gwenhywfar_bindir = @gwenhywfar_bindir@ -gwenhywfar_dir = @gwenhywfar_dir@ -gwenhywfar_has_crypt = @gwenhywfar_has_crypt@ -gwenhywfar_headers = @gwenhywfar_headers@ -gwenhywfar_includes = @gwenhywfar_includes@ -gwenhywfar_libs = @gwenhywfar_libs@ -gwenhywfar_plugins = @gwenhywfar_plugins@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -i18n_libs = @i18n_libs@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -ktoblzcheck_CFLAGS = @ktoblzcheck_CFLAGS@ -ktoblzcheck_LIBS = @ktoblzcheck_LIBS@ -ktoblzcheck_includes = @ktoblzcheck_includes@ -ktoblzcheck_libs = @ktoblzcheck_libs@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -typemaker2_exe = @typemaker2_exe@ -visibility_cflags = @visibility_cflags@ -with_aqebics = @with_aqebics@ -with_aqhbci = @with_aqhbci@ -AM_CFLAGS = -DBUILDING_AQHBCI @visibility_cflags@ -INCLUDES = -I$(aqbanking_symlinkdir) $(all_includes) \ - -I$(srcdir)/../joblayer \ - -I$(srcdir)/../msglayer \ - -I$(srcdir)/../banking \ - -I$(srcdir)/../applayer \ - -I$(srcdir)/.. - -noinst_LTLIBRARIES = libhbciaccjobs.la -noinst_HEADERS = \ - accountjob_l.h \ - accountjob_p.h \ - jobgetbalance_l.h \ - jobgetbalance_p.h \ - jobgettransactions_l.h \ - jobgettransactions_p.h \ - jobgetstandingorders_l.h \ - jobgetstandingorders_p.h \ - jobgetdatedxfers_l.h \ - jobgetdatedxfers_p.h \ - jobsingletransfer_l.h \ - jobsingletransfer_p.h \ - jobeutransfer_l.h \ - jobeutransfer_p.h \ - jobmultitransfer_l.h \ - jobmultitransfer_p.h \ - jobforeignxferwh_l.h \ - jobforeignxferwh_p.h \ - jobloadcellphone_l.h \ - jobloadcellphone_p.h \ - jobsepadebitdatedsinglecreate_l.h \ - jobsepadebitdatedsinglecreate_p.h \ - jobsepadebitdatedmulticreate_l.h \ - jobsepadebitdatedmulticreate_p.h \ - jobsepaxfersingle_l.h \ - jobsepaxfersingle_p.h \ - jobsepadebitsingle_l.h \ - jobsepadebitsingle_p.h \ - jobsepacor1datedsinglecreate_l.h \ - jobsepacor1datedsinglecreate_p.h \ - jobtransferbase_l.h jobtransferbase_p.h \ - jobsepastandingordercreate_l.h jobsepastandingordercreate_p.h - -libhbciaccjobs_la_SOURCES = \ - accountjob.c \ - jobgetbalance.c \ - jobgettransactions.c \ - jobgetdatedxfers.c \ - jobgetstandingorders.c \ - jobsingletransfer.c \ - jobeutransfer.c \ - jobmultitransfer.c \ - jobforeignxferwh.c \ - jobloadcellphone.c \ - jobsepadebitdatedsinglecreate.c \ - jobsepadebitdatedmulticreate.c \ - jobsepaxfersingle.c \ - jobsepadebitsingle.c \ - jobsepacor1datedsinglecreate.c \ - jobtransferbase.c \ - jobsepastandingordercreate.c - -xmlfiles = \ - $(srcdir)/jobgetbalance.xml \ - $(srcdir)/jobgettransactions.xml \ - $(srcdir)/jobgetstandingorders.xml \ - $(srcdir)/jobsingletransfer.xml \ - $(srcdir)/jobsingledebitnote.xml \ - $(srcdir)/jobinternaltransfer.xml \ - $(srcdir)/jobeutransfer.xml \ - $(srcdir)/jobmultitransfer.xml \ - $(srcdir)/jobforeignxferwh.xml \ - $(srcdir)/jobcreatesto.xml \ - $(srcdir)/jobmodifysto.xml \ - $(srcdir)/jobdeletesto.xml \ - $(srcdir)/jobgetdatedxfers.xml \ - $(srcdir)/jobcreatedatedxfer.xml \ - $(srcdir)/jobmodifydatedxfer.xml \ - $(srcdir)/jobdeletedatedxfer.xml \ - $(srcdir)/jobloadcellphone.xml \ - $(srcdir)/jobsepadebitdatedsinglecreate.xml \ - $(srcdir)/jobsepadebitdatedmulticreate.xml \ - $(srcdir)/jobsepaxfersingle.xml \ - $(srcdir)/jobsepadebitsingle.xml \ - $(srcdir)/jobsepacor1datedsinglecreate.xml \ - $(srcdir)/jobsepastandingordercreate.xml \ - $(srcdir)/jobsepastandingorderget.xml - -EXTRA_DIST = $(xmlfiles) -CLEANFILES = accountjobs.xml -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/backends/aqhbci/plugin/accountjobs/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/plugins/backends/aqhbci/plugin/accountjobs/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libhbciaccjobs.la: $(libhbciaccjobs_la_OBJECTS) $(libhbciaccjobs_la_DEPENDENCIES) $(EXTRA_libhbciaccjobs_la_DEPENDENCIES) - $(LINK) $(libhbciaccjobs_la_OBJECTS) $(libhbciaccjobs_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accountjob.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobeutransfer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobforeignxferwh.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgetbalance.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgetdatedxfers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgetstandingorders.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgettransactions.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobloadcellphone.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobmultitransfer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepacor1datedsinglecreate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitdatedmulticreate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitdatedsinglecreate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitsingle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepastandingordercreate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepaxfersingle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsingletransfer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobtransferbase.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@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@ $(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@ $(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 $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - 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) - 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)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - 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 -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -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." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -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 - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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 maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am - - -sources: - for f in $(libhbciaccjobs_la_SOURCES); do \ - echo $(subdir)/$$f >>$(top_srcdir)/i18nsources; \ - done - for d in $(SUBDIRS); do \ - $(MAKE) -C $$d sources; \ - done - -accountjobs.xml: $(xmlfiles) - $(XMLMERGE) -v --compact -o $@ $(xmlfiles) - -all-local: accountjobs.xml - -# 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 libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,222 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "accountjob_p.h" +#include "aqhbci_l.h" +#include "job_l.h" +#include +#include +#include +#include + +#include +#include +#include + + + +GWEN_INHERIT(AH_JOB, AH_ACCOUNTJOB); + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_AccountJob_new(const char *name, + AB_USER *u, + AB_ACCOUNT *account){ + AH_ACCOUNTJOB *aj; + AH_JOB *j; + GWEN_DB_NODE *dbArgs; + const char *s; + int jobVersion=0; + + assert(name); + assert(u); + assert(account); + + if (!(AH_Account_GetFlags(account) & AH_BANK_FLAGS_KTV2)) { + int maxVer=0; + + /* no account suffix, so we try to determine the highest usable + * version of the job which still doesn't need the suffix + */ + if (strcasecmp(name, "JobGetTransactions")==0) + maxVer=4; + else if (strcasecmp(name, "JobGetBalance")==0) + maxVer=4; + else if (strcasecmp(name, "JobSingleTransfer")==0) + maxVer=3; + else if (strcasecmp(name, "JobSingleDebitNote")==0) + maxVer=3; + else if (strcasecmp(name, "JobInternalTransfer")==0 || + strcasecmp(name, "JobLoadCellPhone")==0) + /* this job needs a suffix, so if there is none you don't get it */ + maxVer=-1; + else if (strcasecmp(name, "JobGetDatedTransfers")==0) + maxVer=1; + else if (strcasecmp(name, "JobCreateDatedTransfer")==0) + maxVer=2; + else if (strcasecmp(name, "JobModifyDatedTransfer")==0) + maxVer=2; + else if (strcasecmp(name, "JobDeleteDatedTransfer")==0) + maxVer=1; + else if (strcasecmp(name, "JobCreateStandingOrder")==0) + maxVer=2; + else if (strcasecmp(name, "JobModifyStandingOrder")==0) + maxVer=2; + else if (strcasecmp(name, "JobDeleteStandingOrder")==0) + maxVer=1; + if (maxVer==-1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "This job needs an account suffix, but your bank didn't provide one. " + "Therefore this job is not supported with your account."); + GWEN_Gui_ProgressLog(0, + GWEN_LoggerLevel_Error, + I18N("This job needs an account suffix, but your bank did not provide one. " + "Therefore this job is not supported with your account.\n" + "Setting a higher HBCI version in the user settings might fix " + "the problem.")); + return NULL; + } + if (maxVer>0) { + jobVersion=AH_Job_GetMaxVersionUpUntil(name, u, maxVer); + if (jobVersion<1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No job [%s] below version %d, falling back to 0", name, maxVer); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Warning, + "No version for job [%s] up to %d found, falling back to 0", name, maxVer); + jobVersion=0; + } + else { + DBG_INFO(AQHBCI_LOGDOMAIN, "Reducing version of job [%s] to %d", name, jobVersion); + } + } + } + + j=AH_Job_new(name, u, AB_Account_GetAccountNumber(account), jobVersion); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_ACCOUNTJOB, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_ACCOUNTJOB, j, aj, AH_AccountJob_FreeData); + aj->account=account; + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + s=AB_Account_GetAccountNumber(account); + if (s && *s) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "accountId", s); + + s=AB_Account_GetSubAccountId(account); + if (s && *s) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "accountSubId", s); + + s=AB_Account_GetBankCode(account); + if (s && *s) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "bankCode", s); + + GWEN_DB_SetIntValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "country", 280); + + /* new for SEPA jobs */ + s=AB_Account_GetIBAN(account); + if (s && *s) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "iban", s); + + s=AB_Account_GetBIC(account); + if (s && *s) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, "bic", s); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AB_ACCOUNT *AH_AccountJob_GetAccount(const AH_JOB *j){ + AH_ACCOUNTJOB *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_ACCOUNTJOB, j); + assert(aj); + + return aj->account; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_AccountJob_FreeData(void *bp, void *p) { + AH_ACCOUNTJOB *aj; + + aj=(AH_ACCOUNTJOB*)p; + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_AccountJob_IsAccountJob(const AH_JOB *j) { + return GWEN_INHERIT_ISOFTYPE(AH_JOB, AH_ACCOUNTJOB, j); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_AccountJob_AddCurrentTime(GWEN_BUFFER *buf) { + GWEN_TIME *t; + int hours, mins, secs; + char numbuf[16]; + + t=GWEN_CurrentTime(); + assert(t); + if (GWEN_Time_GetBrokenDownTime(t, &hours, &mins, &secs)) { + GWEN_Time_free(t); + return -1; + } + snprintf(numbuf, sizeof(numbuf), "%02d%02d%02d", hours, mins, secs); + GWEN_Buffer_AppendString(buf, numbuf); + GWEN_Time_free(t); + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_AccountJob_AddCurrentDate(GWEN_BUFFER *buf) { + GWEN_TIME *t; + int year, month, day; + char numbuf[16]; + + t=GWEN_CurrentTime(); + assert(t); + if (GWEN_Time_GetBrokenDownDate(t, &day, &month, &year)) { + GWEN_Time_free(t); + return -1; + } + snprintf(numbuf, sizeof(numbuf), "%04d%02d%02d", year, month, day); + GWEN_Buffer_AppendString(buf, numbuf); + GWEN_Time_free(t); + return 0; +} + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,36 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_ACCOUNTJOBS_L_H +#define AH_ACCOUNTJOBS_L_H + + +#include "job_l.h" +#include +#include + + +AH_JOB *AH_AccountJob_new(const char *name, + AB_USER *u, + AB_ACCOUNT *account); +int AH_AccountJob_IsAccountJob(const AH_JOB *j); + +AB_ACCOUNT *AH_AccountJob_GetAccount(const AH_JOB *j); + +int AH_AccountJob_AddCurrentTime(GWEN_BUFFER *buf); +int AH_AccountJob_AddCurrentDate(GWEN_BUFFER *buf); + + +#endif /* AH_ACCOUNTJOBS_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/accountjob_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,34 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_ACCOUNTJOBS_P_H +#define AH_ACCOUNTJOBS_P_H + + +#include "accountjob_l.h" + + +typedef struct AH_ACCOUNTJOB AH_ACCOUNTJOB; +struct AH_ACCOUNTJOB { + AB_ACCOUNT *account; +}; + + +static void GWENHYWFAR_CB AH_AccountJob_FreeData(void *bp, void *p); + + + + +#endif /* AH_ACCOUNTJOBS_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatedatedxfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatedatedxfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatedatedxfer.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatedatedxfer.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,163 @@ + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatesto.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatesto.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatesto.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobcreatesto.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,244 @@ + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletedatedxfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletedatedxfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletedatedxfer.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletedatedxfer.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,117 @@ + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletesto.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletesto.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletesto.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobdeletesto.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,187 @@ + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,782 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobeutransfer_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + + +GWEN_INHERIT(AH_JOB, AH_JOB_EUTRANSFER); + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_EuTransfer_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_EuTransferBase_new(u, account, 1); + if (j!=NULL) + AH_Job_SetChallengeClass(j, 20); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_EuTransferBase_new(AB_USER *u, + AB_ACCOUNT *account, + int isTransfer) { + AH_JOB *j; + AH_JOB_EUTRANSFER *aj; + GWEN_DB_NODE *dbArgs; + + j=AH_AccountJob_new("JobEuTransfer", + u, account); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_EUTRANSFER, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_EUTRANSFER, j, aj, + AH_Job_EuTransfer_FreeData); + aj->isTransfer=isTransfer; + /* overwrite some virtual functions */ + AH_Job_SetProcessFn(j, AH_Job_EuTransfer_Process); + AH_Job_SetExchangeFn(j, AH_Job_EuTransfer_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_EuTransfer_FreeData(void *bp, void *p){ + AH_JOB_EUTRANSFER *aj; + + aj=(AH_JOB_EUTRANSFER*)p; + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_EuTransfer_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_EUTRANSFER *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_EUTRANSFER, j); + assert(aj); + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing %s", + "JobEuTransfer"); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_EuTransfer__ValidateTransfer(AB_JOB *bj, + AH_JOB *mj, + AB_TRANSACTION *t) { + const GWEN_STRINGLIST *sl; + int maxn; + int maxs; + int n; + const char *s; + AH_JOB_EUTRANSFER *aj; + const AB_EUTRANSFER_INFO *ei=0; + const AB_TRANSACTION_LIMITS *lim=0; + + assert(mj); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_EUTRANSFER, mj); + assert(aj); + + /* get country info (check for IBAN) */ + s=AB_Transaction_GetRemoteIban(t); + if (s) { + char cnt[3]; + + if (AB_JobEuTransfer_GetIbanAllowed(bj)) { + memmove(cnt, s, 2); + cnt[2]=0; + ei=AB_JobEuTransfer_FindCountryInfo(bj, cnt); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "IBAN not allowed for this account"); + return GWEN_ERROR_INVALID; + } + } + else { + s=AB_Transaction_GetRemoteCountry(t); + if (!s) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "remote country code not set"); + return GWEN_ERROR_INVALID; + } + ei=AB_JobEuTransfer_FindCountryInfo(bj, s); + } + + if (ei) + lim=AB_EuTransferInfo_GetFieldLimits(ei); + + /* check purpose */ + if (lim) { + maxn=AB_TransactionLimits_GetMaxLinesPurpose(lim); + if (maxn==-1) + maxn=1; + maxs=AB_TransactionLimits_GetMaxLenPurpose(lim); + if (maxs==-1) + maxs=27; + } + else { + maxn=1; + maxs=27; + } + + sl=AB_Transaction_GetPurpose(t); + n=0; + if (sl) { + GWEN_STRINGLISTENTRY *se; + GWEN_STRINGLIST *nsl; + const char *p; + + nsl=GWEN_StringList_new(); + se=GWEN_StringList_FirstEntry(sl); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p && *p) { + char *np; + int l; + GWEN_BUFFER *tbuf; + + n++; + if (maxn!=-1 && n>maxn) { + DBG_WARN(AQHBCI_LOGDOMAIN, + "Too many purpose lines (%d>%d), cutting off", n, maxn); + break; + } + tbuf=GWEN_Buffer_new(0, maxs, 0, 1); + AB_ImExporter_Utf8ToDta(p, -1, tbuf); + l=GWEN_Buffer_GetUsedBytes(tbuf); + if (l>maxs) { + DBG_WARN(AQHBCI_LOGDOMAIN, + "Too many chars in line %d (%d>27), cutting off", n, l); + l=maxs; + } + np=(char*)malloc(l+1); + memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); + GWEN_Buffer_free(tbuf); + /* let string list take the newly alllocated string */ + GWEN_StringList_AppendString(nsl, np, 1, 0); + } + se=GWEN_StringListEntry_Next(se); + } /* while */ + AB_Transaction_SetPurpose(t, nsl); + } + + /* check remote name */ + maxn=1; + if (lim) { + maxn=AB_TransactionLimits_GetMaxLinesRemoteName(lim); + if (maxn==-1) + maxn=1; + maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); + if (maxs==-1) + maxs=27; + } + else { + maxs=27; + } + sl=AB_Transaction_GetRemoteName(t); + n=0; + if (sl) { + GWEN_STRINGLISTENTRY *se; + GWEN_STRINGLIST *nsl; + const char *p; + + nsl=GWEN_StringList_new(); + se=GWEN_StringList_FirstEntry(sl); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p && *p) { + char *np; + int l; + GWEN_BUFFER *tbuf; + + n++; + if (maxn!=-1 && n>maxn) { + DBG_WARN(AQHBCI_LOGDOMAIN, + "Too many remote name lines (%d>%d), cutting off", + n, maxn); + break; + } + tbuf=GWEN_Buffer_new(0, maxs, 0, 1); + AB_ImExporter_Utf8ToDta(p, -1, tbuf); + l=GWEN_Buffer_GetUsedBytes(tbuf); + if (l>maxs) { + DBG_WARN(AQHBCI_LOGDOMAIN, + "Too many chars in line %d (%d>27), cutting off", n, l); + l=maxs; + } + np=(char*)malloc(l+1); + memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); + GWEN_Buffer_free(tbuf); + /* let string list take the newly alllocated string */ + GWEN_StringList_AppendString(nsl, np, 1, 0); + } + se=GWEN_StringListEntry_Next(se); + } /* while */ + AB_Transaction_SetRemoteName(t, nsl); + } + + /* check local name */ + s=AB_Transaction_GetLocalName(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local name, filling in"); + a=AB_Job_GetAccount(bj); + assert(a); + s=AB_Account_GetOwnerName(a); + if (!s) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No owner name in account, giving up"); + return GWEN_ERROR_INVALID; + } + AB_Transaction_SetLocalName(t, s); + } + + s=AB_Transaction_GetLocalName(t); + if (s) { + int l; + GWEN_BUFFER *tbuf; + + if (lim) { + maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); + if (maxs==-1) + maxs=27; + } + else { + maxs=27; + } + + tbuf=GWEN_Buffer_new(0, maxs, 0, 1); + AB_ImExporter_Utf8ToDta(s, -1, tbuf); + l=GWEN_Buffer_GetUsedBytes(tbuf); + if (l>maxs) { + DBG_WARN(AQHBCI_LOGDOMAIN, + "Too many chars in local name (%d>27), cutting off", l); + GWEN_Buffer_Crop(tbuf, 0, maxs); + } + AB_Transaction_SetLocalName(t, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + + /* check local bank code */ + s=AB_Transaction_GetLocalBankCode(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local bank code, filling in"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetBankCode(a); + assert(s); + AB_Transaction_SetLocalBankCode(t, s); + } + + /* check local account number */ + s=AB_Transaction_GetLocalAccountNumber(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local account number, filling in"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetAccountNumber(a); + assert(s); + AB_Transaction_SetLocalAccountNumber(t, s); + } + + /* check local account suffix */ + s=AB_Transaction_GetLocalSuffix(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_INFO(AQHBCI_LOGDOMAIN, + "No local suffix, filling in (if possible)"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetSubAccountId(a); + if (s && *s) + AB_Transaction_SetLocalSuffix(t, s); + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_EuTransfer_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_EUTRANSFER *aj; + AB_BANKING *ab; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_EUTRANSFER, j); + assert(aj); + + ab=AB_Account_GetBanking(AB_Job_GetAccount(bj)); + assert(ab); + + if (AB_Job_GetType(bj)!=AB_Job_TypeEuTransfer) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Not a %s job job", + "EuTransfer"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: { + GWEN_DB_NODE *dbParams; + GWEN_DB_NODE *dbT; + int i; + const char *s; + + dbParams=AH_Job_GetParams(j); + /*DBG_NOTICE(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + GWEN_DB_Dump(dbParams, stderr, 2);*/ + s=GWEN_DB_GetCharValue(dbParams, "IbanAllowed", 0, "N"); + AB_JobEuTransfer_SetIbanAllowed(bj, strcasecmp(s, "J")==0); + + dbT=GWEN_DB_FindFirstGroup(dbParams, "country"); + if (dbT) { + AB_EUTRANSFER_INFO_LIST *eil; + + eil=AB_EuTransferInfo_List_new(); + while(dbT) { + i=GWEN_DB_GetIntValue(dbT, "code", 0, 0); + if (i) { + const AB_COUNTRY *cnt; + AB_BANKING *ab; + + ab=AB_Account_GetBanking(AB_Job_GetAccount(bj)); + assert(ab); + cnt=AB_Banking_FindCountryByNumeric(ab, i); + if (cnt) { + AB_EUTRANSFER_INFO *ei; + const char *v, *cur; + AB_TRANSACTION_LIMITS *lim; + + ei=AB_EuTransferInfo_new(); + lim=AB_TransactionLimits_new(); + + AB_TransactionLimits_SetNeedDate(lim, -1); + + AB_EuTransferInfo_SetCountryCode(ei, AB_Country_GetCode(cnt)); + + i=GWEN_DB_GetIntValue(dbT, "MaxLenOurName", 0, -1); + AB_TransactionLimits_SetMaxLenLocalName(lim, i); + + i=GWEN_DB_GetIntValue(dbT, "MaxLenOtherName", 0, -1); + AB_TransactionLimits_SetMaxLenRemoteName(lim, i); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + + i=GWEN_DB_GetIntValue(dbT, "MaxLenPurpose", 0, -1); + AB_TransactionLimits_SetMaxLenPurpose(lim, i); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 1); + + v=GWEN_DB_GetCharValue(dbT, "LimitLocalValue", 0, 0); + cur=GWEN_DB_GetCharValue(dbT, "LimitLocalCurrency", 0, 0); + if (v) { + double dv; + + if (GWEN_Text_StringToDouble(v, &dv)) { + DBG_WARN(AQHBCI_LOGDOMAIN, "Bad value"); + } + else { + AB_VALUE *val; + + val=AB_Value_fromDouble(dv); + assert(val); + AB_Value_SetCurrency(val, cur); + AB_EuTransferInfo_SetLimitLocalValue(ei, val); + AB_Value_free(val); + } + } + + v=GWEN_DB_GetCharValue(dbT, "LimitForeignValue", 0, 0); + cur=GWEN_DB_GetCharValue(dbT, "LimitforeignCurrency", 0, 0); + if (v) { + double dv; + + if (GWEN_Text_StringToDouble(v, &dv)) { + DBG_WARN(AQHBCI_LOGDOMAIN, "Bad value"); + } + else { + AB_VALUE *val; + + val=AB_Value_fromDouble(dv); + assert(val); + AB_Value_SetCurrency(val, cur); + AB_EuTransferInfo_SetLimitForeignValue(ei, val); + AB_Value_free(val); + } + } + + /* set limits */ + AB_EuTransferInfo_SetFieldLimits(ei, lim); + + /* add country info */ + AB_EuTransferInfo_List_Add(ei, eil); + } /* if cnt */ + } /* if numeric country code given */ + dbT=GWEN_DB_FindNextGroup(dbT, "country"); + } /* while dbT */ + AB_JobEuTransfer_SetCountryInfoList(bj, eil); + } /* if countryInfo in params */ + + return 0; + } + + case AH_Job_ExchangeModeArgs: { + GWEN_DB_NODE *dbArgs; + const AB_TRANSACTION *ot; + const AB_VALUE *v; + + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + ot=AB_JobEuTransfer_GetTransaction(bj); + if (ot) { + GWEN_DB_NODE *dbT; + const char *p; + const GWEN_STRINGLIST *sl; + AB_TRANSACTION *t; + const AB_COUNTRY *cy=0; + int i; + + t=AB_Transaction_dup(ot); + assert(t); + if (AH_Job_EuTransfer__ValidateTransfer(bj, j, t)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Invalid transaction"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_INVALID; + } + + /* get remote country information */ + p=AB_Transaction_GetRemoteIban(t); + if (p) { + char cnt[3]; + + memmove(cnt, p, 2); + cnt[2]=0; + cy=AB_Banking_FindCountryByCode(ab, cnt); + } + else { + p=AB_Transaction_GetRemoteCountry(t); + if (!p) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "remote country code not set"); + return GWEN_ERROR_INVALID; + } + cy=AB_Banking_FindCountryByCode(ab, p); + } + if (!cy) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No country info available"); + return GWEN_ERROR_INVALID; + } + + /* store the validated transaction back into application job, + * to allow the application to recognize answers to this job later */ + AB_JobEuTransfer_SetTransaction(bj, t); + + dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, + "transaction"); + assert(dbT); + + /* store local account */ + GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/country", 280); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/bankCode", + AB_Transaction_GetLocalBankCode(t)); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/accountId", + AB_Transaction_GetLocalAccountNumber(t)); + + p=AB_Transaction_GetLocalSuffix(t); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/accountsubid", p); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourName", + AB_Transaction_GetLocalName(t)); + + p=AB_Transaction_GetRemoteIban(t); + if (p) { + /* store IBAN */ + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "iban", + p); + } + else { + const char *s; + + /* store remote account */ + if (cy) { + GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "otherAccount/country", + AB_Country_GetNumericCode(cy)); + } + + s=AB_Transaction_GetRemoteBankCode(t); + if (s) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "otherAccount/bankCode", + s); + s=AB_Transaction_GetRemoteAccountNumber(t); + if (s) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "otherAccount/accountId", + s); + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Remote account id not set"); + return GWEN_ERROR_INVALID; + } + } + + p=AB_Transaction_GetRemoteBankName(t); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "otherBankName", + p); + + + /* store remote name */ + sl=AB_Transaction_GetRemoteName(t); + if (sl) { + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(sl); + GWEN_DB_DeleteVar(dbT, "otherName"); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, + "otherName", p); + se=GWEN_StringListEntry_Next(se); + } /* while */ + } + + /* store value */ + v=AB_Transaction_GetValue(t); + if (v) { + GWEN_DB_NODE *dbV; + GWEN_BUFFER *nbuf; + char *p; + const char *s; + int l; + + dbV=GWEN_DB_GetGroup(dbT, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "value"); + assert(dbV); + + nbuf=GWEN_Buffer_new(0, 32, 0, 1); + if (GWEN_Text_DoubleToBuffer(AB_Value_GetValueAsDouble(v), + nbuf)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Buffer overflow"); + GWEN_Buffer_free(nbuf); + abort(); + } + + l=GWEN_Buffer_GetUsedBytes(nbuf); + if (!l) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); + GWEN_Buffer_free(nbuf); + abort(); + } + + /* replace "C" comma with "DE" comma, remove thousand's comma */ + p=GWEN_Buffer_GetStart(nbuf); + s=p; + while(*s) { + if (*s=='.') { + *p=','; + p++; + } + else if (*s!=',') { + *p=*s; + p++; + } + s++; + } /* while */ + *p=0; + + if (strchr(GWEN_Buffer_GetStart(nbuf), ',')) { + /* kill all trailing '0' behind the comma */ + p=GWEN_Buffer_GetStart(nbuf)+l; + while(l--) { + --p; + if (*p=='0') + *p=0; + else + break; + } + } + else + GWEN_Buffer_AppendString(nbuf, ","); + + /* store value */ + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "value", + GWEN_Buffer_GetStart(nbuf)); + GWEN_Buffer_free(nbuf); + + s=AB_Value_GetCurrency(v); + if (!s) + s="EUR"; + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "currency", s); + } /* if value */ + + /* store purpose */ + sl=AB_Transaction_GetPurpose(t); + if (sl) { + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(sl); + GWEN_DB_DeleteVar(dbT, "purpose"); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, + "purpose", p); + se=GWEN_StringListEntry_Next(se); + } /* while */ + } + + /* store "chargeWhom" */ + switch (AB_JobEuTransfer_GetChargeWhom(bj)) { + case AB_JobEuTransfer_ChargeWhom_Local: i=1; break; + case AB_JobEuTransfer_ChargeWhom_Remote: i=3; break; + case AB_JobEuTransfer_ChargeWhom_Share: i=2; break; + default: i=1; break; + } /* switch */ + GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "chargeWhom", i); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + + + return 0; + } + + case AH_Job_ExchangeModeResults: { + AH_RESULT_LIST *rl; + AH_RESULT *r; + int has10; + int has20; + + rl=AH_Job_GetSegResults(j); + assert(rl); + + r=AH_Result_List_First(rl); + if (!r) { + DBG_INFO(AQHBCI_LOGDOMAIN, "No segment results"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + has10=0; + has20=0; + while(r) { + int rcode; + + rcode=AH_Result_GetCode(r); + DBG_INFO(AQHBCI_LOGDOMAIN, "Found job result: %d", rcode); + if (rcode<=19) + has10=1; + else if (rcode>=20 && rcode <=29) + has20=1; + r=AH_Result_List_Next(r); + } + + if (has20) { + AB_Job_SetStatus(bj, AB_Job_StatusFinished); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); + } + else if (has10) { + AB_Job_SetStatus(bj, AB_Job_StatusPending); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); + } + else { + DBG_INFO(AQHBCI_LOGDOMAIN, + "Can't determine the status (neither 0010 nor 0020)"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + return 0; + } + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,28 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBEUTRANSFER_L_H +#define AH_JOBEUTRANSFER_L_H + + +#include "accountjob_l.h" + +#include + + +AH_JOB *AH_Job_EuTransfer_new(AB_USER *cu, AB_ACCOUNT *account); + + +#endif /* AH_JOBEUTRANSFER_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,41 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBEUTRANSFER_P_H +#define AH_JOBEUTRANSFER_P_H + + +#include "jobsingletransfer_l.h" +#include + + +typedef struct AH_JOB_EUTRANSFER AH_JOB_EUTRANSFER; +struct AH_JOB_EUTRANSFER { + int isTransfer; +}; +static void GWENHYWFAR_CB AH_Job_EuTransfer_FreeData(void *bp, void *p); +static int AH_Job_EuTransfer_Process(AH_JOB *j, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_EuTransfer_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + + +static int AH_Job_EuTransfer__ValidateTransfer(AB_JOB *bj, + AH_JOB *mj, + AB_TRANSACTION *t); + +static AH_JOB *AH_Job_EuTransferBase_new(AB_USER *u, + AB_ACCOUNT *account, + int isTransfer); + +#endif /* AH_JOBEUTRANSFER_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobeutransfer.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,136 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id: jobmultitransfer.c 1309 2007-10-24 01:48:05Z martin $ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobforeignxferwh_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + + +GWEN_INHERIT(AH_JOB, AH_JOB_FOREIGNXFERWH); + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_ForeignTransferWH_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_FOREIGNXFERWH *aj; + GWEN_DB_NODE *dbArgs; + GWEN_DB_NODE *dbParams; + + j=AH_AccountJob_new("JobForeignTransferWH", u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 60); + + GWEN_NEW_OBJECT(AH_JOB_FOREIGNXFERWH, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_FOREIGNXFERWH, j, aj, + AH_Job_ForeignTransferWH_FreeData); + /* overwrite some virtual functions */ + AH_Job_SetProcessFn(j, AH_Job_ForeignTransferWH_Process); + AH_Job_SetExchangeFn(j, AH_Job_ForeignTransferWH_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "bankCode", + AB_Account_GetBankCode(account)); + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "accountId", + AB_Account_GetAccountNumber(account)); + + dbParams=AH_Job_GetParams(j); + aj->maxTransfers=GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0); + if (aj->maxTransfers==0 || aj->maxTransfers>AH_JOBFOREIGNXFERWH_MAXTRANS) + aj->maxTransfers=AH_JOBFOREIGNXFERWH_MAXTRANS; + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_ForeignTransferWH_FreeData(void *bp, void *p){ + AH_JOB_FOREIGNXFERWH *aj; + + aj=(AH_JOB_FOREIGNXFERWH*)p; + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_ForeignTransferWH_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_FOREIGNXFERWH *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_FOREIGNXFERWH, j); + assert(aj); + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobForeignTransferWH"); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_ForeignTransferWH_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + /* this function is not needed since there is no AB_Job for this */ + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_ForeignTransferWH_SetDtazv(AH_JOB *j, + const uint8_t *dataPtr, + uint32_t dataLen) { + GWEN_DB_NODE *dbArgs; + + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + GWEN_DB_SetBinValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "transfers", + dataPtr, dataLen); + + return 0; +} + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,31 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id: jobgetbalance_p.h 1283 2007-07-25 14:28:36Z martin $ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOB_FOREIGNXFERWH_L_H +#define AH_JOB_FOREIGNXFERWH_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_ForeignTransferWH_new(AB_USER *u, AB_ACCOUNT *account); + +int AH_Job_ForeignTransferWH_SetDtazv(AH_JOB *j, + const uint8_t *dataPtr, + uint32_t dataLen); + + + +#endif /* AH_JOB_FOREIGNXFERWH_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,42 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOB_FOREIGNXFERWH_P_H +#define AH_JOB_FOREIGNXFERWH_P_H + + +#include "jobforeignxferwh_l.h" +#include + + +#define AH_JOBFOREIGNXFERWH_MAXTRANS 256 + + +typedef struct AH_JOB_FOREIGNXFERWH AH_JOB_FOREIGNXFERWH; +struct AH_JOB_FOREIGNXFERWH { + int maxTransfers; +}; + +static void GWENHYWFAR_CB AH_Job_ForeignTransferWH_FreeData(void *bp, + void *p); + +static int AH_Job_ForeignTransferWH_Process(AH_JOB *j, + AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_ForeignTransferWH_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + + + + +#endif /* AH_JOB_FOREIGNXFERWH_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobforeignxferwh.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,199 @@ + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,326 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobgetbalance_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include +#include +#include + +#include +#include + +#include +#include +#include + + + +GWEN_INHERIT(AH_JOB, AH_JOB_GETBALANCE); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_GetBalance_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_GETBALANCE *aj; + GWEN_DB_NODE *dbArgs; + int useCreditCardJob=0; + GWEN_DB_NODE *updgroup; + + //Check if we should use DKKKS + updgroup=AH_User_GetUpd(u); + assert(updgroup); + updgroup=GWEN_DB_GetGroup(updgroup, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + AB_Account_GetAccountNumber(account)); + if (updgroup) { + GWEN_DB_NODE *n; + + n=GWEN_DB_GetFirstGroup(updgroup); + while(n) { + if (strcasecmp(GWEN_DB_GetCharValue(n, "job", 0, ""), + "DKKKS")==0) { + useCreditCardJob = 1; + break; + } + n=GWEN_DB_GetNextGroup(n); + } /* while */ + } /* if updgroup for the given account found */ + + if(useCreditCardJob) + j=AH_AccountJob_new("JobGetBalanceCreditCard", u, account); + else + j=AH_AccountJob_new("JobGetBalance", u, account); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_GETBALANCE, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETBALANCE, j, aj, AH_Job_GetBalance_FreeData); + /* overwrite some virtual functions */ + AH_Job_SetProcessFn(j, AH_Job_GetBalance_Process); + AH_Job_SetExchangeFn(j, AH_Job_GetBalance_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + if(useCreditCardJob) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "accountNumber", AB_Account_GetAccountNumber(account)); + else + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "allAccounts", "N"); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_GetBalance_FreeData(void *bp, void *p){ + AH_JOB_GETBALANCE *aj; + + aj=(AH_JOB_GETBALANCE*)p; + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AB_BALANCE *AH_Job_GetBalance__ReadBalance(GWEN_DB_NODE *dbT) { + GWEN_BUFFER *buf; + GWEN_TIME *t; + AB_VALUE *v1, *v2; + AB_BALANCE *bal; + const char *p; + + bal=0; + + /* read date and time */ + buf=GWEN_Buffer_new(0, 32, 0, 1); + p=GWEN_DB_GetCharValue(dbT, "date", 0, 0); + if (p) + GWEN_Buffer_AppendString(buf, p); + else { + AH_AccountJob_AddCurrentDate(buf); + } + p=GWEN_DB_GetCharValue(dbT, "time", 0, 0); + if (p) + GWEN_Buffer_AppendString(buf, p); + else { + AH_AccountJob_AddCurrentTime(buf); + } + t=GWEN_Time_fromString(GWEN_Buffer_GetStart(buf), "YYYYMMDDhhmmss"); + if (!t) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing date and time"); + } + GWEN_Buffer_free(buf); + + /* read value */ + v1=AB_Value_fromDb(dbT); + v2=0; + if (!v1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing value from DB"); + } + else { + p=GWEN_DB_GetCharValue(dbT, "debitMark", 0, 0); + if (p) { + if (strcasecmp(p, "D")==0 || + strcasecmp(p, "RC")==0) { + v2=AB_Value_dup(v1); + AB_Value_Negate(v2); + } + else if (strcasecmp(p, "C")==0 || + strcasecmp(p, "RD")==0) + v2=AB_Value_dup(v1); + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad debit mark \"%s\"", p); + v2=0; + } + } + if (v2) + bal=AB_Balance_new(v2, t); + else + bal=0; + } + + AB_Value_free(v2); + AB_Value_free(v1); + GWEN_Time_free(t); + + return bal; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetBalance_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETBALANCE *aj; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + int rv; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetBalance"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETBALANCE, j); + assert(aj); + + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + + /* search for "Balance" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbBalance; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbBalance=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/balance"); + if (!dbBalance) + dbBalance=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/balancecreditcard"); + if (dbBalance) { + AB_ACCOUNT_STATUS *acst; + GWEN_DB_NODE *dbT; + AB_ACCOUNT *a; + AB_IMEXPORTER_ACCOUNTINFO *ai; + + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Got a balance"); + if (GWEN_Logger_GetLevel(0)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbBalance, 2); + + acst=AB_AccountStatus_new(); + + /* read booked balance */ + dbT=GWEN_DB_GetGroup(dbBalance, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "booked"); + if (dbT) { + AB_BALANCE *bal; + + bal=AH_Job_GetBalance__ReadBalance(dbT); + if (bal) { + AB_AccountStatus_SetBookedBalance(acst, bal); + AB_AccountStatus_SetTime(acst, AB_Balance_GetTime(bal)); + AB_Balance_free(bal); + } + } + + /* read noted balance */ + dbT=GWEN_DB_GetGroup(dbBalance, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "noted"); + if (dbT) { + AB_BALANCE *bal; + + bal=AH_Job_GetBalance__ReadBalance(dbT); + if (bal) { + AB_AccountStatus_SetNotedBalance(acst, bal); + if (AB_AccountStatus_GetTime(acst)==NULL) + AB_AccountStatus_SetTime(acst, AB_Balance_GetTime(bal)); + AB_Balance_free(bal); + } + } + + /* read credit Line */ + dbT=GWEN_DB_GetGroup(dbBalance, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "creditLine"); + if (dbT) { + AB_VALUE *v; + + v=AB_Value_fromDb(dbT); + if (!v) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing value from DB"); + } + else { + AB_AccountStatus_SetBankLine(acst, v); + } + AB_Value_free(v); + } + + a=AH_AccountJob_GetAccount(j); + assert(a); + ai=AB_ImExporterContext_GetAccountInfo(ctx, + AB_Account_GetBankCode(a), + AB_Account_GetAccountNumber(a)); + assert(ai); + + /* add new account status */ + AB_ImExporterAccountInfo_AddAccountStatus(ai, acst); + break; /* break loop, we found the balance */ + } /* if "Balance" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetBalance_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETBALANCE *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETBALANCE, j); + assert(aj); + + if (AB_Job_GetType(bj)!=AB_Job_TypeGetBalance) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetBalance job"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "No params to exchange"); + return 0; + case AH_Job_ExchangeModeArgs: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "No arguments to exchange"); + return 0; + case AH_Job_ExchangeModeResults: + return 0; + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,27 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETBALANCE_L_H +#define AH_JOBGETBALANCE_L_H + + +#include "accountjob_l.h" +#include + + +AH_JOB *AH_Job_GetBalance_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBGETBALANCE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,38 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETBALANCE_P_H +#define AH_JOBGETBALANCE_P_H + + +#include "jobgetbalance_l.h" +#include + + +typedef struct AH_JOB_GETBALANCE AH_JOB_GETBALANCE; +struct AH_JOB_GETBALANCE { + int dummy; +}; +static void GWENHYWFAR_CB AH_Job_GetBalance_FreeData(void *bp, void *p); +static int AH_Job_GetBalance_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_GetBalance_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + +static AB_BALANCE *AH_Job_GetBalance__ReadBalance(GWEN_DB_NODE *dbT); + + + +#endif /* AH_JOBGETBALANCE_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetbalance.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,287 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobgetdatedxfers_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + + +GWEN_INHERIT(AH_JOB, AH_JOB_GETDATEDTRANSFERS); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_GetDatedTransfers_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_GETDATEDTRANSFERS *aj; + GWEN_DB_NODE *dbArgs; + + j=AH_AccountJob_new("JobGetDatedTransfers", u, account); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_GETDATEDTRANSFERS, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETDATEDTRANSFERS, j, aj, + AH_Job_GetDatedTransfers_FreeData); + /* overwrite some virtual functions */ + AH_Job_SetProcessFn(j, AH_Job_GetDatedTransfers_Process); + AH_Job_SetExchangeFn(j, AH_Job_GetDatedTransfers_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_GetDatedTransfers_FreeData(void *bp, void *p){ + AH_JOB_GETDATEDTRANSFERS *aj; + + aj=(AH_JOB_GETDATEDTRANSFERS*)p; + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetDatedTransfers_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETDATEDTRANSFERS *aj; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + AB_ACCOUNT *a; + AB_IMEXPORTER_ACCOUNTINFO *ai; + int rv; + int i; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetDatedTransfers"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETDATEDTRANSFERS, j); + assert(aj); + + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + + a=AH_AccountJob_GetAccount(j); + assert(a); + ai=AB_ImExporterContext_GetAccountInfo(ctx, + AB_Account_GetBankCode(a), + AB_Account_GetAccountNumber(a)); + assert(ai); + + /* search for "DatedTransfer" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/GetDatedTransfersResponse"); + if (dbXA) { + GWEN_DB_NODE *dbT; + AB_TRANSACTION *t; + const char *s; + + dbXA=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "datedTransfer"); + assert(dbXA); + + /* create transaction: raw */ + t=AB_Transaction_fromDb(dbXA); + assert(t); + + /* now work out some of the fields */ + + /* date */ + s=GWEN_DB_GetCharValue(dbXA, "xDate", 0, 0); + if (s && *s) { + GWEN_BUFFER *dbuf; + GWEN_TIME *ti; + + dbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Buffer_AppendString(dbuf, s); + GWEN_Buffer_AppendString(dbuf, "-12:00"); + ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), + "YYYYMMDD-hh:mm"); + assert(ti); + AB_Transaction_SetDate(t, ti); + GWEN_Time_free(ti); + } + + /* local account */ + dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "ouraccount"); + if (dbT) { + const AB_COUNTRY *cn; + + cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), + GWEN_DB_GetIntValue(dbT, + "country", 0, + 280)); + assert(cn); + AB_Transaction_SetLocalCountry(t, AB_Country_GetCode(cn)); + s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); + if (s && *s) + AB_Transaction_SetLocalBankCode(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); + if (s && *s) + AB_Transaction_SetLocalAccountNumber(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); + if (s && *s) + AB_Transaction_SetLocalSuffix(t, s); + } + + /* remote account */ + dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "otheraccount"); + if (dbT) { + const AB_COUNTRY *cn; + + cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), + GWEN_DB_GetIntValue(dbT, + "country", 0, + 280)); + assert(cn); + AB_Transaction_SetRemoteCountry(t, AB_Country_GetCode(cn)); + s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); + if (s && *s) + AB_Transaction_SetRemoteBankCode(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); + if (s && *s) + AB_Transaction_SetRemoteAccountNumber(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); + if (s && *s) + AB_Transaction_SetRemoteSuffix(t, s); + } + + /* remote name */ + AB_Transaction_ClearRemoteName(t); + for (i=0; ; i++) { + s=GWEN_DB_GetCharValue(dbXA, "otherName", i, 0); + if (s) { + if (*s) { + GWEN_BUFFER *dbuf; + + dbuf=GWEN_Buffer_new(0, 27, 0, 1); + AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); + AB_Transaction_AddRemoteName(t, GWEN_Buffer_GetStart(dbuf), 1); + GWEN_Buffer_free(dbuf); + } + } + else + break; + } + + /* purpose name */ + AB_Transaction_ClearPurpose(t); + for (i=0; ; i++) { + s=GWEN_DB_GetCharValue(dbXA, "purpose", i, 0); + if (s) { + if (*s) { + GWEN_BUFFER *dbuf; + + dbuf=GWEN_Buffer_new(0, 27, 0, 1); + AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); + AB_Transaction_AddPurpose(t, GWEN_Buffer_GetStart(dbuf), 0); + GWEN_Buffer_free(dbuf); + } + } + else + break; + } + + /* add to list */ + AB_ImExporterAccountInfo_AddDatedTransfer(ai, t); + } /* if "datedTransfer" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetDatedTransfers_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETDATEDTRANSFERS *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETDATEDTRANSFERS, j); + assert(aj); + + if (AB_Job_GetType(bj)!=AB_Job_TypeGetDatedTransfers) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetDatedTransfers job"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: + return 0; + + case AH_Job_ExchangeModeArgs: + return 0; + + case AH_Job_ExchangeModeResults: + return 0; + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,26 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETDATEDTRANSFERS_L_H +#define AH_JOBGETDATEDTRANSFERS_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_GetDatedTransfers_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBGETDATEDTRANSFERS_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,37 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETDATEDTRANSFERS_P_H +#define AH_JOBGETDATEDTRANSFERS_P_H + + +#include "jobgetdatedxfers_l.h" +#include + + +typedef struct AH_JOB_GETDATEDTRANSFERS AH_JOB_GETDATEDTRANSFERS; +struct AH_JOB_GETDATEDTRANSFERS { + int dummy; +}; +static void GWENHYWFAR_CB AH_Job_GetDatedTransfers_FreeData(void *bp, void *p); + +static int AH_Job_GetDatedTransfers_Process(AH_JOB *j, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_GetDatedTransfers_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + + +#endif /* AH_JOBGETDATEDTRANSFERS_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetdatedxfers.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,362 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobgetstandingorders_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + + +GWEN_INHERIT(AH_JOB, AH_JOB_GETSTANDINGORDERS); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_GetStandingOrders_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_GETSTANDINGORDERS *aj; + GWEN_DB_NODE *dbArgs; + + j=AH_AccountJob_new("JobGetStandingOrders", u, account); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_GETSTANDINGORDERS, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETSTANDINGORDERS, j, aj, + AH_Job_GetStandingOrders_FreeData); + /* overwrite some virtual functions */ + AH_Job_SetProcessFn(j, AH_Job_GetStandingOrders_Process); + AH_Job_SetExchangeFn(j, AH_Job_GetStandingOrders_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "allAccounts", "N"); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_GetStandingOrders_FreeData(void *bp, void *p){ + AH_JOB_GETSTANDINGORDERS *aj; + + aj=(AH_JOB_GETSTANDINGORDERS*)p; + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetStandingOrders_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETSTANDINGORDERS *aj; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + int rv; + int i; + AB_ACCOUNT *a; + AB_IMEXPORTER_ACCOUNTINFO *ai; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetStandingOrders"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETSTANDINGORDERS, j); + assert(aj); + + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + + a=AH_AccountJob_GetAccount(j); + assert(a); + ai=AB_ImExporterContext_GetAccountInfo(ctx, + AB_Account_GetBankCode(a), + AB_Account_GetAccountNumber(a)); + assert(ai); + + /* search for "StandingOrder" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/GetStandingOrdersResponse"); + if (dbXA) { + GWEN_DB_NODE *dbT; + AB_TRANSACTION *t; + const char *s; + + dbXA=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "standingOrder"); + assert(dbXA); + + /* create transaction: raw */ + t=AB_Transaction_fromDb(dbXA); + assert(t); + + /* now work out some of the fields */ + + /* date */ + s=GWEN_DB_GetCharValue(dbXA, "xDate", 0, 0); + if (s && *s) { + GWEN_BUFFER *dbuf; + GWEN_TIME *ti; + + dbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Buffer_AppendString(dbuf, s); + GWEN_Buffer_AppendString(dbuf, "-12:00"); + ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), + "YYYYMMDD-hh:mm"); + assert(ti); + AB_Transaction_SetDate(t, ti); + GWEN_Time_free(ti); + GWEN_Buffer_free(dbuf); + } + + /* firstExecutionDate */ + s=GWEN_DB_GetCharValue(dbXA, "special/xfirstExecutionDate", 0, 0); + if (s && *s) { + GWEN_BUFFER *dbuf; + GWEN_TIME *ti; + + dbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Buffer_AppendString(dbuf, s); + GWEN_Buffer_AppendString(dbuf, "-12:00"); + ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), + "YYYYMMDD-hh:mm"); + assert(ti); + AB_Transaction_SetFirstExecutionDate(t, ti); + GWEN_Time_free(ti); + GWEN_Buffer_free(dbuf); + } + + /* lastExecutionDate */ + s=GWEN_DB_GetCharValue(dbXA, "special/xlastExecutionDate", 0, 0); + if (s && *s) { + GWEN_BUFFER *dbuf; + GWEN_TIME *ti; + + dbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Buffer_AppendString(dbuf, s); + GWEN_Buffer_AppendString(dbuf, "-12:00"); + ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), + "YYYYMMDD-hh:mm"); + assert(ti); + AB_Transaction_SetLastExecutionDate(t, ti); + GWEN_Time_free(ti); + GWEN_Buffer_free(dbuf); + } + + /* nextExecutionDate */ + s=GWEN_DB_GetCharValue(dbXA, "xnextExecutionDate", 0, 0); + if (s && *s) { + GWEN_BUFFER *dbuf; + GWEN_TIME *ti; + + dbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Buffer_AppendString(dbuf, s); + GWEN_Buffer_AppendString(dbuf, "-12:00"); + ti=GWEN_Time_fromUtcString(GWEN_Buffer_GetStart(dbuf), + "YYYYMMDD-hh:mm"); + assert(ti); + AB_Transaction_SetNextExecutionDate(t, ti); + GWEN_Time_free(ti); + GWEN_Buffer_free(dbuf); + } + + /* period */ + s=GWEN_DB_GetCharValue(dbXA, "special/xperiod", 0, 0); + if (s && *s) { + if (strcasecmp(s, "W")==0) + AB_Transaction_SetPeriod(t, AB_Transaction_PeriodWeekly); + else if (strcasecmp(s, "M")==0) + AB_Transaction_SetPeriod(t, AB_Transaction_PeriodMonthly); + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Unknown period \"%s\"", s); + abort(); + } + } + + /* cycle */ + i=GWEN_DB_GetIntValue(dbXA, "special/cycle", 0, 0); + AB_Transaction_SetCycle(t, i); + + /* execution day */ + i=GWEN_DB_GetIntValue(dbXA, "special/executionDay", 0, 0); + AB_Transaction_SetExecutionDay(t, i); + + /* local account */ + dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "ouraccount"); + if (dbT) { + const AB_COUNTRY *cn; + + cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), + GWEN_DB_GetIntValue(dbT, + "country", 0, + 280)); + assert(cn); + AB_Transaction_SetLocalCountry(t, AB_Country_GetCode(cn)); + s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); + if (s && *s) + AB_Transaction_SetLocalBankCode(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); + if (s && *s) + AB_Transaction_SetLocalAccountNumber(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); + if (s && *s) + AB_Transaction_SetLocalSuffix(t, s); + } + + /* remote account */ + dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "otheraccount"); + if (dbT) { + const AB_COUNTRY *cn; + + cn=AB_Banking_FindCountryByNumeric(AH_Job_GetBankingApi(j), + GWEN_DB_GetIntValue(dbT, + "country", 0, + 280)); + assert(cn); + AB_Transaction_SetRemoteCountry(t, AB_Country_GetCode(cn)); + s=GWEN_DB_GetCharValue(dbT, "bankCode", 0, 0); + if (s && *s) + AB_Transaction_SetRemoteBankCode(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountId", 0, 0); + if (s && *s) + AB_Transaction_SetRemoteAccountNumber(t, s); + s=GWEN_DB_GetCharValue(dbT, "accountSubId", 0, 0); + if (s && *s) + AB_Transaction_SetRemoteSuffix(t, s); + } + + /* remote name */ + AB_Transaction_ClearRemoteName(t); + for (i=0; ; i++) { + s=GWEN_DB_GetCharValue(dbXA, "otherName", i, 0); + if (s) { + if (*s) { + GWEN_BUFFER *dbuf; + + dbuf=GWEN_Buffer_new(0, 27, 0, 1); + AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); + AB_Transaction_AddRemoteName(t, GWEN_Buffer_GetStart(dbuf), 1); + GWEN_Buffer_free(dbuf); + } + } + else + break; + } + + /* purpose name */ + AB_Transaction_ClearPurpose(t); + for (i=0; ; i++) { + s=GWEN_DB_GetCharValue(dbXA, "purpose", i, 0); + if (s) { + if (*s) { + GWEN_BUFFER *dbuf; + + dbuf=GWEN_Buffer_new(0, 27, 0, 1); + AB_ImExporter_DtaToUtf8(s, strlen(s), dbuf); + AB_Transaction_AddPurpose(t, GWEN_Buffer_GetStart(dbuf), 0); + GWEN_Buffer_free(dbuf); + } + } + else + break; + } + + /* add to list */ + AB_ImExporterAccountInfo_AddStandingOrder(ai, t); + } /* if "standingOrder" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetStandingOrders_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETSTANDINGORDERS *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETSTANDINGORDERS, j); + assert(aj); + + if (AB_Job_GetType(bj)!=AB_Job_TypeGetStandingOrders) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetStandingOrders job"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: + return 0; + + case AH_Job_ExchangeModeArgs: + return 0; + + case AH_Job_ExchangeModeResults: + return 0; + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,25 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETSTANDINGORDERS_L_H +#define AH_JOBGETSTANDINGORDERS_L_H + + +#include "accountjob_l.h" + +AH_JOB *AH_Job_GetStandingOrders_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBGETSTANDINGORDERS_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,34 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETSTANDINGORDERS_P_H +#define AH_JOBGETSTANDINGORDERS_P_H + + +#include "jobgetstandingorders_l.h" +#include + + +typedef struct AH_JOB_GETSTANDINGORDERS AH_JOB_GETSTANDINGORDERS; +struct AH_JOB_GETSTANDINGORDERS { + int dummy; +}; +static void GWENHYWFAR_CB AH_Job_GetStandingOrders_FreeData(void *bp, void *p); + +static int AH_Job_GetStandingOrders_Process(AH_JOB *j, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_GetStandingOrders_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + + +#endif /* AH_JOBGETSTANDINGORDERS_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgetstandingorders.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,357 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.c 2015-06-01 11:44:55.000000000 +0000 @@ -0,0 +1,661 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobgettransactions_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include + + +GWEN_INHERIT(AH_JOB, AH_JOB_GETTRANSACTIONS); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_GetTransactions_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_GETTRANSACTIONS *aj; + GWEN_DB_NODE *dbArgs; + + int useCreditCardJob = 0; + + //Check if we should use DKKKU + GWEN_DB_NODE *updgroup; + updgroup=AH_User_GetUpd(u); + assert(updgroup); + updgroup=GWEN_DB_GetGroup(updgroup, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + AB_Account_GetAccountNumber(account)); + if (updgroup) { + GWEN_DB_NODE *n; + n=GWEN_DB_GetFirstGroup(updgroup); + while(n) { + if (strcasecmp(GWEN_DB_GetCharValue(n, "job", 0, ""), + "DKKKU")==0) { + useCreditCardJob = 1; + break; + } + n=GWEN_DB_GetNextGroup(n); + } /* while */ + } /* if updgroup for the given account found */ + + if(useCreditCardJob) + j=AH_AccountJob_new("JobGetTransactionsCreditCard", u, account); + else + j=AH_AccountJob_new("JobGetTransactions", u, account); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_GETTRANSACTIONS, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j, aj, + AH_Job_GetTransactions_FreeData); + /* overwrite some virtual functions */ + if(useCreditCardJob) + AH_Job_SetProcessFn(j, AH_Job_GetTransactionsCreditCard_Process); + else + AH_Job_SetProcessFn(j, AH_Job_GetTransactions_Process); + + AH_Job_SetExchangeFn(j, AH_Job_GetTransactions_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + if(useCreditCardJob) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "accountNumber", AB_Account_GetAccountNumber(account)); + else + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "allAccounts", "N"); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_GetTransactions_FreeData(void *bp, void *p){ + AH_JOB_GETTRANSACTIONS *aj; + + aj=(AH_JOB_GETTRANSACTIONS*)p; + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetTransactions__ReadTransactions(AH_JOB *j, + AB_IMEXPORTER_ACCOUNTINFO *ai, + const char *docType, + int noted, + GWEN_BUFFER *buf){ + GWEN_DBIO *dbio; + GWEN_SYNCIO *sio; + int rv; + GWEN_DB_NODE *db; + GWEN_DB_NODE *dbDay; + GWEN_DB_NODE *dbParams; + AB_ACCOUNT *a; + AB_USER *u; + uint32_t progressId; + uint64_t cnt=0; + + a=AH_AccountJob_GetAccount(j); + assert(a); + u=AH_Job_GetUser(j); + assert(u); + + dbio=GWEN_DBIO_GetPlugin("swift"); + if (!dbio) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Plugin SWIFT is not found"); + GWEN_Gui_ProgressLog(0, + GWEN_LoggerLevel_Error, + I18N("Plugin \"SWIFT\" not found.")); + return AB_ERROR_PLUGIN_MISSING; + } + + GWEN_Buffer_Rewind(buf); + sio=GWEN_SyncIo_Memory_new(buf, 0); + + db=GWEN_DB_Group_new("transactions"); + dbParams=GWEN_DB_Group_new("params"); + GWEN_DB_SetCharValue(dbParams, GWEN_DB_FLAGS_OVERWRITE_VARS, + "type", docType); + if (AH_User_GetFlags(u) & AH_USER_FLAGS_KEEP_MULTIPLE_BLANKS) + GWEN_DB_SetIntValue(dbParams, GWEN_DB_FLAGS_OVERWRITE_VARS, + "keepMultipleBlanks", 1); + else + GWEN_DB_SetIntValue(dbParams, GWEN_DB_FLAGS_OVERWRITE_VARS, + "keepMultipleBlanks", 0); + + rv=GWEN_DBIO_Import(dbio, sio, + db, dbParams, + GWEN_PATH_FLAGS_CREATE_GROUP); + if (rv<0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Error parsing SWIFT %s (%d)", + docType, rv); + GWEN_DB_Group_free(dbParams); + GWEN_DB_Group_free(db); + GWEN_SyncIo_free(sio); + GWEN_DBIO_free(dbio); + return rv; + } + GWEN_DB_Group_free(dbParams); + GWEN_SyncIo_free(sio); + GWEN_DBIO_free(dbio); + + /* first count the groups */ + dbDay=GWEN_DB_FindFirstGroup(db, "day"); + while(dbDay) { + GWEN_DB_NODE *dbT; + + dbT=GWEN_DB_FindFirstGroup(dbDay, "transaction"); + while(dbT) { + cnt++; + dbT=GWEN_DB_FindNextGroup(dbT, "transaction"); + } /* while */ + dbDay=GWEN_DB_FindNextGroup(dbDay, "day"); + } /* while */ + + progressId=GWEN_Gui_ProgressStart(GWEN_GUI_PROGRESS_DELAY | + GWEN_GUI_PROGRESS_ALLOW_EMBED | + GWEN_GUI_PROGRESS_SHOW_PROGRESS | + GWEN_GUI_PROGRESS_SHOW_ABORT, + I18N("Importing transactions..."), + NULL, + cnt, + 0); + + /* add transactions to list */ + dbDay=GWEN_DB_FindFirstGroup(db, "day"); + while(dbDay) { + GWEN_DB_NODE *dbT; + + dbT=GWEN_DB_FindFirstGroup(dbDay, "transaction"); + while(dbT) { + AB_TRANSACTION *t; + + t=AB_Transaction_fromDb(dbT); + if (!t) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad transaction data:"); + GWEN_DB_Dump(dbT, 2); + } + else { + AB_Transaction_SetLocalBankCode(t, AB_User_GetBankCode(u)); + AB_Transaction_SetLocalAccountNumber(t, + AB_Account_GetAccountNumber(a)); + DBG_INFO(AQHBCI_LOGDOMAIN, "Adding transaction"); + if (noted) + AB_ImExporterAccountInfo_AddNotedTransaction(ai, t); + else + AB_ImExporterAccountInfo_AddTransaction(ai, t); + } + + if (GWEN_ERROR_USER_ABORTED== + GWEN_Gui_ProgressAdvance(progressId, GWEN_GUI_PROGRESS_ONE)) { + GWEN_Gui_ProgressEnd(progressId); + return GWEN_ERROR_USER_ABORTED; + } + + dbT=GWEN_DB_FindNextGroup(dbT, "transaction"); + } /* while */ + + /* read all endsaldos */ + if (!noted) { + dbT=GWEN_DB_FindFirstGroup(dbDay, "endSaldo"); + while (dbT) { + GWEN_DB_NODE *dbX; + GWEN_TIME *ti=0; + + dbX=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "date"); + if (dbX) + ti=GWEN_Time_fromDb(dbX); + dbX=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "value"); + if (dbX) { + AB_VALUE *v; + + v=AB_Value_fromDb(dbX); + if (v) { + AB_BALANCE *bal; + AB_ACCOUNT_STATUS *as; + + bal=AB_Balance_new(v, ti); + AB_Value_free(v); + as=AB_AccountStatus_new(); + if (ti) + AB_AccountStatus_SetTime(as, ti); + AB_AccountStatus_SetNotedBalance(as, bal); + AB_Balance_free(bal); + AB_ImExporterAccountInfo_AddAccountStatus(ai, as); + } + } + GWEN_Time_free(ti); + + dbT=GWEN_DB_FindNextGroup(dbT, "endSaldo"); + } /* while */ + } + + dbDay=GWEN_DB_FindNextGroup(dbDay, "day"); + } /* while */ + + GWEN_Gui_ProgressEnd(progressId); + + GWEN_DB_Group_free(db); + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetTransactions_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETTRANSACTIONS *aj; + AB_ACCOUNT *a; + AB_IMEXPORTER_ACCOUNTINFO *ai; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + GWEN_BUFFER *tbooked; + GWEN_BUFFER *tnoted; + int rv; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetTransactions"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j); + assert(aj); + + tbooked=GWEN_Buffer_new(0, 1024, 0, 1); + tnoted=GWEN_Buffer_new(0, 1024, 0, 1); + + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + + /* search for "Transactions" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + GWEN_Buffer_free(tbooked); + GWEN_Buffer_free(tnoted); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + GWEN_Buffer_free(tbooked); + GWEN_Buffer_free(tnoted); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/transactions"); + if (dbXA) { + const void *p; + unsigned int bs; + + if (GWEN_Logger_GetLevel(0)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbXA, 2); + p=GWEN_DB_GetBinValue(dbXA, "booked", 0, 0, 0, &bs); + if (p && bs) + GWEN_Buffer_AppendBytes(tbooked, p, bs); + p=GWEN_DB_GetBinValue(dbXA, "noted", 0, 0, 0, &bs); + if (p && bs) + GWEN_Buffer_AppendBytes(tnoted, p, bs); + } /* if "Transactions" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + + GWEN_Buffer_Rewind(tbooked); + GWEN_Buffer_Rewind(tnoted); + + /* now the buffers contain data to be parsed by DBIOs */ + a=AH_AccountJob_GetAccount(j); + assert(a); + ai=AB_ImExporterContext_GetAccountInfo(ctx, + AB_Account_GetBankCode(a), + AB_Account_GetAccountNumber(a)); + assert(ai); + AB_ImExporterAccountInfo_SetAccountId(ai, AB_Account_GetUniqueId(a)); + + /* read booked transactions */ + if (GWEN_Buffer_GetUsedBytes(tbooked)) { + if (getenv("AQHBCI_LOGBOOKED")) { + FILE *f; + + f=fopen("/tmp/booked.mt", "w+"); + if (f) { + if (fwrite(GWEN_Buffer_GetStart(tbooked), + GWEN_Buffer_GetUsedBytes(tbooked), 1, f)!=1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "fwrite: %s", strerror(errno)); + } + if (fclose(f)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "fclose: %s", strerror(errno)); + } + } + } + + if (AH_Job_GetTransactions__ReadTransactions(j, ai, "mt940", 0, tbooked)){ + GWEN_Buffer_free(tbooked); + GWEN_Buffer_free(tnoted); + DBG_INFO(AQHBCI_LOGDOMAIN, "Error parsing booked transactions"); + AH_Job_SetStatus(j, AH_JobStatusError); + return -1; + } + } + + /* read noted transactions */ + if (GWEN_Buffer_GetUsedBytes(tnoted)) { + if (getenv("AQHBCI_LOGNOTED")) { + FILE *f; + + f=fopen("/tmp/noted.mt", "w+"); + if (f) { + if (fwrite(GWEN_Buffer_GetStart(tnoted), + GWEN_Buffer_GetUsedBytes(tnoted), 1, f)!=1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "fwrite: %s", strerror(errno)); + } + if (fclose(f)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "fclose: %s", strerror(errno)); + } + } + } + + if (AH_Job_GetTransactions__ReadTransactions(j, ai, "mt942", 1, tnoted)) { + GWEN_Buffer_free(tbooked); + GWEN_Buffer_free(tnoted); + DBG_INFO(AQHBCI_LOGDOMAIN, "Error parsing noted transactions"); + AH_Job_SetStatus(j, AH_JobStatusError); + return -1; + } + } + + GWEN_Buffer_free(tbooked); + GWEN_Buffer_free(tnoted); + return 0; +} + +int AH_Job_GetTransactionsCreditCard_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETTRANSACTIONS *aj; + AB_ACCOUNT *a; + AB_IMEXPORTER_ACCOUNTINFO *ai; + AB_USER *u; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + GWEN_BUFFER *tbooked; + GWEN_BUFFER *tnoted; + int rv; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobGetTransactionsCreditCard"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j); + assert(aj); + + tbooked=GWEN_Buffer_new(0, 1024, 0, 1); + tnoted=GWEN_Buffer_new(0, 1024, 0, 1); + + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + DBG_INFO(AQHBCI_LOGDOMAIN, "Response:"); + GWEN_DB_Dump(dbResponses, 2); + DBG_INFO(AQHBCI_LOGDOMAIN, "Response end"); + + + a=AH_AccountJob_GetAccount(j); + assert(a); + ai=AB_ImExporterContext_GetAccountInfo(ctx, + AB_Account_GetBankCode(a), + AB_Account_GetAccountNumber(a)); + assert(ai); + AB_ImExporterAccountInfo_SetAccountId(ai, AB_Account_GetUniqueId(a)); + + u=AH_Job_GetUser(j); + assert(u); + + /* search for "Transactions" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + GWEN_Buffer_free(tbooked); + GWEN_Buffer_free(tnoted); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + GWEN_Buffer_free(tbooked); + GWEN_Buffer_free(tnoted); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/transactionscreditcard"); + if (dbXA) { + GWEN_DB_NODE *dbT; + GWEN_DB_NODE *dbV; + GWEN_TIME *date; + GWEN_TIME *valutaDate; + const char *p; + const char *ref; + int i; + + dbT=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "entries"); + while (dbT) { + AB_VALUE *v1; + AB_VALUE *v2; + GWEN_STRINGLIST* purpose; + AB_TRANSACTION *t; + + /* read date (Buchungsdatum) */ + p=GWEN_DB_GetCharValue(dbT, "date", 0, 0); + if (p) + date=GWEN_Time_fromString(p, "YYYYMMDD"); + else + date=NULL; + + /* read valutaData (Umsatzdatum) */ + p=GWEN_DB_GetCharValue(dbT, "valutaDate", 0, 0); + if (p) + valutaDate=GWEN_Time_fromString(p, "YYYYMMDD"); + else + valutaDate=NULL; + + /* read value */ + dbV=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "value"); + if (dbV) + v1=AB_Value_fromDb(dbV); + else + v1=NULL; + v2=0; + if (!v1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error parsing value from DB"); + } + else { + p=GWEN_DB_GetCharValue(dbT, "debitMark", 0, 0); + if (p) { + if (strcasecmp(p, "D")==0 || + strcasecmp(p, "RC")==0) { + v2=AB_Value_dup(v1); + AB_Value_Negate(v2); + } + else if (strcasecmp(p, "C")==0 || + strcasecmp(p, "RD")==0) + v2=AB_Value_dup(v1); + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad debit mark \"%s\"", p); + v2=0; + } + } + AB_Value_free(v1); + } + + /* read purpose */ + purpose=GWEN_StringList_new(); + for (i=0; i<10; i++) { + p=GWEN_DB_GetCharValue(dbT, "purpose", i, 0); + if (!p) + break; + GWEN_StringList_AppendString(purpose, p, 0, 0); + } + + /* read reference */ + ref=GWEN_DB_GetCharValue(dbT, "reference", 0, 0); + if (ref) + GWEN_StringList_AppendString(purpose, ref, 0, 0); + + t=AB_Transaction_new(); + if(ref) + AB_Transaction_SetFiId(t, ref); + AB_Transaction_SetLocalBankCode(t, AB_User_GetBankCode(u)); + AB_Transaction_SetLocalAccountNumber(t, AB_Account_GetAccountNumber(a)); + AB_Transaction_SetValutaDate(t, valutaDate); + AB_Transaction_SetDate(t, date); + AB_Transaction_SetValue(t, v2); + AB_Transaction_SetPurpose(t, purpose); + DBG_INFO(AQHBCI_LOGDOMAIN, "Adding transaction"); + AB_ImExporterAccountInfo_AddTransaction(ai, t); + + GWEN_StringList_free(purpose); + AB_Value_free(v2); + GWEN_Time_free(date); + GWEN_Time_free(valutaDate); + + dbT = GWEN_DB_FindNextGroup(dbT, "entries"); + } //while (dbT) + } //if (dbXA) + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_GetTransactions_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_GETTRANSACTIONS *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_GETTRANSACTIONS, j); + assert(aj); + + if (AB_Job_GetType(bj)!=AB_Job_TypeGetTransactions) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetTransactions job"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: { + GWEN_DB_NODE *dbParams; + + dbParams=AH_Job_GetParams(j); + AB_JobGetTransactions_SetMaxStoreDays(bj, + GWEN_DB_GetIntValue(dbParams, + "storeDays", + 0, 0) + ); + return 0; + } + + case AH_Job_ExchangeModeArgs: { + const GWEN_TIME *ti; + + ti=AB_JobGetTransactions_GetFromTime(bj); + if (ti) { + int year, month, day; + char dbuf[16]; + GWEN_DB_NODE *dbArgs; + + dbArgs=AH_Job_GetArguments(j); + if (GWEN_Time_GetBrokenDownDate(ti, &day, &month, &year)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Internal error: bad fromTime"); + return GWEN_ERROR_INVALID; + } + snprintf(dbuf, sizeof(dbuf), "%04d%02d%02d", year, month+1, day); + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "fromDate", dbuf); + } + + ti=AB_JobGetTransactions_GetToTime(bj); + if (ti) { + int year, month, day; + char dbuf[16]; + GWEN_DB_NODE *dbArgs; + + dbArgs=AH_Job_GetArguments(j); + if (GWEN_Time_GetBrokenDownDate(ti, &day, &month, &year)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Internal error: bad toTime"); + return GWEN_ERROR_INVALID; + } + snprintf(dbuf, sizeof(dbuf), "%04d%02d%02d", year, month+1, day); + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "toDate", dbuf); + } + + return 0; + } + + case AH_Job_ExchangeModeResults: + return 0; + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,29 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETTRANSACTIONS_L_H +#define AH_JOBGETTRANSACTIONS_L_H + + +#include "accountjob_l.h" + +#include + + +AH_JOB *AH_Job_GetTransactions_new(AB_USER *u, + AB_ACCOUNT *account); + + +#endif /* AH_JOBGETTRANSACTIONS_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,44 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBGETTRANSACTIONS_P_H +#define AH_JOBGETTRANSACTIONS_P_H + + +#include "jobgettransactions_l.h" +#include + + +typedef struct AH_JOB_GETTRANSACTIONS AH_JOB_GETTRANSACTIONS; +struct AH_JOB_GETTRANSACTIONS { + int dummy; +}; +static void GWENHYWFAR_CB AH_Job_GetTransactions_FreeData(void *bp, void *p); +static int AH_Job_GetTransactions_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_GetTransactionsCreditCard_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_GetTransactions_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + +static int + AH_Job_GetTransactions__ReadTransactions(AH_JOB *j, + AB_IMEXPORTER_ACCOUNTINFO *ai, + const char *docType, + int noted, + GWEN_BUFFER *buf); + + + +#endif /* AH_JOBGETTRANSACTIONS_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobgettransactions.xml 2015-06-01 11:44:55.000000000 +0000 @@ -0,0 +1,568 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + %code + %version + N + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + %code + %version + N + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + N + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + N + + + + + + + + + + + %code + %version + N + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobinternaltransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobinternaltransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobinternaltransfer.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobinternaltransfer.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,74 @@ + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,357 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobloadcellphone_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + + + +GWEN_INHERIT(AH_JOB, AH_JOB_LOADCELLPHONE); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_LoadCellPhone_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_LOADCELLPHONE *aj; + GWEN_DB_NODE *dbArgs; + + j=AH_AccountJob_new("JobLoadCellPhone", u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 41); + + GWEN_NEW_OBJECT(AH_JOB_LOADCELLPHONE, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j, aj, + AH_Job_LoadCellPhone_FreeData); + /* overwrite some virtual functions */ + AH_Job_SetExchangeFn(j, AH_Job_LoadCellPhone_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "allAccounts", "N"); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_LoadCellPhone_FreeData(void *bp, void *p){ + AH_JOB_LOADCELLPHONE *aj; + + aj=(AH_JOB_LOADCELLPHONE*)p; + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_LoadCellPhone_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AH_JOB_LOADCELLPHONE *aj; + GWEN_DB_NODE *dbParams; + GWEN_DB_NODE *dbProduct; + AB_CELLPHONE_PRODUCT_LIST *pl; + int i; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j); + assert(aj); + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* read products */ + pl=AB_CellPhoneProduct_List_new(); + dbProduct=GWEN_DB_FindFirstGroup(dbParams, "product"); + while (dbProduct) { + AB_CELLPHONE_PRODUCT *cp; + char numbuf[16]; + const char *s; + + cp=AB_CellPhoneProduct_new(); + + i=GWEN_DB_GetIntValue(dbProduct, "Code", 0, -1); + snprintf(numbuf, sizeof(numbuf), "%d", i); + AB_CellPhoneProduct_SetId(cp, numbuf); + + i=GWEN_DB_GetIntValue(dbParams, "FreeValueAllowed", 0, 0); + AB_CellPhoneProduct_SetAllowFreeValue(cp, i); + + s=GWEN_DB_GetCharValue(dbProduct, "Name", 0, NULL); + if (s) + AB_CellPhoneProduct_SetProviderName(cp, s); + + s=GWEN_DB_GetCharValue(dbProduct, "ProductName", 0, NULL); + if (s) + AB_CellPhoneProduct_SetProductName(cp, s); + + s=GWEN_DB_GetCharValue(dbProduct, "MinimumValue", 0, NULL); + if (s) { + AB_VALUE *v; + + v=AB_Value_fromString(s); + if (v==NULL) { + DBG_INFO(GWEN_LOGDOMAIN, "Bad minimum value [%s]", s); + } + else { + AB_CellPhoneProduct_SetMinimumValue(cp, v); + AB_Value_free(v); + } + } + + s=GWEN_DB_GetCharValue(dbProduct, "MaximumValue", 0, NULL); + if (s) { + AB_VALUE *v; + + v=AB_Value_fromString(s); + if (v==NULL) { + DBG_INFO(GWEN_LOGDOMAIN, "Bad maximum value [%s]", s); + } + else { + AB_CellPhoneProduct_SetMaximumValue(cp, v); + AB_Value_free(v); + } + } + + s=GWEN_DB_GetCharValue(dbProduct, "ValueList", 0, NULL); + if (s) { + char *ns; + char *p; + AB_VALUE_LIST *vl; + + /* read value list */ + vl=AB_CellPhoneProduct_GetValues(cp); + ns=strdup(s); + p=ns; + while(*p) { + char *p0; + + p0=p; + p=strchr(p0, ';'); + if (p) + *p=0; + if (*p0) { + AB_VALUE *v; + + v=AB_Value_fromString(p0); + if (v) { + AB_Value_List_Add(v, vl); + } + else { + DBG_INFO(GWEN_LOGDOMAIN, "Bad value [%s]", p0); + } + } + if (p) + p++; + else + break; + } + } + AB_CellPhoneProduct_List_Add(cp, pl); + dbProduct=GWEN_DB_FindNextGroup(dbProduct, "product"); + } + + AB_JobLoadCellPhone_SetProductList(bj, pl); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_LoadCellPhone_ExchangeArgs(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AH_JOB_LOADCELLPHONE *aj; + GWEN_DB_NODE *dbArgs; + const AB_CELLPHONE_PRODUCT *cp; + const AB_VALUE *v; + const char *s; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j); + assert(aj); + + dbArgs=AH_Job_GetArguments(j); + + cp=AB_JobLoadCellPhone_GetCellPhoneProduct(bj); + if (cp==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No product"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + + /* cell phone card provider */ + s=AB_CellPhoneProduct_GetId(cp); + assert(s); + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, "ProviderCode", s); + + /* phone number */ + s=AB_JobLoadCellPhone_GetPhoneNumber(bj); + if (s==NULL || *s==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No phone number"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, "PhoneNumber", s); + + /* value */ + v=AB_JobLoadCellPhone_GetValue(bj); + if (v==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No value"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + else if (AB_Value_IsZero(v) || AB_Value_IsNegative(v)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad value"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_INVALID; + } + else { + GWEN_DB_NODE *dbV; + GWEN_BUFFER *nbuf; + char *p; + const char *s; + int l; + + dbV=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "value"); + assert(dbV); + + nbuf=GWEN_Buffer_new(0, 32, 0, 1); + if (GWEN_Text_DoubleToBuffer(AB_Value_GetValueAsDouble(v), + nbuf)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Buffer overflow"); + GWEN_Buffer_free(nbuf); + abort(); + } + + l=GWEN_Buffer_GetUsedBytes(nbuf); + if (!l) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); + GWEN_Buffer_free(nbuf); + abort(); + } + + /* replace "C" comma with "DE" comma, remove thousand's comma */ + p=GWEN_Buffer_GetStart(nbuf); + s=p; + while(*s) { + if (*s=='.') { + *p=','; + p++; + } + else if (*s!=',') { + *p=*s; + p++; + } + s++; + } /* while */ + *p=0; + + if (strchr(GWEN_Buffer_GetStart(nbuf), ',')) { + /* kill all trailing '0' behind the comma */ + p=GWEN_Buffer_GetStart(nbuf)+l; + while(l--) { + --p; + if (*p=='0') + *p=0; + else + break; + } + } + else + GWEN_Buffer_AppendString(nbuf, ","); + + /* store value */ + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "value", + GWEN_Buffer_GetStart(nbuf)); + GWEN_Buffer_free(nbuf); + + s=AB_Value_GetCurrency(v); + if (!s) + s="EUR"; + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "currency", s); + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_LoadCellPhone_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_LOADCELLPHONE *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_LOADCELLPHONE, j); + assert(aj); + + if (AB_Job_GetType(bj)!=AB_Job_TypeLoadCellPhone) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetLoadCellPhone job"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: + return AH_Job_LoadCellPhone_ExchangeParams(j, bj, ctx); + case AH_Job_ExchangeModeArgs: + return AH_Job_LoadCellPhone_ExchangeArgs(j, bj, ctx); + case AH_Job_ExchangeModeResults: + return 0; + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBLOADCELLPHONE_L_H +#define AH_JOBLOADCELLPHONE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_LoadCellPhone_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBLOADCELLPHONE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,37 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2010 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBLOADCELLPHONE_P_H +#define AH_JOBLOADCELLPHONE_P_H + + +#include "jobloadcellphone_l.h" +#include + + +typedef struct AH_JOB_LOADCELLPHONE AH_JOB_LOADCELLPHONE; +struct AH_JOB_LOADCELLPHONE { + int dummy; +}; +static void GWENHYWFAR_CB AH_Job_LoadCellPhone_FreeData(void *bp, void *p); + +static int AH_Job_LoadCellPhone_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_LoadCellPhone_ExchangeArgs(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_LoadCellPhone_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + + +#endif /* AH_JOBLOADCELLPHONE_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobloadcellphone.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifydatedxfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifydatedxfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifydatedxfer.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifydatedxfer.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,159 @@ + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifysto.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifysto.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifysto.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmodifysto.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,283 @@ + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,797 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2011 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobmultitransfer_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + + +/*#define CHALLENGE_ADD_ONLY_PREKOMMA_VALUES*/ + +#define AH_MULTI_CHALLENGE_CLASS_HKSUB 12 +#define AH_MULTI_CHALLENGE_CLASS_HKSLA 19 + + + + +GWEN_INHERIT(AH_JOB, AH_JOB_MULTITRANSFER); + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_MultiTransfer_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_MultiTransferBase_new(u, account, 1); + if (j) + AH_Job_SetChallengeClass(j, AH_MULTI_CHALLENGE_CLASS_HKSUB); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_MultiDebitNote_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_MultiTransferBase_new(u, account, 0); + if (j) + AH_Job_SetChallengeClass(j, AH_MULTI_CHALLENGE_CLASS_HKSLA); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_MultiTransferBase_new(AB_USER *u, + AB_ACCOUNT *account, + int isTransfer) { + AH_JOB *j; + AH_JOB_MULTITRANSFER *aj; + GWEN_DB_NODE *dbArgs; + GWEN_DB_NODE *dbT; + GWEN_DB_NODE *dbParams; + const char *s; + int userMaxTrans; + int maxTransfers; + + j=AH_AccountJob_new(isTransfer?"JobMultiTransfer":"JobMultiDebitNote", + u, account); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_MULTITRANSFER, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j, aj, + AH_Job_MultiTransfer_FreeData); + aj->isTransfer=isTransfer; + aj->sumRemoteAccountId=AB_Value_new(); + aj->sumRemoteBankCode=AB_Value_new(); + aj->sumValues=AB_Value_new(); + + /* overwrite some virtual functions */ + AH_Job_SetProcessFn(j, AH_Job_MultiTransfer_Process); + AH_Job_SetExchangeFn(j, AH_Job_MultiTransfer_Exchange); + AH_Job_SetPrepareFn(j, AH_Job_MultiTransfer_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_MultiTransfer_AddChallengeParams); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "transfers"); + assert(dbT); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "bankCode", + AB_Account_GetBankCode(account)); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "accountId", + AB_Account_GetAccountNumber(account)); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "currency", "EUR"); + s=AB_Account_GetOwnerName(account); + if (s) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "name", s); + else { + DBG_WARN(AQHBCI_LOGDOMAIN, + "No owner name for account, some banks don't accept this"); + } + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "type", + isTransfer?"transfer":"debitNote"); + + dbParams=AH_Job_GetParams(j); + if (isTransfer) + userMaxTrans=AH_User_GetMaxTransfersPerJob(u); + else + userMaxTrans=AH_User_GetMaxDebitNotesPerJob(u); + maxTransfers=GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0); + if (maxTransfers==0 || maxTransfers>userMaxTrans) + AH_Job_SetMaxTransfers(j, userMaxTrans); + else + AH_Job_SetMaxTransfers(j, maxTransfers); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_MultiTransfer_FreeData(void *bp, void *p){ + AH_JOB_MULTITRANSFER *aj; + + aj=(AH_JOB_MULTITRANSFER*)p; + + AB_Value_free(aj->sumValues); + AB_Value_free(aj->sumRemoteBankCode); + AB_Value_free(aj->sumRemoteAccountId); + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_MultiTransfer_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_MULTITRANSFER *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); + assert(aj); + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing %s", + (aj->isTransfer)?"JobMultiTransfer":"JobMultiDebitNote"); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_MultiTransfer__ValidateTransfer(AB_JOB *bj, + AH_JOB *mj, + AB_TRANSACTION *t) { + const GWEN_STRINGLIST *sl; + int maxn; + int maxs; + int n; + const char *s; + AH_JOB_MULTITRANSFER *aj; + const AB_TRANSACTION_LIMITS *lim; + + assert(mj); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, mj); + assert(aj); + + lim=AB_Job_GetFieldLimits(bj); + + /* check purpose */ + if (lim) { + maxn=AB_TransactionLimits_GetMaxLinesPurpose(lim); + maxs=AB_TransactionLimits_GetMaxLenPurpose(lim); + } + else { + maxn=0; + maxs=0; + } + sl=AB_Transaction_GetPurpose(t); + n=0; + if (sl) { + GWEN_STRINGLISTENTRY *se; + const char *p; + + se=GWEN_StringList_FirstEntry(sl); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p && *p) { + int l; + GWEN_BUFFER *tbuf; + + n++; + if (maxn && n>maxn) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many purpose lines (%d>%d)", n, maxn); + return GWEN_ERROR_INVALID; + } + tbuf=GWEN_Buffer_new(0, maxs, 0, 1); + AB_ImExporter_Utf8ToDta(p, -1, tbuf); + l=GWEN_Buffer_GetUsedBytes(tbuf); + GWEN_Buffer_free(tbuf); + if (l>maxs) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many chars in purpose line %d (%d>%d)", n, l, maxs); + return GWEN_ERROR_INVALID; + } + } + se=GWEN_StringListEntry_Next(se); + } /* while */ + } + if (!n) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No purpose lines"); + return GWEN_ERROR_INVALID; + } + + /* check remote name */ + if (lim) { + maxn=AB_TransactionLimits_GetMaxLinesRemoteName(lim); + maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); + } + else { + maxn=0; + maxs=0; + } + sl=AB_Transaction_GetRemoteName(t); + n=0; + if (sl) { + GWEN_STRINGLISTENTRY *se; + const char *p; + + se=GWEN_StringList_FirstEntry(sl); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p && *p) { + int l; + GWEN_BUFFER *tbuf; + + n++; + if (maxn && n>maxn) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many remote name lines (%d>%d)", + n, maxn); + return GWEN_ERROR_INVALID; + } + tbuf=GWEN_Buffer_new(0, maxs, 0, 1); + AB_ImExporter_Utf8ToDta(p, -1, tbuf); + l=GWEN_Buffer_GetUsedBytes(tbuf); + GWEN_Buffer_free(tbuf); + if (l>maxs) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many chars in remote name line %d (%d>%d)", + n, l, maxs); + return GWEN_ERROR_INVALID; + } + } + se=GWEN_StringListEntry_Next(se); + } /* while */ + } + if (!n) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No remote name lines"); + return GWEN_ERROR_INVALID; + } + + /* check local name */ + s=AB_Transaction_GetLocalName(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local name, filling in"); + a=AB_Job_GetAccount(bj); + assert(a); + s=AB_Account_GetOwnerName(a); + if (!s) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No owner name in account, giving up"); + return GWEN_ERROR_INVALID; + } + AB_Transaction_SetLocalName(t, s); + } + + /* check local bank code */ + s=AB_Transaction_GetLocalBankCode(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local bank code, filling in"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetBankCode(a); + assert(s); + AB_Transaction_SetLocalBankCode(t, s); + } + + /* check local account number */ + s=AB_Transaction_GetLocalAccountNumber(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local account number, filling in"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetAccountNumber(a); + assert(s); + AB_Transaction_SetLocalAccountNumber(t, s); + } + + /* check local account suffix */ + s=AB_Transaction_GetLocalSuffix(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_INFO(AQHBCI_LOGDOMAIN, + "No local suffix, filling in (if possible)"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetSubAccountId(a); + if (s && *s) + AB_Transaction_SetLocalSuffix(t, s); + } + + /* check text key */ + if (lim) { + if (GWEN_StringList_Count(AB_TransactionLimits_GetValuesTextKey(lim))){ + char numbuf[32]; + + n=AB_Transaction_GetTextKey(t); + if (n==0) { + if (aj->isTransfer) + n=51; /* "Ueberweisung" */ + else + n=5; /* "Lastschrift" */ + AB_Transaction_SetTextKey(t, n); + } + + snprintf(numbuf, sizeof(numbuf), "%d", n); + if (!AB_TransactionLimits_HasValuesTextKey(lim, numbuf)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Text key \"%s\" not supported by bank", + numbuf); + return GWEN_ERROR_INVALID; + } + } + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_MultiTransfer_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_MULTITRANSFER *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); + assert(aj); + + if ((aj->isTransfer && AB_Job_GetType(bj)!=AB_Job_TypeTransfer) || + (!aj->isTransfer && AB_Job_GetType(bj)!=AB_Job_TypeDebitNote)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Not a %s job job", + (aj->isTransfer)?"MultiTransfer":"MultiDebitNote"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: { + GWEN_DB_NODE *dbParams; + GWEN_DB_NODE *dbTk; + AB_TRANSACTION_LIMITS *lim; + int i; + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + /* read limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 27); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 2); + + AB_TransactionLimits_SetNeedDate(lim, -1); + + i=GWEN_DB_GetIntValue(dbParams, "maxpurposeLines", 0, 0); + AB_TransactionLimits_SetMaxLinesPurpose(lim, i); + + /* read text keys */ + dbTk=GWEN_DB_GetGroup(dbParams, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "textkey"); + if (dbTk) { + for (i=0; ; i++) { + int k; + char numbuf[16]; + + k=GWEN_DB_GetIntValue(dbTk, "key", i, -1); + if (k==-1) + break; + snprintf(numbuf, sizeof(numbuf), "%d", k); + AB_TransactionLimits_AddValuesTextKey(lim, numbuf, 1); + } + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesTextKey(lim), + 1, GWEN_StringList_SortModeInt); + } + + AB_Job_SetFieldLimits(bj, lim); + + return 0; + } + + case AH_Job_ExchangeModeArgs: { + GWEN_DB_NODE *dbArgs; + const AB_TRANSACTION *ot; + char groupIdBuf[10]; + + groupIdBuf[0]=0; + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + ot=AB_Job_GetTransaction(bj); + if (ot) { + GWEN_DB_NODE *dbT; + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + assert(t); + if (AH_Job_MultiTransfer__ValidateTransfer(bj, j, t)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Invalid transaction"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_INVALID; + } + AB_Transaction_SetGroupId(t, AH_Job_GetId(j)); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Setting groupID to %d", AH_Job_GetId(j)); + if (groupIdBuf[0]==0) { + snprintf(groupIdBuf, sizeof(groupIdBuf)-1, "%08d", AH_Job_GetId(j)); + groupIdBuf[sizeof(groupIdBuf)-1]=0; + } + + /* store the validated transaction back into application job, + * to allow the application to recognize answers to this job later */ + AB_Job_SetTransaction(bj, t); + + dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "transfers"); + assert(dbT); + /* store customer reference */ + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "custref", + groupIdBuf); + + dbT=GWEN_DB_GetGroup(dbT, GWEN_DB_FLAGS_DEFAULT, + "transactions"); + assert(dbT); + if (aj->isTransfer) + dbT=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_CREATE_GROUP, + "transfer"); + else + dbT=GWEN_DB_GetGroup(dbT, GWEN_PATH_FLAGS_CREATE_GROUP, + "debitNote"); + assert(dbT); + + /* store transaction */ + if (AB_Transaction_toDb(t, dbT)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error storing transaction to db"); + AB_Transaction_free(t); + return GWEN_ERROR_BAD_DATA; + } + else { + const char *s; + char tbuf[11]; + AB_VALUE *tv; + + /* sum up account ids */ + s=AB_Transaction_GetRemoteAccountNumber(t); + assert(s); + tbuf[0]=0; + strncat(tbuf, s, 10); + tv=AB_Value_fromString(tbuf); + assert(tv); + AB_Value_AddValue(aj->sumRemoteAccountId, tv); + AB_Value_free(tv); + + /* sum up bank codes */ + s=AB_Transaction_GetRemoteBankCode(t); + assert(s); + tbuf[0]=0; + strncat(tbuf, s, 10); + tv=AB_Value_fromString(tbuf); + assert(tv); + AB_Value_AddValue(aj->sumRemoteBankCode, tv); + AB_Value_free(tv); + +#ifdef CHALLENGE_ADD_ONLY_PREKOMMA_VALUES + if (1) { + GWEN_BUFFER *tbuf; + char *p; + AB_VALUE *tv; + + tbuf=GWEN_Buffer_new(0, 32, 0, 1); + AB_Value_toHumanReadableString2(AB_Transaction_GetValue(t), + tbuf, 0, 0); + p=strchr(GWEN_Buffer_GetStart(tbuf), ','); + if (p) + *p=0; + tv=AB_Value_fromString(GWEN_Buffer_GetStart(tbuf)); + assert(tv); + AB_Value_AddValue(aj->sumValues, tv); + AB_Value_free(tv); + GWEN_Buffer_free(tbuf); + } +#else + AB_Value_AddValue(aj->sumValues, AB_Transaction_GetValue(t)); +#endif + } + AB_Transaction_free(t); + + AH_Job_IncTransferCount(j); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + return 0; + } + + case AH_Job_ExchangeModeResults: { + AH_RESULT_LIST *rl; + AH_RESULT *r; + int has10; + int has20; + AB_TRANSACTION_STATUS tStatus; + + rl=AH_Job_GetSegResults(j); + assert(rl); + + r=AH_Result_List_First(rl); + if (!r) { + DBG_INFO(AQHBCI_LOGDOMAIN, "No segment results"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + has10=0; + has20=0; + while(r) { + int rcode; + + rcode=AH_Result_GetCode(r); + DBG_INFO(AQHBCI_LOGDOMAIN, "Found job result: %d", rcode); + if (rcode<=19) + has10=1; + else if (rcode>=20 && rcode <=29) + has20=1; + r=AH_Result_List_Next(r); + } + + if (has20) { + AB_Job_SetStatus(bj, AB_Job_StatusFinished); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); + } + else if (has10) { + AB_Job_SetStatus(bj, AB_Job_StatusPending); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); + } + else { + DBG_INFO(AQHBCI_LOGDOMAIN, + "Error status (neither 0010 nor 0020)"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + } + + if (has20) + tStatus=AB_Transaction_StatusAccepted; + else if (has10) + tStatus=AB_Transaction_StatusPending; + else + tStatus=AB_Transaction_StatusRejected; + + if (aj->isTransfer) { + const AB_TRANSACTION *ot; + + ot=AB_Job_GetTransaction(bj); + if (ot) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + AB_Transaction_SetStatus(t, tStatus); + AB_Transaction_SetType(t, AB_Transaction_TypeTransfer); + AB_ImExporterContext_AddTransfer(ctx, t); + } + } + else { + const AB_TRANSACTION *ot; + + ot=AB_Job_GetTransaction(bj); + if (ot) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + AB_Transaction_SetStatus(t, tStatus); + AB_Transaction_SetType(t, AB_Transaction_TypeDebitNote); + AB_ImExporterContext_AddTransfer(ctx, t); + } + } + + return 0; + } + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode %d", m); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + +int AH_Job_MultiTransfer_Prepare(AH_JOB *j){ +#if 0 + /* this code should no longer be needed since we use + * AH_Job_MultiTransfer_AddChallengeParams now */ + + AH_JOB_MULTITRANSFER *aj; + GWEN_BUFFER *tbuf; + char *p; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "Prepare function called"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); + assert(aj); + + tbuf=GWEN_Buffer_new(0, 32, 0, 1); + + /* set challenge parameter */ + + /* add sum of account numbers */ + AB_Value_toHumanReadableString2(aj->sumRemoteAccountId, + tbuf, 0, 0); + p=strchr(GWEN_Buffer_GetStart(tbuf), '.'); + if (p) + *p=0; + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_Reset(tbuf); + + /* add sum of bank codes */ + AB_Value_toHumanReadableString2(aj->sumRemoteBankCode, + tbuf, 0, 0); + p=strchr(GWEN_Buffer_GetStart(tbuf), '.'); + if (p) + *p=0; + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + + + GWEN_Buffer_free(tbuf); + + if (aj->sumValues) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Setting value"); + } + AH_Job_SetChallengeValue(j, aj->sumValues); + +#endif + + return 0; +} + + +int AH_Job_MultiTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { + AH_JOB_MULTITRANSFER *aj; + const char *s; + int tanVer=AH_JOB_TANVER_1_4; + char *p; + AB_ACCOUNT *acc=NULL; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_MULTITRANSFER, j); + assert(aj); + + s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); + if (s && *s && strncasecmp(s, "1.3", 3)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); + tanVer=AH_JOB_TANVER_1_3; + } + + /* set challenge parameter */ + if (tanVer==AH_JOB_TANVER_1_4) { + GWEN_BUFFER *tbuf; + char numbuf[16]; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); + tbuf=GWEN_Buffer_new(0, 32, 0, 1); + + if (aj->isTransfer) + AH_Job_SetChallengeClass(j, 12); + else + AH_Job_SetChallengeClass(j, 19); + + /* P1: number of transfers */ + snprintf(numbuf, sizeof(numbuf)-1, "%d", AH_Job_GetTransferCount(j)); + numbuf[sizeof(numbuf)-1]=0; + AH_Job_AddChallengeParam(j, numbuf); + + /* P2: sum of amount */ + AH_Job_ValueToChallengeString(aj->sumValues, tbuf); + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_Reset(tbuf); + + /* P3: local account number */ + acc=AH_AccountJob_GetAccount(j); + assert(acc); + s=AB_Account_GetAccountNumber(acc); + if (s && *s) { + int i; + + GWEN_Buffer_AppendString(tbuf, s); + i=10-strlen(s); + if (i>0) { + /* need to left-fill the account number with leading zeroes + * to a length of exactly 10 digits */ + GWEN_Buffer_Rewind(tbuf); + GWEN_Buffer_FillLeftWithBytes(tbuf, '0', i); + } + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_Reset(tbuf); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No account number"); + GWEN_Buffer_free(tbuf); + return GWEN_ERROR_INVALID; + } + + /* add sum of account numbers */ + AB_Value_toHumanReadableString2(aj->sumRemoteAccountId, + tbuf, 0, 0); + p=strchr(GWEN_Buffer_GetStart(tbuf), '.'); + if (p) + *p=0; + /* only use first 10 digits */ + GWEN_Buffer_Crop(tbuf, 0, 10); + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_Reset(tbuf); + + + /* done */ + GWEN_Buffer_free(tbuf); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version 0x%02x for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + + return 0; +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,29 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBMULTITRANSFER_L_H +#define AH_JOBMULTITRANSFER_L_H + + +#include "accountjob_l.h" + +#include + + +AH_JOB *AH_Job_MultiTransfer_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_MultiDebitNote_new(AB_USER *cu, + AB_ACCOUNT *account); + + +#endif /* AH_JOBMULTITRANSFER_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,49 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2009 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBMULTITRANSFER_P_H +#define AH_JOBMULTITRANSFER_P_H + + +#include "jobmultitransfer_l.h" +#include + + +typedef struct AH_JOB_MULTITRANSFER AH_JOB_MULTITRANSFER; +struct AH_JOB_MULTITRANSFER { + int isTransfer; + + AB_VALUE *sumRemoteAccountId; + AB_VALUE *sumRemoteBankCode; + AB_VALUE *sumValues; +}; +static void GWENHYWFAR_CB AH_Job_MultiTransfer_FreeData(void *bp, void *p); +static int AH_Job_MultiTransfer_Process(AH_JOB *j, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_MultiTransfer_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_MultiTransfer_Prepare(AH_JOB *j); + +static int AH_Job_MultiTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + + +static int AH_Job_MultiTransfer__ValidateTransfer(AB_JOB *bj, + AH_JOB *mj, + AB_TRANSACTION *t); + +static AH_JOB *AH_Job_MultiTransferBase_new(AB_USER *u, + AB_ACCOUNT *account, + int isTransfer); + + +#endif /* AH_JOBMULTITRANSFER_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobmultitransfer.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,503 @@ + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.c 2015-05-25 16:22:08.000000000 +0000 @@ -0,0 +1,323 @@ +/*************************************************************************** + begin : Wed Jan 08 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepacor1datedmulticreate_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + + + +GWEN_INHERIT(AH_JOB, AH_JOB_CREATESEPAMULTICOR1); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaCor1DebitDatedMultiCreate_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_CREATESEPAMULTICOR1 *aj; + GWEN_DB_NODE *dbParams; + GWEN_DB_NODE *dbArgs; + const char *s; + + j=AH_Job_TransferBase_new("JobSepaCor1DebitDatedMultiCreate", + AB_Transaction_TypeSepaDebitNote, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 32); + + GWEN_NEW_OBJECT(AH_JOB_CREATESEPAMULTICOR1, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_CREATESEPAMULTICOR1, j, aj, + AH_Job_SepaCor1DebitDatedMultiCreate_FreeData); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaCor1DebitDatedMultiCreate_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaCor1DebitDatedMultiCreate_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaCor1DebitDatedMultiCreate_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); + + /* get params */ + dbParams=AH_Job_GetParams(j); + assert(dbParams); + + AH_Job_SetMaxTransfers(j, GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0)); + + s=GWEN_DB_GetCharValue(dbParams, "sumFieldNeeded", 0, "j"); + if (s && toupper(*s)=='J') + aj->sumFieldNeeded=1; + else + aj->sumFieldNeeded=0; + + s=GWEN_DB_GetCharValue(dbParams, "singleBookingAllowed", 0, "j"); + if (s && toupper(*s)=='J') + aj->singleBookingAllowed=1; + else + aj->singleBookingAllowed=0; + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_SepaCor1DebitDatedMultiCreate_FreeData(void *bp, void *p){ + AH_JOB_CREATESEPAMULTICOR1 *aj; + + aj=(AH_JOB_CREATESEPAMULTICOR1*)p; + + free(aj->fiid); + AB_Value_free(aj->sumValues); + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaCor1DebitDatedMultiCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AH_JOB_CREATESEPAMULTICOR1 *aj; + AB_TRANSACTION_LIMITS *lim; + GWEN_DB_NODE *dbParams; + int i, i1, i2; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_CREATESEPAMULTICOR1, j); + assert(aj); + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 70); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + + AB_TransactionLimits_SetNeedDate(lim, 1); + + /* set info from BPD */ + i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1>i2)?i1:i2; + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1sumValues, + AB_Transaction_GetLocalIban(t), + AB_Transaction_GetDate(t)); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaCor1DebitDatedMultiCreate_Prepare(AH_JOB *j) { + AH_JOB_CREATESEPAMULTICOR1 *aj; + GWEN_DB_NODE *dbArgs; + GWEN_DB_NODE *profile; + int rv; + AB_TRANSACTION *t; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfers"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_CREATESEPAMULTICOR1, j); + assert(aj); + + dbArgs=AH_Job_GetArguments(j); + + /* calculate sum */ + AB_Value_free(aj->sumValues); + aj->sumValues=AB_Value_new(); + AB_Value_SetCurrency(aj->sumValues, "EUR"); + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + assert(t); /* debug */ + return GWEN_ERROR_INTERNAL; + } + while(t) { + const AB_VALUE *v; + + v=AB_Transaction_GetValue(t); + if (v) + AB_Value_AddValue(aj->sumValues, v); + t=AB_Transaction_List_Next(t); + } + + /* find the right profile to produce pain.008 messages */ + profile=AH_Job_FindSepaProfile(j, "008*", AH_User_GetSepaDebitNoteProfile(AH_Job_GetUser(j))); + if (!profile) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No suitable profile found"); + return GWEN_ERROR_GENERIC; + } + + /* set singleBookingWanted */ + if (aj->singleBookingAllowed && + GWEN_DB_GetIntValue(profile, "singleBookingWanted", 0, 1)) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", "J"); + else { + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", "N"); + GWEN_DB_SetIntValue(profile, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", 0); + } + + /* adjust parameters for COR1 transactions */ + GWEN_DB_SetCharValue(profile, GWEN_DB_FLAGS_OVERWRITE_VARS, + "LocalInstrumentSEPACode", "COR1"); + + /* export transfers to SEPA */ + rv=AH_Job_TransferBase_SepaExportTransactions(j, profile); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + /* store sum value */ + if (aj->sumValues) { + GWEN_DB_NODE *dbV; + GWEN_BUFFER *nbuf; + const char *s; + + dbV=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "totalSum"); + assert(dbV); + + nbuf=GWEN_Buffer_new(0, 32, 0, 1); + AB_Value_toHbciString(aj->sumValues, nbuf); + if (GWEN_Buffer_GetUsedBytes(nbuf)<1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); + GWEN_Buffer_free(nbuf); + return GWEN_ERROR_BAD_DATA; + } + + /* store value */ + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "value", + GWEN_Buffer_GetStart(nbuf)); + GWEN_Buffer_free(nbuf); + + /* store currency */ + s=AB_Value_GetCurrency(aj->sumValues); + if (!s) + s="EUR"; + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, "currency", s); + } + return 0; +} + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_l.h 2015-05-25 16:22:08.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPACOR1DATEDMULTICREATE_L_H +#define AH_JOBSEPACOR1DATEDMULTICREATE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaCor1DebitDatedMultiCreate_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPACOR1DATEDMULTICREATE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate_p.h 2015-05-25 16:22:08.000000000 +0000 @@ -0,0 +1,44 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPACOR1DATEDMULTICREATE_P_H +#define AH_JOBSEPACOR1DATEDMULTICREATE_P_H + + +#include "jobsepacor1datedmulticreate_l.h" +#include +#include + + + +typedef struct AH_JOB_CREATESEPAMULTICOR1 AH_JOB_CREATESEPAMULTICOR1; +struct AH_JOB_CREATESEPAMULTICOR1 { + char *fiid; + + int sumFieldNeeded; + int singleBookingAllowed; + + AB_VALUE *sumValues; + char *localIban; + +}; +static void GWENHYWFAR_CB AH_Job_SepaCor1DebitDatedMultiCreate_FreeData(void *bp, void *p); + +static int AH_Job_SepaCor1DebitDatedMultiCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_SepaCor1DebitDatedMultiCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + +static int AH_Job_SepaCor1DebitDatedMultiCreate_Prepare(AH_JOB *j); + + +#endif /* AH_JOBSEPACOR1DATEDMULTICREATE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedmulticreate.xml 2015-05-25 16:22:08.000000000 +0000 @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,197 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepacor1datedsinglecreate_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaCor1DebitDatedSingleCreate_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + GWEN_DB_NODE *dbArgs; + + j=AH_Job_TransferBase_new("JobSepaCor1DebitDatedSingleCreate", + AB_Transaction_TypeSepaDebitNote, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 29); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AB_TRANSACTION_LIMITS *lim; + GWEN_DB_NODE *dbParams; + int i, i1, i2; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + + AB_TransactionLimits_SetNeedDate(lim, 1); + + /* set info from BPD */ + i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1>i2)?i1:i2; + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1 + + + +static int AH_Job_SepaCor1DebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_SepaCor1DebitDatedSingleCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); +static int AH_Job_SepaCor1DebitDatedSingleCreate_Prepare(AH_JOB *j); + + + +#endif /* AH_JOBSEPACOR1DEBITDATEDSINGLECREATE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepacor1datedsinglecreate.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,319 @@ +/*************************************************************************** + begin : Wed Jan 08 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepadebitdatedmulticreate_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + + + +GWEN_INHERIT(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaDebitDatedMultiCreate_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_CREATESEPAMULTIDEBIT *aj; + GWEN_DB_NODE *dbParams; + GWEN_DB_NODE *dbArgs; + const char *s; + + j=AH_Job_TransferBase_new("JobSepaDebitDatedMultiCreate", + AB_Transaction_TypeSepaDebitNote, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 32); + + GWEN_NEW_OBJECT(AH_JOB_CREATESEPAMULTIDEBIT, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT, j, aj, + AH_Job_SepaDebitDatedMultiCreate_FreeData); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaDebitDatedMultiCreate_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaDebitDatedMultiCreate_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaDebitDatedMultiCreate_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); + + /* get params */ + dbParams=AH_Job_GetParams(j); + assert(dbParams); + + AH_Job_SetMaxTransfers(j, GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0)); + + s=GWEN_DB_GetCharValue(dbParams, "sumFieldNeeded", 0, "j"); + if (s && toupper(*s)=='J') + aj->sumFieldNeeded=1; + else + aj->sumFieldNeeded=0; + + s=GWEN_DB_GetCharValue(dbParams, "singleBookingAllowed", 0, "j"); + if (s && toupper(*s)=='J') + aj->singleBookingAllowed=1; + else + aj->singleBookingAllowed=0; + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_SepaDebitDatedMultiCreate_FreeData(void *bp, void *p){ + AH_JOB_CREATESEPAMULTIDEBIT *aj; + + aj=(AH_JOB_CREATESEPAMULTIDEBIT*)p; + + free(aj->fiid); + AB_Value_free(aj->sumValues); + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaDebitDatedMultiCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AH_JOB_CREATESEPAMULTIDEBIT *aj; + AB_TRANSACTION_LIMITS *lim; + GWEN_DB_NODE *dbParams; + int i, i1, i2; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT, j); + assert(aj); + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 70); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + + AB_TransactionLimits_SetNeedDate(lim, 1); + + /* set info from BPD */ + i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1>i2)?i1:i2; + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1sumValues, + AB_Transaction_GetLocalIban(t), + AB_Transaction_GetDate(t)); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaDebitDatedMultiCreate_Prepare(AH_JOB *j) { + AH_JOB_CREATESEPAMULTIDEBIT *aj; + GWEN_DB_NODE *dbArgs; + GWEN_DB_NODE *profile; + int rv; + AB_TRANSACTION *t; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfers"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_CREATESEPAMULTIDEBIT, j); + assert(aj); + + dbArgs=AH_Job_GetArguments(j); + + /* calculate sum */ + AB_Value_free(aj->sumValues); + aj->sumValues=AB_Value_new(); + AB_Value_SetCurrency(aj->sumValues, "EUR"); + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + assert(t); /* debug */ + return GWEN_ERROR_INTERNAL; + } + while(t) { + const AB_VALUE *v; + + v=AB_Transaction_GetValue(t); + if (v) + AB_Value_AddValue(aj->sumValues, v); + t=AB_Transaction_List_Next(t); + } + + /* find the right profile to produce pain.008 messages */ + profile=AH_Job_FindSepaProfile(j, "008*", AH_User_GetSepaDebitNoteProfile(AH_Job_GetUser(j))); + if (!profile) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No suitable profile found"); + return GWEN_ERROR_GENERIC; + } + + /* set singleBookingWanted */ + if (aj->singleBookingAllowed && + GWEN_DB_GetIntValue(profile, "singleBookingWanted", 0, 1)) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", "J"); + else { + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", "N"); + GWEN_DB_SetIntValue(profile, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", 0); + } + + /* export transfers to SEPA */ + rv=AH_Job_TransferBase_SepaExportTransactions(j, profile); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + /* store sum value */ + if (aj->sumValues) { + GWEN_DB_NODE *dbV; + GWEN_BUFFER *nbuf; + const char *s; + + dbV=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "totalSum"); + assert(dbV); + + nbuf=GWEN_Buffer_new(0, 32, 0, 1); + AB_Value_toHbciString(aj->sumValues, nbuf); + if (GWEN_Buffer_GetUsedBytes(nbuf)<1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); + GWEN_Buffer_free(nbuf); + return GWEN_ERROR_BAD_DATA; + } + + /* store value */ + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "value", + GWEN_Buffer_GetStart(nbuf)); + GWEN_Buffer_free(nbuf); + + /* store currency */ + s=AB_Value_GetCurrency(aj->sumValues); + if (!s) + s="EUR"; + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, "currency", s); + } + return 0; +} + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPADEBITDATEDMULTICREATE_L_H +#define AH_JOBSEPADEBITDATEDMULTICREATE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaDebitDatedMultiCreate_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPADEBITDATEDMULTICREATE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,44 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPADEBITDATEDMULTICREATE_P_H +#define AH_JOBSEPADEBITDATEDMULTICREATE_P_H + + +#include "jobsepadebitdatedmulticreate_l.h" +#include +#include + + + +typedef struct AH_JOB_CREATESEPAMULTIDEBIT AH_JOB_CREATESEPAMULTIDEBIT; +struct AH_JOB_CREATESEPAMULTIDEBIT { + char *fiid; + + int sumFieldNeeded; + int singleBookingAllowed; + + AB_VALUE *sumValues; + char *localIban; + +}; +static void GWENHYWFAR_CB AH_Job_SepaDebitDatedMultiCreate_FreeData(void *bp, void *p); + +static int AH_Job_SepaDebitDatedMultiCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_SepaDebitDatedMultiCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + +static int AH_Job_SepaDebitDatedMultiCreate_Prepare(AH_JOB *j); + + +#endif /* AH_JOBSEPADEBITDATEDMULTICREATE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedmulticreate.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,194 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepadebitdatedsinglecreate_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaDebitDatedSingleCreate_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + GWEN_DB_NODE *dbArgs; + + j=AH_Job_TransferBase_new("JobSepaDebitDatedSingleCreate", + AB_Transaction_TypeSepaDebitNote, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 29); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaDebitDatedSingleCreate_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaDebitDatedSingleCreate_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaDebitDatedSingleCreate_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaDebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AB_TRANSACTION_LIMITS *lim; + GWEN_DB_NODE *dbParams; + int i, i1, i2; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + + AB_TransactionLimits_SetNeedDate(lim, 1); + + /* set info from BPD */ + i1=GWEN_DB_GetIntValue(dbParams, "minDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "minDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMinValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMinValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1>i2)?i1:i2; + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i1=GWEN_DB_GetIntValue(dbParams, "maxDelay_FNAL_RCUR", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeRecurring(lim, i1); + AB_TransactionLimits_SetMinValueSetupTimeFinal(lim, i1); + + i2=GWEN_DB_GetIntValue(dbParams, "maxDelay_FRST_OOFF", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTimeFirst(lim, i2); + AB_TransactionLimits_SetMaxValueSetupTimeOnce(lim, i2); + + /* combine into minimum values for older apps */ + i=(i1 + + +static int AH_Job_SepaDebitDatedSingleCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_SepaDebitDatedSingleCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); +static int AH_Job_SepaDebitDatedSingleCreate_Prepare(AH_JOB *j); + + +#endif /* AH_JOBSEPADEBITDATEDSINGLECREATE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitdatedsinglecreate.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,161 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepadebitsingle_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include + +#include +#include +#include + + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaDebitSingle_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + GWEN_DB_NODE *dbArgs; + + j=AH_Job_TransferBase_new("JobSepaDebitSingle", + AB_Transaction_TypeSepaDebitNote, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 17); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaDebitSingle_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaDebitSingle_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaDebitSingle_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaUndated); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaDebitSingle_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AB_TRANSACTION_LIMITS *lim; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + + AB_TransactionLimits_SetNeedDate(lim, -1); + + AB_Job_SetFieldLimits(bj, lim); + AB_TransactionLimits_free(lim); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaDebitSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { + const AB_TRANSACTION *t; + const char *s; + int tanVer=AH_JOB_TANVER_1_4; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); + + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); + return GWEN_ERROR_INVALID; + } + + s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); + if (s && *s && strncasecmp(s, "1.3", 3)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); + tanVer=AH_JOB_TANVER_1_3; + } + + if (tanVer==AH_JOB_TANVER_1_4) { + int rv; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); + rv=AH_HHD14_AddChallengeParams_17(j, + AB_Transaction_GetValue(t), + AB_Transaction_GetRemoteIban(t)); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaDebitSingle_Prepare(AH_JOB *j) { + GWEN_DB_NODE *profile; + int rv; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfer"); + + /* find the right profile to produce pain.008 messages */ + profile=AH_Job_FindSepaProfile(j, "008*", AH_User_GetSepaDebitNoteProfile(AH_Job_GetUser(j))); + if (!profile) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No suitable profile found"); + return GWEN_ERROR_GENERIC; + } + + /* export transfers to SEPA */ + rv=AH_Job_TransferBase_SepaExportTransactions(j, profile); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + return 0; +} + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPADEBITSINGLE_L_H +#define AH_JOBSEPADEBITSINGLE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaDebitSingle_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPADEBITSINGLE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,29 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPADEBITSINGLE_P_H +#define AH_JOBSEPADEBITSINGLE_P_H + + +#include "jobsepadebitsingle_l.h" + +#include + + +static int AH_Job_SepaDebitSingle_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_SepaDebitSingle_Prepare(AH_JOB *j); +static int AH_Job_SepaDebitSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + + +#endif /* AH_JOBSEPADEBITSINGLE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepadebitsingle.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,390 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepastandingordercreate_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + + + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaStandingOrderCreate_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_TransferBase_new("JobSepaStandingOrderCreate", + AB_Transaction_TypeSepaTransfer, + AB_Transaction_SubTypeStandingOrder, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 35); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaStandingOrderCreate_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaStandingOrderCreate_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaStandingOrderCreate_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_SepaStandingOrderCreate_ExchangeArgs); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrderCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AB_TRANSACTION_LIMITS *lim; + GWEN_DB_NODE *dbParams; + const char *s; + int i; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 70); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + + /* get specific limits for creation of standing orders */ + s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusMonths", 0, 0); + if (s && *s) { + AB_TransactionLimits_SetAllowMonthly(lim, 1); + while(*s) { + char buf[3]; + const char *x; + + buf[2]=0; + strncpy(buf, s, 2); + x=buf; + if (*x=='0') + x++; + + AB_TransactionLimits_AddValuesCycleMonth(lim, x, 0); + s+=2; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleMonth(lim), + 1, GWEN_StringList_SortModeInt); + } + else + AB_TransactionLimits_SetAllowMonthly(lim, -1); + + s=GWEN_DB_GetCharValue(dbParams, "AllowedMonthDays", 0, 0); + if (s && *s) { + while(*s) { + char buf[3]; + const char *x; + + buf[2]=0; + strncpy(buf, s, 2); + x=buf; + if (*x=='0') + x++; + AB_TransactionLimits_AddValuesExecutionDayMonth(lim, x, 0); + s+=2; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayMonth(lim), + 1, GWEN_StringList_SortModeInt); + } + + s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusWeeks", 0, 0); + if (s && *s) { + AB_TransactionLimits_SetAllowWeekly(lim, 1); + while(*s) { + char buf[3]; + const char *x; + + buf[2]=0; + strncpy(buf, s, 2); + x=buf; + if (*x=='0') + x++; + AB_TransactionLimits_AddValuesCycleWeek(lim, x, 0); + s+=2; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleWeek(lim), + 1, GWEN_StringList_SortModeInt); + } + else + AB_TransactionLimits_SetAllowWeekly(lim, -1); + + s=GWEN_DB_GetCharValue(dbParams, "AllowedWeekDays", 0, 0); + if (s && *s) { + while(*s) { + char buf[2]; + const char *x; + + buf[0]=*s; + buf[1]=0; + x=buf; + if (*x=='0') + x++; + AB_TransactionLimits_AddValuesExecutionDayWeek(lim, x, 0); + s++; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayWeek(lim), + 1, GWEN_StringList_SortModeInt); + } + + i=GWEN_DB_GetIntValue(dbParams, "minDelay", 0, 0); + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i=GWEN_DB_GetIntValue(dbParams, "maxDelay", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTime(lim, i); + + + AB_Job_SetFieldLimits(bj, lim); + AB_TransactionLimits_free(lim); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrderCreate_ExchangeArgs(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { + const AB_TRANSACTION_LIMITS *lim=NULL; + AB_BANKING *ab; + const AB_TRANSACTION *t=NULL; + AB_TRANSACTION *tCopy=NULL; + int rv; + AB_USER *u; + uint32_t uflags; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); + + ab=AH_Job_GetBankingApi(j); + assert(ab); + + u=AH_Job_GetUser(j); + assert(u); + + uflags=AH_User_GetFlags(u); + + /* get limits and transaction */ + lim=AB_Job_GetFieldLimits(bj); + t=AB_Job_GetTransaction(bj); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + return GWEN_ERROR_INVALID; + } + + /* DISABLED according to a discussion on aqbanking-user: + * The application should do this, not the library. + AB_Transaction_FillLocalFromAccount(t, a); */ + + /* validate transaction */ + rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckRecurrenceAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckFirstExecutionDateAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + + tCopy=AB_Transaction_dup(t); + + /* set group id so the application can now which transfers went together in one setting */ + AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); + + /* store validated transaction in job */ + AB_Job_SetTransaction(bj, tCopy); + + /* store copy of transaction for later */ + AH_Job_AddTransfer(j, tCopy); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrderCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { + const AB_TRANSACTION *t; + const char *s; + int tanVer=AH_JOB_TANVER_1_4; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); + + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); + return GWEN_ERROR_INVALID; + } + + s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); + if (s && *s && strncasecmp(s, "1.3", 3)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); + tanVer=AH_JOB_TANVER_1_3; + } + + if (tanVer==AH_JOB_TANVER_1_4) { + int rv; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); + rv=AH_HHD14_AddChallengeParams_35(j, + AB_Transaction_GetValue(t), + AB_Transaction_GetRemoteIban(t)); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrderCreate_Prepare(AH_JOB *j) { + GWEN_DB_NODE *dbArgs; + GWEN_DB_NODE *profile; + int rv; + const GWEN_TIME *ti; + const char *s; + AB_TRANSACTION *t; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfer"); + + dbArgs=AH_Job_GetArguments(j); + + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + assert(t); /* debug */ + return GWEN_ERROR_INTERNAL; + } + + /* find the right profile to produce pain.001 messages */ + profile=AH_Job_FindSepaProfile(j, "001*", AH_User_GetSepaTransferProfile(AH_Job_GetUser(j))); + if (!profile) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No suitable profile found"); + return GWEN_ERROR_GENERIC; + } + + /* export transfers to SEPA */ + rv=AH_Job_TransferBase_SepaExportTransactions(j, profile); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + /* first execution date */ + ti=AB_Transaction_GetFirstExecutionDate(t); + if (ti) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Time_toString(ti, "YYYYMMDD", tbuf); + GWEN_DB_SetCharValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "details/xfirstExecutionDate", + GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Missing first execution date."); + } + + /* period */ + switch(AB_Transaction_GetPeriod(t)) { + case AB_Transaction_PeriodMonthly: s="M"; break; + case AB_Transaction_PeriodWeekly: s="W"; break; + default: + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unsupported period %d", + AB_Transaction_GetPeriod(t)); + return GWEN_ERROR_INVALID; + } + GWEN_DB_SetCharValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "details/xperiod", + s); + + /* cycle */ + GWEN_DB_SetIntValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "details/cycle", + AB_Transaction_GetCycle(t)); + + /* execution day */ + GWEN_DB_SetIntValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "details/executionDay", + AB_Transaction_GetExecutionDay(t)); + + return 0; +} + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPASTANDINGORDERCREATE_L_H +#define AH_JOBSEPASTANDINGORDERCREATE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaStandingOrderCreate_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPASTANDINGORDERCREATE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,30 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPASTANDINGORDERCREATE_P_H +#define AH_JOBSEPASTANDINGORDERCREATE_P_H + + +#include "jobsepastandingordercreate_l.h" + +#include + + +static int AH_Job_SepaStandingOrderCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_SepaStandingOrderCreate_ExchangeArgs(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_SepaStandingOrderCreate_Prepare(AH_JOB *j); +static int AH_Job_SepaStandingOrderCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + + +#endif /* AH_JOBSEPASTANDINGORDERCREATE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,253 @@ +/*************************************************************************** + begin : Sat Aug 03 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepastandingorderget_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaStandingOrderGet_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + GWEN_DB_NODE *dbArgs; + + j=AH_AccountJob_new("JobSepaStandingOrderGet", u, account); + if (!j) + return 0; + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaStandingOrderGet_Prepare); + AH_Job_SetProcessFn(j, AH_Job_SepaStandingOrdersGet_Process); + AH_Job_SetExchangeFn(j, AH_Job_SepaStandingOrdersGet_Exchange); + + /* set some known arguments */ + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_DEFAULT, + "allAccounts", "N"); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +static const char *_findPatternInStringList(const GWEN_STRINGLIST *sl, const char *pattern){ + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(sl); + while(se) { + const char *s; + + s=GWEN_StringListEntry_Data(se); + if (s && *s && -1!=GWEN_Text_ComparePattern(s, pattern, 0)) { + return s; + } + se=GWEN_StringListEntry_Next(se); + } + + return NULL; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrderGet_Prepare(AH_JOB *j) { + GWEN_DB_NODE *dbArgs; + const GWEN_STRINGLIST *descriptors; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing job"); + + dbArgs=AH_Job_GetArguments(j); + + descriptors=AH_User_GetSepaDescriptors(AH_Job_GetUser(j)); + if (descriptors) { + const char *s; + + s=_findPatternInStringList(descriptors, "*pain.001.*"); + if (s) { + GWEN_DB_SetCharValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "SupportedSepaFormats/Format", + s); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No matching SEPA descriptor found"); + return GWEN_ERROR_GENERIC; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No list of supported SEPA descriptor found"); + return GWEN_ERROR_GENERIC; + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrdersGet_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AB_ACCOUNT *a; + AB_IMEXPORTER_ACCOUNTINFO *ai; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + GWEN_BUFFER *bufStandingOrders; + const char *responseName; + int rv; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing JobSepaStandingOrdersGet"); + + assert(j); + + responseName=AH_Job_GetResponseName(j); + + + bufStandingOrders=GWEN_Buffer_new(0, 1024, 0, 1); + + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + + /* search for "Transactions" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + GWEN_Buffer_free(bufStandingOrders); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + GWEN_Buffer_free(bufStandingOrders); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + if (responseName && *responseName) { + GWEN_DB_NODE *dbXA; + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "data"); + if (dbXA) + dbXA=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, responseName); + if (dbXA) { + const void *p; + unsigned int bs; + + p=GWEN_DB_GetBinValue(dbXA, "transfer", 0, 0, 0, &bs); + if (p && bs) + GWEN_Buffer_AppendBytes(bufStandingOrders, p, bs); + } + } + + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + + GWEN_Buffer_Rewind(bufStandingOrders); + + /* now the buffers contain data to be parsed by ImExporters */ + a=AH_AccountJob_GetAccount(j); + assert(a); + ai=AB_ImExporterContext_GetAccountInfo(ctx, + AB_Account_GetBankCode(a), + AB_Account_GetAccountNumber(a)); + assert(ai); + AB_ImExporterAccountInfo_SetAccountId(ai, AB_Account_GetUniqueId(a)); + + /* read booked transactions */ + if (GWEN_Buffer_GetUsedBytes(bufStandingOrders)) { + if (getenv("AQHBCI_LOGBOOKED")) { + FILE *f; + + f=fopen("/tmp/standingOrders.pain", "w+"); + if (f) { + if (fwrite(GWEN_Buffer_GetStart(bufStandingOrders), + GWEN_Buffer_GetUsedBytes(bufStandingOrders), 1, f)!=1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "fwrite: %s", strerror(errno)); + } + if (fclose(f)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "fclose: %s", strerror(errno)); + } + } + } + + /* TODO: parse data */ + } + + GWEN_Buffer_free(bufStandingOrders); + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrdersGet_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + + if (AB_Job_GetType(bj)!=AB_Job_TypeSepaGetStandingOrders) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Not a GetStandingOrders job"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: + return 0; + + case AH_Job_ExchangeModeArgs: + return 0; + + case AH_Job_ExchangeModeResults: + return 0; + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPASTANDINGORDERGET_L_H +#define AH_JOBSEPASTANDINGORDERGET_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaStandingOrderGet_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPASTANDINGORDERGET_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,30 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPASTANDINGORDERGET_P_H +#define AH_JOBSEPASTANDINGORDERGET_P_H + + +#include "jobsepastandingorderget_l.h" + + +static int AH_Job_SepaStandingOrderGet_Prepare(AH_JOB *j); +static int AH_Job_SepaStandingOrdersGet_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_SepaStandingOrdersGet_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + + + + + +#endif /* AH_JOBSEPASTANDINGORDERGET_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + %code + %version + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,260 @@ +/*************************************************************************** + begin : Wed Jan 08 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepaxfermulti_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + + + +GWEN_INHERIT(AH_JOB, AH_JOB_SEPAXFERMULTI); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaTransferMulti_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_SEPAXFERMULTI *aj; + GWEN_DB_NODE *dbParams; + const char *s; + + j=AH_Job_TransferBase_new("JobSepaTransferMulti", + AB_Transaction_TypeSepaTransfer, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 13); + + GWEN_NEW_OBJECT(AH_JOB_SEPAXFERMULTI, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_SEPAXFERMULTI, j, aj, + AH_Job_SepaTransferMulti_FreeData); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaTransferMulti_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaTransferMulti_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_TransferBase_ExchangeParams_SepaUndated); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaUndated); + + /* get params */ + dbParams=AH_Job_GetParams(j); + assert(dbParams); + + AH_Job_SetMaxTransfers(j, GWEN_DB_GetIntValue(dbParams, "maxTransfers", 0, 0)); + + s=GWEN_DB_GetCharValue(dbParams, "sumFieldNeeded", 0, "j"); + if (s && toupper(*s)=='J') + aj->sumFieldNeeded=1; + else + aj->sumFieldNeeded=0; + + s=GWEN_DB_GetCharValue(dbParams, "singleBookingAllowed", 0, "j"); + if (s && toupper(*s)=='J') + aj->singleBookingAllowed=1; + else + aj->singleBookingAllowed=0; + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_SepaTransferMulti_FreeData(void *bp, void *p){ + AH_JOB_SEPAXFERMULTI *aj; + + aj=(AH_JOB_SEPAXFERMULTI*)p; + + AB_Value_free(aj->sumValues); + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaTransferMulti_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { + AH_JOB_SEPAXFERMULTI *aj; + const AB_TRANSACTION *t; + const char *s; + int tanVer=AH_JOB_TANVER_1_4; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SEPAXFERMULTI, j); + assert(aj); + + /* get data from first transaction */ + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); + return GWEN_ERROR_INVALID; + } + + s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); + if (s && *s && strncasecmp(s, "1.3", 3)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); + tanVer=AH_JOB_TANVER_1_3; + } + + if (tanVer==AH_JOB_TANVER_1_4) { + int rv; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); + rv=AH_HHD14_AddChallengeParams_13(j, + AH_Job_GetTransferCount(j), + aj->sumValues, + AB_Transaction_GetLocalIban(t)); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaTransferMulti_Prepare(AH_JOB *j) { + AH_JOB_SEPAXFERMULTI *aj; + GWEN_DB_NODE *dbArgs; + GWEN_DB_NODE *profile; + int rv; + AB_TRANSACTION *t; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfers"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SEPAXFERMULTI, j); + assert(aj); + + dbArgs=AH_Job_GetArguments(j); + + /* calculate sum */ + AB_Value_free(aj->sumValues); + aj->sumValues=AB_Value_new(); + AB_Value_SetCurrency(aj->sumValues, "EUR"); + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + return GWEN_ERROR_INTERNAL; + } + while(t) { + const AB_VALUE *v; + + v=AB_Transaction_GetValue(t); + if (v) { + const char *s; + + s=AB_Value_GetCurrency(v); + if (s && strcmp(s, "EUR")) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "EUR required in SEPA transactions (%s)", s); + return GWEN_ERROR_BAD_DATA; + } + AB_Value_AddValue(aj->sumValues, v); + } + t=AB_Transaction_List_Next(t); + } + + /* find the right profile to produce pain.001 messages */ + profile=AH_Job_FindSepaProfile(j, "001*", AH_User_GetSepaTransferProfile(AH_Job_GetUser(j))); + if (!profile) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No suitable profile found"); + return GWEN_ERROR_GENERIC; + } + + /* set singleBookingWanted */ + if (aj->singleBookingAllowed && + GWEN_DB_GetIntValue(profile, "singleBookingWanted", 0, 1)) + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", "J"); + else { + GWEN_DB_SetCharValue(dbArgs, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", "N"); + GWEN_DB_SetIntValue(profile, GWEN_DB_FLAGS_OVERWRITE_VARS, + "singleBookingWanted", 0); + } + + /* export transfers to SEPA */ + rv=AH_Job_TransferBase_SepaExportTransactions(j, profile); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + /* store sum value */ + if (1) { + GWEN_DB_NODE *dbV; + GWEN_BUFFER *nbuf; + const char *s; + + dbV=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "totalSum"); + assert(dbV); + + nbuf=GWEN_Buffer_new(0, 32, 0, 1); + AB_Value_toHbciString(aj->sumValues, nbuf); + if (GWEN_Buffer_GetUsedBytes(nbuf)<1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); + GWEN_Buffer_free(nbuf); + return GWEN_ERROR_BAD_DATA; + } + + /* store value */ + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "value", + GWEN_Buffer_GetStart(nbuf)); + GWEN_Buffer_free(nbuf); + + /* store currency */ + s=AB_Value_GetCurrency(aj->sumValues); + assert(s); + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, "currency", s); + } + return 0; +} + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPAXFERMULTI_L_H +#define AH_JOBSEPAXFERMULTI_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaTransferMulti_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPAXFERMULTI_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,40 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPAXFERMULTI_P_H +#define AH_JOBSEPAXFERMULTI_P_H + + +#include "jobsepaxfermulti_l.h" +#include +#include + + + +typedef struct AH_JOB_SEPAXFERMULTI AH_JOB_SEPAXFERMULTI; +struct AH_JOB_SEPAXFERMULTI { + int sumFieldNeeded; + int singleBookingAllowed; + + AB_VALUE *sumValues; + char *localIban; + +}; +static void GWENHYWFAR_CB AH_Job_SepaTransferMulti_FreeData(void *bp, void *p); + +static int AH_Job_SepaTransferMulti_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + +static int AH_Job_SepaTransferMulti_Prepare(AH_JOB *j); + + +#endif /* AH_JOBSEPAXFERMULTI_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfermulti.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,137 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsepaxfersingle_p.h" +#include "jobtransferbase_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "user_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + + + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SepaTransferSingle_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_TransferBase_new("JobSepaTransferSingle", + AB_Transaction_TypeSepaTransfer, + AB_Transaction_SubTypeStandard, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 9); + + /* overwrite some virtual functions */ + AH_Job_SetPrepareFn(j, AH_Job_SepaTransferSingle_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaTransferSingle_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_TransferBase_ExchangeParams_SepaUndated); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_TransferBase_ExchangeArgs_SepaUndated); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaTransferSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { + const AB_TRANSACTION *t; + const char *s; + int tanVer=AH_JOB_TANVER_1_4; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); + + t=AH_Job_GetFirstTransfer(j); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); + return GWEN_ERROR_INVALID; + } + + s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); + if (s && *s && strncasecmp(s, "1.3", 3)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); + tanVer=AH_JOB_TANVER_1_3; + } + + if (tanVer==AH_JOB_TANVER_1_4) { + int rv; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); + rv=AH_HHD14_AddChallengeParams_09(j, + AB_Transaction_GetValue(t), + AB_Transaction_GetRemoteIban(t)); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaTransferSingle_Prepare(AH_JOB *j) { + GWEN_DB_NODE *profile; + int rv; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Preparing transfer"); + + /* find the right profile to produce pain.001 messages */ + profile=AH_Job_FindSepaProfile(j, "001*", AH_User_GetSepaTransferProfile(AH_Job_GetUser(j))); + if (!profile) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No suitable profile found"); + return GWEN_ERROR_GENERIC; + } + + /* export transfers to SEPA */ + rv=AH_Job_TransferBase_SepaExportTransactions(j, profile); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + return 0; +} + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,23 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPAXFERSINGLE_L_H +#define AH_JOBSEPAXFERSINGLE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaTransferSingle_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPAXFERSINGLE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,27 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPAXFERSINGLE_P_H +#define AH_JOBSEPAXFERSINGLE_P_H + + +#include "jobsepaxfersingle_l.h" + +#include + + +static int AH_Job_SepaTransferSingle_Prepare(AH_JOB *j); +static int AH_Job_SepaTransferSingle_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + + +#endif /* AH_JOBSEPAXFERSINGLE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepaxfersingle.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingledebitnote.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingledebitnote.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingledebitnote.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingledebitnote.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,208 @@ + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,1869 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2011 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobsingletransfer_p.h" +#include "job_l.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + + +GWEN_INHERIT(AH_JOB, AH_JOB_SINGLETRANSFER); + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SingleTransfer_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, AB_Job_TypeTransfer); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SingleDebitNote_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, AB_Job_TypeDebitNote); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_CreateStandingOrder_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, + AB_Job_TypeCreateStandingOrder); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_ModifyStandingOrder_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, + AB_Job_TypeModifyStandingOrder); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_DeleteStandingOrder_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, + AB_Job_TypeDeleteStandingOrder); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_CreateDatedTransfer_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, + AB_Job_TypeCreateDatedTransfer); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_ModifyDatedTransfer_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, + AB_Job_TypeModifyDatedTransfer); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_DeleteDatedTransfer_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, + AB_Job_TypeDeleteDatedTransfer); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_InternalTransfer_new(AB_USER *u, + AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_SingleTransferBase_new(u, account, + AB_Job_TypeInternalTransfer); + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_SingleTransferBase_new(AB_USER *u, + AB_ACCOUNT *account, + AB_JOB_TYPE jobType) { + AH_JOB *j; + AH_JOB_SINGLETRANSFER *aj; + + switch(jobType) { + case AB_Job_TypeTransfer: + j=AH_AccountJob_new("JobSingleTransfer", u, account); + break; + case AB_Job_TypeDebitNote: + j=AH_AccountJob_new("JobSingleDebitNote", u, account); + break; + case AB_Job_TypeCreateStandingOrder: + j=AH_AccountJob_new("JobCreateStandingOrder", u, account); + break; + case AB_Job_TypeModifyStandingOrder: + j=AH_AccountJob_new("JobModifyStandingOrder", u, account); + break; + case AB_Job_TypeDeleteStandingOrder: + j=AH_AccountJob_new("JobDeleteStandingOrder", u, account); + break; + case AB_Job_TypeCreateDatedTransfer: + j=AH_AccountJob_new("JobCreateDatedTransfer", u, account); + break; + case AB_Job_TypeModifyDatedTransfer: + j=AH_AccountJob_new("JobModifyDatedTransfer", u, account); + break; + case AB_Job_TypeDeleteDatedTransfer: + j=AH_AccountJob_new("JobDeleteDatedTransfer", u, account); + break; + case AB_Job_TypeInternalTransfer: + j=AH_AccountJob_new("JobInternalTransfer", u, account); + break; + default: + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unknown job type %d", jobType); + j=0; + } + + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_SINGLETRANSFER, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j, aj, + AH_Job_SingleTransfer_FreeData); + aj->jobType=jobType; + /* overwrite some virtual functions */ + AH_Job_SetProcessFn(j, AH_Job_SingleTransfer_Process); + AH_Job_SetExchangeFn(j, AH_Job_SingleTransfer_Exchange); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SingleTransfer_AddChallengeParams); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_SingleTransfer_FreeData(void *bp, void *p){ + AH_JOB_SINGLETRANSFER *aj; + + aj=(AH_JOB_SINGLETRANSFER*)p; + free(aj->fiid); + free(aj->oldFiid); + + AB_Transaction_free(aj->validatedTransaction); + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +const char *AH_Job_SingleTransfer_GetFiid(AH_JOB *j) { + AH_JOB_SINGLETRANSFER *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); + assert(aj); + + return aj->fiid; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +const char *AH_Job_SingleTransfer_GetOldFiid(AH_JOB *j) { + AH_JOB_SINGLETRANSFER *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); + assert(aj); + + return aj->oldFiid; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SingleTransfer_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_SINGLETRANSFER *aj; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); + assert(aj); + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing %s", + AB_Job_Type2Char(aj->jobType)); + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + + switch(aj->jobType) { + case AB_Job_TypeTransfer: + case AB_Job_TypeDebitNote: + case AB_Job_TypeDeleteStandingOrder: + case AB_Job_TypeDeleteDatedTransfer: + case AB_Job_TypeInternalTransfer: + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + int rv; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + break; + + case AB_Job_TypeCreateStandingOrder: + /* search for "CreateStandingOrderResponse" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + int rv; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/CreateStandingOrderResponse"); + if (dbXA) { + const char *s; + + s=GWEN_DB_GetCharValue(dbXA, "referenceId", 0, 0); + if (s) { + free(aj->fiid); + aj->fiid=strdup(s); + } + } /* if "standingOrderResponse" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + break; + + case AB_Job_TypeModifyStandingOrder: + /* search for "ModifyStandingOrderResponse" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + int rv; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/ModifyStandingOrderResponse"); + if (dbXA) { + const char *s; + + s=GWEN_DB_GetCharValue(dbXA, "referenceIdOld", 0, 0); + if (s) { + free(aj->oldFiid); + aj->oldFiid=strdup(s); + } + s=GWEN_DB_GetCharValue(dbXA, "referenceIdNew", 0, 0); + if (s) { + free(aj->fiid); + aj->fiid=strdup(s); + } + } /* if "standingOrderResponse" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + break; + + case AB_Job_TypeCreateDatedTransfer: + /* search for "CreateDatedTransferResponse" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + int rv; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/CreateDatedTransferResponse"); + if (dbXA) { + const char *s; + + s=GWEN_DB_GetCharValue(dbXA, "referenceId", 0, 0); + if (s) { + free(aj->fiid); + aj->fiid=strdup(s); + } + } /* if "standingOrderResponse" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + break; + + case AB_Job_TypeModifyDatedTransfer: + /* search for "ModifyDatedTransferResponse" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + GWEN_DB_NODE *dbXA; + int rv; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, + "data/ModifyDatedTransferResponse"); + if (dbXA) { + const char *s; + + s=GWEN_DB_GetCharValue(dbXA, "referenceIdOld", 0, 0); + if (s) { + free(aj->oldFiid); + aj->oldFiid=strdup(s); + } + s=GWEN_DB_GetCharValue(dbXA, "referenceIdNew", 0, 0); + if (s) { + free(aj->fiid); + aj->fiid=strdup(s); + } + } /* if "standingOrderResponse" */ + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + break; + + default: + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Unhandled job type %d", aj->jobType); + return -1; + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SingleTransfer__ValidateTransfer(AB_JOB *bj, + AH_JOB *mj, + AB_TRANSACTION *t) { + const GWEN_STRINGLIST *sl; + int maxn; + int maxs; + int n; + const char *s; + AH_JOB_SINGLETRANSFER *aj; + const AB_TRANSACTION_LIMITS *lim; + + assert(mj); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, mj); + assert(aj); + + lim=AB_Job_GetFieldLimits(bj); + + /* check purpose */ + if (lim) { + maxn=AB_TransactionLimits_GetMaxLinesPurpose(lim); + maxs=AB_TransactionLimits_GetMaxLenPurpose(lim); + } + else { + DBG_INFO(AQHBCI_LOGDOMAIN, "No transaction limits"); + maxn=0; + maxs=0; + } + sl=AB_Transaction_GetPurpose(t); + n=0; + if (sl) { + GWEN_STRINGLISTENTRY *se; + GWEN_STRINGLIST *nsl; + const char *p; + + nsl=GWEN_StringList_new(); + se=GWEN_StringList_FirstEntry(sl); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p && *p) { + char *np; + int l; + GWEN_BUFFER *tbuf; + + n++; + if (maxn && n>maxn) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many purpose lines (%d>%d)", n, maxn); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Too many purpose lines (%d>%d)"), + n, maxn); + GWEN_StringList_free(nsl); + return GWEN_ERROR_INVALID; + } + tbuf=GWEN_Buffer_new(0, maxs, 0, 1); + AB_ImExporter_Utf8ToDta(p, -1, tbuf); + GWEN_Text_CondenseBuffer(tbuf); + l=GWEN_Buffer_GetUsedBytes(tbuf); + if (maxs && l>maxs) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many chars in purpose line %d (%d>%d)", n, l, maxs); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Too many chars in purpose line %d (%d>%d)"), + n, l, maxs); + GWEN_StringList_free(nsl); + GWEN_Buffer_free(tbuf); + return GWEN_ERROR_INVALID; + } + np=(char*)malloc(l+1); + memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); + GWEN_Buffer_free(tbuf); + /* let string list take the newly alllocated string */ + GWEN_StringList_AppendString(nsl, np, 1, 0); + } + se=GWEN_StringListEntry_Next(se); + } /* while */ + AB_Transaction_SetPurpose(t, nsl); + GWEN_StringList_free(nsl); + } + if (!n) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No purpose lines"); + return GWEN_ERROR_INVALID; + } + + /* check remote name */ + if (lim) { + maxn=AB_TransactionLimits_GetMaxLinesRemoteName(lim); + maxs=AB_TransactionLimits_GetMaxLenRemoteName(lim); + } + else { + maxn=0; + maxs=0; + } + sl=AB_Transaction_GetRemoteName(t); + n=0; + if (sl) { + GWEN_STRINGLISTENTRY *se; + GWEN_STRINGLIST *nsl; + const char *p; + + nsl=GWEN_StringList_new(); + se=GWEN_StringList_FirstEntry(sl); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p && *p) { + char *np; + int l; + GWEN_BUFFER *tbuf; + + n++; + if (maxn && n>maxn) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many remote name lines (%d>%d)", + n, maxn); + GWEN_StringList_free(nsl); + return GWEN_ERROR_INVALID; + } + tbuf=GWEN_Buffer_new(0, maxs, 0, 1); + AB_ImExporter_Utf8ToDta(p, -1, tbuf); + GWEN_Text_CondenseBuffer(tbuf); + l=GWEN_Buffer_GetUsedBytes(tbuf); + if (l>maxs) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Too many chars in remote name line %d (%d>%d)", + n, l, maxs); + GWEN_StringList_free(nsl); + GWEN_Buffer_free(tbuf); + return GWEN_ERROR_INVALID; + } + np=(char*)malloc(l+1); + memmove(np, GWEN_Buffer_GetStart(tbuf), l+1); + GWEN_Buffer_free(tbuf); + /* let string list take the newly alllocated string */ + GWEN_StringList_AppendString(nsl, np, 1, 0); + } + se=GWEN_StringListEntry_Next(se); + } /* while */ + AB_Transaction_SetRemoteName(t, nsl); + GWEN_StringList_free(nsl); + } + if (!n) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No remote name lines"); + return GWEN_ERROR_INVALID; + } + + /* check local name */ + s=AB_Transaction_GetLocalName(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_NOTICE(AQHBCI_LOGDOMAIN, + "No local name, filling in"); + a=AB_Job_GetAccount(bj); + assert(a); + s=AB_Account_GetOwnerName(a); + if (!s) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No owner name in account, giving up"); + return GWEN_ERROR_INVALID; + } + AB_Transaction_SetLocalName(t, s); + } + + /* check local bank code */ + s=AB_Transaction_GetLocalBankCode(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local bank code, filling in"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetBankCode(a); + assert(s); + AB_Transaction_SetLocalBankCode(t, s); + } + + /* check local account number */ + s=AB_Transaction_GetLocalAccountNumber(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_WARN(AQHBCI_LOGDOMAIN, + "No local account number, filling in"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetAccountNumber(a); + assert(s); + AB_Transaction_SetLocalAccountNumber(t, s); + } + + /* check local account suffix */ + s=AB_Transaction_GetLocalSuffix(t); + if (!s) { + AB_ACCOUNT *a; + + DBG_INFO(AQHBCI_LOGDOMAIN, + "No local suffix, filling in (if possible)"); + a=AH_AccountJob_GetAccount(mj); + assert(a); + s=AB_Account_GetSubAccountId(a); + if (s && *s) + AB_Transaction_SetLocalSuffix(t, s); + } + + /* check text key */ + if (lim) { + if (GWEN_StringList_Count(AB_TransactionLimits_GetValuesTextKey(lim))){ + char numbuf[32]; + + n=AB_Transaction_GetTextKey(t); + if (n==0) { + switch(aj->jobType) { + case AB_Job_TypeDebitNote: + n=5; /* "Lastschrift" */ + break; + case AB_Job_TypeTransfer: + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + case AB_Job_TypeDeleteStandingOrder: + case AB_Job_TypeInternalTransfer: + default: + n=51; /* "Ueberweisung" */ + break; + } + AB_Transaction_SetTextKey(t, n); + } + + snprintf(numbuf, sizeof(numbuf), "%d", n); + if (!AB_TransactionLimits_HasValuesTextKey(lim, numbuf)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Text key \"%s\" not supported by bank", + numbuf); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Text key \"%d\" not supported by the bank"), + n); + return GWEN_ERROR_INVALID; + } + } + } + + if (lim) { + const GWEN_TIME *ti; + + switch(aj->jobType) { + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + case AB_Job_TypeDeleteStandingOrder: + /* additional checks for standing orders */ + + /* check period */ + if (AB_Transaction_GetPeriod(t)==AB_Transaction_PeriodMonthly) { + const GWEN_STRINGLIST *sl; + + /* check cycle */ + sl=AB_TransactionLimits_GetValuesCycleMonth(lim); + if (GWEN_StringList_Count(sl)){ + char numbuf[32]; + + n=AB_Transaction_GetCycle(t); + if (n==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No cycle given"); + return GWEN_ERROR_INVALID; + } + + snprintf(numbuf, sizeof(numbuf), "%d", n); + if (!AB_TransactionLimits_HasValuesCycleMonth(lim, numbuf) && + !AB_TransactionLimits_HasValuesCycleMonth(lim, "0")) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Month day \"%s\" not supported by bank", + numbuf); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Month day \"%d\" not supported by bank"), + n); + return GWEN_ERROR_INVALID; + } + } + + /* check execution day */ + sl=AB_TransactionLimits_GetValuesExecutionDayMonth(lim); + if (GWEN_StringList_Count(sl)){ + char numbuf[32]; + + n=AB_Transaction_GetExecutionDay(t); + if (n==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No execution day given"); + return GWEN_ERROR_INVALID; + } + + snprintf(numbuf, sizeof(numbuf), "%d", n); + if (!AB_TransactionLimits_HasValuesExecutionDayMonth(lim, numbuf) && + !AB_TransactionLimits_HasValuesExecutionDayMonth(lim, "0")) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Execution month day \"%s\" not supported by bank", + numbuf); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Execution month day \"%d\" not supported by bank"), + n); + return GWEN_ERROR_INVALID; + } + } /* if there are limits */ + } + else if (AB_Transaction_GetPeriod(t)==AB_Transaction_PeriodWeekly) { + const GWEN_STRINGLIST *sl; + + /* check cycle */ + sl=AB_TransactionLimits_GetValuesCycleWeek(lim); + if (GWEN_StringList_Count(sl)) { + char numbuf[32]; + + n=AB_Transaction_GetCycle(t); + if (n==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No cycle given"); + return GWEN_ERROR_INVALID; + } + + snprintf(numbuf, sizeof(numbuf), "%d", n); + if (!AB_TransactionLimits_HasValuesCycleWeek(lim, numbuf) && + !AB_TransactionLimits_HasValuesCycleWeek(lim, "0")) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Week day \"%s\" not supported by bank", + numbuf); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Week day \"%d\" not supported by bank"), + n); + return GWEN_ERROR_INVALID; + } + } /* if there are limits */ + + /* check execution day */ + sl=AB_TransactionLimits_GetValuesExecutionDayWeek(lim); + if (GWEN_StringList_Count(sl)){ + char numbuf[32]; + + n=AB_Transaction_GetExecutionDay(t); + if (n==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No execution day given"); + return GWEN_ERROR_INVALID; + } + + snprintf(numbuf, sizeof(numbuf), "%d", n); + if (!AB_TransactionLimits_HasValuesExecutionDayWeek(lim, numbuf) && + !AB_TransactionLimits_HasValuesExecutionDayWeek(lim, "0")) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Execution month day \"%s\" not supported by bank", + numbuf); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Execution month day \"%d\" not supported by bank"), + n); + return GWEN_ERROR_INVALID; + } + } /* if there are limits */ + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Unsupported period %d", AB_Transaction_GetPeriod(t)); + return GWEN_ERROR_INVALID; + } + + /* check setup times */ + ti=AB_Transaction_GetFirstExecutionDate(t); + if (ti && aj->jobType==AB_Job_TypeCreateStandingOrder) { + GWEN_TIME *currDate; + int dt; + + currDate=GWEN_CurrentTime(); + assert(currDate); + dt=((int)GWEN_Time_DiffSeconds(ti, currDate))/(60*60*24); + GWEN_Time_free(currDate); + + + /* check minimum setup time */ + n=AB_TransactionLimits_GetMinValueSetupTime(lim); + if (n && dtn) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Maximum setup time violated"); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Maximum setup time violated. " + "Dated transactions need to be at most %d days away"), + n); + return GWEN_ERROR_INVALID; + } + } + break; + + case AB_Job_TypeCreateDatedTransfer: + case AB_Job_TypeModifyDatedTransfer: + /* check setup times */ + ti=AB_Transaction_GetDate(t); + if (ti) { + GWEN_TIME *currDate; + int dt; + + currDate=GWEN_CurrentTime(); + assert(currDate); + dt=((int)GWEN_Time_DiffSeconds(ti, currDate))/(60*60*24); + GWEN_Time_free(currDate); + + /* check minimum setup time */ + n=AB_TransactionLimits_GetMinValueSetupTime(lim); + if (n && dtn) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Maximum setup time violated"); + GWEN_Gui_ProgressLog2(0, + GWEN_LoggerLevel_Error, + I18N("Maximum setup time violated. " + "Dated transactions need to be at most %d days away"), + n); + return GWEN_ERROR_INVALID; + } + } + break; + + case AB_Job_TypeDeleteDatedTransfer: + break; + + /* --------------- add more jobs here ---------------------- */ + + default: + break; + } /* switch */ + } + return 0; +} + + + +int AH_Job_SingleTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod) { + AH_JOB_SINGLETRANSFER *aj; + const AB_TRANSACTION *t; + const char *s; + int tanVer=AH_JOB_TANVER_1_4; + + DBG_ERROR(AQHBCI_LOGDOMAIN, "AddChallengeParams function called"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); + assert(aj); + + t=aj->validatedTransaction; + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No validated transaction"); + return GWEN_ERROR_INVALID; + } + + s=GWEN_DB_GetCharValue(dbMethod, "zkaTanVersion", 0, NULL); + if (s && *s && strncasecmp(s, "1.3", 3)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.3 (%s)", s); + tanVer=AH_JOB_TANVER_1_3; + } + + if (tanVer==AH_JOB_TANVER_1_4) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "TAN version is 1.4.x"); + + switch(aj->jobType) { + case AB_Job_TypeTransfer: + case AB_Job_TypeDebitNote: + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + case AB_Job_TypeDeleteStandingOrder: + { + const char *s; + const AB_VALUE *v; + + /* select challenge class (why the heck doesn't the bank derive this from the job??) */ + switch(aj->jobType) { + case AB_Job_TypeTransfer: + AH_Job_SetChallengeClass(j, 4); + break; + case AB_Job_TypeDebitNote: + AH_Job_SetChallengeClass(j, 15); + break; + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + case AB_Job_TypeDeleteStandingOrder: + AH_Job_SetChallengeClass(j, 34); + break; + default: + /* TSNH */ + break; + } + + /* P1: Betrag */ + v=AB_Transaction_GetValue(t); + if (v) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + AH_Job_ValueToChallengeString(v, tbuf); + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + + /* P2: BLZ Zahler/Empfaenger */ + s=AB_Transaction_GetRemoteBankCode(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P3: Konto Zahler/Empfaenger */ + s=AB_Transaction_GetRemoteAccountNumber(t); + if (s && *s) { + int i; + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + GWEN_Buffer_AppendString(tbuf, s); + i=10-strlen(s); + if (i>0) { + /* need to left-fill the account number with leading zeroes + * to a length of exactly 10 digits */ + GWEN_Buffer_Rewind(tbuf); + GWEN_Buffer_FillLeftWithBytes(tbuf, '0', i); + } + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No account number"); + return GWEN_ERROR_INVALID; + } + +#if 0 /* don't provide more info than needed, more data=more trouble sources */ + /* P4: BLZ Absender (O) */ + s=AB_Transaction_GetLocalBankCode(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P5: Konto Absender (O) */ + s=AB_Transaction_GetLocalAccountNumber(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + if (aj->jobType==AB_Job_TypeTransfer) { + /* P6: Name Absender (O) */ + s=AB_Transaction_GetLocalName(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + } +#endif + + } + break; + + case AB_Job_TypeCreateDatedTransfer: + case AB_Job_TypeModifyDatedTransfer: + case AB_Job_TypeDeleteDatedTransfer: + { + const char *s; + const AB_VALUE *v; + const GWEN_TIME *ti; + GWEN_BUFFER *tbuf; + + /* P1: Betrag */ + v=AB_Transaction_GetValue(t); + assert(v); + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + AB_Value_toHumanReadableString2(v, tbuf, 2, 0); /* TODO: currency needed?? */ + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + + /* P2: BLZ Empfaenger */ + s=AB_Transaction_GetRemoteBankCode(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P3: Konto Empfaenger */ + s=AB_Transaction_GetRemoteAccountNumber(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P4: Termin (M) */ + ti=AB_Transaction_GetDate(t); + assert(ti); + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + GWEN_Time_toString(ti, "YYYYMMDD", tbuf); + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + + /* P5: BLZ Absender (O) */ + s=AB_Transaction_GetLocalBankCode(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P6: Konto Absender (O) */ + s=AB_Transaction_GetLocalAccountNumber(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P7: Name Absender (O) */ + s=AB_Transaction_GetLocalName(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + } + break; + + case AB_Job_TypeInternalTransfer: + { + const char *s; + const AB_VALUE *v; + GWEN_BUFFER *tbuf; + + AH_Job_SetChallengeClass(j, 5); + + /* P1: Betrag */ + v=AB_Transaction_GetValue(t); + assert(v); + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + AB_Value_toHumanReadableString2(v, tbuf, 2, 0); /* TODO: currency needed?? */ + AH_Job_AddChallengeParam(j, GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + + /* P2: Konto Empfaenger */ + s=AB_Transaction_GetRemoteAccountNumber(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P3: Konto Absender (O) */ + s=AB_Transaction_GetLocalAccountNumber(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + + /* P4: Name Empfaenger (O) (we use the local name here instead, but it is the same as the remote name) */ + s=AB_Transaction_GetLocalName(t); + assert(s && *s); + AH_Job_AddChallengeParam(j, s); + } + break; + + default: + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Unhandled job type %d", aj->jobType); + return GWEN_ERROR_INVALID; + } /* switch */ + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unhandled tan version %d for now", tanVer); + return GWEN_ERROR_INTERNAL; + } + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SingleTransfer_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_SINGLETRANSFER *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_SINGLETRANSFER, j); + assert(aj); + + if (aj->jobType!=AB_Job_GetType(bj)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Different job types"); + return GWEN_ERROR_INVALID; + } + + switch(m) { + case AH_Job_ExchangeModeParams: { + GWEN_DB_NODE *dbParams; + GWEN_DB_NODE *dbTk; + AB_TRANSACTION_LIMITS *lim; + const char *s; + int i; + + dbParams=AH_Job_GetParams(j); + DBG_DEBUG(AQHBCI_LOGDOMAIN, "Have this parameters to exchange:"); + if (GWEN_Logger_GetLevel(AQHBCI_LOGDOMAIN)>=GWEN_LoggerLevel_Debug) + GWEN_DB_Dump(dbParams, 2); + + /* read limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 27); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 27); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 2); + + AB_TransactionLimits_SetNeedDate(lim, -1); + + i=GWEN_DB_GetIntValue(dbParams, "maxpurposeLines", 0, 0); + AB_TransactionLimits_SetMaxLinesPurpose(lim, i); + + /* read text keys */ + dbTk=GWEN_DB_GetGroup(dbParams, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "textkey"); + if (dbTk) { + for (i=0; ; i++) { + int k; + char numbuf[16]; + + k=GWEN_DB_GetIntValue(dbTk, "key", i, -1); + if (k==-1) + break; + snprintf(numbuf, sizeof(numbuf), "%d", k); + AB_TransactionLimits_AddValuesTextKey(lim, numbuf, 0); + } + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesTextKey(lim), + 1, GWEN_StringList_SortModeInt); + } + + /* some special limits for standing order jobs */ + switch(aj->jobType) { + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + case AB_Job_TypeDeleteStandingOrder: + s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusMonths", 0, 0); + if (s && *s) { + AB_TransactionLimits_SetAllowMonthly(lim, 1); + while(*s) { + char buf[3]; + const char *x; + + buf[2]=0; + strncpy(buf, s, 2); + x=buf; + if (*x=='0') + x++; + + AB_TransactionLimits_AddValuesCycleMonth(lim, x, 0); + s+=2; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleMonth(lim), + 1, GWEN_StringList_SortModeInt); + } + else + AB_TransactionLimits_SetAllowMonthly(lim, -1); + + s=GWEN_DB_GetCharValue(dbParams, "AllowedMonthDays", 0, 0); + if (s && *s) { + while(*s) { + char buf[3]; + const char *x; + + buf[2]=0; + strncpy(buf, s, 2); + x=buf; + if (*x=='0') + x++; + AB_TransactionLimits_AddValuesExecutionDayMonth(lim, x, 0); + s+=2; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayMonth(lim), + 1, GWEN_StringList_SortModeInt); + } + + s=GWEN_DB_GetCharValue(dbParams, "AllowedTurnusWeeks", 0, 0); + if (s && *s) { + AB_TransactionLimits_SetAllowWeekly(lim, 1); + while(*s) { + char buf[3]; + const char *x; + + buf[2]=0; + strncpy(buf, s, 2); + x=buf; + if (*x=='0') + x++; + AB_TransactionLimits_AddValuesCycleWeek(lim, x, 0); + s+=2; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesCycleWeek(lim), + 1, GWEN_StringList_SortModeInt); + } + else + AB_TransactionLimits_SetAllowWeekly(lim, -1); + + s=GWEN_DB_GetCharValue(dbParams, "AllowedWeekDays", 0, 0); + if (s && *s) { + while(*s) { + char buf[2]; + const char *x; + + buf[0]=*s; + buf[1]=0; + x=buf; + if (*x=='0') + x++; + AB_TransactionLimits_AddValuesExecutionDayWeek(lim, x, 0); + s++; + } /* while */ + GWEN_StringList_Sort(AB_TransactionLimits_GetValuesExecutionDayWeek(lim), + 1, GWEN_StringList_SortModeInt); + } + + i=GWEN_DB_GetIntValue(dbParams, "minDelay", 0, 0); + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i=GWEN_DB_GetIntValue(dbParams, "maxDelay", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTime(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgOtherAccount", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeRecipientAccount(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgOtherName", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeRecipientName(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgValue", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeValue(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgTextKey", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeTextKey(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgPurpose", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangePurpose(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgFirstDate", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeFirstExecutionDate(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgUnit", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangePeriod(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgTurnus", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeCycle(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgDay", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeExecutionDay(lim, i); + + s=GWEN_DB_GetCharValue(dbParams, "AllowChgLastDate", 0, ""); + if (*s=='J') i=1; + else if (*s=='N') i=-1; + else i=0; + AB_TransactionLimits_SetAllowChangeLastExecutionDate(lim, i); + break; + + case AB_Job_TypeCreateDatedTransfer: + case AB_Job_TypeModifyDatedTransfer: + AB_TransactionLimits_SetNeedDate(lim, 1); + i=GWEN_DB_GetIntValue(dbParams, "minDelay", 0, 0); + AB_TransactionLimits_SetMinValueSetupTime(lim, i); + + i=GWEN_DB_GetIntValue(dbParams, "maxDelay", 0, 0); + AB_TransactionLimits_SetMaxValueSetupTime(lim, i); + break; + + default: + break; + } + + /* store field limits */ + AB_Job_SetFieldLimits(bj, lim); + + AB_TransactionLimits_free(lim); + return 0; + } + + case AH_Job_ExchangeModeArgs: { + GWEN_DB_NODE *dbArgs; + const AB_TRANSACTION *ot; + const AB_VALUE *v; + + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + ot=AB_Job_GetTransaction(bj); + if (ot) { + GWEN_DB_NODE *dbT; + const char *p; + const GWEN_STRINGLIST *sl; + AB_TRANSACTION *t; + const GWEN_TIME *ti; + + t=AB_Transaction_dup(ot); + assert(t); + if (AH_Job_SingleTransfer__ValidateTransfer(bj, j, t)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Invalid transaction"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_INVALID; + } + /* store the validated transaction back into application job, + * to allow the application to recognize answers to this job later */ + AB_Job_SetTransaction(bj, t); + + /* preset challenge stuff */ + AH_Job_SetChallengeClass(j, 4); + AH_Job_SetChallengeValue(j, AB_Transaction_GetValue(t)); + + dbT=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_OVERWRITE_GROUPS, + "transaction"); + assert(dbT); + + /* store transaction */ + GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/country", 280); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/bankCode", + AB_Transaction_GetLocalBankCode(t)); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/accountId", + AB_Transaction_GetLocalAccountNumber(t)); + + p=AB_Transaction_GetLocalSuffix(t); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "ourAccount/accountsubid", p); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "name", + AB_Transaction_GetLocalName(t)); + + GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "otherAccount/country", + 280); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "otherAccount/bankCode", + AB_Transaction_GetRemoteBankCode(t)); + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "otherAccount/accountId", + AB_Transaction_GetRemoteAccountNumber(t)); + + sl=AB_Transaction_GetRemoteName(t); + if (sl) { + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(sl); + GWEN_DB_DeleteVar(dbT, "otherName"); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, + "otherName", p); + se=GWEN_StringListEntry_Next(se); + } /* while */ + } + + v=AB_Transaction_GetValue(t); + if (v) { + GWEN_DB_NODE *dbV; + GWEN_BUFFER *nbuf; + char *p; + const char *s; + int l; + + dbV=GWEN_DB_GetGroup(dbT, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "value"); + assert(dbV); + + nbuf=GWEN_Buffer_new(0, 32, 0, 1); + if (GWEN_Text_DoubleToBuffer(AB_Value_GetValueAsDouble(v), + nbuf)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Buffer overflow"); + GWEN_Buffer_free(nbuf); + abort(); + } + + l=GWEN_Buffer_GetUsedBytes(nbuf); + if (!l) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error in conversion"); + GWEN_Buffer_free(nbuf); + abort(); + } + + /* replace "C" comma with "DE" comma, remove thousand's comma */ + p=GWEN_Buffer_GetStart(nbuf); + s=p; + while(*s) { + if (*s=='.') { + *p=','; + p++; + } + else if (*s!=',') { + *p=*s; + p++; + } + s++; + } /* while */ + *p=0; + + if (strchr(GWEN_Buffer_GetStart(nbuf), ',')) { + /* kill all trailing '0' behind the comma */ + p=GWEN_Buffer_GetStart(nbuf)+l; + while(l--) { + --p; + if (*p=='0') + *p=0; + else + break; + } + } + else + GWEN_Buffer_AppendString(nbuf, ","); + + /* store value */ + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "value", + GWEN_Buffer_GetStart(nbuf)); + GWEN_Buffer_free(nbuf); + + s=AB_Value_GetCurrency(v); + if (!s) + s="EUR"; + GWEN_DB_SetCharValue(dbV, GWEN_DB_FLAGS_OVERWRITE_VARS, + "currency", s); + } /* if value */ + + GWEN_DB_SetIntValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "textKey", + AB_Transaction_GetTextKey(t)); + + sl=AB_Transaction_GetPurpose(t); + if (sl) { + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(sl); + GWEN_DB_DeleteVar(dbT, "purpose"); + while(se) { + p=GWEN_StringListEntry_Data(se); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_DEFAULT, + "purpose", p); + se=GWEN_StringListEntry_Next(se); + } /* while */ + } + + switch(aj->jobType) { + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + case AB_Job_TypeDeleteStandingOrder: + /* additional data for standing orders */ + + /* first execution date */ + ti=AB_Transaction_GetFirstExecutionDate(t); + if (ti) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Time_toString(ti, "YYYYMMDD", tbuf); + GWEN_DB_SetCharValue(dbT, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "special/xfirstExecutionDate", + GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + +#if 0 + /* don't ever set lastExecutionDate */ + /* lastExecutionDate */ + ti=AB_Transaction_GetLastExecutionDate(t); + if (ti) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Time_toString(ti, "YYYYMMDD", tbuf); + GWEN_DB_SetCharValue(dbT, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "special/xlastExecutionDate", + GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } +#endif + +#if 0 + /* don't ever set nextExecutionDate */ + if (aj->jobType==AB_Job_TypeCreateStandingOrder) { + /* nextExecutionDate */ + ti=AB_Transaction_GetNextExecutionDate(t); + if (ti) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Time_toString(ti, "YYYYMMDD", tbuf); + GWEN_DB_SetCharValue(dbT, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "special/xnextExecutionDate", + GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + } +#endif + + /* period */ + switch(AB_Transaction_GetPeriod(t)) { + case AB_Transaction_PeriodMonthly: p="M"; break; + case AB_Transaction_PeriodWeekly: p="W"; break; + default: + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unsupported period %d", + AB_Transaction_GetPeriod(t)); + return GWEN_ERROR_INVALID; + } + GWEN_DB_SetCharValue(dbT, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "special/xperiod", + p); + + /* cycle */ + GWEN_DB_SetIntValue(dbT, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "special/cycle", + AB_Transaction_GetCycle(t)); + + /* execution day */ + GWEN_DB_SetIntValue(dbT, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "special/executionDay", + AB_Transaction_GetExecutionDay(t)); + + /* fiid */ + p=AB_Transaction_GetFiId(t); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "fiid", p); + break; + + case AB_Job_TypeCreateDatedTransfer: + case AB_Job_TypeModifyDatedTransfer: + case AB_Job_TypeDeleteDatedTransfer: + /* fiid */ + p=AB_Transaction_GetFiId(t); + if (p) + GWEN_DB_SetCharValue(dbT, GWEN_DB_FLAGS_OVERWRITE_VARS, + "fiid", p); + + /* date */ + ti=AB_Transaction_GetDate(t); + if (ti) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 16, 0, 1); + GWEN_Time_toString(ti, "YYYYMMDD", tbuf); + GWEN_DB_SetCharValue(dbT, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "xdate", + GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + + break; + + /* --------------- add more jobs here -------------- */ + + default: + break; + } /* switch */ + + /* store pointer to the validated transaction */ + aj->validatedTransaction=t; + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + return 0; + } + + case AH_Job_ExchangeModeResults: { + AH_RESULT_LIST *rl; + AH_RESULT *r; + int has10; + int has20; + const AB_TRANSACTION *ot; + AB_TRANSACTION_STATUS tStatus; + + rl=AH_Job_GetSegResults(j); + assert(rl); + + r=AH_Result_List_First(rl); + if (!r) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No segment results"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + /* return GWEN_ERROR_NO_DATA; */ + return 0; + } + has10=0; + has20=0; + while(r) { + int rcode; + + rcode=AH_Result_GetCode(r); + if (rcode <=19) + has10=1; + else if (rcode>=20 && rcode <=29) + has20=1; + r=AH_Result_List_Next(r); + } + + if (has20) { + AB_Job_SetStatus(bj, AB_Job_StatusFinished); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); + } + else if (has10) { + switch(aj->jobType) { + case AB_Job_TypeTransfer: + case AB_Job_TypeDebitNote: + case AB_Job_TypeInternalTransfer: + AB_Job_SetStatus(bj, AB_Job_StatusPending); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); + break; + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + case AB_Job_TypeDeleteStandingOrder: + case AB_Job_TypeCreateDatedTransfer: + case AB_Job_TypeModifyDatedTransfer: + case AB_Job_TypeDeleteDatedTransfer: + AB_Job_SetStatus(bj, AB_Job_StatusFinished); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); + break; + default: + DBG_ERROR(AQHBCI_LOGDOMAIN, "Unknown job type %d", aj->jobType); + abort(); + } + } + else { + DBG_INFO(AQHBCI_LOGDOMAIN, + "Error status (neither 0010 nor 0020)"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + } + + if (has20) + tStatus=AB_Transaction_StatusAccepted; + else if (has10) + tStatus=AB_Transaction_StatusPending; + else + tStatus=AB_Transaction_StatusRejected; + + switch(aj->jobType) { + case AB_Job_TypeTransfer: + ot=AB_Job_GetTransaction(bj); + if (ot) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + AB_Transaction_SetStatus(t, tStatus); + AB_Transaction_SetType(t, AB_Transaction_TypeTransfer); + AB_ImExporterContext_AddTransfer(ctx, t); + } + break; + + case AB_Job_TypeDebitNote: + ot=AB_Job_GetTransaction(bj); + if (ot) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + AB_Transaction_SetStatus(t, tStatus); + AB_Transaction_SetType(t, AB_Transaction_TypeDebitNote); + AB_ImExporterContext_AddTransfer(ctx, t); + } + break; + + case AB_Job_TypeInternalTransfer: + ot=AB_Job_GetTransaction(bj); + if (ot) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + AB_Transaction_SetStatus(t, tStatus); + AB_Transaction_SetType(t, AB_Transaction_TypeInternalTransfer); + AB_ImExporterContext_AddTransfer(ctx, t); + } + break; + + case AB_Job_TypeCreateStandingOrder: + case AB_Job_TypeModifyStandingOrder: + ot=AB_Job_GetTransaction(bj); + if (ot && aj->fiid) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + AB_Transaction_SetFiId(t, aj->fiid); + AB_Transaction_SetStatus(t, tStatus); + AB_Job_SetTransaction(bj, t); + AB_ImExporterContext_AddStandingOrder(ctx, t); + } + break; + + case AB_Job_TypeDeleteStandingOrder: + ot=AB_Job_GetTransaction(bj); + if (ot) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + switch(tStatus) { + case AB_Transaction_StatusAccepted: + AB_Transaction_SetStatus(t, AB_Transaction_StatusRevoked); + break; + case AB_Transaction_StatusPending: + AB_Transaction_SetStatus(t, AB_Transaction_StatusPending); + break; + case AB_Transaction_StatusRejected: + default: + /* don't modify status */ + break; + } + AB_Job_SetTransaction(bj, t); + AB_ImExporterContext_AddStandingOrder(ctx, t); + } + break; + + case AB_Job_TypeCreateDatedTransfer: + case AB_Job_TypeModifyDatedTransfer: + ot=AB_Job_GetTransaction(bj); + if (ot && aj->fiid) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + AB_Transaction_SetFiId(t, aj->fiid); + AB_Transaction_SetStatus(t, tStatus); + AB_Job_SetTransaction(bj, t); + AB_ImExporterContext_AddDatedTransfer(ctx, t); + } + break; + + case AB_Job_TypeDeleteDatedTransfer: + ot=AB_Job_GetTransaction(bj); + if (ot) { + AB_TRANSACTION *t; + + t=AB_Transaction_dup(ot); + switch(tStatus) { + case AB_Transaction_StatusAccepted: + AB_Transaction_SetStatus(t, AB_Transaction_StatusRevoked); + break; + case AB_Transaction_StatusPending: + AB_Transaction_SetStatus(t, AB_Transaction_StatusPending); + break; + case AB_Transaction_StatusRejected: + default: + /* don't modify status */ + break; + } + AB_Job_SetTransaction(bj, t); + AB_ImExporterContext_AddDatedTransfer(ctx, t); + } + break; + + default: + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Unhandled job type %d", aj->jobType); + return -1; + } + + return 0; + } + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ +} + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,58 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id$ + begin : Mon Mar 01 2004 + copyright : (C) 2004 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSINGLETRANSFER_L_H +#define AH_JOBSINGLETRANSFER_L_H + + +#include "accountjob_l.h" + +#include + + +AH_JOB *AH_Job_SingleTransfer_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_SingleDebitNote_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_CreateStandingOrder_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_ModifyStandingOrder_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_DeleteStandingOrder_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_CreateDatedTransfer_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_ModifyDatedTransfer_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_DeleteDatedTransfer_new(AB_USER *u, + AB_ACCOUNT *account); + +AH_JOB *AH_Job_InternalTransfer_new(AB_USER *u, + AB_ACCOUNT *account); + + +const char *AH_Job_SingleTransfer_GetFiid(AH_JOB *j); + +const char *AH_Job_SingleTransfer_GetOldFiid(AH_JOB *j); + + +#endif /* AH_JOBSINGLETRANSFER_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,46 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2011 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSINGLETRANSFER_P_H +#define AH_JOBSINGLETRANSFER_P_H + + +#include "jobsingletransfer_l.h" +#include + + +typedef struct AH_JOB_SINGLETRANSFER AH_JOB_SINGLETRANSFER; +struct AH_JOB_SINGLETRANSFER { + AB_JOB_TYPE jobType; + char *fiid; + char *oldFiid; + AB_TRANSACTION *validatedTransaction; +}; +static void GWENHYWFAR_CB AH_Job_SingleTransfer_FreeData(void *bp, void *p); +static int AH_Job_SingleTransfer_Process(AH_JOB *j, + AB_IMEXPORTER_CONTEXT *ctx); +static int AH_Job_SingleTransfer_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + + +static int AH_Job_SingleTransfer__ValidateTransfer(AB_JOB *bj, + AH_JOB *mj, + AB_TRANSACTION *t); + +static AH_JOB *AH_Job_SingleTransferBase_new(AB_USER *u, + AB_ACCOUNT *account, + AB_JOB_TYPE jobType); + +static int AH_Job_SingleTransfer_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + +#endif /* AH_JOBSINGLETRANSFER_P_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.xml 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsingletransfer.xml 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,214 @@ + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + %code + %version + + + + + + + + + + + + + %code + %version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase.c 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,644 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "jobtransferbase_p.h" +#include "aqhbci_l.h" +#include "accountjob_l.h" +#include "job_l.h" +#include "provider_l.h" +#include "hhd_l.h" +#include +#include +#include +#include + +#include + +#include +#include +#include + + + +GWEN_INHERIT(AH_JOB, AH_JOB_TRANSFERBASE); + + + + +/* --------------------------------------------------------------- FUNCTION */ +AH_JOB *AH_Job_TransferBase_new(const char *jobName, + AB_TRANSACTION_TYPE tt, + AB_TRANSACTION_SUBTYPE tst, + AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + AH_JOB_TRANSFERBASE *aj; + + j=AH_AccountJob_new(jobName, u, account); + if (!j) + return 0; + + GWEN_NEW_OBJECT(AH_JOB_TRANSFERBASE, aj); + GWEN_INHERIT_SETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j, aj, + AH_Job_TransferBase_FreeData); + + aj->transactionType=tt; + aj->transactionSubType=tst; + + /* overwrite some virtual functions */ + AH_Job_SetExchangeFn(j, AH_Job_TransferBase_Exchange); + AH_Job_SetProcessFn(j, AH_Job_TransferBase_Process); + + return j; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void GWENHYWFAR_CB AH_Job_TransferBase_FreeData(void *bp, void *p){ + AH_JOB_TRANSFERBASE *aj; + + aj=(AH_JOB_TRANSFERBASE*)p; + free(aj->fiid); + + GWEN_FREE_OBJECT(aj); +} + + + +/* --------------------------------------------------------------- FUNCTION */ +const char *AH_Job_TransferBase_GetFiid(const AH_JOB *j) { + AH_JOB_TRANSFERBASE *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + return aj->fiid; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_SepaExportTransactions(AH_JOB *j, GWEN_DB_NODE *profile) { + AH_JOB_TRANSFERBASE *aj; + GWEN_DB_NODE *dbArgs; + AB_BANKING *ab; + const char *descriptor; + const AB_TRANSACTION *t; + int rv; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exporting transaction"); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + ab=AH_Job_GetBankingApi(j); + assert(ab); + + dbArgs=AH_Job_GetArguments(j); + assert(dbArgs); + + descriptor=GWEN_DB_GetCharValue(profile, "descriptor", 0, 0); + assert(descriptor); + DBG_INFO(AQHBCI_LOGDOMAIN, "Using SEPA descriptor %s and profile %s", + descriptor, GWEN_DB_GetCharValue(profile, "name", 0, 0)); + + /* set data in job */ + t=AH_Job_GetFirstTransfer(j); + if (t) { + AB_IMEXPORTER_CONTEXT *ioc; + AB_TRANSACTION *cpy; + AB_IMEXPORTER *ie; + + /* add transfers as transactions for export (exporters only use transactions) */ + ioc=AB_ImExporterContext_new(); + while(t) { + cpy=AB_Transaction_dup(t); + AB_ImExporterContext_AddTransaction(ioc, cpy); + t=AB_Transaction_List_Next(t); + } + + ie=AB_Banking_GetImExporter(ab, "sepa"); + if (ie) { + GWEN_BUFFER *dbuf; + + dbuf=GWEN_Buffer_new(0, 256, 0, 1); + rv=AB_ImExporter_ExportToBuffer(ie, ioc, dbuf, profile); + AB_ImExporterContext_free(ioc); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + GWEN_Buffer_free(dbuf); + return rv; + } + + /* store descriptor */ + GWEN_DB_SetCharValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "descriptor", + descriptor); + /* store transfer */ + GWEN_DB_SetBinValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "transfer", + GWEN_Buffer_GetStart(dbuf), + GWEN_Buffer_GetUsedBytes(dbuf)); + GWEN_Buffer_free(dbuf); + } + else { + DBG_ERROR(AQBANKING_LOGDOMAIN, "here"); + AB_ImExporterContext_free(ioc); + return GWEN_ERROR_NO_DATA; + } + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + return GWEN_ERROR_INTERNAL; + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_ExchangeParams_SepaUndated(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx) { + AB_TRANSACTION_LIMITS *lim; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging params"); + + /* set some default limits */ + lim=AB_TransactionLimits_new(); + AB_TransactionLimits_SetMaxLenPurpose(lim, 35); + AB_TransactionLimits_SetMaxLinesPurpose(lim, 4); + AB_TransactionLimits_SetMaxLenRemoteName(lim, 70); + AB_TransactionLimits_SetMaxLinesRemoteName(lim, 1); + + AB_TransactionLimits_SetNeedDate(lim, -1); + + AB_Job_SetFieldLimits(bj, lim); + AB_TransactionLimits_free(lim); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_ExchangeArgs_SepaUndated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { + const AB_TRANSACTION_LIMITS *lim=NULL; + AB_BANKING *ab; + const AB_TRANSACTION *t=NULL; + AB_TRANSACTION *tCopy=NULL; + int rv; + AB_USER *u; + uint32_t uflags; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); + + ab=AH_Job_GetBankingApi(j); + assert(ab); + + u=AH_Job_GetUser(j); + assert(u); + + uflags=AH_User_GetFlags(u); + + /* get limits and transaction */ + lim=AB_Job_GetFieldLimits(bj); + t=AB_Job_GetTransaction(bj); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + return GWEN_ERROR_INVALID; + } + + /* DISABLED according to a discussion on aqbanking-user: + * The application should do this, not the library. + AB_Transaction_FillLocalFromAccount(t, a); */ + + /* validate transaction */ + rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + tCopy=AB_Transaction_dup(t); + + /* set group id so the application can now which transfers went together in one setting */ + AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); + + /* store validated transaction in job */ + AB_Job_SetTransaction(bj, tCopy); + + /* store copy of transaction for later */ + AH_Job_AddTransfer(j, tCopy); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_ExchangeArgs_SepaDated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { + const AB_TRANSACTION_LIMITS *lim=NULL; + AB_BANKING *ab; + const AB_TRANSACTION *t=NULL; + AB_TRANSACTION *tCopy=NULL; + int rv; + AB_USER *u; + uint32_t uflags; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); + + ab=AH_Job_GetBankingApi(j); + assert(ab); + + u=AH_Job_GetUser(j); + assert(u); + + uflags=AH_User_GetFlags(u); + + /* get limits and transaction */ + lim=AB_Job_GetFieldLimits(bj); + t=AB_Job_GetTransaction(bj); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + return GWEN_ERROR_INVALID; + } + + /* DISABLED according to a discussion on aqbanking-user: + * The application should do this, not the library. + AB_Transaction_FillLocalFromAccount(t, a); */ + + /* validate transaction */ + rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckDateAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + + tCopy=AB_Transaction_dup(t); + + /* set group id so the application can now which transfers went together in one setting */ + AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); + + /* store validated transaction in job */ + AB_Job_SetTransaction(bj, tCopy); + + /* store copy of transaction for later */ + AH_Job_AddTransfer(j, tCopy); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { + const AB_TRANSACTION_LIMITS *lim=NULL; + AB_BANKING *ab; + const AB_TRANSACTION *t=NULL; + AB_TRANSACTION *tCopy=NULL; + int rv; + AB_USER *u; + uint32_t uflags; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging args"); + + ab=AH_Job_GetBankingApi(j); + assert(ab); + + u=AH_Job_GetUser(j); + assert(u); + + uflags=AH_User_GetFlags(u); + + /* get limits and transaction */ + lim=AB_Job_GetFieldLimits(bj); + t=AB_Job_GetTransaction(bj); + if (t==NULL) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No transaction in job"); + return GWEN_ERROR_INVALID; + } + + /* DISABLED according to a discussion on aqbanking-user: + * The application should do this, not the library. + AB_Transaction_FillLocalFromAccount(t, a); */ + + /* validate transaction */ + rv=AB_Transaction_CheckForSepaConformity(t, (uflags & AH_USER_FLAGS_USE_STRICT_SEPA_CHARSET)?1:0); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckPurposeAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckNamesAgainstLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + rv=AB_Transaction_CheckDateAgainstSequenceLimits(t, lim); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + return rv; + } + + + tCopy=AB_Transaction_dup(t); + + /* set group id so the application can now which transfers went together in one setting */ + AB_Transaction_SetGroupId(tCopy, AH_Job_GetId(j)); + + /* store validated transaction in job */ + AB_Job_SetTransaction(bj, tCopy); + + /* store copy of transaction for later */ + AH_Job_AddTransfer(j, tCopy); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_ExchangeResults(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx) { + AH_JOB_TRANSFERBASE *aj; + AH_RESULT_LIST *rl; + AH_RESULT *r; + int has10; + int has20; + AB_TRANSACTION_STATUS tStatus; + const AB_TRANSACTION *t; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + rl=AH_Job_GetSegResults(j); + assert(rl); + + r=AH_Result_List_First(rl); + if (!r) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "No segment results"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + return GWEN_ERROR_NO_DATA; + } + has10=0; + has20=0; + while(r) { + int rcode; + + rcode=AH_Result_GetCode(r); + if (rcode>=10 && rcode<=19) + has10=1; + else if (rcode>=20 && rcode <=29) + has20=1; + r=AH_Result_List_Next(r); + } + + if (has20) { + AB_Job_SetStatus(bj, AB_Job_StatusFinished); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job finished"); + } + else if (has10) { + AB_Job_SetStatus(bj, AB_Job_StatusPending); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job pending"); + } + else { + DBG_INFO(AQHBCI_LOGDOMAIN, + "Error status (neither 0010 nor 0020)"); + AB_Job_SetStatus(bj, AB_Job_StatusError); + } + + if (has20) + tStatus=AB_Transaction_StatusAccepted; + else if (has10) + tStatus=AB_Transaction_StatusPending; + else + tStatus=AB_Transaction_StatusRejected; + + t=AB_Job_GetTransaction(bj); + if (t) { + AB_TRANSACTION *cpy; + + cpy=AB_Transaction_dup(t); + AB_Transaction_SetFiId(cpy, aj->fiid); + AB_Transaction_SetStatus(cpy, tStatus); + AB_Transaction_SetType(cpy, aj->transactionType); + AB_Transaction_SetSubType(cpy, aj->transactionSubType); + + switch(aj->transactionType) { + case AB_Transaction_TypeUnknown: + case AB_Transaction_TypeTransaction: + AB_ImExporterContext_AddTransaction(ctx, cpy); /* takes over cpy */ + break; + + case AB_Transaction_TypeTransfer: + case AB_Transaction_TypeDebitNote: + case AB_Transaction_TypeEuTransfer: + case AB_Transaction_TypeSepaTransfer: + case AB_Transaction_TypeSepaDebitNote: + case AB_Transaction_TypeInternalTransfer: + if (aj->transactionSubType==AB_Transaction_SubTypeStandingOrder) + AB_ImExporterContext_AddStandingOrder(ctx, cpy); /* takes over cpy */ + else + AB_ImExporterContext_AddTransfer(ctx, cpy); /* takes over cpy */ + break; + } + } + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx){ + AH_JOB_TRANSFERBASE *aj; + + DBG_INFO(AQHBCI_LOGDOMAIN, "Exchanging (%d)", m); + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + switch(m) { + case AH_Job_ExchangeModeParams: + if (aj->exchangeParamsFn) + return aj->exchangeParamsFn(j, bj, ctx); + break; + + case AH_Job_ExchangeModeArgs: + if (aj->exchangeArgsFn) + return aj->exchangeArgsFn(j, bj, ctx); + break; + + case AH_Job_ExchangeModeResults: + if (aj->exchangeResultsFn) + return aj->exchangeResultsFn(j, bj, ctx); + else + return AH_Job_TransferBase_ExchangeResults(j, bj, ctx); + break; + + default: + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Unsupported exchange mode"); + return GWEN_ERROR_NOT_SUPPORTED; + } /* switch */ + + /* just ignore */ + DBG_ERROR(AQHBCI_LOGDOMAIN, "Exchange mode %d not implemented", m); + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_TransferBase_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx) { + AH_JOB_TRANSFERBASE *aj; + GWEN_DB_NODE *dbResponses; + GWEN_DB_NODE *dbCurr; + const char *responseName; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + DBG_INFO(AQHBCI_LOGDOMAIN, "Processing"); + responseName=AH_Job_GetResponseName(j); + + dbResponses=AH_Job_GetResponses(j); + assert(dbResponses); + + /* search for "TransferBaseSingleResponse" */ + dbCurr=GWEN_DB_GetFirstGroup(dbResponses); + while(dbCurr) { + int rv; + + rv=AH_Job_CheckEncryption(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + rv=AH_Job_CheckSignature(j, dbCurr); + if (rv) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); + AH_Job_SetStatus(j, AH_JobStatusError); + return rv; + } + + if (responseName && *responseName) { + GWEN_DB_NODE *dbXA; + + dbXA=GWEN_DB_GetGroup(dbCurr, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "data"); + if (dbXA) + dbXA=GWEN_DB_GetGroup(dbXA, GWEN_PATH_FLAGS_NAMEMUSTEXIST, responseName); + if (dbXA) { + const char *s; + + s=GWEN_DB_GetCharValue(dbXA, "referenceId", 0, 0); + if (s) { + free(aj->fiid); + aj->fiid=strdup(s); + } + } + } + dbCurr=GWEN_DB_GetNextGroup(dbCurr); + } + + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void AH_Job_TransferBase_SetExchangeParamsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f){ + AH_JOB_TRANSFERBASE *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + aj->exchangeParamsFn=f; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void AH_Job_TransferBase_SetExchangeArgsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f){ + AH_JOB_TRANSFERBASE *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + aj->exchangeArgsFn=f; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +void AH_Job_TransferBase_SetExchangeResultsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f){ + AH_JOB_TRANSFERBASE *aj; + + assert(j); + aj=GWEN_INHERIT_GETDATA(AH_JOB, AH_JOB_TRANSFERBASE, j); + assert(aj); + + aj->exchangeResultsFn=f; +} diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_l.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_l.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,48 @@ +/*************************************************************************** + begin : Mon Mar 01 2004 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBTRANSFERBASE_L_H +#define AH_JOBTRANSFERBASE_L_H + + +#include "accountjob_l.h" + + +typedef int (*AH_JOB_TRANSFERBASE_EXCHANGE_FN)(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); + + +AH_JOB *AH_Job_TransferBase_new(const char *jobName, + AB_TRANSACTION_TYPE tt, + AB_TRANSACTION_SUBTYPE tst, + AB_USER *u, AB_ACCOUNT *account); + +const char *AH_Job_TransferBase_GetFiid(const AH_JOB *j); + + +void AH_Job_TransferBase_SetExchangeParamsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f); +void AH_Job_TransferBase_SetExchangeArgsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f); +void AH_Job_TransferBase_SetExchangeResultsFn(AH_JOB *j, AH_JOB_TRANSFERBASE_EXCHANGE_FN f); + + + + +int AH_Job_TransferBase_SepaExportTransactions(AH_JOB *j, GWEN_DB_NODE *profile); + +int AH_Job_TransferBase_ExchangeParams_SepaUndated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); +int AH_Job_TransferBase_ExchangeArgs_SepaDated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); +int AH_Job_TransferBase_ExchangeArgs_SepaUndated(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); +int AH_Job_TransferBase_ExchangeArgs_SepaDatedDebit(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); + + + +#endif /* AH_JOBTRANSFERBASE_L_H */ + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_p.h 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase_p.h 2014-08-20 19:45:01.000000000 +0000 @@ -0,0 +1,43 @@ +/*************************************************************************** + begin : Tue Dec 31 2013 + copyright : (C) 2004-2013 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBTRANSFERBASE_P_H +#define AH_JOBTRANSFERBASE_P_H + + +#include "jobtransferbase_l.h" +#include + + +typedef struct AH_JOB_TRANSFERBASE AH_JOB_TRANSFERBASE; +struct AH_JOB_TRANSFERBASE { + AB_TRANSACTION_TYPE transactionType; + AB_TRANSACTION_SUBTYPE transactionSubType; + char *fiid; + AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeParamsFn; + AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeArgsFn; + AH_JOB_TRANSFERBASE_EXCHANGE_FN exchangeResultsFn; +}; +static void GWENHYWFAR_CB AH_Job_TransferBase_FreeData(void *bp, void *p); + +static int AH_Job_TransferBase_ExchangeResults(AH_JOB *j, AB_JOB *bj, + AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_TransferBase_Exchange(AH_JOB *j, AB_JOB *bj, + AH_JOB_EXCHANGE_MODE m, + AB_IMEXPORTER_CONTEXT *ctx); + +static int AH_Job_TransferBase_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx); + + +#endif /* AH_JOBTRANSFERBASE_P_H */ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am 2015-05-25 16:22:08.000000000 +0000 @@ -0,0 +1,120 @@ + +AM_CFLAGS=-DBUILDING_AQHBCI @visibility_cflags@ + +INCLUDES = -I$(aqbanking_symlinkdir) $(all_includes) \ + -I$(srcdir)/../joblayer \ + -I$(srcdir)/../msglayer \ + -I$(srcdir)/../banking \ + -I$(srcdir)/../applayer \ + -I$(srcdir)/.. + +noinst_LTLIBRARIES=libhbciaccjobs.la + +noinst_HEADERS=\ + accountjob_l.h \ + accountjob_p.h \ + jobgetbalance_l.h \ + jobgetbalance_p.h \ + jobgettransactions_l.h \ + jobgettransactions_p.h \ + jobgetstandingorders_l.h \ + jobgetstandingorders_p.h \ + jobgetdatedxfers_l.h \ + jobgetdatedxfers_p.h \ + jobsingletransfer_l.h \ + jobsingletransfer_p.h \ + jobeutransfer_l.h \ + jobeutransfer_p.h \ + jobmultitransfer_l.h \ + jobmultitransfer_p.h \ + jobforeignxferwh_l.h \ + jobforeignxferwh_p.h \ + jobloadcellphone_l.h \ + jobloadcellphone_p.h \ + jobsepadebitdatedsinglecreate_l.h \ + jobsepadebitdatedsinglecreate_p.h \ + jobsepadebitdatedmulticreate_l.h \ + jobsepadebitdatedmulticreate_p.h \ + jobsepacor1datedmulticreate_l.h \ + jobsepacor1datedmulticreate_p.h \ + jobsepaxfermulti_l.h \ + jobsepaxfermulti_p.h \ + jobsepaxfersingle_l.h \ + jobsepaxfersingle_p.h \ + jobsepadebitsingle_l.h \ + jobsepadebitsingle_p.h \ + jobsepacor1datedsinglecreate_l.h \ + jobsepacor1datedsinglecreate_p.h \ + jobtransferbase_l.h jobtransferbase_p.h \ + jobsepastandingordercreate_l.h jobsepastandingordercreate_p.h \ + jobsepastandingorderget_l.h jobsepastandingorderget_p.h + +libhbciaccjobs_la_SOURCES=\ + accountjob.c \ + jobgetbalance.c \ + jobgettransactions.c \ + jobgetdatedxfers.c \ + jobgetstandingorders.c \ + jobsingletransfer.c \ + jobeutransfer.c \ + jobmultitransfer.c \ + jobforeignxferwh.c \ + jobloadcellphone.c \ + jobsepadebitdatedsinglecreate.c \ + jobsepadebitdatedmulticreate.c \ + jobsepacor1datedmulticreate.c \ + jobsepaxfermulti.c \ + jobsepaxfersingle.c \ + jobsepadebitsingle.c \ + jobsepacor1datedsinglecreate.c \ + jobtransferbase.c \ + jobsepastandingordercreate.c \ + jobsepastandingorderget.c + + + +sources: + for f in $(libhbciaccjobs_la_SOURCES); do \ + echo $(subdir)/$$f >>$(top_srcdir)/i18nsources; \ + done + for d in $(SUBDIRS); do \ + $(MAKE) -C $$d sources; \ + done + +xmlfiles=\ + $(srcdir)/jobgetbalance.xml \ + $(srcdir)/jobgettransactions.xml \ + $(srcdir)/jobgetstandingorders.xml \ + $(srcdir)/jobsingletransfer.xml \ + $(srcdir)/jobsingledebitnote.xml \ + $(srcdir)/jobinternaltransfer.xml \ + $(srcdir)/jobeutransfer.xml \ + $(srcdir)/jobmultitransfer.xml \ + $(srcdir)/jobforeignxferwh.xml \ + $(srcdir)/jobcreatesto.xml \ + $(srcdir)/jobmodifysto.xml \ + $(srcdir)/jobdeletesto.xml \ + $(srcdir)/jobgetdatedxfers.xml \ + $(srcdir)/jobcreatedatedxfer.xml \ + $(srcdir)/jobmodifydatedxfer.xml \ + $(srcdir)/jobdeletedatedxfer.xml \ + $(srcdir)/jobloadcellphone.xml \ + $(srcdir)/jobsepadebitdatedsinglecreate.xml \ + $(srcdir)/jobsepadebitdatedmulticreate.xml \ + $(srcdir)/jobsepacor1datedmulticreate.xml \ + $(srcdir)/jobsepaxfermulti.xml \ + $(srcdir)/jobsepaxfersingle.xml \ + $(srcdir)/jobsepadebitsingle.xml \ + $(srcdir)/jobsepacor1datedsinglecreate.xml \ + $(srcdir)/jobsepastandingordercreate.xml \ + $(srcdir)/jobsepastandingorderget.xml + + +EXTRA_DIST=$(xmlfiles) + +accountjobs.xml: $(xmlfiles) + $(XMLMERGE) -v --compact -o $@ $(xmlfiles) + +all-local: accountjobs.xml + +CLEANFILES = accountjobs.xml diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -0,0 +1,863 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@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 +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/plugins/backends/aqhbci/plugin/ajobs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ + $(top_srcdir)/m4/as-scrub-include.m4 \ + $(top_srcdir)/m4/distri.m4 $(top_srcdir)/m4/gwenhywfar.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/os.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libhbciaccjobs_la_LIBADD = +am_libhbciaccjobs_la_OBJECTS = accountjob.lo jobgetbalance.lo \ + jobgettransactions.lo jobgetdatedxfers.lo \ + jobgetstandingorders.lo jobsingletransfer.lo jobeutransfer.lo \ + jobmultitransfer.lo jobforeignxferwh.lo jobloadcellphone.lo \ + jobsepadebitdatedsinglecreate.lo \ + jobsepadebitdatedmulticreate.lo jobsepacor1datedmulticreate.lo \ + jobsepaxfermulti.lo jobsepaxfersingle.lo jobsepadebitsingle.lo \ + jobsepacor1datedsinglecreate.lo jobtransferbase.lo \ + jobsepastandingordercreate.lo jobsepastandingorderget.lo +libhbciaccjobs_la_OBJECTS = $(am_libhbciaccjobs_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +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) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libhbciaccjobs_la_SOURCES) +DIST_SOURCES = $(libhbciaccjobs_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ +AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ +AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ +AQBANKING_SO_EFFECTIVE = @AQBANKING_SO_EFFECTIVE@ +AQBANKING_SO_REVISION = @AQBANKING_SO_REVISION@ +AQBANKING_VERSION_BUILD = @AQBANKING_VERSION_BUILD@ +AQBANKING_VERSION_FULL_STRING = @AQBANKING_VERSION_FULL_STRING@ +AQBANKING_VERSION_MAJOR = @AQBANKING_VERSION_MAJOR@ +AQBANKING_VERSION_MINOR = @AQBANKING_VERSION_MINOR@ +AQBANKING_VERSION_PATCHLEVEL = @AQBANKING_VERSION_PATCHLEVEL@ +AQBANKING_VERSION_RELEASE_STRING = @AQBANKING_VERSION_RELEASE_STRING@ +AQBANKING_VERSION_STRING = @AQBANKING_VERSION_STRING@ +AQBANKING_VERSION_TAG = @AQBANKING_VERSION_TAG@ +AQEBICS_CFLAGS = @AQEBICS_CFLAGS@ +AQEBICS_LIBS = @AQEBICS_LIBS@ +AQEBICS_SO_AGE = @AQEBICS_SO_AGE@ +AQEBICS_SO_CURRENT = @AQEBICS_SO_CURRENT@ +AQEBICS_SO_EFFECTIVE = @AQEBICS_SO_EFFECTIVE@ +AQEBICS_SO_REVISION = @AQEBICS_SO_REVISION@ +AQEBICS_VERSION_BUILD = @AQEBICS_VERSION_BUILD@ +AQEBICS_VERSION_FULL_STRING = @AQEBICS_VERSION_FULL_STRING@ +AQEBICS_VERSION_MAJOR = @AQEBICS_VERSION_MAJOR@ +AQEBICS_VERSION_MINOR = @AQEBICS_VERSION_MINOR@ +AQEBICS_VERSION_PATCHLEVEL = @AQEBICS_VERSION_PATCHLEVEL@ +AQEBICS_VERSION_RELEASE_STRING = @AQEBICS_VERSION_RELEASE_STRING@ +AQEBICS_VERSION_STRING = @AQEBICS_VERSION_STRING@ +AQEBICS_VERSION_TAG = @AQEBICS_VERSION_TAG@ +AQHBCI_SO_AGE = @AQHBCI_SO_AGE@ +AQHBCI_SO_CURRENT = @AQHBCI_SO_CURRENT@ +AQHBCI_SO_EFFECTIVE = @AQHBCI_SO_EFFECTIVE@ +AQHBCI_SO_REVISION = @AQHBCI_SO_REVISION@ +AQHBCI_VERSION_BUILD = @AQHBCI_VERSION_BUILD@ +AQHBCI_VERSION_FULL_STRING = @AQHBCI_VERSION_FULL_STRING@ +AQHBCI_VERSION_MAJOR = @AQHBCI_VERSION_MAJOR@ +AQHBCI_VERSION_MINOR = @AQHBCI_VERSION_MINOR@ +AQHBCI_VERSION_PATCHLEVEL = @AQHBCI_VERSION_PATCHLEVEL@ +AQHBCI_VERSION_RELEASE_STRING = @AQHBCI_VERSION_RELEASE_STRING@ +AQHBCI_VERSION_STRING = @AQHBCI_VERSION_STRING@ +AQHBCI_VERSION_TAG = @AQHBCI_VERSION_TAG@ +AQOFXCONNECT_SO_AGE = @AQOFXCONNECT_SO_AGE@ +AQOFXCONNECT_SO_CURRENT = @AQOFXCONNECT_SO_CURRENT@ +AQOFXCONNECT_SO_EFFECTIVE = @AQOFXCONNECT_SO_EFFECTIVE@ +AQOFXCONNECT_SO_REVISION = @AQOFXCONNECT_SO_REVISION@ +AQOFXCONNECT_VERSION_BUILD = @AQOFXCONNECT_VERSION_BUILD@ +AQOFXCONNECT_VERSION_FULL_STRING = @AQOFXCONNECT_VERSION_FULL_STRING@ +AQOFXCONNECT_VERSION_MAJOR = @AQOFXCONNECT_VERSION_MAJOR@ +AQOFXCONNECT_VERSION_MINOR = @AQOFXCONNECT_VERSION_MINOR@ +AQOFXCONNECT_VERSION_PATCHLEVEL = @AQOFXCONNECT_VERSION_PATCHLEVEL@ +AQOFXCONNECT_VERSION_RELEASE_STRING = @AQOFXCONNECT_VERSION_RELEASE_STRING@ +AQOFXCONNECT_VERSION_STRING = @AQOFXCONNECT_VERSION_STRING@ +AQOFXCONNECT_VERSION_TAG = @AQOFXCONNECT_VERSION_TAG@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATETIME = @DATETIME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOXYGEN_DEFINE = @DOXYGEN_DEFINE@ +DOXYGEN_FILE_PATTERNS = @DOXYGEN_FILE_PATTERNS@ +DOXYGEN_INPUT = @DOXYGEN_INPUT@ +DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ +GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ +HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ +HAVE_I18N = @HAVE_I18N@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DLL_TARGET = @INSTALL_DLL_TARGET@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ +LIBXSLT_LIBS = @LIBXSLT_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MAKE_DLL_TARGET = @MAKE_DLL_TARGET@ +MAKE_I18N_FILES = @MAKE_I18N_FILES@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_SUPPORTS_QT = @MSGFMT_SUPPORTS_QT@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OSYSTEM = @OSYSTEM@ +OS_TYPE = @OS_TYPE@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +RC = @RC@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STRIPALL = @STRIPALL@ +TUTORIALS = @TUTORIALS@ +USE_DOT = @USE_DOT@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XMLMERGE = @XMLMERGE@ +XMLSEC_CFLAGS = @XMLSEC_CFLAGS@ +XMLSEC_LIBS = @XMLSEC_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +all_includes = @all_includes@ +all_libraries = @all_libraries@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +aq_distrib_name = @aq_distrib_name@ +aq_distrib_tag = @aq_distrib_tag@ +aq_distrib_version = @aq_distrib_version@ +aqbanking_backends = @aqbanking_backends@ +aqbanking_cfg_searchdir = @aqbanking_cfg_searchdir@ +aqbanking_data_searchdir = @aqbanking_data_searchdir@ +aqbanking_headerdir = @aqbanking_headerdir@ +aqbanking_headerdir_am = @aqbanking_headerdir_am@ +aqbanking_includes = @aqbanking_includes@ +aqbanking_internal_libs = @aqbanking_internal_libs@ +aqbanking_ldflags = @aqbanking_ldflags@ +aqbanking_libs = @aqbanking_libs@ +aqbanking_locale_searchdir = @aqbanking_locale_searchdir@ +aqbanking_modules = @aqbanking_modules@ +aqbanking_pkgdatadir = @aqbanking_pkgdatadir@ +aqbanking_plugin_searchdir = @aqbanking_plugin_searchdir@ +aqbanking_plugindir = @aqbanking_plugindir@ +aqbanking_plugins_backends_dirs = @aqbanking_plugins_backends_dirs@ +aqbanking_plugins_bankinfo_dirs = @aqbanking_plugins_bankinfo_dirs@ +aqbanking_plugins_imexporters_dirs = @aqbanking_plugins_imexporters_dirs@ +aqbanking_plugins_parsers_dirs = @aqbanking_plugins_parsers_dirs@ +aqbanking_symlinkdir = @aqbanking_symlinkdir@ +aqbanking_sys_is_windows = @aqbanking_sys_is_windows@ +aqbankingpp_modules = @aqbankingpp_modules@ +aqebics_datadir = @aqebics_datadir@ +aqebics_includes = @aqebics_includes@ +aqebics_internal_libs = @aqebics_internal_libs@ +aqebics_ldflags = @aqebics_ldflags@ +aqebics_libs = @aqebics_libs@ +aqhbci_datadir = @aqhbci_datadir@ +aqhbci_includes = @aqhbci_includes@ +aqhbci_internal_libs = @aqhbci_internal_libs@ +aqhbci_ldflags = @aqhbci_ldflags@ +aqhbci_libs = @aqhbci_libs@ +aqofxconnect_includes = @aqofxconnect_includes@ +aqofxconnect_internal_libs = @aqofxconnect_internal_libs@ +aqofxconnect_libs = @aqofxconnect_libs@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +docpath = @docpath@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gmp_libs = @gmp_libs@ +gwenhywfar_bindir = @gwenhywfar_bindir@ +gwenhywfar_dir = @gwenhywfar_dir@ +gwenhywfar_has_crypt = @gwenhywfar_has_crypt@ +gwenhywfar_headers = @gwenhywfar_headers@ +gwenhywfar_includes = @gwenhywfar_includes@ +gwenhywfar_libs = @gwenhywfar_libs@ +gwenhywfar_plugins = @gwenhywfar_plugins@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +i18n_libs = @i18n_libs@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +ktoblzcheck_CFLAGS = @ktoblzcheck_CFLAGS@ +ktoblzcheck_LIBS = @ktoblzcheck_LIBS@ +ktoblzcheck_includes = @ktoblzcheck_includes@ +ktoblzcheck_libs = @ktoblzcheck_libs@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +typemaker2_exe = @typemaker2_exe@ +visibility_cflags = @visibility_cflags@ +with_aqebics = @with_aqebics@ +with_aqhbci = @with_aqhbci@ +AM_CFLAGS = -DBUILDING_AQHBCI @visibility_cflags@ +INCLUDES = -I$(aqbanking_symlinkdir) $(all_includes) \ + -I$(srcdir)/../joblayer \ + -I$(srcdir)/../msglayer \ + -I$(srcdir)/../banking \ + -I$(srcdir)/../applayer \ + -I$(srcdir)/.. + +noinst_LTLIBRARIES = libhbciaccjobs.la +noinst_HEADERS = \ + accountjob_l.h \ + accountjob_p.h \ + jobgetbalance_l.h \ + jobgetbalance_p.h \ + jobgettransactions_l.h \ + jobgettransactions_p.h \ + jobgetstandingorders_l.h \ + jobgetstandingorders_p.h \ + jobgetdatedxfers_l.h \ + jobgetdatedxfers_p.h \ + jobsingletransfer_l.h \ + jobsingletransfer_p.h \ + jobeutransfer_l.h \ + jobeutransfer_p.h \ + jobmultitransfer_l.h \ + jobmultitransfer_p.h \ + jobforeignxferwh_l.h \ + jobforeignxferwh_p.h \ + jobloadcellphone_l.h \ + jobloadcellphone_p.h \ + jobsepadebitdatedsinglecreate_l.h \ + jobsepadebitdatedsinglecreate_p.h \ + jobsepadebitdatedmulticreate_l.h \ + jobsepadebitdatedmulticreate_p.h \ + jobsepacor1datedmulticreate_l.h \ + jobsepacor1datedmulticreate_p.h \ + jobsepaxfermulti_l.h \ + jobsepaxfermulti_p.h \ + jobsepaxfersingle_l.h \ + jobsepaxfersingle_p.h \ + jobsepadebitsingle_l.h \ + jobsepadebitsingle_p.h \ + jobsepacor1datedsinglecreate_l.h \ + jobsepacor1datedsinglecreate_p.h \ + jobtransferbase_l.h jobtransferbase_p.h \ + jobsepastandingordercreate_l.h jobsepastandingordercreate_p.h \ + jobsepastandingorderget_l.h jobsepastandingorderget_p.h + +libhbciaccjobs_la_SOURCES = \ + accountjob.c \ + jobgetbalance.c \ + jobgettransactions.c \ + jobgetdatedxfers.c \ + jobgetstandingorders.c \ + jobsingletransfer.c \ + jobeutransfer.c \ + jobmultitransfer.c \ + jobforeignxferwh.c \ + jobloadcellphone.c \ + jobsepadebitdatedsinglecreate.c \ + jobsepadebitdatedmulticreate.c \ + jobsepacor1datedmulticreate.c \ + jobsepaxfermulti.c \ + jobsepaxfersingle.c \ + jobsepadebitsingle.c \ + jobsepacor1datedsinglecreate.c \ + jobtransferbase.c \ + jobsepastandingordercreate.c \ + jobsepastandingorderget.c + +xmlfiles = \ + $(srcdir)/jobgetbalance.xml \ + $(srcdir)/jobgettransactions.xml \ + $(srcdir)/jobgetstandingorders.xml \ + $(srcdir)/jobsingletransfer.xml \ + $(srcdir)/jobsingledebitnote.xml \ + $(srcdir)/jobinternaltransfer.xml \ + $(srcdir)/jobeutransfer.xml \ + $(srcdir)/jobmultitransfer.xml \ + $(srcdir)/jobforeignxferwh.xml \ + $(srcdir)/jobcreatesto.xml \ + $(srcdir)/jobmodifysto.xml \ + $(srcdir)/jobdeletesto.xml \ + $(srcdir)/jobgetdatedxfers.xml \ + $(srcdir)/jobcreatedatedxfer.xml \ + $(srcdir)/jobmodifydatedxfer.xml \ + $(srcdir)/jobdeletedatedxfer.xml \ + $(srcdir)/jobloadcellphone.xml \ + $(srcdir)/jobsepadebitdatedsinglecreate.xml \ + $(srcdir)/jobsepadebitdatedmulticreate.xml \ + $(srcdir)/jobsepacor1datedmulticreate.xml \ + $(srcdir)/jobsepaxfermulti.xml \ + $(srcdir)/jobsepaxfersingle.xml \ + $(srcdir)/jobsepadebitsingle.xml \ + $(srcdir)/jobsepacor1datedsinglecreate.xml \ + $(srcdir)/jobsepastandingordercreate.xml \ + $(srcdir)/jobsepastandingorderget.xml + +EXTRA_DIST = $(xmlfiles) +CLEANFILES = accountjobs.xml +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/backends/aqhbci/plugin/ajobs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/plugins/backends/aqhbci/plugin/ajobs/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libhbciaccjobs.la: $(libhbciaccjobs_la_OBJECTS) $(libhbciaccjobs_la_DEPENDENCIES) $(EXTRA_libhbciaccjobs_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libhbciaccjobs_la_OBJECTS) $(libhbciaccjobs_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accountjob.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobeutransfer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobforeignxferwh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgetbalance.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgetdatedxfers.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgetstandingorders.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobgettransactions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobloadcellphone.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobmultitransfer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepacor1datedmulticreate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepacor1datedsinglecreate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitdatedmulticreate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitdatedsinglecreate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitsingle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepastandingordercreate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepastandingorderget.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepaxfermulti.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepaxfersingle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsingletransfer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobtransferbase.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + 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 -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +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." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +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 + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + + +sources: + for f in $(libhbciaccjobs_la_SOURCES); do \ + echo $(subdir)/$$f >>$(top_srcdir)/i18nsources; \ + done + for d in $(SUBDIRS); do \ + $(MAKE) -C $$d sources; \ + done + +accountjobs.xml: $(xmlfiles) + $(XMLMERGE) -v --compact -o $@ $(xmlfiles) + +all-local: accountjobs.xml + +# 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 libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/adminjobs.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/adminjobs.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/adminjobs.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/adminjobs.c 2014-07-23 20:29:51.000000000 +0000 @@ -1301,8 +1301,16 @@ if (p && l) { GWEN_BUFFER *bbuf; - bbuf=GWEN_Buffer_new(0, 256, 0, 1); + DBG_INFO(AQHBCI_LOGDOMAIN, "Job has a challengeHHD string:"); + GWEN_Text_LogString((const char*)p, l, AQHBCI_LOGDOMAIN, GWEN_LoggerLevel_Info); + + bbuf=GWEN_Buffer_new(0, 256, 0, 1); +#if 0 GWEN_Text_ToHexBuffer((const char*) p, l, bbuf, 0, 0, 0); +#else + /* data is a string, no need to transform to hex */ + GWEN_Buffer_AppendBytes(bbuf, (const char*) p, l); +#endif free(aj->challengeHhd); aj->challengeHhd=strdup(GWEN_Buffer_GetStart(bbuf)); GWEN_Buffer_free(bbuf); @@ -1961,6 +1969,7 @@ int useWithSepa=0; /* account data found */ + DBG_INFO(AQHBCI_LOGDOMAIN, "Found a GetAccountSepaInfoResponse segment"); accountId=GWEN_DB_GetCharValue(dbXA, "accountId", 0, 0); accountSuffix=GWEN_DB_GetCharValue(dbXA, "accountsubid", 0, 0); bankCode=GWEN_DB_GetCharValue(dbXA, "bankCode", 0, 0); @@ -1980,15 +1989,25 @@ AB_Account_SetSubAccountId(jd->account, accountSuffix); AH_Account_AddFlags(jd->account, AH_BANK_FLAGS_KTV2); /* we have a sub id (even if emtpy), set flag */ - if (useWithSepa) - AH_Account_AddFlags(jd->account, AH_BANK_FLAGS_SEPA); /* we have a sub id (even if emtpy), set flag */ - else - AH_Account_SubFlags(jd->account, AH_BANK_FLAGS_SEPA); /* we have a sub id (even if emtpy), set flag */ - - if (iban && *iban && bic && *bic) { - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Setting IBAN and BIC: %s/%s", iban, bic); - AB_Account_SetIBAN(jd->account, iban); - AB_Account_SetBIC(jd->account, bic); + if (useWithSepa) { + DBG_INFO(AQHBCI_LOGDOMAIN, "SEPA available with this account"); + AH_Account_AddFlags(jd->account, AH_BANK_FLAGS_SEPA); /* we have a sub id (even if emtpy), set flag */ + } + else { + DBG_INFO(AQHBCI_LOGDOMAIN, "SEPA not available with this account"); + AH_Account_SubFlags(jd->account, AH_BANK_FLAGS_SEPA); /* we have a sub id (even if emtpy), set flag */ + } + + if (iban && *iban) { + if (bic && *bic) { + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Setting IBAN and BIC: %s/%s", iban, bic); + AB_Account_SetIBAN(jd->account, iban); + AB_Account_SetBIC(jd->account, bic); + } + else { + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Setting IBAN (no BIC): %s", iban); + AB_Account_SetIBAN(jd->account, iban); + } } else { DBG_ERROR(AQHBCI_LOGDOMAIN, "Missing information in account: BLZ=[%s], Kto=[%s], IBAN=[%s], BIC=[%s]", diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c 2014-01-21 20:02:09.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c 2014-07-23 20:29:51.000000000 +0000 @@ -27,7 +27,9 @@ int AH_HHD14_ReadBytesDec(const char *p, int len) { int r=0; int i; + const char *pSave; + pSave=p; for (i=0; i'9') { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad char in data (no decimal digit)"); + DBG_ERROR(AQHBCI_LOGDOMAIN, "Bad char in data (no decimal digit), pos=%d, byte=%02x", i, c); + GWEN_Text_LogString(pSave, len, AQHBCI_LOGDOMAIN, GWEN_LoggerLevel_Error); return GWEN_ERROR_INVALID; } c-='0'; @@ -221,7 +224,7 @@ int AH_HHD14__Translate(const char *code, GWEN_BUFFER *cbuf) { - /*unsigned int totalLength;*/ + /*unsigned int totalLength;*/ /*TODO: handle total length */ unsigned int inLenAndFlags; unsigned int inLen; unsigned int outLenAndFlags; @@ -424,7 +427,8 @@ rv=AH_HHD14__Translate(GWEN_Buffer_GetStart(xbuf), cbuf); if (rv<0) { - DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + DBG_ERROR(AQHBCI_LOGDOMAIN, "Error translating HHD code (%d)", rv); + GWEN_Text_LogString(code, strlen(code), AQHBCI_LOGDOMAIN, GWEN_LoggerLevel_Error); GWEN_Buffer_free(xbuf); return rv; } diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.am libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.am 2011-12-17 16:23:44.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.am 2014-08-20 19:45:01.000000000 +0000 @@ -3,7 +3,7 @@ AM_CFLAGS=-DBUILDING_AQHBCI @visibility_cflags@ INCLUDES = -I$(aqbanking_symlinkdir) $(all_includes) \ - -I$(srcdir)/../accountjobs \ + -I$(srcdir)/../ajobs \ -I$(srcdir)/../joblayer -I$(srcdir)/../msglayer -I$(srcdir)/.. EXTRA_DIST=README itan.inc itan1.inc itan2.inc diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci/plugin/applayer -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -73,28 +100,54 @@ libhbciapp_la_LIBADD = am_libhbciapp_la_OBJECTS = adminjobs.lo outbox.lo hhd.lo libhbciapp_la_OBJECTS = $(am_libhbciapp_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libhbciapp_la_SOURCES) DIST_SOURCES = $(libhbciapp_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -103,9 +156,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -138,6 +211,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -226,6 +300,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -399,7 +474,7 @@ SUBDIRS = xml AM_CFLAGS = -DBUILDING_AQHBCI @visibility_cflags@ INCLUDES = -I$(aqbanking_symlinkdir) $(all_includes) \ - -I$(srcdir)/../accountjobs \ + -I$(srcdir)/../ajobs \ -I$(srcdir)/../joblayer -I$(srcdir)/../msglayer -I$(srcdir)/.. EXTRA_DIST = README itan.inc itan1.inc itan2.inc @@ -452,14 +527,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libhbciapp.la: $(libhbciapp_la_OBJECTS) $(libhbciapp_la_DEPENDENCIES) $(EXTRA_libhbciapp_la_DEPENDENCIES) - $(LINK) $(libhbciapp_la_OBJECTS) $(libhbciapp_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libhbciapp_la_OBJECTS) $(libhbciapp_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -472,25 +550,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outbox.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -499,22 +577,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -529,57 +610,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -595,12 +631,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -612,15 +643,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -629,6 +656,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -795,12 +837,11 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -810,8 +851,8 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/outbox.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/outbox.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/outbox.c 2014-03-01 20:15:38.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/outbox.c 2014-07-23 20:29:51.000000000 +0000 @@ -2159,7 +2159,7 @@ AH_JOB *AH_Outbox__FindTransferJobInCheckJobList(const AH_JOB_LIST *jl, AB_USER *u, AB_ACCOUNT *a, - int isTransfer) { + const char *jobName) { AH_JOB *j; assert(jl); @@ -2167,12 +2167,9 @@ while(j) { DBG_INFO(AQHBCI_LOGDOMAIN, "Checking job \"%s\"", AH_Job_GetName(j)); - if (strcasecmp(AH_Job_GetName(j), - isTransfer?"JobMultiTransfer":"JobMultiDebitNote") - ==0 && + if (strcasecmp(AH_Job_GetName(j), jobName)==0 && AH_AccountJob_GetAccount(j)==a) { - if (AH_Job_GetTransferCount(j)< - AH_Job_GetMaxTransfers(j)) + if (AH_Job_GetTransferCount(j)userBoxes); - while(cbox) { - if (cbox->user==u) { - AH_JOBQUEUE *jq; - - /* check jobs in lists */ - j=AH_Outbox__FindTransferJobInCheckJobList(cbox->todoJobs, - u, a, isTransfer); - if (j) - return j; - - /* check jobs in queues */ - jq=AH_JobQueue_List_First(cbox->todoQueues); - while(jq) { - const AH_JOB_LIST *jl; - - jl=AH_JobQueue_GetJobList(jq); - if (jl) { - j=AH_Outbox__FindTransferJobInCheckJobList(jl, u, a, isTransfer); - if (j) - return j; - } - jq=AH_JobQueue_List_Next(jq); - } /* while */ - } - else { - DBG_WARN(AQHBCI_LOGDOMAIN, "Customer doesn't match"); - } - - cbox=AH_Outbox__CBox_List_Next(cbox); - } /* while */ - - DBG_INFO(AQHBCI_LOGDOMAIN, "No matching multi job found"); - return 0; -} - - - - - - -AH_JOB *AH_Outbox__FindDatedTransferJobInJobList(const AH_JOB_LIST *jl, - AB_ACCOUNT *a, - const char *jobName, - const GWEN_TIME *tti) { - AH_JOB *j; - uint32_t transDate=0; - - assert(jl); - - if (tti) { - int day, month, year; - - GWEN_Time_GetBrokenDownDate(tti, &day, &month, &year); - transDate=(year<<16)+(month<<8)+(day); - } - - j=AH_Job_List_First(jl); - while(j) { - DBG_INFO(AQHBCI_LOGDOMAIN, "Checking job \"%s\"", - AH_Job_GetName(j)); - if (strcasecmp(AH_Job_GetName(j), jobName)==0 && - AH_AccountJob_GetAccount(j)==a) { - const AB_TRANSACTION *jt=NULL; - uint32_t jobTransDate=0; - - jt=AH_Job_GetFirstTransfer(j); - if (jt) { - const GWEN_TIME *jti=NULL; - - jti=AB_Transaction_GetDate(jt); - if (jti) { - int day, month, year; - - GWEN_Time_GetBrokenDownDate(jti, &day, &month, &year); - jobTransDate=(year<<16)+(month<<8)+(day); - } - } - - if (transDate==jobTransDate || transDate==0 || jobTransDate==0) { - if (AH_Job_GetTransferCount(j)userBoxes); @@ -2324,7 +2206,7 @@ AH_JOBQUEUE *jq; /* check jobs in lists */ - j=AH_Outbox__FindDatedTransferJobInJobList(cbox->todoJobs, a, jobName, tti); + j=AH_Outbox__FindTransferJobInCheckJobList(cbox->todoJobs, u, a, jobName); if (j) return j; @@ -2335,7 +2217,7 @@ jl=AH_JobQueue_GetJobList(jq); if (jl) { - j=AH_Outbox__FindDatedTransferJobInJobList(jl, a, jobName, tti); + j=AH_Outbox__FindTransferJobInCheckJobList(jl, u, a, jobName); if (j) return j; } diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_l.h 2014-01-12 16:56:04.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_l.h 2014-07-23 20:29:51.000000000 +0000 @@ -65,13 +65,7 @@ AH_JOB *AH_Outbox_FindTransferJob(AH_OUTBOX *ob, AB_USER *u, AB_ACCOUNT *a, - int isTransfer); - -AH_JOB *AH_Outbox_FindDatedTransferJob(AH_OUTBOX *ob, - AB_USER *u, - AB_ACCOUNT *a, - const char *jobName, - const GWEN_TIME *tti); + const char *jobName); AH_JOB_LIST *AH_Outbox_GetFinishedJobs(AH_OUTBOX *ob); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_p.h 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/outbox_p.h 2014-07-23 20:29:51.000000000 +0000 @@ -167,7 +167,7 @@ static AH_JOB *AH_Outbox__FindTransferJobInCheckJobList(const AH_JOB_LIST *jl, AB_USER *u, AB_ACCOUNT *a, - int isTransfer); + const char *jobName); static int AH_Outbox__CBox_JobToMessage(AH_JOB *j, AH_MSG *msg); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/xml/hbciallgrp.xml libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/xml/hbciallgrp.xml --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/xml/hbciallgrp.xml 2013-02-14 23:54:06.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/xml/hbciallgrp.xml 2014-08-02 16:16:36.000000000 +0000 @@ -71,6 +71,16 @@ + + + + + + + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci/plugin/applayer/xml -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,6 +93,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -73,10 +112,12 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -165,6 +206,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -388,11 +430,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -529,16 +571,17 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + clean-libtool cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distdir 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.am libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.am 2010-08-07 11:35:58.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.am 2014-08-20 19:45:01.000000000 +0000 @@ -3,7 +3,7 @@ INCLUDES = -I$(aqbanking_symlinkdir) $(gwenhywfar_includes) \ -I$(srcdir)/../msglayer -I$(srcdir)/../joblayer \ - -I$(srcdir)/../applayer -I$(srcdir)/../accountjobs -I$(srcdir)/.. \ + -I$(srcdir)/../applayer -I$(srcdir)/../ajobs -I$(srcdir)/.. \ -I$(srcdir)/../dialogs localedir = $(datadir)/locale diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci/plugin/banking -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -73,19 +100,44 @@ libhbcibanking_la_LIBADD = am_libhbcibanking_la_OBJECTS = provider.lo libhbcibanking_la_OBJECTS = $(am_libhbcibanking_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libhbcibanking_la_SOURCES) DIST_SOURCES = $(libhbcibanking_la_SOURCES) am__can_run_installinfo = \ @@ -122,12 +174,30 @@ } am__installdirs = "$(DESTDIR)$(iheaderdir)" HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -217,6 +287,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -390,7 +461,7 @@ AM_CFLAGS = -DBUILDING_AQHBCI @visibility_cflags@ INCLUDES = -I$(aqbanking_symlinkdir) $(gwenhywfar_includes) \ -I$(srcdir)/../msglayer -I$(srcdir)/../joblayer \ - -I$(srcdir)/../applayer -I$(srcdir)/../accountjobs -I$(srcdir)/.. \ + -I$(srcdir)/../applayer -I$(srcdir)/../ajobs -I$(srcdir)/.. \ -I$(srcdir)/../dialogs noinst_LTLIBRARIES = libhbcibanking.la @@ -442,14 +513,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libhbcibanking.la: $(libhbcibanking_la_OBJECTS) $(libhbcibanking_la_DEPENDENCIES) $(EXTRA_libhbcibanking_la_DEPENDENCIES) - $(LINK) $(libhbcibanking_la_OBJECTS) $(libhbcibanking_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libhbcibanking_la_OBJECTS) $(libhbcibanking_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -460,25 +534,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/provider.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -507,26 +581,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -538,15 +601,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -555,6 +614,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -699,19 +773,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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-iheaderHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iheaderHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iheaderHEADERS sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/banking/provider.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/provider.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/banking/provider.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/provider.c 2015-05-25 16:22:08.000000000 +0000 @@ -28,9 +28,14 @@ #include "jobeutransfer_l.h" #include "jobloadcellphone_l.h" #include "jobsepaxfersingle_l.h" +#include "jobsepaxfermulti_l.h" #include "jobsepadebitdatedsinglecreate_l.h" #include "jobsepadebitdatedmulticreate_l.h" +#include "jobsepacor1datedsinglecreate_l.h" +#include "jobsepacor1datedmulticreate_l.h" + #include "jobsepastandingordercreate_l.h" +#include "jobsepastandingorderget_l.h" #include "jobsepadebitsingle_l.h" /* deprecated job */ @@ -444,30 +449,110 @@ break; case AB_Job_TypeSepaTransfer: - mj=AH_Job_SepaTransferSingle_new(mu, ma); - if (!mj) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Job not supported with this account"); - return GWEN_ERROR_NOT_AVAILABLE; + if (!(aFlags & AH_BANK_FLAGS_SEPA_PREFER_SINGLE_TRANSFER)) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Customer prefers multi jobs"); + + /* try multi transfer first */ + mj=AH_Job_SepaTransferMulti_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "Job \"SepaTransferMulti\" not supported with this account"); + + /* try single transfer */ + mj=AH_Job_SepaTransferSingle_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "Job \"SepaTransferSingle\" not supported with this account"); + return GWEN_ERROR_NOT_AVAILABLE; + } + } + } + else { + /* try single job first */ + mj=AH_Job_SepaTransferSingle_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "Job \"SepaTransferSingle\" not supported with this account"); + + /* try multi transfer next */ + mj=AH_Job_SepaTransferMulti_new(mu, ma); + if (!mj) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Job \"SepaTransferMulti\" not supported with this account"); + return GWEN_ERROR_NOT_AVAILABLE; + } + } } break; case AB_Job_TypeSepaDebitNote: - /* try multi transfer first */ - mj=AH_Job_SepaDebitDatedMultiCreate_new(mu, ma); - if (!mj) { - DBG_WARN(AQHBCI_LOGDOMAIN, - "Multi-job not supported with this account, " - "using single-job"); - } + if (!(aFlags & AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE)) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Customer prefers multi jobs"); - if (!mj) { - /* try single transfer */ + /* try multi transfer first */ + mj=AH_Job_SepaDebitDatedMultiCreate_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "SepaDebitDatedMultiCreate not supported with this account"); + + /* try single transfer */ + mj=AH_Job_SepaDebitDatedSingleCreate_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "Job \"SepaDebitDatedSingleCreate\" not supported with this account, trying old single debit"); + + /* try old singleDebit job next */ + mj=AH_Job_SepaDebitSingle_new(mu, ma); + if (!mj) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Job \"SepaDebitSingle\" not supported with this account"); + return GWEN_ERROR_NOT_AVAILABLE; + } + } + } + } + else { + /* try single job first */ mj=AH_Job_SepaDebitDatedSingleCreate_new(mu, ma); if (!mj) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "Job \"SepaDebitDatedSingleCreate\" not supported with this account, trying old single debit"); + DBG_WARN(AQHBCI_LOGDOMAIN, "SepaDebitDatedSingleCreate not supported with this account"); + + /* try old singleDebit job next */ mj=AH_Job_SepaDebitSingle_new(mu, ma); if (!mj) { DBG_ERROR(AQHBCI_LOGDOMAIN, "Job \"SepaDebitSingle\" not supported with this account"); + + /* try multi transfer next */ + mj=AH_Job_SepaDebitDatedMultiCreate_new(mu, ma); + if (!mj) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "SepaDebitDatedMultiCreate not supported with this account"); + return GWEN_ERROR_NOT_AVAILABLE; + } + } + } + } + break; + + case AB_Job_TypeSepaFlashDebitNote: + if (!(aFlags & AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE)) { + DBG_INFO(AQHBCI_LOGDOMAIN, "Customer prefers multi jobs"); + + /* try multi transfer first */ + mj=AH_Job_SepaCor1DebitDatedMultiCreate_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "SepaCor1DebitDatedMultiCreate not supported with this account"); + + /* try single transfer */ + mj=AH_Job_SepaCor1DebitDatedSingleCreate_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "Job \"SepaCor1DebitDatedSingleCreate\" not supported with this account"); + return GWEN_ERROR_NOT_AVAILABLE; + } + } + } + else { + /* try single job first */ + mj=AH_Job_SepaCor1DebitDatedSingleCreate_new(mu, ma); + if (!mj) { + DBG_WARN(AQHBCI_LOGDOMAIN, "SepaCor1DebitDatedSingleCreate not supported with this account"); + + /* try multi transfer next */ + mj=AH_Job_SepaCor1DebitDatedMultiCreate_new(mu, ma); + if (!mj) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "SepaCor1DebitDatedMultiCreate not supported with this account"); return GWEN_ERROR_NOT_AVAILABLE; } } @@ -482,6 +567,14 @@ } break; + case AB_Job_TypeSepaGetStandingOrders: + mj=AH_Job_SepaStandingOrderGet_new(mu, ma); + if (!mj) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Job not supported with this account"); + return GWEN_ERROR_NOT_AVAILABLE; + } + break; + default: DBG_ERROR(AQHBCI_LOGDOMAIN, @@ -511,14 +604,11 @@ AH_JOB *mj=NULL; AB_ACCOUNT *ma; AB_USER *mu; - const AB_TRANSACTION *t; assert(pro); hp=GWEN_INHERIT_GETDATA(AB_PROVIDER, AH_PROVIDER, pro); assert(hp); - t=AB_Job_GetTransaction(j); - if (hp->outbox==0) hp->outbox=AH_Outbox_new(hp->hbci); assert(hp->outbox); @@ -541,21 +631,20 @@ switch(AB_Job_GetType(j)) { case AB_Job_TypeTransfer: - mj=AH_Outbox_FindTransferJob(hp->outbox, mu, ma, 1); + mj=AH_Outbox_FindTransferJob(hp->outbox, mu, ma, "JobMultiTransfer"); break; case AB_Job_TypeDebitNote: - mj=AH_Outbox_FindTransferJob(hp->outbox, mu, ma, 0); + mj=AH_Outbox_FindTransferJob(hp->outbox, mu, ma, "JobMultiDebitNote"); break; case AB_Job_TypeSepaTransfer: - mj=AH_Outbox_FindDatedTransferJob(hp->outbox, mu, ma, "JobSepaTransferSingle", - t?(AB_Transaction_GetDate(t)):NULL); + mj=AH_Outbox_FindTransferJob(hp->outbox, mu, ma, "JobSepaTransferMulti"); break; case AB_Job_TypeSepaDebitNote: - mj=AH_Outbox_FindDatedTransferJob(hp->outbox, mu, ma, "JobSepaDebitDatedMultiCreate", - t?(AB_Transaction_GetDate(t)):NULL); + mj=AH_Outbox_FindTransferJob(hp->outbox, mu, ma, + "JobSepaDebitDatedMultiCreate"); break; default: @@ -721,7 +810,8 @@ rv=AH_Job_Exchange(mj, j, AH_Job_ExchangeModeArgs, NULL); if (rv) { DBG_ERROR(AQHBCI_LOGDOMAIN, "Error exchanging params"); - AH_Job_free(mj); + if (jobIsNew) + AH_Job_free(mj); return rv; } @@ -3839,31 +3929,20 @@ GWEN_LoggerLevel_Notice, I18N("Server key has a modulus size of %d bytes"), modLen); if (modPtr && modLen) { - int nbits; - - nbits=modLen*8; + /* The specs require us to use a key no longer than that of the server, + * so for our key we use the largest multiple of 8 smaller or equal to + * the length of the server key in order to keep everyone happy. + */ + maxServerKeySizeInBits=modLen*8; while(modLen && *modPtr==0) { - nbits-=8; - modLen--; + maxServerKeySizeInBits-=8; + modLen--; modPtr++; } - if (modLen) { - int i; - uint8_t mask=0x80; - uint8_t b=*modPtr; - - for (i=0; i<8; i++) { - if (b & mask) - break; - nbits--; - mask>>=1; - } - } - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Max Server Keysize in bits: %d", nbits); - if (nbits>1) - maxServerKeySizeInBits=nbits-1; - else - maxServerKeySizeInBits=nbits; + if (modLen && (*modPtr&0x80)==0) + maxServerKeySizeInBits-=8; + DBG_NOTICE(AQHBCI_LOGDOMAIN, "Max Server Keysize in bits: %d", + maxServerKeySizeInBits); } else { DBG_NOTICE(AQHBCI_LOGDOMAIN, "Key info for key %d has no modulus data, using default key size (2048 bits)", (int) skeyId); @@ -3894,8 +3973,8 @@ case 10: if (maxServerKeySizeInBits) { int n=maxServerKeySizeInBits/8; - if (maxServerKeySizeInBits%8) - n++; + + assert(maxServerKeySizeInBits%8==0); GWEN_Crypt_CryptAlgo_SetChunkSize(algo, n); GWEN_Crypt_CryptAlgo_SetKeySizeInBits(algo, maxServerKeySizeInBits); DBG_NOTICE(AQHBCI_LOGDOMAIN, "Creating keys of size: %d bytes, %d bits", n, maxServerKeySizeInBits); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.c 2014-03-01 19:23:34.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.c 2014-07-23 20:29:51.000000000 +0000 @@ -632,6 +632,13 @@ (aflags & AH_BANK_FLAGS_PREFER_SINGLE_DEBITNOTE)?1:0, 0); + GWEN_Dialog_SetIntProperty(dlg, "sepaPreferSingleTransferCheck", GWEN_DialogProperty_Value, 0, + (aflags & AH_BANK_FLAGS_SEPA_PREFER_SINGLE_TRANSFER)?1:0, + 0); + GWEN_Dialog_SetIntProperty(dlg, "sepaPreferSingleDebitNoteCheck", GWEN_DialogProperty_Value, 0, + (aflags & AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE)?1:0, + 0); + /* read width */ i=GWEN_DB_GetIntValue(dbPrefs, "dialog_width", 0, -1); @@ -782,6 +789,10 @@ aflags|=AH_BANK_FLAGS_PREFER_SINGLE_TRANSFER; if (GWEN_Dialog_GetIntProperty(dlg, "preferSingleDebitNoteCheck", GWEN_DialogProperty_Value, 0, 0)) aflags|=AH_BANK_FLAGS_PREFER_SINGLE_DEBITNOTE; + if (GWEN_Dialog_GetIntProperty(dlg, "sepaPreferSingleTransferCheck", GWEN_DialogProperty_Value, 0, 0)) + aflags|=AH_BANK_FLAGS_SEPA_PREFER_SINGLE_TRANSFER; + if (GWEN_Dialog_GetIntProperty(dlg, "sepaPreferSingleDebitNoteCheck", GWEN_DialogProperty_Value, 0, 0)) + aflags|=AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE; if (a) AH_Account_SetFlags(a, aflags); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.dlg libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.dlg --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.dlg 2013-10-23 18:41:32.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/dialogs/dlg_editaccount.dlg 2014-07-23 20:29:51.000000000 +0000 @@ -41,6 +41,9 @@ + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/dialogs/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/dialogs/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/dialogs/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/dialogs/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci/plugin/dialogs -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -78,19 +105,44 @@ dlg_ddvcard_special.lo dlg_newkeyfile.lo dlg_rdh_special.lo \ dlg_importkeyfile.lo dlg_choose_usertype.lo dlg_editaccount.lo libaqhbci_dlgs_la_OBJECTS = $(am_libaqhbci_dlgs_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libaqhbci_dlgs_la_SOURCES) DIST_SOURCES = $(libaqhbci_dlgs_la_SOURCES) am__can_run_installinfo = \ @@ -128,12 +180,30 @@ am__installdirs = "$(DESTDIR)$(dlgdatadir)" "$(DESTDIR)$(dlgimagedir)" DATA = $(dlgdata_DATA) $(dlgimage_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -222,6 +292,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -491,14 +562,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libaqhbci_dlgs.la: $(libaqhbci_dlgs_la_OBJECTS) $(libaqhbci_dlgs_la_DEPENDENCIES) $(EXTRA_libaqhbci_dlgs_la_DEPENDENCIES) - $(LINK) $(libaqhbci_dlgs_la_OBJECTS) $(libaqhbci_dlgs_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libaqhbci_dlgs_la_OBJECTS) $(libaqhbci_dlgs_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -521,25 +595,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlg_rdh_special.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -589,26 +663,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dlgimagedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -620,15 +683,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -637,6 +696,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -781,20 +855,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dlgdataDATA install-dlgimageDATA 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-dlgdataDATA uninstall-dlgimageDATA +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dlgdataDATA install-dlgimageDATA \ + 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 maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-dlgdataDATA uninstall-dlgimageDATA sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/job.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/job.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/job.c 2014-03-01 20:15:16.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/job.c 2014-07-23 20:29:51.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -259,6 +260,7 @@ /* get UPD jobs (if any) */ if (accountId) { GWEN_DB_NODE *updgroup; + GWEN_DB_NODE *updnode=NULL; updgroup=AH_User_GetUpd(u); assert(updgroup); @@ -269,27 +271,31 @@ code=GWEN_XMLNode_GetProperty(jobNode, "code", 0); if (code) { - GWEN_DB_NODE *n; - DBG_NOTICE(AQHBCI_LOGDOMAIN, "Code is \"%s\"", code); - n=GWEN_DB_GetFirstGroup(updgroup); - while(n) { - if (strcasecmp(GWEN_DB_GetCharValue(n, "job", 0, ""), + updnode=GWEN_DB_GetFirstGroup(updgroup); + while(updnode) { + if (strcasecmp(GWEN_DB_GetCharValue(updnode, "job", 0, ""), code)==0) { - GWEN_DB_NODE *dgr; - - /* upd job found */ - dgr=GWEN_DB_GetGroup(j->jobParams, - GWEN_DB_FLAGS_OVERWRITE_GROUPS, - "upd"); - assert(dgr); - GWEN_DB_AddGroupChildren(dgr, n); break; } - n=GWEN_DB_GetNextGroup(n); + updnode=GWEN_DB_GetNextGroup(updnode); } /* while */ } /* if code given */ } /* if updgroup for the given account found */ + if (updnode) { + GWEN_DB_NODE *dgr; + + /* upd job found */ + dgr=GWEN_DB_GetGroup(j->jobParams, GWEN_DB_FLAGS_OVERWRITE_GROUPS, "upd"); + assert(dgr); + GWEN_DB_AddGroupChildren(dgr, updnode); + } + else if (needsBPD) { + DBG_INFO(AQHBCI_LOGDOMAIN,"Job \"%s\" not enabled for account \"%s\"", + name, accountId); + AH_Job_free(j); + return NULL; + } } /* if accountId given */ /* sample flags from XML file */ @@ -385,6 +391,33 @@ j->msgResults=AH_Result_List_new(); j->messages=AB_Message_List_new(); + /* check BPD for job specific SEPA descriptors */ + if (needsBPD) { + GWEN_DB_NODE *dbT; + + dbT=GWEN_DB_FindFirstGroup(j->jobParams, "SupportedSepaFormats"); + if (dbT) { + GWEN_STRINGLIST *descriptors; + unsigned int i; + const char *s; + + descriptors=GWEN_StringList_new(); + while(dbT) { + for (i=0; i<10; i++) { + s=GWEN_DB_GetCharValue(dbT, "format", i, NULL); + if (!(s && *s)) + break; + GWEN_StringList_AppendString(descriptors, s, 0, 1); + } + dbT=GWEN_DB_FindNextGroup(dbT, "SupportedSepaFormats"); + } + if (GWEN_StringList_Count(descriptors)>0) + j->sepaDescriptors=descriptors; + else + GWEN_StringList_free(descriptors); + } + } + AH_Job_Log(j, GWEN_LoggerLevel_Info, "HBCI-Job created"); @@ -401,6 +434,7 @@ GWEN_StringList_free(j->challengeParams); GWEN_StringList_free(j->log); GWEN_StringList_free(j->signers); + GWEN_StringList_free(j->sepaDescriptors); free(j->responseName); free(j->code); free(j->name); @@ -413,6 +447,7 @@ GWEN_DB_Group_free(j->jobParams); GWEN_DB_Group_free(j->jobArguments); GWEN_DB_Group_free(j->jobResponses); + GWEN_DB_Group_free(j->sepaProfile); AH_Result_List_free(j->msgResults); AH_Result_List_free(j->segResults); AB_Message_List_free(j->messages); @@ -2542,6 +2577,168 @@ +static int AH_Job__SepaProfileSupported(GWEN_DB_NODE *profile, + const GWEN_STRINGLIST *descriptors) { + GWEN_STRINGLISTENTRY *se; + char pattern[13]; + const char *s; + + /* patterns shall always have the form *xxx.yyy.zz* */ + pattern[0]=pattern[11]='*'; + pattern[12]='\0'; + + /* Well formed type strings are exactly 10 characters long. Others + * will either not match or be rejected by the exporter. */ + strncpy(pattern+1, GWEN_DB_GetCharValue(profile, "type", 0, ""), 10); + se=GWEN_StringList_FirstEntry(descriptors); + while(se) { + s=GWEN_StringListEntry_Data(se); + if (s && GWEN_Text_ComparePattern(s, pattern, 1)!=-1) { + /* record the descriptor matching this profile */ + GWEN_DB_SetCharValue(profile, GWEN_DB_FLAGS_OVERWRITE_VARS, + "descriptor", s); + break; + } + se=GWEN_StringListEntry_Next(se); + } + if (se) + return 1; + else + return 0; +} + + + +static int AH_Job__SortSepaProfiles(const void *a, const void *b) { + GWEN_DB_NODE **ppa=(GWEN_DB_NODE **)a; + GWEN_DB_NODE **ppb=(GWEN_DB_NODE **)b; + GWEN_DB_NODE *pa=*ppa; + GWEN_DB_NODE *pb=*ppb; + int res; + + /* This function is supposed to return a list of profiles in order + * of decreasing precedence. */ + res=strcmp(GWEN_DB_GetCharValue(pb, "type", 0, ""), + GWEN_DB_GetCharValue(pa, "type", 0, "")); + if (res) + return res; + + res=strcmp(GWEN_DB_GetCharValue(pb, "name", 0, ""), + GWEN_DB_GetCharValue(pa, "name", 0, "")); + + return res; +} + + + +GWEN_DB_NODE *AH_Job_FindSepaProfile(AH_JOB *j, const char *type, + const char *name) { + const GWEN_STRINGLIST *descriptors; + GWEN_DB_NODE *dbProfiles; + + assert(j); + + if (j->sepaDescriptors) + descriptors=j->sepaDescriptors; + else + descriptors=AH_User_GetSepaDescriptors(j->user); + if (GWEN_StringList_Count(descriptors)==0) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No SEPA descriptor found, please update your account information"); + return NULL; + } + + if (name) { + GWEN_DB_NODE *profile; + + profile=AB_Banking_GetImExporterProfile(AH_Job_GetBankingApi(j), + "sepa", name); + if (!profile) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Profile \"%s\" not available", name); + return NULL; + } + if (GWEN_Text_ComparePattern(GWEN_DB_GetCharValue(profile, "type", 0, ""), + type, 1)==-1) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Profile \"%s\" does not match type speecification (\"%s\")", + name, type); + return NULL; + } + if (!AH_Job__SepaProfileSupported(profile, descriptors)) { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "Profile \"%s\" not supported by bank server", name); + return NULL; + } + j->sepaProfile=profile; + return profile; + } + + if (!type) + return j->sepaProfile; + + if (j->sepaProfile) { + if (GWEN_Text_ComparePattern(GWEN_DB_GetCharValue(j->sepaProfile, "type", + 0, ""), + type, 1)!=-1) + return j->sepaProfile; + else { + GWEN_DB_Group_free(j->sepaProfile); + j->sepaProfile=NULL; + } + } + + dbProfiles=AB_Banking_GetImExporterProfiles(AH_Job_GetBankingApi(j), "sepa"); + if (dbProfiles) { + GWEN_DB_NODE *n, *nn; + unsigned int pCount=0; + + n=GWEN_DB_GetFirstGroup(dbProfiles); + while(n) { + nn=n; + n=GWEN_DB_GetNextGroup(n); + + if (GWEN_Text_ComparePattern(GWEN_DB_GetCharValue(nn, "type", 0, ""), + type, 1)!=-1 && + AH_Job__SepaProfileSupported(nn, descriptors)) + pCount++; + else { + GWEN_DB_UnlinkGroup(nn); + GWEN_DB_Group_free(nn); + } + } + + if (pCount) { + GWEN_DB_NODE **orderedProfiles; + unsigned int i; + + orderedProfiles=malloc(pCount*sizeof(GWEN_DB_NODE *)); + assert(orderedProfiles); + n=GWEN_DB_GetFirstGroup(dbProfiles); + for (i=0; isepaProfile=orderedProfiles[0]; + free(orderedProfiles); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No supported SEPA format found for job \"%s\"", j->name); + } + GWEN_DB_Group_free(dbProfiles); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, + "No SEPA profiles found"); + } + + return j->sepaProfile; +} diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/job_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/job_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/job_l.h 2014-01-14 19:31:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/job_l.h 2014-07-23 20:29:51.000000000 +0000 @@ -322,6 +322,16 @@ AB_TRANSACTION *AH_Job_GetFirstTransfer(const AH_JOB *j); +/** + * Finds a profile of the SEPA ImExporter whose type option matches + * the pattern provided in the tmpl parameter. The pattern "001", for + * instance, will choose a profile suitable for credit transfer jobs. + * Specifying the NULL pointer for tmpl will return the profile + * selected during an earlier call to this function for the same job. + */ +GWEN_DB_NODE *AH_Job_FindSepaProfile(AH_JOB *j, const char *type, + const char *name); + #endif /* AH_JOB_L_H */ diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/job_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/job_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/job_p.h 2014-01-14 20:21:37.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/job_p.h 2014-07-23 20:29:51.000000000 +0000 @@ -44,12 +44,14 @@ uint32_t lastSegment; GWEN_STRINGLIST *signers; + GWEN_STRINGLIST *sepaDescriptors; GWEN_XMLNODE *xmlNode; GWEN_XMLNODE *msgNode; GWEN_DB_NODE *jobParams; GWEN_DB_NODE *jobArguments; GWEN_DB_NODE *jobResponses; + GWEN_DB_NODE *sepaProfile; AH_JOB_STATUS status; uint32_t flags; diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/joblayer/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/joblayer/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci/plugin/joblayer -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -73,19 +100,44 @@ libhbcijob_la_LIBADD = am_libhbcijob_la_OBJECTS = job.lo jobqueue.lo result.lo tanmethod.lo libhbcijob_la_OBJECTS = $(am_libhbcijob_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libhbcijob_la_SOURCES) DIST_SOURCES = $(libhbcijob_la_SOURCES) am__can_run_installinfo = \ @@ -122,12 +174,30 @@ } am__installdirs = "$(DESTDIR)$(iheaderdir)" HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -216,6 +286,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -450,14 +521,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libhbcijob.la: $(libhbcijob_la_OBJECTS) $(libhbcijob_la_DEPENDENCIES) $(EXTRA_libhbcijob_la_DEPENDENCIES) - $(LINK) $(libhbcijob_la_OBJECTS) $(libhbcijob_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libhbcijob_la_OBJECTS) $(libhbcijob_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -471,25 +545,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tanmethod.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -518,26 +592,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -549,15 +612,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -566,6 +625,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -710,19 +784,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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-iheaderHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iheaderHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iheaderHEADERS types: $(typefiles) diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/Makefile.am libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/Makefile.am 2011-02-13 19:35:57.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/Makefile.am 2014-08-20 19:45:01.000000000 +0000 @@ -1,4 +1,4 @@ -SUBDIRS=msglayer joblayer accountjobs applayer banking dialogs +SUBDIRS=msglayer joblayer ajobs applayer banking dialogs AM_CFLAGS=-DBUILDING_AQHBCI @visibility_cflags@ @@ -25,8 +25,8 @@ xmldatadir=$(aqbanking_pkgdatadir)/backends/aqhbci xmldata_DATA=hbci.xml -hbci.xml: header.xml applayer/xml/base.xml accountjobs/accountjobs.xml - $(XMLMERGE) --compact --header -v header.xml applayer/xml/base.xml accountjobs/accountjobs.xml -o $@ +hbci.xml: header.xml applayer/xml/base.xml ajobs/accountjobs.xml + $(XMLMERGE) --compact --header -v header.xml applayer/xml/base.xml ajobs/accountjobs.xml -o $@ sources: @@ -46,7 +46,7 @@ libaqhbci_la_LIBADD = \ msglayer/libhbcimsg.la \ joblayer/libhbcijob.la \ - accountjobs/libhbciaccjobs.la \ + ajobs/libhbciaccjobs.la \ applayer/libhbciapp.la \ banking/libhbcibanking.la \ dialogs/libaqhbci_dlgs.la \ diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -19,23 +18,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,10 +83,10 @@ host_triplet = @host@ noinst_PROGRAMS = testlib$(EXEEXT) subdir = src/plugins/backends/aqhbci/plugin -DIST_COMMON = README $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/aqhbci.xml.in $(srcdir)/header.xml.in \ - $(srcdir)/version.h.in + $(srcdir)/version.h.in $(top_srcdir)/depcomp \ + $(iheader_HEADERS) $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -111,17 +138,21 @@ $(am__DEPENDENCIES_1) am_aqhbci_la_OBJECTS = dummy.lo aqhbci_la_OBJECTS = $(am_aqhbci_la_OBJECTS) -aqhbci_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +aqhbci_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(aqhbci_la_LDFLAGS) $(LDFLAGS) -o $@ libaqhbci_la_DEPENDENCIES = msglayer/libhbcimsg.la \ - joblayer/libhbcijob.la accountjobs/libhbciaccjobs.la \ + joblayer/libhbcijob.la ajobs/libhbciaccjobs.la \ applayer/libhbciapp.la banking/libhbcibanking.la \ dialogs/libaqhbci_dlgs.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libaqhbci_la_OBJECTS = aqhbci.lo libaqhbci_la_OBJECTS = $(am_libaqhbci_la_OBJECTS) -libaqhbci_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +libaqhbci_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libaqhbci_la_LDFLAGS) $(LDFLAGS) -o $@ libaqhbciplugin_la_DEPENDENCIES = libaqhbci.la $(am__DEPENDENCIES_1) \ @@ -133,30 +164,52 @@ testlib_OBJECTS = $(am_testlib_OBJECTS) testlib_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(aqhbci_la_SOURCES) $(libaqhbci_la_SOURCES) \ $(libaqhbciplugin_la_SOURCES) $(testlib_SOURCES) DIST_SOURCES = $(aqhbci_la_SOURCES) $(libaqhbci_la_SOURCES) \ $(libaqhbciplugin_la_SOURCES) $(testlib_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -166,9 +219,29 @@ HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -201,6 +274,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -289,6 +363,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -459,7 +534,7 @@ visibility_cflags = @visibility_cflags@ with_aqebics = @with_aqebics@ with_aqhbci = @with_aqhbci@ -SUBDIRS = msglayer joblayer accountjobs applayer banking dialogs +SUBDIRS = msglayer joblayer ajobs applayer banking dialogs AM_CFLAGS = -DBUILDING_AQHBCI @visibility_cflags@ EXTRA_DIST = aqhbci.xml.in header.xml.in INCLUDES = -I$(aqbanking_symlinkdir) $(gwenhywfar_includes) \ @@ -482,7 +557,7 @@ libaqhbci_la_LIBADD = \ msglayer/libhbcimsg.la \ joblayer/libhbcijob.la \ - accountjobs/libhbciaccjobs.la \ + ajobs/libhbciaccjobs.la \ applayer/libhbciapp.la \ banking/libhbcibanking.la \ dialogs/libaqhbci_dlgs.la \ @@ -557,6 +632,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ version.h: $(top_builddir)/config.status $(srcdir)/version.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -583,21 +659,26 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ @@ -624,18 +705,23 @@ clean-pluginLTLIBRARIES: -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(plugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + aqhbci.la: $(aqhbci_la_OBJECTS) $(aqhbci_la_DEPENDENCIES) $(EXTRA_aqhbci_la_DEPENDENCIES) - $(aqhbci_la_LINK) -rpath $(plugindir) $(aqhbci_la_OBJECTS) $(aqhbci_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(aqhbci_la_LINK) -rpath $(plugindir) $(aqhbci_la_OBJECTS) $(aqhbci_la_LIBADD) $(LIBS) + libaqhbci.la: $(libaqhbci_la_OBJECTS) $(libaqhbci_la_DEPENDENCIES) $(EXTRA_libaqhbci_la_DEPENDENCIES) - $(libaqhbci_la_LINK) -rpath $(libdir) $(libaqhbci_la_OBJECTS) $(libaqhbci_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libaqhbci_la_LINK) -rpath $(libdir) $(libaqhbci_la_OBJECTS) $(libaqhbci_la_LIBADD) $(LIBS) + libaqhbciplugin.la: $(libaqhbciplugin_la_OBJECTS) $(libaqhbciplugin_la_DEPENDENCIES) $(EXTRA_libaqhbciplugin_la_DEPENDENCIES) - $(LINK) $(libaqhbciplugin_la_OBJECTS) $(libaqhbciplugin_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libaqhbciplugin_la_OBJECTS) $(libaqhbciplugin_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -645,9 +731,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + testlib$(EXEEXT): $(testlib_OBJECTS) $(testlib_DEPENDENCIES) $(EXTRA_testlib_DEPENDENCIES) @rm -f testlib$(EXEEXT) - $(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(testlib_OBJECTS) $(testlib_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -661,25 +748,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testlib.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -751,22 +838,25 @@ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -781,57 +871,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -847,12 +892,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -864,15 +904,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -881,6 +917,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1057,34 +1108,32 @@ uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ uninstall-xmldataDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS clean-pluginLTLIBRARIES ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-pluginDATA install-pluginLTLIBRARIES install-ps \ - install-ps-am install-strip install-xmldataDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + clean-pluginLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-iheaderHEADERS install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-pluginDATA install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip install-xmldataDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-iheaderHEADERS uninstall-libLTLIBRARIES \ uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ uninstall-xmldataDATA -hbci.xml: header.xml applayer/xml/base.xml accountjobs/accountjobs.xml - $(XMLMERGE) --compact --header -v header.xml applayer/xml/base.xml accountjobs/accountjobs.xml -o $@ +hbci.xml: header.xml applayer/xml/base.xml ajobs/accountjobs.xml + $(XMLMERGE) --compact --header -v header.xml applayer/xml/base.xml ajobs/accountjobs.xml -o $@ sources: for f in $(libaqhbci_la_SOURCES); do \ diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/account.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/account.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/account.c 2013-12-31 00:12:30.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/account.c 2014-07-23 20:29:51.000000000 +0000 @@ -151,6 +151,12 @@ if (flags & AH_BANK_FLAGS_SEPA) GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_DEFAULT, name, "sepa"); + if (flags & AH_BANK_FLAGS_SEPA_PREFER_SINGLE_TRANSFER) + GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_DEFAULT, name, + "sepaPreferSingleTransfer"); + if (flags & AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE) + GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_DEFAULT, name, + "sepaPreferSingleDebitNote"); } @@ -173,6 +179,10 @@ fl|=AH_BANK_FLAGS_KTV2; else if (strcasecmp(s, "sepa")==0) fl|=AH_BANK_FLAGS_SEPA; + else if (strcasecmp(s, "sepaPreferSingleTransfer")==0) + fl|=AH_BANK_FLAGS_SEPA_PREFER_SINGLE_TRANSFER; + else if (strcasecmp(s, "sepaPreferSingleDebitNote")==0) + fl|=AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE; else { DBG_WARN(AQHBCI_LOGDOMAIN, "Unknown account flag \"%s\"", s); } diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/account.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/account.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/account.h 2013-02-12 22:04:40.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/account.h 2014-07-23 20:29:51.000000000 +0000 @@ -41,6 +41,12 @@ /* this account can be used with SEPA jobs */ #define AH_BANK_FLAGS_SEPA 0x00000008 +/** Prefer single transfers over multi transfers for this account (SEPA) */ +#define AH_BANK_FLAGS_SEPA_PREFER_SINGLE_TRANSFER 0x00000010 +/** Prefer single debit notes over multi debit notes for this account (SEPA) */ +#define AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE 0x00000020 + + #define AH_BANK_FLAGS_DEFAULT 0 /*@}*/ diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci/plugin/msglayer -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -74,19 +101,44 @@ am_libhbcimsg_la_OBJECTS = account.lo bpd.lo dialog.lo hbci.lo \ hbci-updates.lo message.lo msgengine.lo user.lo libhbcimsg_la_OBJECTS = $(am_libhbcimsg_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libhbcimsg_la_SOURCES) DIST_SOURCES = $(libhbcimsg_la_SOURCES) am__can_run_installinfo = \ @@ -123,12 +175,30 @@ } am__installdirs = "$(DESTDIR)$(iheaderdir)" HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -218,6 +288,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -480,14 +551,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libhbcimsg.la: $(libhbcimsg_la_OBJECTS) $(libhbcimsg_la_DEPENDENCIES) $(EXTRA_libhbcimsg_la_DEPENDENCIES) - $(LINK) $(libhbcimsg_la_OBJECTS) $(libhbcimsg_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libhbcimsg_la_OBJECTS) $(libhbcimsg_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -505,25 +579,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -552,26 +626,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -583,15 +646,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -600,6 +659,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -744,19 +818,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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-iheaderHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-iheaderHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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-iheaderHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iheaderHEADERS sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/message.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/message.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/message.c 2012-01-01 18:30:58.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/message.c 2014-07-23 20:29:51.000000000 +0000 @@ -381,7 +381,6 @@ assert(node); assert(data); - assert(hmsg); e=AH_Dialog_GetMsgEngine(hmsg->dialog); assert(e); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user.c 2013-11-27 00:04:12.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user.c 2014-07-23 20:29:51.000000000 +0000 @@ -375,6 +375,14 @@ /* read some settings */ ue->maxTransfersPerJob=GWEN_DB_GetIntValue(db, "maxTransfersPerJob", 0, AH_USER_MAX_TRANSFERS_PER_JOB); ue->maxDebitNotesPerJob=GWEN_DB_GetIntValue(db, "maxDebitNotesPerJob", 0, AH_USER_MAX_DEBITNOTES_PER_JOB); + free(ue->sepaTransferProfile); + s=GWEN_DB_GetCharValue(db, "sepaTransferProfile", 0, NULL); + if (s) ue->sepaTransferProfile=strdup(s); + else ue->sepaTransferProfile=NULL; + free(ue->sepaDebitNoteProfile); + s=GWEN_DB_GetCharValue(db, "sepaDebitNoteProfile", 0, NULL); + if (s) ue->sepaDebitNoteProfile=strdup(s); + else ue->sepaDebitNoteProfile=NULL; free(ue->tanMediumId); s=GWEN_DB_GetCharValue(db, "tanMediumId", 0, NULL); @@ -497,6 +505,12 @@ GWEN_DB_SetIntValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, "maxDebitNotesPerJob", ue->maxDebitNotesPerJob); + if (ue->sepaTransferProfile) + GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, + "sepaTransferProfile", ue->sepaTransferProfile); + if (ue->sepaDebitNoteProfile) + GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, + "sepaDebitNoteProfile", ue->sepaDebitNoteProfile); if (ue->tanMediumId) GWEN_DB_SetCharValue(db, GWEN_DB_FLAGS_OVERWRITE_VARS, "tanMediumId", ue->tanMediumId); @@ -2077,5 +2091,68 @@ +const GWEN_STRINGLIST *AH_User_GetSepaDescriptors(AB_USER *u) { + AH_USER *ue; + + assert(u); + ue=GWEN_INHERIT_GETDATA(AB_USER, AH_USER, u); + assert(ue); + + return ue->sepaDescriptors; +} + + + +const char *AH_User_GetSepaTransferProfile(const AB_USER *u) { + const AH_USER *ue; + + assert(u); + ue=GWEN_INHERIT_GETDATA(AB_USER, AH_USER, u); + assert(ue); + + return ue->sepaTransferProfile; +} + +void AH_User_SetSepaTransferProfile(AB_USER *u, const char *profileName) { + AH_USER *ue; + + assert(u); + ue=GWEN_INHERIT_GETDATA(AB_USER, AH_USER, u); + assert(ue); + + free(ue->sepaTransferProfile); + if (profileName) + ue->sepaTransferProfile=strdup(profileName); + else + ue->sepaTransferProfile=NULL; +} + + + +const char *AH_User_GetSepaDebitNoteProfile(const AB_USER *u) { + const AH_USER *ue; + + assert(u); + ue=GWEN_INHERIT_GETDATA(AB_USER, AH_USER, u); + assert(ue); + + return ue->sepaDebitNoteProfile; +} + + + +void AH_User_SetSepaDebitNoteProfile(AB_USER *u, const char *profileName) { + AH_USER *ue; + + assert(u); + ue=GWEN_INHERIT_GETDATA(AB_USER, AH_USER, u); + assert(ue); + + free(ue->sepaDebitNoteProfile); + if (profileName) + ue->sepaDebitNoteProfile=strdup(profileName); + else + ue->sepaDebitNoteProfile=NULL; +} diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user.h 2014-02-03 20:37:56.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user.h 2014-07-23 20:29:51.000000000 +0000 @@ -217,6 +217,16 @@ int AH_User_GetHbciVersion(const AB_USER *u); AQHBCI_API void AH_User_SetHbciVersion(AB_USER *u, int i); + + +AQHBCI_API +const char *AH_User_GetSepaTransferProfile(const AB_USER *u); +AQHBCI_API +void AH_User_SetSepaTransferProfile(AB_USER *u, const char *profileName); +AQHBCI_API +const char *AH_User_GetSepaDebitNoteProfile(const AB_USER *u); +AQHBCI_API +void AH_User_SetSepaDebitNoteProfile(AB_USER *u, const char *profileName); /*@}*/ diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user_l.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user_l.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user_l.h 2011-12-01 17:51:09.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user_l.h 2014-07-23 20:29:51.000000000 +0000 @@ -102,6 +102,9 @@ GWEN_GUI_PASSWORD_STATUS status); +const GWEN_STRINGLIST *AH_User_GetSepaDescriptors(AB_USER *u); + + #endif /* AH_USER_L_H */ diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user_p.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user_p.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/plugin/msglayer/user_p.h 2013-02-19 19:35:30.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/user_p.h 2014-07-23 20:29:51.000000000 +0000 @@ -62,6 +62,8 @@ AH_TAN_METHOD_LIST *tanMethodDescriptions; char *tanMediumId; GWEN_STRINGLIST *sepaDescriptors; + char *sepaTransferProfile; + char *sepaDebitNoteProfile; int maxTransfersPerJob; int maxDebitNotesPerJob; diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/adduser.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/adduser.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/adduser.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/adduser.c 2015-05-25 16:22:08.000000000 +0000 @@ -402,7 +402,6 @@ keyId=GWEN_Crypt_Token_Context_GetEncipherKeyId(ctx); if (keyId==0) keyId=GWEN_Crypt_Token_Context_GetDecipherKeyId(ctx); - GWEN_Crypt_Token_Context_free(ctx); if (keyId==0) { DBG_ERROR(0, "No keys, unable to determine crypt mode"); GWEN_Buffer_free(nameBuffer); @@ -415,7 +414,8 @@ if (ki==NULL) { DBG_ERROR(0, "Could not get keyinfo for key %d, " - "unable to determine crypt mode", keyId); + "unable to determine crypt mode", keyId); + GWEN_Crypt_Token_Context_free(ctx); GWEN_Buffer_free(nameBuffer); GWEN_Crypt_Token_Close(ct, 1, 0); GWEN_Crypt_Token_free(ct); @@ -432,6 +432,7 @@ "Unexpected crypt algorithm \"%s\", " "unable to determine crypt mode", GWEN_Crypt_CryptAlgoId_toString(algo)); + GWEN_Crypt_Token_Context_free(ctx); GWEN_Buffer_free(nameBuffer); GWEN_Crypt_Token_Close(ct, 1, 0); GWEN_Crypt_Token_free(ct); @@ -442,6 +443,7 @@ GWEN_Crypt_Token_free(ct); if (rv) { DBG_ERROR(0, "Could not close token (%d)", rv); + GWEN_Crypt_Token_Context_free(ctx); GWEN_Buffer_free(nameBuffer); return 3; } @@ -449,11 +451,13 @@ if (!lbankId || !*lbankId) { DBG_ERROR(0, "No bank id stored and none given"); + GWEN_Crypt_Token_Context_free(ctx); GWEN_Buffer_free(nameBuffer); return 3; } if (!luserId || !*luserId) { DBG_ERROR(0, "No user id (Benutzerkennung) stored and none given"); + GWEN_Crypt_Token_Context_free(ctx); GWEN_Buffer_free(nameBuffer); return 3; } @@ -463,6 +467,7 @@ lbankId, luserId, lcustomerId); if (user) { DBG_ERROR(0, "User %s already exists", luserId); + GWEN_Crypt_Token_Context_free(ctx); return 3; } @@ -510,12 +515,14 @@ } if (GWEN_Buffer_GetUsedBytes(tbuf)==0) { DBG_ERROR(0, "No address given and none available in internal db"); + GWEN_Crypt_Token_Context_free(ctx); return 3; } url=GWEN_Url_fromString(GWEN_Buffer_GetStart(tbuf)); if (url==NULL) { DBG_ERROR(0, "Bad URL \"%s\" in internal db", GWEN_Buffer_GetStart(tbuf)); + GWEN_Crypt_Token_Context_free(ctx); return 3; } GWEN_Buffer_free(tbuf); @@ -525,6 +532,7 @@ url=GWEN_Url_fromString(lserverAddr); if (url==NULL) { DBG_ERROR(0, "Bad URL \"%s\"", lserverAddr); + GWEN_Crypt_Token_Context_free(ctx); return 3; } } @@ -546,6 +554,9 @@ AH_User_SetStatus(user, AH_UserStatusEnabled); AB_Banking_AddUser(ab, user); + + /* context no longer needed */ + GWEN_Crypt_Token_Context_free(ctx); } rv=AB_Banking_OnlineFini(ab); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/globals.h libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/globals.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/globals.h 2013-02-12 21:08:36.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/globals.h 2014-07-23 20:29:51.000000000 +0000 @@ -158,6 +158,11 @@ int argc, char **argv); +int setSepaProfile(AB_BANKING *ab, + GWEN_DB_NODE *dbArgs, + int argc, + char **argv); + int setTanMediumId(AB_BANKING *ab, GWEN_DB_NODE *dbArgs, int argc, diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/listaccounts.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/listaccounts.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/listaccounts.c 2010-08-27 10:25:44.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/listaccounts.c 2014-10-12 13:40:15.000000000 +0000 @@ -31,10 +31,21 @@ int argc, char **argv) { GWEN_DB_NODE *db; - int rv; + int rv, verbose; AB_ACCOUNT_LIST2 *al; const GWEN_ARGS args[]={ { + 0, /* flags */ + GWEN_ArgsType_Int, /* type */ + "verbose", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "v", /* short option */ + "verbose", /* long option */ + "Show list in verbose form (with more columns)", /* short description */ + 0 + }, + { GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ GWEN_ArgsType_Int, /* type */ "help", /* name */ @@ -69,6 +80,8 @@ return 0; } + verbose = GWEN_DB_VariableExists(db, "verbose"); + rv=AB_Banking_Init(ab); if (rv) { DBG_ERROR(0, "Error on init (%d)", rv); @@ -93,10 +106,18 @@ a=AB_Account_List2Iterator_Data(ait); assert(a); while(a) { - fprintf(stdout, "Account %d: Bank: %s Account Number: %s\n", + fprintf(stdout, "Account %d: Bank: %s Account Number: %s", i++, AB_Account_GetBankCode(a), AB_Account_GetAccountNumber(a)); + if (verbose) + { + const char* subAccountId = AB_Account_GetSubAccountId(a); + fprintf(stdout, " SubAccountId: %s LocalUniqueId: %d", + subAccountId ? subAccountId : "(none)", + AB_Account_GetUniqueId(a)); + } + fprintf(stdout, "\n"); a=AB_Account_List2Iterator_Next(ait); } AB_Account_List2Iterator_free(ait); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/main.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/main.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/main.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/main.c 2014-07-23 20:29:51.000000000 +0000 @@ -237,6 +237,10 @@ " Set the maximum number of transfers/debit notes per job \n\n")); GWEN_Buffer_AppendString(ubuf, + I18N(" setsepaprofile:\n" + " Set the SEPA profile for transfers/debit notes\n\n")); + + GWEN_Buffer_AppendString(ubuf, I18N(" setTanMediumId:\n" " Set the medium id for some PIN/TAN methods (like mTAN) \n\n")); @@ -376,6 +380,9 @@ else if (strcasecmp(cmd, "getaccsepa")==0) { rv=getAccSepa(ab, db, argc, argv); } + else if (strcasecmp(cmd, "setsepaprofile")==0) { + rv=setSepaProfile(ab, db, argc, argv); + } else if (strcasecmp(cmd, "versions")==0) { showVersions(); rv=0; diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.am libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.am 2013-02-12 21:08:49.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.am 2014-07-23 20:29:51.000000000 +0000 @@ -37,6 +37,7 @@ listitanmodes.c \ setitanmode.c \ setmaxtransfers.c \ + setsepaprofile.c \ settanmediumid.c \ logfile.c \ getaccsepa.c diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,8 +82,8 @@ host_triplet = @host@ bin_PROGRAMS = aqhbci-tool4$(EXEEXT) subdir = src/plugins/backends/aqhbci/tools/aqhbci-tool -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -84,28 +111,53 @@ sethbciversion.$(OBJEXT) adduserflags.$(OBJEXT) \ subuserflags.$(OBJEXT) listitanmodes.$(OBJEXT) \ setitanmode.$(OBJEXT) setmaxtransfers.$(OBJEXT) \ - settanmediumid.$(OBJEXT) logfile.$(OBJEXT) \ - getaccsepa.$(OBJEXT) + setsepaprofile.$(OBJEXT) settanmediumid.$(OBJEXT) \ + logfile.$(OBJEXT) getaccsepa.$(OBJEXT) aqhbci_tool4_OBJECTS = $(am_aqhbci_tool4_OBJECTS) am__DEPENDENCIES_1 = aqhbci_tool4_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -aqhbci_tool4_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +aqhbci_tool4_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(aqhbci_tool4_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(aqhbci_tool4_SOURCES) DIST_SOURCES = $(aqhbci_tool4_SOURCES) am__can_run_installinfo = \ @@ -142,12 +194,30 @@ } DATA = $(idata_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -237,6 +307,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -437,6 +508,7 @@ listitanmodes.c \ setitanmode.c \ setmaxtransfers.c \ + setsepaprofile.c \ settanmediumid.c \ logfile.c \ getaccsepa.c @@ -490,10 +562,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -514,7 +588,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -527,9 +602,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + aqhbci-tool4$(EXEEXT): $(aqhbci_tool4_OBJECTS) $(aqhbci_tool4_DEPENDENCIES) $(EXTRA_aqhbci_tool4_DEPENDENCIES) @rm -f aqhbci-tool4$(EXEEXT) - $(aqhbci_tool4_LINK) $(aqhbci_tool4_OBJECTS) $(aqhbci_tool4_LDADD) $(LIBS) + $(AM_V_CCLD)$(aqhbci_tool4_LINK) $(aqhbci_tool4_OBJECTS) $(aqhbci_tool4_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -562,30 +638,31 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sethbciversion.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setitanmode.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setmaxtransfers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setsepaprofile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settanmediumid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subuserflags.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -614,26 +691,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(idatadir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -645,15 +711,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -662,6 +724,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -805,19 +882,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-idataDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-idataDATA +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-idataDATA install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-idataDATA sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/sendkeys.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/sendkeys.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/sendkeys.c 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/sendkeys.c 2014-07-23 20:29:51.000000000 +0000 @@ -55,6 +55,17 @@ { GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ + "userId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "u", /* short option */ + "user", /* long option */ + "Specify the user id (Benutzerkennung)", /* short description */ + "Specify the user id (Benutzerkennung)" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ "customerId", /* name */ 0, /* minnum */ 1, /* maxnum */ diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/setsepaprofile.c libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/setsepaprofile.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/setsepaprofile.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/aqhbci-tool/setsepaprofile.c 2014-07-23 20:29:51.000000000 +0000 @@ -0,0 +1,282 @@ +/*************************************************************************** + $RCSfile$ + ------------------- + cvs : $Id: getsysid.c 1288 2007-08-11 16:53:57Z martin $ + begin : Tue May 03 2005 + copyright : (C) 2005 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include +#endif + + +#include "globals.h" + +#include + +#include + +#include +#include +#include +#include +#include + + +int setSepaProfile(AB_BANKING *ab, + GWEN_DB_NODE *dbArgs, + int argc, + char **argv) { + GWEN_DB_NODE *db; + AB_PROVIDER *pro; + AB_USER_LIST2 *ul; + AB_USER *u=0; + int rv; + const char *bankId; + const char *userId; + const char *customerId; + const char *tProfile, *dProfile; + const GWEN_ARGS args[]={ + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "bankId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "b", /* short option */ + "bank", /* long option */ + "Specify the bank code", /* short description */ + "Specify the bank code" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "userId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "u", /* short option */ + "user", /* long option */ + "Specify the user id (Benutzerkennung)", /* short description */ + "Specify the user id (Benutzerkennung)" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "customerId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "c", /* short option */ + "customer", /* long option */ + "Specify the customer id (Kundennummer)", /* short description */ + "Specify the customer id (Kundennummer)" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "transferProfile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "t", /* short option */ + "transfers", /* long option */ + "Specify the SEPA profile for transfers", /* short description */ + "Specify the SEPA profile for transfers (\"\" for default)" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "debitNoteProfile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "d", /* short option */ + "debitnotes", /* long option */ + "Specify the SEPA profile for debit notes", /* short description */ + "Specify the SEPA profile for debit notes (\"\" for default)" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ + GWEN_ArgsType_Int, /* type */ + "help", /* name */ + 0, /* minnum */ + 0, /* maxnum */ + "h", /* short option */ + "help", /* long option */ + "Show this help screen", /* short description */ + "Show this help screen" /* long description */ + } + }; + + db=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, "local"); + rv=GWEN_Args_Check(argc, argv, 1, + 0 /*GWEN_ARGS_MODE_ALLOW_FREEPARAM*/, + args, + db); + if (rv==GWEN_ARGS_RESULT_ERROR) { + fprintf(stderr, "ERROR: Could not parse arguments\n"); + return 1; + } + else if (rv==GWEN_ARGS_RESULT_HELP) { + GWEN_BUFFER *ubuf; + + ubuf=GWEN_Buffer_new(0, 1024, 0, 1); + if (GWEN_Args_Usage(args, ubuf, GWEN_ArgsOutType_Txt)) { + fprintf(stderr, "ERROR: Could not create help string\n"); + return 1; + } + fprintf(stderr, "%s\n", GWEN_Buffer_GetStart(ubuf)); + GWEN_Buffer_free(ubuf); + return 0; + } + + rv=AB_Banking_Init(ab); + if (rv) { + DBG_ERROR(0, "Error on init (%d)", rv); + return 2; + } + + rv=AB_Banking_OnlineInit(ab); + if (rv) { + DBG_ERROR(0, "Error on init (%d)", rv); + return 2; + } + + pro=AB_Banking_GetProvider(ab, "aqhbci"); + assert(pro); + + bankId=GWEN_DB_GetCharValue(db, "bankId", 0, "*"); + userId=GWEN_DB_GetCharValue(db, "userId", 0, "*"); + customerId=GWEN_DB_GetCharValue(db, "customerId", 0, "*"); + + tProfile=GWEN_DB_GetCharValue(db, "transferProfile", 0, NULL); + dProfile=GWEN_DB_GetCharValue(db, "debitNoteProfile", 0, NULL); + + ul=AB_Banking_FindUsers(ab, AH_PROVIDER_NAME, "de", + bankId, userId, customerId); + if (ul) { + if (AB_User_List2_GetSize(ul)!=1) { + DBG_ERROR(0, "Ambiguous customer specification"); + return 3; + } + else { + AB_USER_LIST2_ITERATOR *uit; + + uit=AB_User_List2_First(ul); + assert(uit); + u=AB_User_List2Iterator_Data(uit); + AB_User_List2Iterator_free(uit); + } + AB_User_List2_free(ul); + } + if (!u) { + DBG_ERROR(0, "No matching customer"); + return 3; + } + else { + GWEN_DB_NODE *profile; + const char *s; + + if (!tProfile && !dProfile) { + DBG_ERROR(0, "No action specified"); + return 1; + } + if (tProfile && *tProfile) { + profile=AB_Banking_GetImExporterProfile(ab, "sepa", tProfile); + if (!profile) { + DBG_ERROR(0, + "Profile \"%s\" not found", tProfile); + return 1; + } + s=GWEN_DB_GetCharValue(profile, "type", 0, ""); + if (GWEN_Text_ComparePattern(s, "001.*", 1)==-1) { + DBG_ERROR(0, + "Profile \"%s\" is of type \"%s\" but should match \"001.*\"", + tProfile, s); + return 1; + } + } + if (dProfile && *dProfile) { + profile=AB_Banking_GetImExporterProfile(ab, "sepa", dProfile); + if (!profile) { + DBG_ERROR(0, + "Profile \"%s\" not found", dProfile); + return 1; + } + s=GWEN_DB_GetCharValue(profile, "type", 0, ""); + if (GWEN_Text_ComparePattern(s, "008.*", 1)==-1) { + DBG_ERROR(0, + "Profile \"%s\" is of type \"%s\" but should match \"008.*\"", + dProfile, s); + return 1; + } + } + + /* lock user */ + rv=AB_Banking_BeginExclUseUser(ab, u); + if (rv<0) { + fprintf(stderr, + "ERROR: Could not lock user, maybe it is used in another application? (%d)\n", + rv); + AB_Banking_OnlineFini(ab); + AB_Banking_Fini(ab); + return 4; + } + + /* modify user */ + if (tProfile) { + if (*tProfile) { + fprintf(stderr, "Setting SEPA profile for transfers to \"%s\"\n", + tProfile); + } + else { + fprintf(stderr, "Resetting default SEPA profile for transfers\n"); + tProfile=NULL; + } + AH_User_SetSepaTransferProfile(u, tProfile); + } + + if (dProfile) { + if (*dProfile) { + fprintf(stderr, "Setting SEPA profile for debit notes to \"%s\"\n", + dProfile); + } + else { + fprintf(stderr, "Resetting default SEPA profile for debit notes\n"); + dProfile=NULL; + } + AH_User_SetSepaDebitNoteProfile(u, dProfile); + } + + /* unlock user */ + rv=AB_Banking_EndExclUseUser(ab, u, 0); + if (rv<0) { + fprintf(stderr, + "ERROR: Could not unlock user (%d)\n", + rv); + AB_Banking_OnlineFini(ab); + AB_Banking_Fini(ab); + return 4; + } + } + + rv=AB_Banking_OnlineFini(ab); + if (rv) { + fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); + return 5; + } + + rv=AB_Banking_Fini(ab); + if (rv) { + fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); + return 5; + } + + return 0; +} + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/hbcixml/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/hbcixml/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/hbcixml/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/hbcixml/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ host_triplet = @host@ bin_PROGRAMS = hbcixml3$(EXEEXT) subdir = src/plugins/backends/aqhbci/tools/hbcixml -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -78,22 +105,47 @@ am__DEPENDENCIES_1 = hbcixml3_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -hbcixml3_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +hbcixml3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(hbcixml3_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(hbcixml3_SOURCES) DIST_SOURCES = $(hbcixml3_SOURCES) am__can_run_installinfo = \ @@ -102,12 +154,30 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -197,6 +267,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -419,10 +490,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -443,7 +516,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -456,9 +530,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + hbcixml3$(EXEEXT): $(hbcixml3_OBJECTS) $(hbcixml3_DEPENDENCIES) $(EXTRA_hbcixml3_DEPENDENCIES) @rm -f hbcixml3$(EXEEXT) - $(hbcixml3_LINK) $(hbcixml3_OBJECTS) $(hbcixml3_LDADD) $(LIBS) + $(AM_V_CXXLD)$(hbcixml3_LINK) $(hbcixml3_OBJECTS) $(hbcixml3_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -471,25 +546,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loganalyzer.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -497,26 +572,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -528,15 +592,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -545,6 +605,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -688,19 +763,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqhbci/tools/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqhbci/tools/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqhbci/tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqnone/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqnone/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqnone/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqnone/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqnone -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/aqnone.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/aqnone.xml.in $(top_srcdir)/depcomp \ + $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -106,36 +134,62 @@ $(am__DEPENDENCIES_1) am_aqnone_la_OBJECTS = dummy.lo aqnone_la_OBJECTS = $(am_aqnone_la_OBJECTS) -aqnone_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +aqnone_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(aqnone_la_LDFLAGS) $(LDFLAGS) -o $@ libaqnone_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libaqnone_la_OBJECTS = provider.lo libaqnone_la_OBJECTS = $(am_libaqnone_la_OBJECTS) -libaqnone_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +libaqnone_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libaqnone_la_LDFLAGS) $(LDFLAGS) -o $@ libaqnoneplugin_la_DEPENDENCIES = libaqnone.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libaqnoneplugin_la_OBJECTS = aqnone-plugin.lo libaqnoneplugin_la_OBJECTS = $(am_libaqnoneplugin_la_OBJECTS) -libaqnoneplugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libaqnoneplugin_la_LDFLAGS) $(LDFLAGS) -o $@ +libaqnoneplugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libaqnoneplugin_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(aqnone_la_SOURCES) $(libaqnone_la_SOURCES) \ $(libaqnoneplugin_la_SOURCES) DIST_SOURCES = $(aqnone_la_SOURCES) $(libaqnone_la_SOURCES) \ @@ -147,12 +201,30 @@ esac DATA = $(plugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -241,6 +313,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -475,6 +548,7 @@ $(am__aclocal_m4_deps): aqnone.xml: $(top_builddir)/config.status $(srcdir)/aqnone.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -501,21 +575,26 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ @@ -542,18 +621,23 @@ clean-pluginLTLIBRARIES: -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(plugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + aqnone.la: $(aqnone_la_OBJECTS) $(aqnone_la_DEPENDENCIES) $(EXTRA_aqnone_la_DEPENDENCIES) - $(aqnone_la_LINK) -rpath $(plugindir) $(aqnone_la_OBJECTS) $(aqnone_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(aqnone_la_LINK) -rpath $(plugindir) $(aqnone_la_OBJECTS) $(aqnone_la_LIBADD) $(LIBS) + libaqnone.la: $(libaqnone_la_OBJECTS) $(libaqnone_la_DEPENDENCIES) $(EXTRA_libaqnone_la_DEPENDENCIES) - $(libaqnone_la_LINK) -rpath $(libdir) $(libaqnone_la_OBJECTS) $(libaqnone_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libaqnone_la_LINK) -rpath $(libdir) $(libaqnone_la_OBJECTS) $(libaqnone_la_LIBADD) $(LIBS) + libaqnoneplugin.la: $(libaqnoneplugin_la_OBJECTS) $(libaqnoneplugin_la_DEPENDENCIES) $(EXTRA_libaqnoneplugin_la_DEPENDENCIES) - $(libaqnoneplugin_la_LINK) $(libaqnoneplugin_la_OBJECTS) $(libaqnoneplugin_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libaqnoneplugin_la_LINK) $(libaqnoneplugin_la_OBJECTS) $(libaqnoneplugin_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -566,25 +650,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/provider.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -613,26 +697,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -644,15 +717,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -661,6 +730,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -806,21 +890,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-pluginLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir 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-libLTLIBRARIES \ - install-man install-pdf install-pdf-am install-pluginDATA \ - install-pluginLTLIBRARIES install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-pluginDATA \ + clean-pluginLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-pluginDATA install-pluginLTLIBRARIES install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-libLTLIBRARIES uninstall-pluginDATA \ uninstall-pluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqofxconnect -DIST_COMMON = README $(iheader_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/version.h.in ChangeLog +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/version.h.in $(iheader_HEADERS) ChangeLog README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -68,15 +95,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.h CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -113,9 +153,29 @@ HEADERS = $(iheader_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -148,6 +208,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -236,6 +297,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -479,22 +541,25 @@ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -509,57 +574,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -575,12 +595,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -592,15 +607,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -609,6 +620,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -776,24 +802,22 @@ uninstall-am: uninstall-iheaderHEADERS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install 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 \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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-iheaderHEADERS 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 \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-iheaderHEADERS 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 uninstall-iheaderHEADERS + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iheaderHEADERS sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -19,23 +18,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,8 +83,8 @@ host_triplet = @host@ noinst_PROGRAMS = libtest$(EXEEXT) subdir = src/plugins/backends/aqofxconnect/plugin/libofxhome -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -77,6 +104,10 @@ am__objects_1 = oh_institute_data.lo oh_institute_spec.lo am_libofxhome_la_OBJECTS = $(am__objects_1) ofxhome.lo dlg_getinst.lo libofxhome_la_OBJECTS = $(am_libofxhome_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = PROGRAMS = $(noinst_PROGRAMS) am_libtest_OBJECTS = libtest.$(OBJEXT) libtest_OBJECTS = $(am_libtest_OBJECTS) @@ -84,19 +115,40 @@ libtest_DEPENDENCIES = libofxhome.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libofxhome_la_SOURCES) $(libtest_SOURCES) DIST_SOURCES = $(libofxhome_la_SOURCES) $(libtest_SOURCES) am__can_run_installinfo = \ @@ -134,12 +186,30 @@ am__installdirs = "$(DESTDIR)$(dlgdatadir)" "$(DESTDIR)$(iheaderdir)" DATA = $(dlgdata_DATA) HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -228,6 +298,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -488,14 +559,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libofxhome.la: $(libofxhome_la_OBJECTS) $(libofxhome_la_DEPENDENCIES) $(EXTRA_libofxhome_la_DEPENDENCIES) - $(LINK) $(libofxhome_la_OBJECTS) $(libofxhome_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libofxhome_la_OBJECTS) $(libofxhome_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -505,9 +579,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + libtest$(EXEEXT): $(libtest_OBJECTS) $(libtest_DEPENDENCIES) $(EXTRA_libtest_DEPENDENCIES) @rm -f libtest$(EXEEXT) - $(LINK) $(libtest_OBJECTS) $(libtest_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libtest_OBJECTS) $(libtest_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -522,25 +597,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oh_institute_spec.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -590,26 +665,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -621,15 +685,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -638,6 +698,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -782,20 +857,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dlgdataDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iheaderHEADERS install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-dlgdataDATA uninstall-iheaderHEADERS + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dlgdataDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iheaderHEADERS install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-dlgdataDATA \ + uninstall-iheaderHEADERS built_sources: $(build_sources) diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.c libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.c 2010-08-17 14:03:08.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.c 2014-07-23 20:30:33.000000000 +0000 @@ -21,7 +21,7 @@ GWEN_LIST2_FUNCTIONS(OH_INSTITUTE_DATA, OH_InstituteData) -OH_INSTITUTE_DATA *OH_InstituteData_new() { +OH_INSTITUTE_DATA *OH_InstituteData_new(void) { OH_INSTITUTE_DATA *p_struct; GWEN_NEW_OBJECT(OH_INSTITUTE_DATA, p_struct) @@ -38,6 +38,7 @@ p_struct->lastOfxValidationTime=NULL; p_struct->lastSslValidationTime=NULL; p_struct->fileName=NULL; + /* virtual functions */ return p_struct; } @@ -156,6 +157,114 @@ return p_struct; } +OH_INSTITUTE_DATA *OH_InstituteData_copy(OH_INSTITUTE_DATA *p_struct, const OH_INSTITUTE_DATA *p_src) { + assert(p_struct); + assert(p_src); + /* member "id" */ + p_struct->id=p_src->id; + + /* member "flags" */ + p_struct->flags=p_src->flags; + + /* member "name" */ + if (p_struct->name) { + free(p_struct->name); + } + if (p_struct->name) { + free(p_struct->name); + p_struct->name=NULL; + } + if (p_src->name) { + p_struct->name=strdup(p_src->name); + } + + /* member "fid" */ + if (p_struct->fid) { + free(p_struct->fid); + } + if (p_struct->fid) { + free(p_struct->fid); + p_struct->fid=NULL; + } + if (p_src->fid) { + p_struct->fid=strdup(p_src->fid); + } + + /* member "org" */ + if (p_struct->org) { + free(p_struct->org); + } + if (p_struct->org) { + free(p_struct->org); + p_struct->org=NULL; + } + if (p_src->org) { + p_struct->org=strdup(p_src->org); + } + + /* member "brokerId" */ + if (p_struct->brokerId) { + free(p_struct->brokerId); + } + if (p_struct->brokerId) { + free(p_struct->brokerId); + p_struct->brokerId=NULL; + } + if (p_src->brokerId) { + p_struct->brokerId=strdup(p_src->brokerId); + } + + /* member "url" */ + if (p_struct->url) { + free(p_struct->url); + } + if (p_struct->url) { + free(p_struct->url); + p_struct->url=NULL; + } + if (p_src->url) { + p_struct->url=strdup(p_src->url); + } + + /* member "lastOfxValidationTime" */ + if (p_struct->lastOfxValidationTime) { + GWEN_Time_free(p_struct->lastOfxValidationTime); + } + if (p_struct->lastOfxValidationTime) { + GWEN_Time_free(p_struct->lastOfxValidationTime); + p_struct->lastOfxValidationTime=NULL; + } + if (p_src->lastOfxValidationTime) { + p_struct->lastOfxValidationTime=GWEN_Time_dup(p_src->lastOfxValidationTime); + } + + /* member "lastSslValidationTime" */ + if (p_struct->lastSslValidationTime) { + GWEN_Time_free(p_struct->lastSslValidationTime); + } + if (p_struct->lastSslValidationTime) { + GWEN_Time_free(p_struct->lastSslValidationTime); + p_struct->lastSslValidationTime=NULL; + } + if (p_src->lastSslValidationTime) { + p_struct->lastSslValidationTime=GWEN_Time_dup(p_src->lastSslValidationTime); + } + + /* member "fileName" */ + if (p_struct->fileName) { + free(p_struct->fileName); + } + if (p_struct->fileName) { + free(p_struct->fileName); + p_struct->fileName=NULL; + } + if (p_src->fileName) { + p_struct->fileName=strdup(p_src->fileName); + } + + return p_struct; +} + int OH_InstituteData_GetId(const OH_INSTITUTE_DATA *p_struct) { assert(p_struct); return p_struct->id; @@ -330,6 +439,7 @@ } } +/* list1 functions */ OH_INSTITUTE_DATA_LIST *OH_InstituteData_List_dup(const OH_INSTITUTE_DATA_LIST *p_src) { OH_INSTITUTE_DATA_LIST *p_dest; OH_INSTITUTE_DATA *p_elem; @@ -351,68 +461,73 @@ void OH_InstituteData_ReadDb(OH_INSTITUTE_DATA *p_struct, GWEN_DB_NODE *p_db) { assert(p_struct); /* member "id" */ - p_struct->id=0; p_struct->id=GWEN_DB_GetIntValue(p_db, "id", 0, 0); /* member "flags" */ - p_struct->flags=0; p_struct->flags=GWEN_DB_GetIntValue(p_db, "flags", 0, 0); /* member "name" */ if (p_struct->name) { free(p_struct->name); } - p_struct->name=NULL; { const char *s; s=GWEN_DB_GetCharValue(p_db, "name", 0, NULL); if (s) p_struct->name=strdup(s); } + if (p_struct->name==NULL) { p_struct->name=NULL; + } /* member "fid" */ if (p_struct->fid) { free(p_struct->fid); } - p_struct->fid=NULL; { const char *s; s=GWEN_DB_GetCharValue(p_db, "fid", 0, NULL); if (s) p_struct->fid=strdup(s); } + if (p_struct->fid==NULL) { p_struct->fid=NULL; + } /* member "org" */ if (p_struct->org) { free(p_struct->org); } - p_struct->org=NULL; { const char *s; s=GWEN_DB_GetCharValue(p_db, "org", 0, NULL); if (s) p_struct->org=strdup(s); } + if (p_struct->org==NULL) { p_struct->org=NULL; + } /* member "brokerId" */ if (p_struct->brokerId) { free(p_struct->brokerId); } - p_struct->brokerId=NULL; { const char *s; s=GWEN_DB_GetCharValue(p_db, "brokerId", 0, NULL); if (s) p_struct->brokerId=strdup(s); } + if (p_struct->brokerId==NULL) { p_struct->brokerId=NULL; + } /* member "url" */ if (p_struct->url) { free(p_struct->url); } - p_struct->url=NULL; { const char *s; s=GWEN_DB_GetCharValue(p_db, "url", 0, NULL); if (s) p_struct->url=strdup(s); } + if (p_struct->url==NULL) { p_struct->url=NULL; + } /* member "lastOfxValidationTime" */ if (p_struct->lastOfxValidationTime) { GWEN_Time_free(p_struct->lastOfxValidationTime); } - p_struct->lastOfxValidationTime=NULL; { GWEN_DB_NODE *dbDest; dbDest=GWEN_DB_GetGroup(p_db, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "lastOfxValidationTime"); if (dbDest) p_struct->lastOfxValidationTime=GWEN_Time_fromDb(dbDest); } + if (p_struct->lastOfxValidationTime==NULL) { p_struct->lastOfxValidationTime=NULL; + } /* member "lastSslValidationTime" */ if (p_struct->lastSslValidationTime) { GWEN_Time_free(p_struct->lastSslValidationTime); } - p_struct->lastSslValidationTime=NULL; { GWEN_DB_NODE *dbDest; dbDest=GWEN_DB_GetGroup(p_db, GWEN_PATH_FLAGS_NAMEMUSTEXIST, "lastSslValidationTime"); if (dbDest) p_struct->lastSslValidationTime=GWEN_Time_fromDb(dbDest); } + if (p_struct->lastSslValidationTime==NULL) { p_struct->lastSslValidationTime=NULL; + } /* member "fileName" */ if (p_struct->fileName) { free(p_struct->fileName); } + /* member "fileName" is volatile, just presetting */ p_struct->fileName=NULL; - /* member "fileName" is volatile, not reading from db */ } diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.h libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.h 2010-08-17 14:03:08.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_data.h 2014-07-23 20:30:33.000000000 +0000 @@ -38,7 +38,7 @@ /** Constructor. */ -AQOFXCONNECT_API OH_INSTITUTE_DATA *OH_InstituteData_new(); +AQOFXCONNECT_API OH_INSTITUTE_DATA *OH_InstituteData_new(void); /** Destructor. */ AQOFXCONNECT_API void OH_InstituteData_free(OH_INSTITUTE_DATA *p_struct); @@ -47,6 +47,8 @@ AQOFXCONNECT_API OH_INSTITUTE_DATA *OH_InstituteData_dup(const OH_INSTITUTE_DATA *p_struct); +AQOFXCONNECT_API OH_INSTITUTE_DATA *OH_InstituteData_copy(OH_INSTITUTE_DATA *p_struct, const OH_INSTITUTE_DATA *p_src); + /** Getter. * Use this function to get the member "id" */ @@ -113,7 +115,7 @@ AQOFXCONNECT_API void OH_InstituteData_AddFlags(OH_INSTITUTE_DATA *p_struct, uint32_t p_src); /** Sub flags. - * Use this function to sub flags to the member "flags" + * Use this function to sub flags from the member "flags" */ AQOFXCONNECT_API void OH_InstituteData_SubFlags(OH_INSTITUTE_DATA *p_struct, uint32_t p_src); @@ -157,6 +159,7 @@ */ AQOFXCONNECT_API void OH_InstituteData_SetFileName(OH_INSTITUTE_DATA *p_struct, const char *p_src); +/* list1 functions */ AQOFXCONNECT_API OH_INSTITUTE_DATA_LIST *OH_InstituteData_List_dup(const OH_INSTITUTE_DATA_LIST *p_src); AQOFXCONNECT_API void OH_InstituteData_ReadDb(OH_INSTITUTE_DATA *p_struct, GWEN_DB_NODE *p_db); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.c libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.c --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.c 2010-08-17 14:02:16.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.c 2014-07-23 20:30:33.000000000 +0000 @@ -21,7 +21,7 @@ GWEN_LIST2_FUNCTIONS(OH_INSTITUTE_SPEC, OH_InstituteSpec) -OH_INSTITUTE_SPEC *OH_InstituteSpec_new() { +OH_INSTITUTE_SPEC *OH_InstituteSpec_new(void) { OH_INSTITUTE_SPEC *p_struct; GWEN_NEW_OBJECT(OH_INSTITUTE_SPEC, p_struct) @@ -30,6 +30,7 @@ /* members */ p_struct->id=0; p_struct->name=NULL; + /* virtual functions */ return p_struct; } @@ -75,6 +76,27 @@ return p_struct; } +OH_INSTITUTE_SPEC *OH_InstituteSpec_copy(OH_INSTITUTE_SPEC *p_struct, const OH_INSTITUTE_SPEC *p_src) { + assert(p_struct); + assert(p_src); + /* member "id" */ + p_struct->id=p_src->id; + + /* member "name" */ + if (p_struct->name) { + free(p_struct->name); + } + if (p_struct->name) { + free(p_struct->name); + p_struct->name=NULL; + } + if (p_src->name) { + p_struct->name=strdup(p_src->name); + } + + return p_struct; +} + int OH_InstituteSpec_GetId(const OH_INSTITUTE_SPEC *p_struct) { assert(p_struct); return p_struct->id; @@ -103,6 +125,7 @@ } } +/* list1 functions */ OH_INSTITUTE_SPEC_LIST *OH_InstituteSpec_List_dup(const OH_INSTITUTE_SPEC_LIST *p_src) { OH_INSTITUTE_SPEC_LIST *p_dest; OH_INSTITUTE_SPEC *p_elem; @@ -124,15 +147,15 @@ void OH_InstituteSpec_ReadDb(OH_INSTITUTE_SPEC *p_struct, GWEN_DB_NODE *p_db) { assert(p_struct); /* member "id" */ - p_struct->id=0; p_struct->id=GWEN_DB_GetIntValue(p_db, "id", 0, 0); /* member "name" */ if (p_struct->name) { free(p_struct->name); } - p_struct->name=NULL; { const char *s; s=GWEN_DB_GetCharValue(p_db, "name", 0, NULL); if (s) p_struct->name=strdup(s); } + if (p_struct->name==NULL) { p_struct->name=NULL; + } } diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.h libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.h 2010-08-17 14:02:16.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/libofxhome/oh_institute_spec.h 2014-07-23 20:30:33.000000000 +0000 @@ -32,7 +32,7 @@ /** Constructor. */ -AQOFXCONNECT_API OH_INSTITUTE_SPEC *OH_InstituteSpec_new(); +AQOFXCONNECT_API OH_INSTITUTE_SPEC *OH_InstituteSpec_new(void); /** Destructor. */ AQOFXCONNECT_API void OH_InstituteSpec_free(OH_INSTITUTE_SPEC *p_struct); @@ -41,6 +41,8 @@ AQOFXCONNECT_API OH_INSTITUTE_SPEC *OH_InstituteSpec_dup(const OH_INSTITUTE_SPEC *p_struct); +AQOFXCONNECT_API OH_INSTITUTE_SPEC *OH_InstituteSpec_copy(OH_INSTITUTE_SPEC *p_struct, const OH_INSTITUTE_SPEC *p_src); + /** Getter. * Use this function to get the member "id" */ @@ -61,6 +63,7 @@ */ AQOFXCONNECT_API void OH_InstituteSpec_SetName(OH_INSTITUTE_SPEC *p_struct, const char *p_src); +/* list1 functions */ AQOFXCONNECT_API OH_INSTITUTE_SPEC_LIST *OH_InstituteSpec_List_dup(const OH_INSTITUTE_SPEC_LIST *p_src); AQOFXCONNECT_API void OH_InstituteSpec_ReadDb(OH_INSTITUTE_SPEC *p_struct, GWEN_DB_NODE *p_db); diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/plugin/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/plugin/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,9 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends/aqofxconnect/plugin -DIST_COMMON = $(iheader_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/aqofxconnect.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/aqofxconnect.xml.in $(top_srcdir)/depcomp \ + $(iheader_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -108,50 +135,79 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_aqofxconnect_la_OBJECTS = dummy.lo aqofxconnect_la_OBJECTS = $(am_aqofxconnect_la_OBJECTS) -aqofxconnect_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(aqofxconnect_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +aqofxconnect_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(aqofxconnect_la_LDFLAGS) $(LDFLAGS) \ + -o $@ libaqofxconnect_la_DEPENDENCIES = libofxhome/libofxhome.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libaqofxconnect_la_OBJECTS = account.lo provider.lo queues.lo \ user.lo dlg_edituser.lo dlg_newuser.lo dlg_ofx_special.lo libaqofxconnect_la_OBJECTS = $(am_libaqofxconnect_la_OBJECTS) -libaqofxconnect_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libaqofxconnect_la_LDFLAGS) $(LDFLAGS) -o $@ +libaqofxconnect_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libaqofxconnect_la_LDFLAGS) \ + $(LDFLAGS) -o $@ libaqofxconnectplugin_la_DEPENDENCIES = libaqofxconnect.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libaqofxconnectplugin_la_OBJECTS = aqofxconnect-plugin.lo libaqofxconnectplugin_la_OBJECTS = \ $(am_libaqofxconnectplugin_la_OBJECTS) -libaqofxconnectplugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libaqofxconnectplugin_la_LDFLAGS) $(LDFLAGS) -o $@ +libaqofxconnectplugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libaqofxconnectplugin_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(aqofxconnect_la_SOURCES) $(libaqofxconnect_la_SOURCES) \ $(libaqofxconnectplugin_la_SOURCES) DIST_SOURCES = $(aqofxconnect_la_SOURCES) \ $(libaqofxconnect_la_SOURCES) \ $(libaqofxconnectplugin_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -161,9 +217,29 @@ HEADERS = $(iheader_HEADERS) $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -196,6 +272,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -284,6 +361,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -567,6 +645,7 @@ $(am__aclocal_m4_deps): aqofxconnect.xml: $(top_builddir)/config.status $(srcdir)/aqofxconnect.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -593,21 +672,26 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ @@ -634,18 +718,23 @@ clean-pluginLTLIBRARIES: -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(plugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + aqofxconnect.la: $(aqofxconnect_la_OBJECTS) $(aqofxconnect_la_DEPENDENCIES) $(EXTRA_aqofxconnect_la_DEPENDENCIES) - $(aqofxconnect_la_LINK) -rpath $(plugindir) $(aqofxconnect_la_OBJECTS) $(aqofxconnect_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(aqofxconnect_la_LINK) -rpath $(plugindir) $(aqofxconnect_la_OBJECTS) $(aqofxconnect_la_LIBADD) $(LIBS) + libaqofxconnect.la: $(libaqofxconnect_la_OBJECTS) $(libaqofxconnect_la_DEPENDENCIES) $(EXTRA_libaqofxconnect_la_DEPENDENCIES) - $(libaqofxconnect_la_LINK) -rpath $(libdir) $(libaqofxconnect_la_OBJECTS) $(libaqofxconnect_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libaqofxconnect_la_LINK) -rpath $(libdir) $(libaqofxconnect_la_OBJECTS) $(libaqofxconnect_la_LIBADD) $(LIBS) + libaqofxconnectplugin.la: $(libaqofxconnectplugin_la_OBJECTS) $(libaqofxconnectplugin_la_DEPENDENCIES) $(EXTRA_libaqofxconnectplugin_la_DEPENDENCIES) - $(libaqofxconnectplugin_la_LINK) $(libaqofxconnectplugin_la_OBJECTS) $(libaqofxconnectplugin_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libaqofxconnectplugin_la_LINK) $(libaqofxconnectplugin_la_OBJECTS) $(libaqofxconnectplugin_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -664,25 +753,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -754,22 +843,25 @@ dir='$(DESTDIR)$(iheaderdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -784,57 +876,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -850,12 +897,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -867,15 +909,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -884,6 +922,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1055,29 +1108,26 @@ uninstall-libLTLIBRARIES uninstall-pluginDATA \ uninstall-pluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-pluginLTLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dlgdataDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ - install-iheaderHEADERS install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-pluginDATA install-pluginLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES clean-pluginLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dlgdataDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iheaderHEADERS install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-pluginDATA install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-dlgdataDATA uninstall-iheaderHEADERS \ - uninstall-libLTLIBRARIES uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES + tags tags-am uninstall uninstall-am uninstall-dlgdataDATA \ + uninstall-iheaderHEADERS uninstall-libLTLIBRARIES \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/version.h libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/version.h --- libaqbanking-5.4.3beta/src/plugins/backends/aqofxconnect/version.h 2014-04-17 20:57:33.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/version.h 2015-06-01 16:31:39.000000000 +0000 @@ -15,12 +15,12 @@ #define AQOFXCONNECT_VERSION_H #define AQOFXCONNECT_VERSION_MAJOR 5 -#define AQOFXCONNECT_VERSION_MINOR 4 -#define AQOFXCONNECT_VERSION_PATCHLEVEL 3 +#define AQOFXCONNECT_VERSION_MINOR 6 +#define AQOFXCONNECT_VERSION_PATCHLEVEL 1 #define AQOFXCONNECT_VERSION_BUILD 0 #define AQOFXCONNECT_VERSION_TAG "beta" -#define AQOFXCONNECT_VERSION_FULL_STRING "5.4.3.0beta" -#define AQOFXCONNECT_VERSION_STRING "5.4.3" +#define AQOFXCONNECT_VERSION_FULL_STRING "5.6.1.0beta" +#define AQOFXCONNECT_VERSION_STRING "5.6.1" diff -Nru libaqbanking-5.4.3beta/src/plugins/backends/Makefile.in libaqbanking-5.6.1beta/src/plugins/backends/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/backends/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/backends/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/backends -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -71,28 +99,54 @@ libbackends_la_DEPENDENCIES = am_libbackends_la_OBJECTS = dummy.lo libbackends_la_OBJECTS = $(am_libbackends_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libbackends_la_SOURCES) DIST_SOURCES = $(libbackends_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -100,9 +154,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -134,6 +208,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -222,6 +297,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -434,14 +510,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libbackends.la: $(libbackends_la_OBJECTS) $(libbackends_la_DEPENDENCIES) $(EXTRA_libbackends_la_DEPENDENCIES) - $(LINK) $(libbackends_la_OBJECTS) $(libbackends_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libbackends_la_OBJECTS) $(libbackends_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -452,25 +531,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -479,22 +558,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -509,57 +591,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -575,12 +612,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -592,15 +624,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -609,6 +637,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -774,12 +817,11 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -789,8 +831,8 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/bankinfo/at/Makefile.in libaqbanking-5.6.1beta/src/plugins/bankinfo/at/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/bankinfo/at/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/bankinfo/at/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/bankinfo/at -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/at.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/at.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,22 +132,47 @@ ../generic/libbankinfo_generic.la $(am__DEPENDENCIES_1) am_at_la_OBJECTS = at.lo at_la_OBJECTS = $(am_at_la_OBJECTS) -at_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(at_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +at_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(at_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(at_la_SOURCES) DIST_SOURCES = $(at_la_SOURCES) am__can_run_installinfo = \ @@ -130,12 +182,30 @@ esac DATA = $(bankinfoplugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -224,6 +294,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -438,6 +509,7 @@ $(am__aclocal_m4_deps): at.xml: $(top_builddir)/config.status $(srcdir)/at.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-bankinfopluginLTLIBRARIES: $(bankinfoplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(bankinfoplugin_LTLIBRARIES)'; test -n "$(bankinfoplugindir)" || list=; \ @@ -464,14 +536,17 @@ clean-bankinfopluginLTLIBRARIES: -test -z "$(bankinfoplugin_LTLIBRARIES)" || rm -f $(bankinfoplugin_LTLIBRARIES) - @list='$(bankinfoplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(bankinfoplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + at.la: $(at_la_OBJECTS) $(at_la_DEPENDENCIES) $(EXTRA_at_la_DEPENDENCIES) - $(at_la_LINK) -rpath $(bankinfoplugindir) $(at_la_OBJECTS) $(at_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(at_la_LINK) -rpath $(bankinfoplugindir) $(at_la_OBJECTS) $(at_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -482,25 +557,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -529,26 +604,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(bankinfoplugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +624,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,6 +637,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -723,11 +798,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-bankinfopluginLTLIBRARIES clean-generic clean-libtool \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-bankinfopluginDATA install-bankinfopluginLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ @@ -736,7 +811,8 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-bankinfopluginDATA \ + tags tags-am uninstall uninstall-am \ + uninstall-bankinfopluginDATA \ uninstall-bankinfopluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/bankinfo/ca/Makefile.in libaqbanking-5.6.1beta/src/plugins/bankinfo/ca/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/bankinfo/ca/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/bankinfo/ca/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/bankinfo/ca -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/ca.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/ca.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,22 +132,47 @@ ../generic/libbankinfo_generic.la $(am__DEPENDENCIES_1) am_ca_la_OBJECTS = ca.lo ca_la_OBJECTS = $(am_ca_la_OBJECTS) -ca_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ca_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +ca_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(ca_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(ca_la_SOURCES) DIST_SOURCES = $(ca_la_SOURCES) am__can_run_installinfo = \ @@ -130,12 +182,30 @@ esac DATA = $(bankinfoplugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -224,6 +294,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -438,6 +509,7 @@ $(am__aclocal_m4_deps): ca.xml: $(top_builddir)/config.status $(srcdir)/ca.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-bankinfopluginLTLIBRARIES: $(bankinfoplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(bankinfoplugin_LTLIBRARIES)'; test -n "$(bankinfoplugindir)" || list=; \ @@ -464,14 +536,17 @@ clean-bankinfopluginLTLIBRARIES: -test -z "$(bankinfoplugin_LTLIBRARIES)" || rm -f $(bankinfoplugin_LTLIBRARIES) - @list='$(bankinfoplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(bankinfoplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + ca.la: $(ca_la_OBJECTS) $(ca_la_DEPENDENCIES) $(EXTRA_ca_la_DEPENDENCIES) - $(ca_la_LINK) -rpath $(bankinfoplugindir) $(ca_la_OBJECTS) $(ca_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(ca_la_LINK) -rpath $(bankinfoplugindir) $(ca_la_OBJECTS) $(ca_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -482,25 +557,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ca.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -529,26 +604,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(bankinfoplugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +624,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,6 +637,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -723,11 +798,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-bankinfopluginLTLIBRARIES clean-generic clean-libtool \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-bankinfopluginDATA install-bankinfopluginLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ @@ -736,7 +811,8 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-bankinfopluginDATA \ + tags tags-am uninstall uninstall-am \ + uninstall-bankinfopluginDATA \ uninstall-bankinfopluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/bankinfo/ch/Makefile.in libaqbanking-5.6.1beta/src/plugins/bankinfo/ch/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/bankinfo/ch/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/bankinfo/ch/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/bankinfo/ch -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/ch.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/ch.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,22 +132,47 @@ ../generic/libbankinfo_generic.la $(am__DEPENDENCIES_1) am_ch_la_OBJECTS = ch.lo ch_la_OBJECTS = $(am_ch_la_OBJECTS) -ch_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ch_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +ch_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(ch_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(ch_la_SOURCES) DIST_SOURCES = $(ch_la_SOURCES) am__can_run_installinfo = \ @@ -130,12 +182,30 @@ esac DATA = $(bankinfoplugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -224,6 +294,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -438,6 +509,7 @@ $(am__aclocal_m4_deps): ch.xml: $(top_builddir)/config.status $(srcdir)/ch.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-bankinfopluginLTLIBRARIES: $(bankinfoplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(bankinfoplugin_LTLIBRARIES)'; test -n "$(bankinfoplugindir)" || list=; \ @@ -464,14 +536,17 @@ clean-bankinfopluginLTLIBRARIES: -test -z "$(bankinfoplugin_LTLIBRARIES)" || rm -f $(bankinfoplugin_LTLIBRARIES) - @list='$(bankinfoplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(bankinfoplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + ch.la: $(ch_la_OBJECTS) $(ch_la_DEPENDENCIES) $(EXTRA_ch_la_DEPENDENCIES) - $(ch_la_LINK) -rpath $(bankinfoplugindir) $(ch_la_OBJECTS) $(ch_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(ch_la_LINK) -rpath $(bankinfoplugindir) $(ch_la_OBJECTS) $(ch_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -482,25 +557,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ch.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -529,26 +604,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(bankinfoplugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +624,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,6 +637,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -723,11 +798,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-bankinfopluginLTLIBRARIES clean-generic clean-libtool \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-bankinfopluginDATA install-bankinfopluginLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ @@ -736,7 +811,8 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-bankinfopluginDATA \ + tags tags-am uninstall uninstall-am \ + uninstall-bankinfopluginDATA \ uninstall-bankinfopluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/bankinfo/de/Makefile.in libaqbanking-5.6.1beta/src/plugins/bankinfo/de/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/bankinfo/de/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/bankinfo/de/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/bankinfo/de -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/de.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/de.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,22 +132,47 @@ ../generic/libbankinfo_generic.la $(am__DEPENDENCIES_1) am_de_la_OBJECTS = de.lo de_la_OBJECTS = $(am_de_la_OBJECTS) -de_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(de_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +de_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(de_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(de_la_SOURCES) DIST_SOURCES = $(de_la_SOURCES) am__can_run_installinfo = \ @@ -130,12 +182,30 @@ esac DATA = $(bankinfoplugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -224,6 +294,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -438,6 +509,7 @@ $(am__aclocal_m4_deps): de.xml: $(top_builddir)/config.status $(srcdir)/de.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-bankinfopluginLTLIBRARIES: $(bankinfoplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(bankinfoplugin_LTLIBRARIES)'; test -n "$(bankinfoplugindir)" || list=; \ @@ -464,14 +536,17 @@ clean-bankinfopluginLTLIBRARIES: -test -z "$(bankinfoplugin_LTLIBRARIES)" || rm -f $(bankinfoplugin_LTLIBRARIES) - @list='$(bankinfoplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(bankinfoplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + de.la: $(de_la_OBJECTS) $(de_la_DEPENDENCIES) $(EXTRA_de_la_DEPENDENCIES) - $(de_la_LINK) -rpath $(bankinfoplugindir) $(de_la_OBJECTS) $(de_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(de_la_LINK) -rpath $(bankinfoplugindir) $(de_la_OBJECTS) $(de_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -482,25 +557,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/de.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -529,26 +604,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(bankinfoplugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +624,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,6 +637,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -723,11 +798,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-bankinfopluginLTLIBRARIES clean-generic clean-libtool \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-bankinfopluginDATA install-bankinfopluginLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ @@ -736,7 +811,8 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-bankinfopluginDATA \ + tags tags-am uninstall uninstall-am \ + uninstall-bankinfopluginDATA \ uninstall-bankinfopluginLTLIBRARIES Binary files /tmp/vq17HVeqKB/libaqbanking-5.4.3beta/src/plugins/bankinfo/generic/de.tar.bz2 and /tmp/VtxIbp9jgJ/libaqbanking-5.6.1beta/src/plugins/bankinfo/generic/de.tar.bz2 differ diff -Nru libaqbanking-5.4.3beta/src/plugins/bankinfo/generic/Makefile.in libaqbanking-5.6.1beta/src/plugins/bankinfo/generic/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/bankinfo/generic/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/bankinfo/generic/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -19,23 +18,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,8 +83,8 @@ host_triplet = @host@ @IS_WINDOWS_FALSE@noinst_PROGRAMS = mkdeinfo$(EXEEXT) subdir = src/plugins/bankinfo/generic -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -78,28 +105,54 @@ $(am__DEPENDENCIES_1) am_libbankinfo_generic_la_OBJECTS = generic.lo libbankinfo_generic_la_OBJECTS = $(am_libbankinfo_generic_la_OBJECTS) -libbankinfo_generic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libbankinfo_generic_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libbankinfo_generic_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libbankinfo_generic_la_LDFLAGS) \ + $(LDFLAGS) -o $@ PROGRAMS = $(noinst_PROGRAMS) am__mkdeinfo_SOURCES_DIST = mkdeinfo.c @IS_WINDOWS_FALSE@am_mkdeinfo_OBJECTS = mkdeinfo.$(OBJEXT) mkdeinfo_OBJECTS = $(am_mkdeinfo_OBJECTS) @IS_WINDOWS_FALSE@mkdeinfo_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @IS_WINDOWS_FALSE@ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libbankinfo_generic_la_SOURCES) $(mkdeinfo_SOURCES) DIST_SOURCES = $(libbankinfo_generic_la_SOURCES) \ $(am__mkdeinfo_SOURCES_DIST) @@ -141,12 +194,30 @@ DATA = $(atbankdata_DATA) $(cabankdata_DATA) $(chbankdata_DATA) \ $(debankdata_DATA) $(usbankdata_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -235,6 +306,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -479,14 +551,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libbankinfo_generic.la: $(libbankinfo_generic_la_OBJECTS) $(libbankinfo_generic_la_DEPENDENCIES) $(EXTRA_libbankinfo_generic_la_DEPENDENCIES) - $(libbankinfo_generic_la_LINK) $(libbankinfo_generic_la_OBJECTS) $(libbankinfo_generic_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libbankinfo_generic_la_LINK) $(libbankinfo_generic_la_OBJECTS) $(libbankinfo_generic_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -496,9 +571,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + mkdeinfo$(EXEEXT): $(mkdeinfo_OBJECTS) $(mkdeinfo_DEPENDENCIES) $(EXTRA_mkdeinfo_DEPENDENCIES) @rm -f mkdeinfo$(EXEEXT) - $(LINK) $(mkdeinfo_OBJECTS) $(mkdeinfo_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(mkdeinfo_OBJECTS) $(mkdeinfo_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -510,25 +586,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdeinfo.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -641,26 +717,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(usbankdatadir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -672,15 +737,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -689,6 +750,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -839,21 +915,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-atbankdataDATA install-cabankdataDATA \ - install-chbankdataDATA install-data install-data-am \ - install-debankdataDATA 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 install-usbankdataDATA \ - installcheck installcheck-am installdirs maintainer-clean \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-atbankdataDATA \ + install-cabankdataDATA install-chbankdataDATA install-data \ + install-data-am install-debankdataDATA 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 install-usbankdataDATA installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-atbankdataDATA \ + tags tags-am uninstall uninstall-am uninstall-atbankdataDATA \ uninstall-cabankdataDATA uninstall-chbankdataDATA \ uninstall-debankdataDATA uninstall-usbankdataDATA diff -Nru libaqbanking-5.4.3beta/src/plugins/bankinfo/Makefile.in libaqbanking-5.6.1beta/src/plugins/bankinfo/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/bankinfo/Makefile.in 2014-04-17 20:57:24.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/bankinfo/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/bankinfo -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -116,6 +176,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -204,6 +265,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/bankinfo/us/Makefile.in libaqbanking-5.6.1beta/src/plugins/bankinfo/us/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/bankinfo/us/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/bankinfo/us/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/bankinfo/us -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/us.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/us.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,22 +132,47 @@ ../generic/libbankinfo_generic.la $(am__DEPENDENCIES_1) am_us_la_OBJECTS = us.lo us_la_OBJECTS = $(am_us_la_OBJECTS) -us_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(us_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +us_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(us_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(us_la_SOURCES) DIST_SOURCES = $(us_la_SOURCES) am__can_run_installinfo = \ @@ -130,12 +182,30 @@ esac DATA = $(bankinfoplugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -224,6 +294,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -438,6 +509,7 @@ $(am__aclocal_m4_deps): us.xml: $(top_builddir)/config.status $(srcdir)/us.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-bankinfopluginLTLIBRARIES: $(bankinfoplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(bankinfoplugin_LTLIBRARIES)'; test -n "$(bankinfoplugindir)" || list=; \ @@ -464,14 +536,17 @@ clean-bankinfopluginLTLIBRARIES: -test -z "$(bankinfoplugin_LTLIBRARIES)" || rm -f $(bankinfoplugin_LTLIBRARIES) - @list='$(bankinfoplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(bankinfoplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + us.la: $(us_la_OBJECTS) $(us_la_DEPENDENCIES) $(EXTRA_us_la_DEPENDENCIES) - $(us_la_LINK) -rpath $(bankinfoplugindir) $(us_la_OBJECTS) $(us_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(us_la_LINK) -rpath $(bankinfoplugindir) $(us_la_OBJECTS) $(us_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -482,25 +557,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/us.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -529,26 +604,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(bankinfoplugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +624,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,6 +637,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -723,11 +798,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-bankinfopluginLTLIBRARIES clean-generic clean-libtool \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ install-bankinfopluginDATA install-bankinfopluginLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ @@ -736,7 +811,8 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-bankinfopluginDATA \ + tags tags-am uninstall uninstall-am \ + uninstall-bankinfopluginDATA \ uninstall-bankinfopluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/csv/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/csv/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/csv/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/csv/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/csv -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/csv.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/csv.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,31 +133,57 @@ csv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_csv_la_OBJECTS = csv.lo csv_editprofile.lo csv_la_OBJECTS = $(am_csv_la_OBJECTS) -csv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(csv_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +csv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(csv_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(csv_la_SOURCES) DIST_SOURCES = $(csv_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -139,9 +193,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -174,6 +248,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -262,6 +337,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -486,6 +562,7 @@ $(am__aclocal_m4_deps): csv.xml: $(top_builddir)/config.status $(srcdir)/csv.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -512,14 +589,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + csv.la: $(csv_la_OBJECTS) $(csv_la_DEPENDENCIES) $(EXTRA_csv_la_DEPENDENCIES) - $(csv_la_LINK) -rpath $(imexporterplugindir) $(csv_la_OBJECTS) $(csv_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(csv_la_LINK) -rpath $(imexporterplugindir) $(csv_la_OBJECTS) $(csv_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -531,25 +611,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csv_editprofile.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -600,22 +680,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -630,57 +713,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -696,12 +734,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -713,15 +746,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -730,6 +759,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -900,26 +944,25 @@ uninstall-am: uninstall-dialogdataDATA uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dialogdataDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dialogdataDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am \ + install-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-dialogdataDATA uninstall-imexporterpluginDATA \ + tags tags-am uninstall uninstall-am uninstall-dialogdataDATA \ + uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/csv/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/csv/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/csv/profiles/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/csv/profiles/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,21 +79,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/csv/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/amex.conf.in $(srcdir)/aqmoney1.conf.in \ - $(srcdir)/aqmoney2.conf.in $(srcdir)/bankaustria.conf.in \ - $(srcdir)/cli-transfers.conf.in $(srcdir)/comdirect.conf.in \ - $(srcdir)/consors-tagesgeld.conf.in $(srcdir)/default.conf.in \ - $(srcdir)/diba.conf.in $(srcdir)/dkb-cash.conf.in \ - $(srcdir)/dkb.conf.in $(srcdir)/full.conf.in \ - $(srcdir)/hypovereinsbank.conf.in $(srcdir)/lbbberlin.conf.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/default.conf.in $(srcdir)/amex.conf.in \ + $(srcdir)/aqmoney1.conf.in $(srcdir)/aqmoney2.conf.in \ + $(srcdir)/comdirect.conf.in \ + $(srcdir)/consors-tagesgeld.conf.in \ $(srcdir)/mijnpostbank.conf.in $(srcdir)/oko.conf.in \ - $(srcdir)/postbankffm.conf.in $(srcdir)/psk.conf.in \ - $(srcdir)/sepadebitnotes.conf.in $(srcdir)/sns.conf.in \ - $(srcdir)/sparda.conf.in $(srcdir)/spk-aachen.conf.in \ - $(srcdir)/spk-steiermark.conf.in $(srcdir)/test.conf.in \ - $(srcdir)/tonline-banking.conf.in $(srcdir)/transfers.conf.in \ - $(srcdir)/vrnetworld.conf.in + $(srcdir)/spk-aachen.conf.in $(srcdir)/spk-steiermark.conf.in \ + $(srcdir)/tonline-banking.conf.in $(srcdir)/test.conf.in \ + $(srcdir)/vrnetworld.conf.in $(srcdir)/lbbberlin.conf.in \ + $(srcdir)/bankaustria.conf.in $(srcdir)/psk.conf.in \ + $(srcdir)/diba.conf.in $(srcdir)/dkb.conf.in \ + $(srcdir)/dkb-cash.conf.in $(srcdir)/sparda.conf.in \ + $(srcdir)/full.conf.in $(srcdir)/hypovereinsbank.conf.in \ + $(srcdir)/postbankffm.conf.in $(srcdir)/cli-transfers.conf.in \ + $(srcdir)/sns.conf.in $(srcdir)/transfers.conf.in \ + $(srcdir)/sepadebitnotes.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -87,6 +115,18 @@ sparda.conf full.conf hypovereinsbank.conf postbankffm.conf \ cli-transfers.conf sns.conf transfers.conf sepadebitnotes.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -123,10 +163,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -215,6 +257,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -519,11 +562,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -662,16 +705,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in 2014-03-29 18:55:46.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/csv/profiles/sepadebitnotes.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -41,7 +41,7 @@ 7="value/currency" 8="localName" 9="remoteName" - 19="creditorSchemeId" # SEPA debit notes + 10="creditorSchemeId" # SEPA debit notes 11="mandateId" 12="mandateDate/dateString" 13="mandateDebitorName" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/ctxfile/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/ctxfile/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/ctxfile/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/ctxfile/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/ctxfile -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/ctxfile.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/ctxfile.xml.in $(top_srcdir)/depcomp \ + $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,31 +132,57 @@ ctxfile_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_ctxfile_la_OBJECTS = ctxfile.lo ctxfile_la_OBJECTS = $(am_ctxfile_la_OBJECTS) -ctxfile_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +ctxfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(ctxfile_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(ctxfile_la_SOURCES) DIST_SOURCES = $(ctxfile_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +192,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -173,6 +247,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -261,6 +336,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -477,6 +553,7 @@ $(am__aclocal_m4_deps): ctxfile.xml: $(top_builddir)/config.status $(srcdir)/ctxfile.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -503,14 +580,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + ctxfile.la: $(ctxfile_la_OBJECTS) $(ctxfile_la_DEPENDENCIES) $(EXTRA_ctxfile_la_DEPENDENCIES) - $(ctxfile_la_LINK) -rpath $(imexporterplugindir) $(ctxfile_la_OBJECTS) $(ctxfile_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(ctxfile_la_LINK) -rpath $(imexporterplugindir) $(ctxfile_la_OBJECTS) $(ctxfile_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -521,25 +601,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxfile.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -569,22 +649,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -599,57 +682,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -665,12 +703,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -682,15 +715,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -699,6 +728,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -869,25 +913,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/ctxfile/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/ctxfile/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/ctxfile/profiles/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/ctxfile/profiles/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/ctxfile/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -431,11 +473,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -574,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/dtaus/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/dtaus/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/dtaus/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/dtaus/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/dtaus -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/dtaus.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/dtaus.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,31 +132,57 @@ dtaus_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_dtaus_la_OBJECTS = dtaus.lo dtaus_la_OBJECTS = $(am_dtaus_la_OBJECTS) -dtaus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dtaus_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +dtaus_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(dtaus_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(dtaus_la_SOURCES) DIST_SOURCES = $(dtaus_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +192,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -173,6 +247,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -261,6 +336,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -477,6 +553,7 @@ $(am__aclocal_m4_deps): dtaus.xml: $(top_builddir)/config.status $(srcdir)/dtaus.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -503,14 +580,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + dtaus.la: $(dtaus_la_OBJECTS) $(dtaus_la_DEPENDENCIES) $(EXTRA_dtaus_la_DEPENDENCIES) - $(dtaus_la_LINK) -rpath $(imexporterplugindir) $(dtaus_la_OBJECTS) $(dtaus_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(dtaus_la_LINK) -rpath $(imexporterplugindir) $(dtaus_la_OBJECTS) $(dtaus_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -521,25 +601,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtaus.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -569,22 +649,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -599,57 +682,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -665,12 +703,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -682,15 +715,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -699,6 +728,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -869,25 +913,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/dtaus/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/dtaus/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/dtaus/profiles/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/dtaus/profiles/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/dtaus/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/debitnote.conf.in $(srcdir)/default.conf.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/default.conf.in $(srcdir)/debitnote.conf.in \ $(srcdir)/transfer.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -69,6 +96,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf debitnote.conf transfer.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -105,10 +144,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -197,6 +238,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -436,11 +478,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -579,16 +621,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/eri2/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/eri2/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/eri2/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/eri2/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,9 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/eri2 -DIST_COMMON = $(dist_imexporterdata_DATA) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/eri2.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/eri2.xml.in $(top_srcdir)/depcomp \ + $(dist_imexporterdata_DATA) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -106,31 +133,57 @@ eri2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_eri2_la_OBJECTS = eri2.lo eri2_la_OBJECTS = $(am_eri2_la_OBJECTS) -eri2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(eri2_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +eri2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(eri2_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(eri2_la_SOURCES) DIST_SOURCES = $(eri2_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -140,9 +193,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -175,6 +248,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -263,6 +337,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -481,6 +556,7 @@ $(am__aclocal_m4_deps): eri2.xml: $(top_builddir)/config.status $(srcdir)/eri2.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -507,14 +583,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + eri2.la: $(eri2_la_OBJECTS) $(eri2_la_DEPENDENCIES) $(EXTRA_eri2_la_DEPENDENCIES) - $(eri2_la_LINK) -rpath $(imexporterplugindir) $(eri2_la_OBJECTS) $(eri2_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(eri2_la_LINK) -rpath $(imexporterplugindir) $(eri2_la_OBJECTS) $(eri2_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -525,25 +604,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eri2.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -594,22 +673,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -624,57 +706,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -690,12 +727,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -707,15 +739,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -724,6 +752,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -896,25 +939,24 @@ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dist_imexporterdataDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_imexporterdataDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-dist_imexporterdataDATA \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/eri2/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/eri2/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/eri2/profiles/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/eri2/profiles/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/eri2/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -431,11 +473,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -574,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -116,6 +176,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -204,6 +265,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/ofx/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/ofx/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/ofx/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/ofx/Makefile.in 2015-06-01 16:31:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/ofx -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/ofx.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/ofx.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,31 +132,57 @@ $(am__DEPENDENCIES_1) am_ofx_la_OBJECTS = ofx.lo ofx_la_OBJECTS = $(am_ofx_la_OBJECTS) -ofx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ofx_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +ofx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(ofx_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(ofx_la_SOURCES) DIST_SOURCES = $(ofx_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -139,9 +192,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -174,6 +247,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -262,6 +336,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -486,6 +561,7 @@ $(am__aclocal_m4_deps): ofx.xml: $(top_builddir)/config.status $(srcdir)/ofx.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -512,14 +588,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + ofx.la: $(ofx_la_OBJECTS) $(ofx_la_DEPENDENCIES) $(EXTRA_ofx_la_DEPENDENCIES) - $(ofx_la_LINK) -rpath $(imexporterplugindir) $(ofx_la_OBJECTS) $(ofx_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(ofx_la_LINK) -rpath $(imexporterplugindir) $(ofx_la_OBJECTS) $(ofx_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -530,25 +609,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ofx.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -578,22 +657,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -608,57 +690,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -674,12 +711,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -691,15 +723,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -708,6 +736,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -878,25 +921,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/ofx/parser/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/ofx/parser/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/ofx/parser/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/ofx/parser/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/ofx/parser -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -83,19 +110,44 @@ g_signonmsgsrsv1.lo g_signupmsgsrsv1.lo g_sonrs.lo g_status.lo \ g_stmtrn.lo g_stmtrs.lo g_stmttrnrs.lo g_stockinfo.lo libofxparser_la_OBJECTS = $(am_libofxparser_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libofxparser_la_SOURCES) DIST_SOURCES = $(libofxparser_la_SOURCES) am__can_run_installinfo = \ @@ -104,12 +156,30 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -198,6 +268,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -497,14 +568,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libofxparser.la: $(libofxparser_la_OBJECTS) $(libofxparser_la_DEPENDENCIES) $(EXTRA_libofxparser_la_DEPENDENCIES) - $(LINK) $(libofxparser_la_OBJECTS) $(libofxparser_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libofxparser_la_OBJECTS) $(libofxparser_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -557,25 +631,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ofxxmlctx.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -583,26 +657,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -614,15 +677,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -631,6 +690,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -772,18 +846,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/ofx/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/ofx/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/ofx/profiles/Makefile.in 2014-04-17 20:57:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/ofx/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/ofx/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in $(srcdir)/iso8859.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf iso8859.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -433,11 +475,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -576,16 +618,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/openhbci1/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/openhbci1/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/openhbci1/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/openhbci1/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/openhbci1 -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/openhbci1.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/openhbci1.xml.in $(top_srcdir)/depcomp \ + $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,31 +133,57 @@ $(am__DEPENDENCIES_1) am_openhbci1_la_OBJECTS = openhbci1.lo openhbci1_la_OBJECTS = $(am_openhbci1_la_OBJECTS) -openhbci1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +openhbci1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(openhbci1_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(openhbci1_la_SOURCES) DIST_SOURCES = $(openhbci1_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -139,9 +193,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -174,6 +248,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -262,6 +337,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -478,6 +554,7 @@ $(am__aclocal_m4_deps): openhbci1.xml: $(top_builddir)/config.status $(srcdir)/openhbci1.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -504,14 +581,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + openhbci1.la: $(openhbci1_la_OBJECTS) $(openhbci1_la_DEPENDENCIES) $(EXTRA_openhbci1_la_DEPENDENCIES) - $(openhbci1_la_LINK) -rpath $(imexporterplugindir) $(openhbci1_la_OBJECTS) $(openhbci1_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(openhbci1_la_LINK) -rpath $(imexporterplugindir) $(openhbci1_la_OBJECTS) $(openhbci1_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -522,25 +602,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openhbci1.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -570,22 +650,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -600,57 +683,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -666,12 +704,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -683,15 +716,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -700,6 +729,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -870,25 +914,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/openhbci1/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/openhbci1/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/openhbci1/profiles/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/openhbci1/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/openhbci1/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -431,11 +473,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -574,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/q43/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/q43/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/q43/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/q43/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/q43 -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/q43.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/q43.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,31 +131,57 @@ q43_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_q43_la_OBJECTS = q43.lo q43_la_OBJECTS = $(am_q43_la_OBJECTS) -q43_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(q43_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +q43_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(q43_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(q43_la_SOURCES) DIST_SOURCES = $(q43_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +191,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -173,6 +246,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -261,6 +335,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -477,6 +552,7 @@ $(am__aclocal_m4_deps): q43.xml: $(top_builddir)/config.status $(srcdir)/q43.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -503,14 +579,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + q43.la: $(q43_la_OBJECTS) $(q43_la_DEPENDENCIES) $(EXTRA_q43_la_DEPENDENCIES) - $(q43_la_LINK) -rpath $(imexporterplugindir) $(q43_la_OBJECTS) $(q43_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(q43_la_LINK) -rpath $(imexporterplugindir) $(q43_la_OBJECTS) $(q43_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -521,25 +600,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q43.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -569,22 +648,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -599,57 +681,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -665,12 +702,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -682,15 +714,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -699,6 +727,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -869,25 +912,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/q43/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/q43/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/q43/profiles/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/q43/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/q43/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -431,11 +473,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -574,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/qif/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/qif/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/qif/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/qif/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/qif -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/qif.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/qif.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,31 +131,57 @@ qif_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_qif_la_OBJECTS = qif.lo qif_la_OBJECTS = $(am_qif_la_OBJECTS) -qif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qif_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +qif_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(qif_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(qif_la_SOURCES) DIST_SOURCES = $(qif_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +191,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -173,6 +246,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -261,6 +335,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -481,6 +556,7 @@ $(am__aclocal_m4_deps): qif.xml: $(top_builddir)/config.status $(srcdir)/qif.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -507,14 +583,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + qif.la: $(qif_la_OBJECTS) $(qif_la_DEPENDENCIES) $(EXTRA_qif_la_DEPENDENCIES) - $(qif_la_LINK) -rpath $(imexporterplugindir) $(qif_la_OBJECTS) $(qif_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(qif_la_LINK) -rpath $(imexporterplugindir) $(qif_la_OBJECTS) $(qif_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -525,25 +604,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qif.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -573,22 +652,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -603,57 +685,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -669,12 +706,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -686,15 +718,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -703,6 +731,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -873,25 +916,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/qif/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/qif/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/qif/profiles/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/qif/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/qif/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -431,11 +473,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -574,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/Makefile.am libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/Makefile.am 2013-10-19 13:10:40.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/Makefile.am 2014-07-23 20:29:51.000000000 +0000 @@ -3,11 +3,8 @@ INCLUDES = -I$(top_srcdir)/src/libs/aqbanking -I$(aqbanking_symlinkdir) $(all_includes) extra_sources=\ - sepa_exp_ccm.c \ - sepa_exp_123.c \ - sepa_exp_008_001_01.c \ - sepa_exp_008_002_02.c \ - sepa_exp_008_003_02.c + sepa_pain_001.c \ + sepa_pain_008.c EXTRA_DIST=README $(extra_sources) diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/sepa -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/sepa.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/sepa.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,31 +132,57 @@ sepa_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_sepa_la_OBJECTS = sepa.lo sepa_la_OBJECTS = $(am_sepa_la_OBJECTS) -sepa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sepa_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +sepa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(sepa_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(sepa_la_SOURCES) DIST_SOURCES = $(sepa_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +192,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -173,6 +247,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -261,6 +336,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -434,11 +510,8 @@ SUBDIRS = profiles INCLUDES = -I$(top_srcdir)/src/libs/aqbanking -I$(aqbanking_symlinkdir) $(all_includes) extra_sources = \ - sepa_exp_ccm.c \ - sepa_exp_123.c \ - sepa_exp_008_001_01.c \ - sepa_exp_008_002_02.c \ - sepa_exp_008_003_02.c + sepa_pain_001.c \ + sepa_pain_008.c EXTRA_DIST = README $(extra_sources) noinst_HEADERS = sepa_p.h @@ -484,6 +557,7 @@ $(am__aclocal_m4_deps): sepa.xml: $(top_builddir)/config.status $(srcdir)/sepa.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -510,14 +584,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + sepa.la: $(sepa_la_OBJECTS) $(sepa_la_DEPENDENCIES) $(EXTRA_sepa_la_DEPENDENCIES) - $(sepa_la_LINK) -rpath $(imexporterplugindir) $(sepa_la_OBJECTS) $(sepa_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(sepa_la_LINK) -rpath $(imexporterplugindir) $(sepa_la_OBJECTS) $(sepa_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -528,25 +605,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sepa.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -576,22 +653,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -606,57 +686,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -672,12 +707,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -689,15 +719,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -706,6 +732,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -876,25 +917,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/001_001_02.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/001_001_02.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/001_001_02.conf.in 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/001_001_02.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -0,0 +1,12 @@ + +char name="001_001_02" +char shortDescr="pain.001.001.02 (sepade)" +char version="@AQBANKING_VERSION_STRING@" +char longDescr="Profile for pain.001.001.02 (sepade rather than ISO version)" +int import="0" +int export="1" + +char type="001.001.02" + +# XML namespace of the pain messages handled by this profile +char xmlns="urn:sepade:xsd:pain.001.001.02" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/001_002_03.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/001_002_03.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/001_002_03.conf.in 2013-02-14 22:04:49.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/001_002_03.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -1,11 +1,16 @@ char name="001_002_03" -char shortDescr="default profile" +char shortDescr="pain.001.002.03" char version="@AQBANKING_VERSION_STRING@" -char longDescr="pain.001.002.03" +char longDescr="Profile for pain.001.002.03" int import="0" int export="1" -char type="001_002_03" +char type="001.002.03" +# XML namespace of the pain messages handled by this profile +char xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.002.03" +# Disable this option if transactions initiated in a batch job should +# not be listed seperately in your account statements. +int singleBookingWanted="1" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/001_003_03.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/001_003_03.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/001_003_03.conf.in 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/001_003_03.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -0,0 +1,16 @@ + +char name="001_003_03" +char shortDescr="pain.001.003.03" +char version="@AQBANKING_VERSION_STRING@" +char longDescr="Profile for pain.001.003.03" +int import="0" +int export="1" + +char type="001.003.03" + +# XML namespace of the pain messages handled by this profile +char xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03" + +# Disable this option if transactions initiated in a batch job should +# not be listed seperately in your account statements. +int singleBookingWanted="1" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_001_01.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_001_01.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_001_01.conf.in 2013-08-30 20:23:33.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_001_01.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -6,6 +6,7 @@ int import="0" int export="1" -char type="008_001_01" - +char type="008.001.01" +# XML namespace of the pain messages handled by this profile +char xmlns="urn:sepade:xsd:pain.008.001.01" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in 2014-03-24 21:15:20.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_001_01_cor1.conf.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ - -char name="008_001_01_cor1" -char shortDescr="pain.008.001.01_cor1" -char version="@AQBANKING_VERSION_STRING@" -char longDescr="COR1 profile for pain.008.001.01" -int import="0" -int export="1" - -char type="008_001_01_cor1" - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_002_02.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_002_02.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_002_02.conf.in 2014-03-24 21:18:58.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_002_02.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -6,6 +6,11 @@ int import="0" int export="1" -char type="008_002_02" +char type="008.002.02" +# XML namespace of the pain messages handled by this profile +char xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.002.02" +# Disable this option if transactions initiated in a batch job should +# not be listed seperately in your account statements. +int singleBookingWanted="1" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in 2014-03-24 21:18:40.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_002_02_cor1.conf.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ - -char name="008_002_02_cor1" -char shortDescr="pain.008.002.02_cor1" -char version="@AQBANKING_VERSION_STRING@" -char longDescr="COR1 profile for pain.008.002.02_cor1" -int import="0" -int export="1" - -char type="008_002_02_cor1" - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_003_02.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_003_02.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_003_02.conf.in 2013-08-30 20:23:33.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_003_02.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -6,6 +6,15 @@ int import="0" int export="1" -char type="008_003_02" +char type="008.003.02" +# XML namespace of the pain messages handled by this profile +char xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.003.02" +# Determine the type of direct debit transactions. +# Options: CORE (default), COR1, B2B. +#char LocalInstrumentSEPACode="CORE" + +# Disable this option if transactions initiated in a batch job should +# not be listed seperately in your account statements. +int singleBookingWanted="1" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in 2014-03-24 21:16:04.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/008_003_02_cor1.conf.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ - -char name="008_003_02_cor1" -char shortDescr="pain.008.003.02_cor1" -char version="@AQBANKING_VERSION_STRING@" -char longDescr="COR1 profile for pain.008.003.02_cor1" -int import="0" -int export="1" - -char type="008_003_02_cor1" - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/ccm.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/ccm.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/ccm.conf.in 2008-10-03 16:41:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/ccm.conf.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ - -char name="ccm" -char shortDescr="default profile" -char version="@AQBANKING_VERSION_STRING@" -char longDescr="This profile supports transfers" -int import="0" -int export="1" - -char type="ccm" - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/default.conf.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/default.conf.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/default.conf.in 2008-10-03 16:41:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/default.conf.in 2014-07-23 20:29:51.000000000 +0000 @@ -6,5 +6,7 @@ int import="0" int export="1" -char type="ccm" +char type="001.001.02" +# XML namespace of the pain messages handled by this profile +char xmlns="urn:sepade:xsd:pain.001.001.02" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/Makefile.am libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/Makefile.am --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/Makefile.am 2014-03-24 21:16:59.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/Makefile.am 2014-07-23 20:29:51.000000000 +0000 @@ -1,15 +1,13 @@ EXTRA_DIST=\ default.conf.in \ - ccm.conf.in \ + 001_001_02.conf.in \ 001_002_03.conf.in \ + 001_003_03.conf.in \ 008_001_01.conf.in \ - 008_001_01_cor1.conf.in \ 008_002_02.conf.in \ - 008_002_02_cor1.conf.in \ - 008_003_02.conf.in \ - 008_003_02_cor1.conf.in + 008_003_02.conf.in profilesdir = $(aqbanking_pkgdatadir)/imexporters/sepa/profiles -profiles_DATA=default.conf ccm.conf 001_002_03.conf 008_001_01.conf 008_002_02.conf 008_003_02.conf +profiles_DATA=default.conf 001_001_02.conf 001_002_03.conf 001_003_03.conf 008_001_01.conf 008_002_02.conf 008_003_02.conf diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/profiles/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,12 +79,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/sepa/profiles -DIST_COMMON = $(srcdir)/001_002_03.conf.in \ - $(srcdir)/008_001_01.conf.in $(srcdir)/008_001_01_cor1.conf.in \ - $(srcdir)/008_002_02.conf.in $(srcdir)/008_002_02_cor1.conf.in \ - $(srcdir)/008_003_02.conf.in $(srcdir)/008_003_02_cor1.conf.in \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/ccm.conf.in $(srcdir)/default.conf.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/default.conf.in $(srcdir)/001_001_02.conf.in \ + $(srcdir)/001_002_03.conf.in $(srcdir)/001_003_03.conf.in \ + $(srcdir)/008_001_01.conf.in $(srcdir)/008_002_02.conf.in \ + $(srcdir)/008_003_02.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -70,10 +96,22 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = default.conf ccm.conf 001_002_03.conf \ - 008_001_01.conf 008_001_01_cor1.conf 008_002_02.conf \ - 008_002_02_cor1.conf 008_003_02.conf 008_003_02_cor1.conf +CONFIG_CLEAN_FILES = default.conf 001_001_02.conf 001_002_03.conf \ + 001_003_03.conf 008_001_01.conf 008_002_02.conf \ + 008_003_02.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -110,10 +148,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -202,6 +242,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -374,17 +415,15 @@ with_aqhbci = @with_aqhbci@ EXTRA_DIST = \ default.conf.in \ - ccm.conf.in \ + 001_001_02.conf.in \ 001_002_03.conf.in \ + 001_003_03.conf.in \ 008_001_01.conf.in \ - 008_001_01_cor1.conf.in \ 008_002_02.conf.in \ - 008_002_02_cor1.conf.in \ - 008_003_02.conf.in \ - 008_003_02_cor1.conf.in + 008_003_02.conf.in profilesdir = $(aqbanking_pkgdatadir)/imexporters/sepa/profiles -profiles_DATA = default.conf ccm.conf 001_002_03.conf 008_001_01.conf 008_002_02.conf 008_003_02.conf +profiles_DATA = default.conf 001_001_02.conf 001_002_03.conf 001_003_03.conf 008_001_01.conf 008_002_02.conf 008_003_02.conf all: all-am .SUFFIXES: @@ -420,22 +459,18 @@ $(am__aclocal_m4_deps): default.conf: $(top_builddir)/config.status $(srcdir)/default.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -ccm.conf: $(top_builddir)/config.status $(srcdir)/ccm.conf.in +001_001_02.conf: $(top_builddir)/config.status $(srcdir)/001_001_02.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 001_002_03.conf: $(top_builddir)/config.status $(srcdir)/001_002_03.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -008_001_01.conf: $(top_builddir)/config.status $(srcdir)/008_001_01.conf.in +001_003_03.conf: $(top_builddir)/config.status $(srcdir)/001_003_03.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -008_001_01_cor1.conf: $(top_builddir)/config.status $(srcdir)/008_001_01_cor1.conf.in +008_001_01.conf: $(top_builddir)/config.status $(srcdir)/008_001_01.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 008_002_02.conf: $(top_builddir)/config.status $(srcdir)/008_002_02.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -008_002_02_cor1.conf: $(top_builddir)/config.status $(srcdir)/008_002_02_cor1.conf.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 008_003_02.conf: $(top_builddir)/config.status $(srcdir)/008_003_02.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -008_003_02_cor1.conf: $(top_builddir)/config.status $(srcdir)/008_003_02_cor1.conf.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -463,11 +498,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -606,16 +641,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa.c 2014-03-24 20:42:11.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa.c 2014-07-23 20:29:51.000000000 +0000 @@ -15,6 +15,7 @@ #include "i18n_l.h" #include +#include #include #include @@ -22,12 +23,42 @@ #include #include +#include +#include + +GWEN_LIST_FUNCTIONS(AH_IMEXPORTER_SEPA_PMTINF, AH_ImExporter_Sepa_PmtInf) GWEN_INHERIT(AB_IMEXPORTER, AH_IMEXPORTER_SEPA); +static AH_IMEXPORTER_SEPA_PMTINF* +AH_ImExporter_Sepa_PmtInf_new() { + AH_IMEXPORTER_SEPA_PMTINF *pmtinf; + + GWEN_NEW_OBJECT(AH_IMEXPORTER_SEPA_PMTINF, pmtinf) + GWEN_LIST_INIT(AH_IMEXPORTER_SEPA_PMTINF, pmtinf) + pmtinf->value=AB_Value_new(); + pmtinf->transactions=AB_Transaction_List2_new(); + + return pmtinf; +} + + + +static void AH_ImExporter_Sepa_PmtInf_free(AH_IMEXPORTER_SEPA_PMTINF *pmtinf) { + if (pmtinf) { + free(pmtinf->ctrlsum); + AB_Value_free(pmtinf->value); + AB_Transaction_List2_free(pmtinf->transactions); + GWEN_LIST_FINI(AH_IMEXPORTER_SEPA_PMTINF, pmtinf) + GWEN_FREE_OBJECT(pmtinf) + } +} + + + GWEN_PLUGIN *imexporter_sepa_factory(GWEN_PLUGIN_MANAGER *pm, const char *name, const char *fileName) { @@ -85,49 +116,334 @@ +static int +AH_ImExporterSEPA_Export_Pain_Setup(AB_IMEXPORTER *ie, + AB_IMEXPORTER_CONTEXT *ctx, + GWEN_XMLNODE *painNode, + uint32_t doctype[], + AH_IMEXPORTER_SEPA_PMTINF_LIST **pList) { + GWEN_XMLNODE *n; + AB_IMEXPORTER_ACCOUNTINFO *ai; + AB_TRANSACTION *t; + AH_IMEXPORTER_SEPA_PMTINF_LIST *pl; + AH_IMEXPORTER_SEPA_PMTINF *pmtinf; + int tcount=0; + AB_VALUE *v; + GWEN_BUFFER *tbuf; + char *ctrlsum; + + ai=AB_ImExporterContext_GetFirstAccountInfo(ctx); + if (ai==0) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No account info"); + return GWEN_ERROR_NO_DATA; + } + else if (AB_ImExporterContext_GetNextAccountInfo(ctx)) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Account info for more than one local account"); + return GWEN_ERROR_NOT_SUPPORTED; + } + + t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); + if (!t) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No transactions in ImExporter context"); + return GWEN_ERROR_NO_DATA; + } + + /* collect matching transactions for storage in a shared PmtInf block */ + pl=AH_ImExporter_Sepa_PmtInf_List_new(); + pmtinf=AH_ImExporter_Sepa_PmtInf_new(); + AH_ImExporter_Sepa_PmtInf_List_Add(pmtinf, pl); + while(t) { + const GWEN_TIME *ti; + int day, month, year; + uint32_t transDate; + const char *name=NULL, *iban=NULL, *bic=NULL, *cdtrSchmeId=NULL; + AB_TRANSACTION_SEQUENCETYPE sequenceType=AB_Transaction_SequenceTypeUnknown; + const char *s; + const AB_VALUE *tv; + + tcount++; + ti=AB_Transaction_GetDate(t); + if (ti) { + GWEN_Time_GetBrokenDownDate(ti, &day, &month, &year); + transDate=(year<<16)+(month<<8)+(day); + } + else + transDate=0; + s=AB_ImExporterAccountInfo_GetOwner(ai); + if (!s || !*s) { + name=AB_Transaction_GetLocalName(t); + if (!name || !*name) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Missing local name in transaction %d", tcount); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + } + s=AB_ImExporterAccountInfo_GetIban(ai); + if (!s || !*s) { + iban=AB_Transaction_GetLocalIban(t); + if (!iban || !*iban) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Missing local IBAN in transaction %d", tcount); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + } + s=AB_ImExporterAccountInfo_GetBic(ai); + if (!s || !*s) { + bic=AB_Transaction_GetLocalBic(t); + if (!bic || !*bic) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Missing local BIC in transaction %d", tcount); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + } + if (doctype[0]==8) { + sequenceType=AB_Transaction_GetSequenceType(t); + if (sequenceType==AB_Transaction_SequenceTypeUnknown) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Missing sequence type in transaction %d", tcount); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + cdtrSchmeId=AB_Transaction_GetCreditorSchemeId(t); + if (!cdtrSchmeId || !*cdtrSchmeId) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Missing creditor scheme id in transaction %d", tcount); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + } + + if (pmtinf->tcount) { + /* specify list of match criteria in one place */ +#define TRANSACTION_DOES_NOT_MATCH \ + (transDate!=pmtinf->transDate || \ + (name && strcmp(name, pmtinf->localName)) || \ + (iban && strcmp(iban, pmtinf->localIban)) || \ + (bic && strcmp(bic, pmtinf->localBic)) || \ + (doctype[0]==8 && \ + (sequenceType!=pmtinf->sequenceType || \ + (cdtrSchmeId && strcmp(cdtrSchmeId, pmtinf->creditorSchemeId))))) + + /* match against current PmtInf block */ + if (TRANSACTION_DOES_NOT_MATCH) { + /* search for a fitting PmtInf block */ + pmtinf=AH_ImExporter_Sepa_PmtInf_List_First(pl); + while(pmtinf && TRANSACTION_DOES_NOT_MATCH) + pmtinf=AH_ImExporter_Sepa_PmtInf_List_Next(pmtinf); +#undef TRANSACTION_DOES_NOT_MATCH + + if (!pmtinf) { + pmtinf=AH_ImExporter_Sepa_PmtInf_new(t); + AH_ImExporter_Sepa_PmtInf_List_Add(pmtinf, pl); + } + } + } + + if (!pmtinf->tcount) { + /* initialise match data for this PmtInf block */ + pmtinf->localName = name ? name : AB_ImExporterAccountInfo_GetOwner(ai); + pmtinf->localIban = iban ? iban : AB_ImExporterAccountInfo_GetIban(ai); + pmtinf->localBic = bic ? bic : AB_ImExporterAccountInfo_GetBic(ai); + pmtinf->date=ti; + pmtinf->transDate=transDate; + if (doctype[0]==8) { + pmtinf->sequenceType=sequenceType; + pmtinf->creditorSchemeId=cdtrSchmeId; + } + } + + AB_Transaction_List2_PushBack(pmtinf->transactions, t); + pmtinf->tcount++; + tv=AB_Transaction_GetValue(t); + if (tv==NULL) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Missing value in transaction %d", tcount); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + AB_Value_AddValue(pmtinf->value, tv); + + t=AB_ImExporterAccountInfo_GetNextTransaction(ai); + } + + /* construct CtrlSum for PmtInf blocks and GrpHdr */ + v=AB_Value_new(); + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + pmtinf=AH_ImExporter_Sepa_PmtInf_List_First(pl); + while(pmtinf) { + AB_Value_toHumanReadableString2(pmtinf->value, tbuf, 2, 0); + pmtinf->ctrlsum=strdup(GWEN_Buffer_GetStart(tbuf)); + assert(pmtinf->ctrlsum); + GWEN_Buffer_Reset(tbuf); + AB_Value_AddValue(v, pmtinf->value); + pmtinf=AH_ImExporter_Sepa_PmtInf_List_Next(pmtinf); + } + + AB_Value_toHumanReadableString2(v, tbuf, 2, 0); + ctrlsum=strdup(GWEN_Buffer_GetStart(tbuf)); + assert(ctrlsum); + GWEN_Buffer_free(tbuf); + AB_Value_free(v); + + /* create GrpHdr */ + n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "GrpHdr"); + if (n) { + GWEN_TIME *ti; + uint32_t uid; + char numbuf[32]; + GWEN_XMLNODE *nn; + + GWEN_XMLNode_AddChild(painNode, n); + ti=GWEN_CurrentTime(); + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + + /* generate MsgId */ + uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); + GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); + snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); + GWEN_Buffer_AppendString(tbuf, numbuf); + GWEN_XMLNode_SetCharValue(n, "MsgId", GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_Reset(tbuf); + + /* generate CreDtTm */ + GWEN_Time_toUtcString(ti, "YYYY-MM-DDThh:mm:ssZ", tbuf); + GWEN_XMLNode_SetCharValue(n, "CreDtTm", GWEN_Buffer_GetStart(tbuf)); + GWEN_Time_free(ti); + GWEN_Buffer_free(tbuf); + + /* store NbOfTxs */ + GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); + /* store CtrlSum */ + GWEN_XMLNode_SetCharValue(n, "CtrlSum", ctrlsum); + + /* special treatment for pain.001.001.02 and pain.008.001.01 */ + if (doctype[1]==1 && ((doctype[0]==1 && doctype[2]==2) || + (doctype[0]==8 && doctype[2]==1))) + GWEN_XMLNode_SetCharValue(n, "Grpg", "GRPD"); + + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InitgPty"); + if (nn) { + GWEN_XMLNode_AddChild(n, nn); + pmtinf=AH_ImExporter_Sepa_PmtInf_List_First(pl); + GWEN_XMLNode_SetCharValue(nn, "Nm", pmtinf->localName); + } + } + free(ctrlsum); + + *pList=pl; + return 0; +} + + + int AH_ImExporterSEPA_Export(AB_IMEXPORTER *ie, AB_IMEXPORTER_CONTEXT *ctx, GWEN_SYNCIO *sio, GWEN_DB_NODE *params){ AH_IMEXPORTER_SEPA *ieh; + GWEN_XMLNODE *root; + GWEN_XMLNODE *documentNode; + GWEN_XMLNODE *topNode; + GWEN_XMLNODE *n; + uint32_t doctype[]={0, 0, 0}; const char *s; + int rv; assert(ie); ieh=GWEN_INHERIT_GETDATA(AB_IMEXPORTER, AH_IMEXPORTER_SEPA, ie); assert(ieh); - s=GWEN_DB_GetCharValue(params, "type", 0, "ccm"); - if (strcasecmp(s, "ccm")==0) { - return AH_ImExporterSEPA_Export_Ccm(ie, ctx, sio, params); - } - else if (strcasecmp(s, "001_002_03")==0) { - return AH_ImExporterSEPA_Export_001_002_03(ie, ctx, sio, params); - } - else if (strcasecmp(s, "008_001_01")==0) { - return AH_ImExporterSEPA_Export_008_001_01(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Default); - } - else if (strcasecmp(s, "008_001_01_cor1")==0) { - return AH_ImExporterSEPA_Export_008_001_01(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Cor1); + s=GWEN_DB_GetCharValue(params, "type", 0, 0); + if (s) { + int i, j; + const char *p; + char *tail; + + /* Parse strings of the form xxx.yyy.zz */ + p=tail=(char*)s; + for (i=0; i<3 && *tail; i++) { + j=strtol(p, &tail, 10); + if (!isspace(*p) && + ((*tail=='.' && tail-p==3) || (*tail=='\0' && tail-p==2)) && + j>0) + doctype[i]=j; + else + break; + p=tail+1; + } + if (i<3) + /* Parsing the "type" option failed, record it for later reference */ + doctype[0]=0; } - else if (strcasecmp(s, "008_002_02")==0) { - return AH_ImExporterSEPA_Export_008_002_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Default); - } - else if (strcasecmp(s, "008_002_02_cor1")==0) { - return AH_ImExporterSEPA_Export_008_002_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Cor1); - } - else if (strcasecmp(s, "008_003_02")==0) { - return AH_ImExporterSEPA_Export_008_003_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Default); + + root=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "root"); + n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "?xml"); + if (n) { + GWEN_XMLNode_AddHeader(root, n); + GWEN_XMLNode_SetProperty(n, "version", "1.0"); + GWEN_XMLNode_SetProperty(n, "encoding", "UTF-8"); } - else if (strcasecmp(s, "008_003_02_cor1")==0) { - return AH_ImExporterSEPA_Export_008_003_02(ie, ctx, sio, params, AH_ImExportSEPA_SubType_Cor1); + + documentNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Document"); + s=GWEN_DB_GetCharValue(params, "xmlns", 0, 0); + if (!s || !*s) { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "xmlns not specified in profile \"%s\"", + GWEN_DB_GetCharValue(params, "name", 0, 0)); + GWEN_XMLNode_free(root); + return GWEN_ERROR_INVALID; } - else { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Unknown SEPA type \"%s\"", s); + GWEN_XMLNode_SetProperty(documentNode, "xmlns", s); + GWEN_XMLNode_AddChild(root, documentNode); + + switch(doctype[0]) { + case 1: + if (doctype[1]>1 || doctype[2]>2) + s="CstmrCdtTrfInitn"; + else + s=strstr(s, "pain"); + topNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, s); + GWEN_XMLNode_AddChild(documentNode, topNode); + rv=AH_ImExporterSEPA_Export_Pain_001(ie, ctx, topNode, doctype, params); + break; + case 8: + if (!(doctype[1]==1 && doctype[2]==1)) + s="CstmrDrctDbtInitn"; + else + s=strstr(s, "pain"); + topNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, s); + GWEN_XMLNode_AddChild(documentNode, topNode); + rv=AH_ImExporterSEPA_Export_Pain_008(ie, ctx, topNode, doctype, params); + break; + default: + DBG_ERROR(AQBANKING_LOGDOMAIN, "Unknown SEPA type \"%s\"", + GWEN_DB_GetCharValue(params, "type", 0, 0)); + GWEN_XMLNode_free(root); return GWEN_ERROR_INVALID; } + if (rv==0) { + GWEN_XML_CONTEXT *xmlctx; + + xmlctx=GWEN_XmlCtxStore_new(root, + GWEN_XML_FLAGS_INDENT | + GWEN_XML_FLAGS_SIMPLE | + GWEN_XML_FLAGS_HANDLE_HEADERS); + + rv=GWEN_XMLNode_WriteToStream(root, xmlctx, sio); + if (rv) + DBG_INFO(AQBANKING_LOGDOMAIN, "here (%d)", rv); + GWEN_XmlCtx_free(xmlctx); + GWEN_XMLNode_free(root); + } + /* TODO */ - return GWEN_ERROR_NOT_IMPLEMENTED; + return rv; } @@ -151,10 +467,7 @@ -#include "sepa_exp_ccm.c" -#include "sepa_exp_123.c" -#include "sepa_exp_008_001_01.c" -#include "sepa_exp_008_002_02.c" -#include "sepa_exp_008_003_02.c" +#include "sepa_pain_001.c" +#include "sepa_pain_008.c" diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c 2014-03-24 20:39:52.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_008_001_01.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,491 +0,0 @@ - - -#include - - - -int AH_ImExporterSEPA_Export_008_001_01(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params, - int subType){ - GWEN_XMLNODE *root; - GWEN_XMLNODE *documentNode; - GWEN_XMLNODE *painNode; - GWEN_XMLNODE *n; - AB_IMEXPORTER_ACCOUNTINFO *ai; - const AB_TRANSACTION *t; - AB_VALUE *v; - int tcount=0; - GWEN_XML_CONTEXT *xmlctx; - const char *s; - int rv; - - ai=AB_ImExporterContext_GetFirstAccountInfo(ctx); - if (ai==0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No account info"); - return GWEN_ERROR_NO_DATA; - } - - v=AB_Value_new(); - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - const AB_VALUE *tv; - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - AB_Value_AddValue(v, tv); - tcount++; - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } - - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - - root=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "root"); - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "?xml"); - if (n) { - GWEN_XMLNode_AddHeader(root, n); - GWEN_XMLNode_SetProperty(n, "version", "1.0"); - GWEN_XMLNode_SetProperty(n, "encoding", "UTF-8"); - } - - documentNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Document"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns", - "urn:sepade:xsd:pain.008.001.01"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns:xsi", - "http://www.w3.org/2001/XMLSchema-instance"); - GWEN_XMLNode_SetProperty(documentNode, - "xsi:schemaLocation", - "urn:sepade:xsd:pain.008.001.01 pain.008.001.01.xsd"); - GWEN_XMLNode_AddChild(root, documentNode); - - painNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "pain.008.001.01"); - GWEN_XMLNode_AddChild(documentNode, painNode); - - /* create GrpHdr */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "GrpHdr"); - if (n) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - GWEN_XMLNODE *nn; - uint32_t uid; - char numbuf[32]; - - GWEN_XMLNode_AddChild(painNode, n); - ti=GWEN_CurrentTime(); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - /* generate MsgId */ - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "MsgId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - /* generate CreDtTm */ - GWEN_Time_toUtcString(ti, "YYYY-MM-DDThh:mm:ssZ", tbuf); - GWEN_XMLNode_SetCharValue(n, "CreDtTm", GWEN_Buffer_GetStart(tbuf)); - GWEN_Time_free(ti); - GWEN_Buffer_Reset(tbuf); - - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - - /* CtrlSum */ - /* store sum */ - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(v, tbuf, 2, 0); - GWEN_XMLNode_SetCharValue(n, "CtrlSum", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - GWEN_XMLNode_SetCharValue(n, "Grpg", "GRPD"); - - /* InitgPty */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InitgPty"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - } - AB_Value_free(v); - - /* generate PmtInf */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtInf"); - if (n) { - const GWEN_TIME *tti; - GWEN_XMLNODE *nn; - - GWEN_XMLNode_AddChild(painNode, n); - - GWEN_XMLNode_SetCharValue(n, "PmtMtd", "DD"); - - /* PmtTpInf */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtTpInf"); - if (nn) { - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "SvcLvl/Cd", "SEPA"); - - switch(AB_Transaction_GetSequenceType(t)) { - case AB_Transaction_SequenceTypeUnknown: - case AB_Transaction_SequenceTypeOnce: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "OOFF"); - break; - case AB_Transaction_SequenceTypeFirst: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FRST"); - break; - case AB_Transaction_SequenceTypeFollowing: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "RCUR"); - break; - case AB_Transaction_SequenceTypeFinal: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FNAL"); - break; - } - - GWEN_XMLNode_AddChild(n, nn); - } - - /* create ReqdColltnDt" */ - tti=AB_Transaction_GetDate(t); - if (tti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - GWEN_Time_toString(tti, "YYYY-MM-DD", tbuf); - GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - else { - GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", "1999-01-01"); - } - - /* create "Cdtr" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Cdtr"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - - /* create "CdtrAcct" */ - s=AB_ImExporterAccountInfo_GetIban(ai); - if (!s) - s=AB_Transaction_GetLocalIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No local IBAN"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "CdtrAcct/Id/IBAN", s); - - /* create "CdtrAgt" */ - s=AB_ImExporterAccountInfo_GetBic(ai); - if (!s) - s=AB_Transaction_GetLocalBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No BIC"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "CdtrAgt/FinInstnId/BIC", s); - - GWEN_XMLNode_SetCharValue(n, "ChrgBr", "SLEV"); - - - /* DrctDbtTxInf */ - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - GWEN_XMLNODE *nn; - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTxInf"); - if (nn) { - GWEN_XMLNODE *nnn; - const AB_VALUE *tv; - - GWEN_XMLNode_AddChild(n, nn); - - /* create "PmtId/EndToEndId" */ - s=AB_Transaction_GetEndToEndReference(t); - if (!( s && *s)) - s=AB_Transaction_GetCustomerReference(t); - if (!s) - s="NOTPROVIDED"; - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "PmtId/EndToEndId", s); - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InstdAmt"); - if (nnn) { - GWEN_BUFFER *tbuf; - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(tv, tbuf, 2, 0); - s=AB_Value_GetCurrency(tv); - if (!s) - s="EUR"; - GWEN_XMLNode_SetProperty(nnn, "Ccy", s); - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeData, GWEN_Buffer_GetStart(tbuf)); - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_Buffer_free(tbuf); - } - - /* DrctDbtTx */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTx"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - /* add mandate info */ - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "MndtRltdInf"); - if (nnnn) { - const char *credSchemId; - const char *mandateId; - const char *origCredSchemId; - const char *origMandateId; - const char *origCreditorName; - const GWEN_DATE *dt; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nnn, nnnn); - - credSchemId=AB_Transaction_GetCreditorSchemeId(t); - if (!credSchemId) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing Creditor Scheme Id"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - dt=AB_Transaction_GetMandateDate(t); - if (!dt) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate date for direct debit"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - mandateId=AB_Transaction_GetMandateId(t); - if (!mandateId) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate id for direct debit"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - origCredSchemId=AB_Transaction_GetOriginalCreditorSchemeId(t); - origMandateId=AB_Transaction_GetOriginalMandateId(t); - origCreditorName=AB_Transaction_GetOriginalCreditorName(t); - - /* MndtId */ - GWEN_XMLNode_SetCharValue(nnnn, "MndtId", mandateId); - - /* DtOfSgntr */ - tbuf=GWEN_Buffer_new(0, 32, 0, 1); - rv=GWEN_Date_toStringWithTemplate(dt, "YYYY-MM-DD", tbuf); - if (rv<0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Error converting date to string"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - return rv; - } - GWEN_XMLNode_SetCharValue(nnnn, "DtOfSgntr", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - if ((origCredSchemId && *origCredSchemId) || - (origMandateId && *origMandateId) || - (origCreditorName && *origCreditorName)) { - GWEN_XMLNODE *n5; - - GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "true"); - - n5=GWEN_XMLNode_GetNodeByXPath(nnnn, "AmdmntInfDtls/OrgnlCdtrSchmeId", 0); - if (n5) { - - if (origMandateId && *origMandateId) - GWEN_XMLNode_SetCharValue(n5, "OrgnlMndtId", origMandateId); - - if (origCreditorName && *origCreditorName) - GWEN_XMLNode_SetCharValue(n5, "Nm", origCreditorName); - - if (origCredSchemId && *origCredSchemId) { - GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/OthrId/Id", origCredSchemId); - GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/OthrId/IdTp", "SEPA"); - } - } - } - else { - GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "false"); - } - } - - /* create "CdtrSchmeId" */ - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrSchmeId"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - - s=AB_Transaction_GetCreditorSchemeId(t); - - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No CreditorSchemeId"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(nnnn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/OthrId/Id", s); - GWEN_XMLNode_SetCharValueByPath(nnnn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/OthrId/IdTp", "SEPA"); - } - } - - /* create "DbtrAgt" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAgt"); - if (nnn) { - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote BIC"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(nnn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "FinInstnId/BIC", s); - } - - /* create "Dbtr" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Dbtr"); - if (nnn) { - const GWEN_STRINGLIST *sl; - const char *s=NULL; - - GWEN_XMLNode_AddChild(nn, nnn); - sl=AB_Transaction_GetRemoteName(t); - if (sl) - s=GWEN_StringList_FirstString(sl); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote name"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nnn, "Nm", s); - } - - /* create "DbtrAcct" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAcct"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote IBAN"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "IBAN", s); - } - } - - /* add "Ultimate Debitor Name", if given */ - s=AB_Transaction_GetMandateDebitorName(t); - if (s && *s) - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "UltmtDbtr/Nm", s); - - /* create "RmtInf" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "RmtInf"); - if (nnn) { - const GWEN_STRINGLIST *sl; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 140, 0, 1); - sl=AB_Transaction_GetPurpose(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - while(se) { - s=GWEN_StringListEntry_Data(se); - assert(s); - if (GWEN_Buffer_GetUsedBytes(tbuf)) - GWEN_Buffer_AppendByte(tbuf, ' '); - GWEN_Buffer_AppendString(tbuf, s); - se=GWEN_StringListEntry_Next(se); - } - if (GWEN_Buffer_GetUsedBytes(tbuf)>140) - GWEN_Buffer_Crop(tbuf, 0, 140); - } - - if (GWEN_Buffer_GetUsedBytes(tbuf)<1) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing purpose in transaction"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nnn, "Ustrd", GWEN_Buffer_GetStart(tbuf)); - - GWEN_Buffer_free(tbuf); - } - } - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } /* while t */ - } - - xmlctx=GWEN_XmlCtxStore_new(root, - GWEN_XML_FLAGS_INDENT | - GWEN_XML_FLAGS_SIMPLE | - GWEN_XML_FLAGS_HANDLE_HEADERS); - - rv=GWEN_XMLNode_WriteToStream(root, xmlctx, sio); - if (rv) { - DBG_INFO(AQBANKING_LOGDOMAIN, "here (%d)", rv); - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - return rv; - } - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - - return 0; -} - - - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c 2014-03-24 20:44:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_008_002_02.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,549 +0,0 @@ - - -#include - - - -int AH_ImExporterSEPA_Export_008_002_02(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params, - int subType){ - GWEN_XMLNODE *root; - GWEN_XMLNODE *documentNode; - GWEN_XMLNODE *painNode; - GWEN_XMLNODE *n; - AB_IMEXPORTER_ACCOUNTINFO *ai; - const AB_TRANSACTION *t; - AB_VALUE *v; - int tcount=0; - GWEN_XML_CONTEXT *xmlctx; - const char *s; - int rv; - - ai=AB_ImExporterContext_GetFirstAccountInfo(ctx); - if (ai==0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No account info"); - return GWEN_ERROR_NO_DATA; - } - - v=AB_Value_new(); - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - const AB_VALUE *tv; - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - AB_Value_AddValue(v, tv); - tcount++; - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } - - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - - root=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "root"); - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "?xml"); - if (n) { - GWEN_XMLNode_AddHeader(root, n); - GWEN_XMLNode_SetProperty(n, "version", "1.0"); - GWEN_XMLNode_SetProperty(n, "encoding", "UTF-8"); - } - - documentNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Document"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns", - "urn:iso:std:iso:20022:tech:xsd:pain.008.002.02"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns:xsi", - "http://www.w3.org/2001/XMLSchema-instance"); - GWEN_XMLNode_SetProperty(documentNode, - "xsi:schemaLocation", - "urn:iso:std:iso:20022:tech:xsd:pain.008.002.02 pain.008.002.02.xsd"); - GWEN_XMLNode_AddChild(root, documentNode); - - painNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CstmrDrctDbtInitn"); - GWEN_XMLNode_AddChild(documentNode, painNode); - - /* create GrpHdr */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "GrpHdr"); - if (n) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - GWEN_XMLNODE *nn; - uint32_t uid; - char numbuf[32]; - - GWEN_XMLNode_AddChild(painNode, n); - ti=GWEN_CurrentTime(); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - /* generate MsgId */ - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "MsgId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - /* generate CreDtTm */ - GWEN_Time_toUtcString(ti, "YYYY-MM-DDThh:mm:ssZ", tbuf); - GWEN_XMLNode_SetCharValue(n, "CreDtTm", GWEN_Buffer_GetStart(tbuf)); - GWEN_Time_free(ti); - GWEN_Buffer_free(tbuf); - - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - - /* InitgPty */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InitgPty"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - } - - /* generate PmtInf */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtInf"); - if (n) { - const GWEN_TIME *tti; - GWEN_XMLNODE *nn; - - GWEN_XMLNode_AddChild(painNode, n); - - /* generate PmtInfId */ - if (1) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - uint32_t uid; - char numbuf[32]; - - ti=GWEN_CurrentTime(); - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "PmtInfId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - GWEN_Time_free(ti); - } - - GWEN_XMLNode_SetCharValue(n, "PmtMtd", "DD"); - - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - /* CtrlSum */ - if (1) { - GWEN_BUFFER *tbuf; - - /* store sum */ - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(v, tbuf, 2, 0); - GWEN_XMLNode_SetCharValue(n, "CtrlSum", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - - /* PmtTpInf */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtTpInf"); - if (nn) { - GWEN_XMLNODE *nnn; - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "SvcLvl"); - if (nnn) { - GWEN_XMLNode_SetCharValue(nnn, "Cd", "SEPA"); - GWEN_XMLNode_AddChild(nn, nnn); - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "LclInstrm"); - if (nnn) { - switch(subType) { - default: - case AH_ImExportSEPA_SubType_Default: GWEN_XMLNode_SetCharValue(nnn, "Cd", "CORE"); break; - case AH_ImExportSEPA_SubType_Cor1: GWEN_XMLNode_SetCharValue(nnn, "Cd", "COR1"); break; - } - GWEN_XMLNode_AddChild(nn, nnn); - } - - switch(AB_Transaction_GetSequenceType(t)) { - case AB_Transaction_SequenceTypeUnknown: - case AB_Transaction_SequenceTypeOnce: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "OOFF"); - break; - case AB_Transaction_SequenceTypeFirst: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FRST"); - break; - case AB_Transaction_SequenceTypeFollowing: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "RCUR"); - break; - case AB_Transaction_SequenceTypeFinal: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FNAL"); - break; - } - - GWEN_XMLNode_AddChild(n, nn); - } - - /* create ReqdColltnDt" */ - tti=AB_Transaction_GetDate(t); - if (tti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - GWEN_Time_toString(tti, "YYYY-MM-DD", tbuf); - GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - else { - GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", "1999-01-01"); - } - - /* create "Cdtr" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Cdtr"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - - /* create "CdtrAcct" */ - s=AB_ImExporterAccountInfo_GetIban(ai); - if (!s) - s=AB_Transaction_GetLocalIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No local IBAN"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "CdtrAcct/Id/IBAN", s); - - /* create "CdtrAgt" */ - s=AB_ImExporterAccountInfo_GetBic(ai); - if (!s) - s=AB_Transaction_GetLocalBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No BIC"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "CdtrAgt/FinInstnId/BIC", s); - - GWEN_XMLNode_SetCharValue(n, "ChrgBr", "SLEV"); - - /* create "CdtrSchmeId" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrSchmeId"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - - s=AB_Transaction_GetCreditorSchemeId(t); - - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No CreditorSchemeId"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/Id", s); - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/SchmeNm/Prtry", "SEPA"); - } - - - /* DrctDbtTxInf */ - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - GWEN_XMLNODE *nn; - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTxInf"); - if (nn) { - GWEN_XMLNODE *nnn; - const AB_VALUE *tv; - - GWEN_XMLNode_AddChild(n, nn); - - /* create "PmtId/EndToEndId" */ - s=AB_Transaction_GetEndToEndReference(t); - if (!( s && *s)) - s=AB_Transaction_GetCustomerReference(t); - if (!s) - s="NOTPROVIDED"; - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "PmtId/EndToEndId", s); - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InstdAmt"); - if (nnn) { - GWEN_BUFFER *tbuf; - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(tv, tbuf, 2, 0); - s=AB_Value_GetCurrency(tv); - if (!s) - s="EUR"; - GWEN_XMLNode_SetProperty(nnn, "Ccy", s); - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeData, GWEN_Buffer_GetStart(tbuf)); - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_Buffer_free(tbuf); - } - - /* DrctDbtTx */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTx"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - /* add mandate info */ - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "MndtRltdInf"); - if (nnnn) { - const char *credSchemId; - const char *mandateId; - const char *origCredSchemId; - const char *origMandateId; - const char *origCreditorName; - const GWEN_DATE *dt; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nnn, nnnn); - - credSchemId=AB_Transaction_GetCreditorSchemeId(t); - if (!credSchemId) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing Creditor Scheme Id"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - dt=AB_Transaction_GetMandateDate(t); - if (!dt) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate date for direct debit"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - mandateId=AB_Transaction_GetMandateId(t); - if (!mandateId) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate id for direct debit"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - origCredSchemId=AB_Transaction_GetOriginalCreditorSchemeId(t); - origMandateId=AB_Transaction_GetOriginalMandateId(t); - origCreditorName=AB_Transaction_GetOriginalCreditorName(t); - - /* MndtId */ - GWEN_XMLNode_SetCharValue(nnnn, "MndtId", mandateId); - - /* DtOfSgntr */ - tbuf=GWEN_Buffer_new(0, 32, 0, 1); - rv=GWEN_Date_toStringWithTemplate(dt, "YYYY-MM-DD", tbuf); - if (rv<0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Error converting date to string"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return rv; - } - GWEN_XMLNode_SetCharValue(nnnn, "DtOfSgntr", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - if ((origCredSchemId && *origCredSchemId) || - (origMandateId && *origMandateId) || - (origCreditorName && *origCreditorName)) { - GWEN_XMLNODE *n5; - - GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "true"); - - n5=GWEN_XMLNode_GetNodeByXPath(nnnn, "AmdmntInfDtls/OrgnlCdtrSchmeId", 0); - if (n5) { - - if (origMandateId && *origMandateId) - GWEN_XMLNode_SetCharValue(n5, "OrgnlMndtId", origMandateId); - - if (origCreditorName && *origCreditorName) - GWEN_XMLNode_SetCharValue(n5, "Nm", origCreditorName); - - if (origCredSchemId && *origCredSchemId) { - GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/Id", origCredSchemId); - GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/SchmeNm/Prtry", "SEPA"); - } - } - } - else { - GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "false"); - } - } - } - - /* create "DbtrAgt" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAgt"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote BIC"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "FinInstnId"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "BIC", s); - } - } - - /* create "Dbtr" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Dbtr"); - if (nnn) { - const GWEN_STRINGLIST *sl; - const char *s=NULL; - - GWEN_XMLNode_AddChild(nn, nnn); - sl=AB_Transaction_GetRemoteName(t); - if (sl) - s=GWEN_StringList_FirstString(sl); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote name"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nnn, "Nm", s); - } - - /* create "DbtrAcct" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAcct"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote IBAN"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "IBAN", s); - } - } - - /* add "Ultimate Debitor Name", if given */ - s=AB_Transaction_GetMandateDebitorName(t); - if (s && *s) - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "UltmtDbtr/Nm", s); - - /* create "RmtInf" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "RmtInf"); - if (nnn) { - const GWEN_STRINGLIST *sl; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 140, 0, 1); - sl=AB_Transaction_GetPurpose(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - while(se) { - s=GWEN_StringListEntry_Data(se); - assert(s); - if (GWEN_Buffer_GetUsedBytes(tbuf)) - GWEN_Buffer_AppendByte(tbuf, ' '); - GWEN_Buffer_AppendString(tbuf, s); - se=GWEN_StringListEntry_Next(se); - } - if (GWEN_Buffer_GetUsedBytes(tbuf)>140) - GWEN_Buffer_Crop(tbuf, 0, 140); - } - - if (GWEN_Buffer_GetUsedBytes(tbuf)<1) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing purpose in transaction"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nnn, "Ustrd", GWEN_Buffer_GetStart(tbuf)); - - GWEN_Buffer_free(tbuf); - } - } - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } /* while t */ - } - - xmlctx=GWEN_XmlCtxStore_new(root, - GWEN_XML_FLAGS_INDENT | - GWEN_XML_FLAGS_SIMPLE | - GWEN_XML_FLAGS_HANDLE_HEADERS); - - rv=GWEN_XMLNode_WriteToStream(root, xmlctx, sio); - if (rv) { - DBG_INFO(AQBANKING_LOGDOMAIN, "here (%d)", rv); - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return rv; - } - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - AB_Value_free(v); - - return 0; -} - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c 2014-03-24 20:43:25.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_008_003_02.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,550 +0,0 @@ - - -#include - - - -int AH_ImExporterSEPA_Export_008_003_02(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params, - int subType){ - GWEN_XMLNODE *root; - GWEN_XMLNODE *documentNode; - GWEN_XMLNODE *painNode; - GWEN_XMLNODE *n; - AB_IMEXPORTER_ACCOUNTINFO *ai; - const AB_TRANSACTION *t; - AB_VALUE *v; - int tcount=0; - GWEN_XML_CONTEXT *xmlctx; - const char *s; - int rv; - - ai=AB_ImExporterContext_GetFirstAccountInfo(ctx); - if (ai==0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No account info"); - return GWEN_ERROR_NO_DATA; - } - - v=AB_Value_new(); - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - const AB_VALUE *tv; - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - AB_ImExporterContext_WriteContext(ctx, NULL); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - AB_Value_AddValue(v, tv); - tcount++; - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } - - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - - root=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "root"); - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "?xml"); - if (n) { - GWEN_XMLNode_AddHeader(root, n); - GWEN_XMLNode_SetProperty(n, "version", "1.0"); - GWEN_XMLNode_SetProperty(n, "encoding", "UTF-8"); - } - - documentNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Document"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns", - "urn:iso:std:iso:20022:tech:xsd:pain.008.003.02"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns:xsi", - "http://www.w3.org/2001/XMLSchema-instance"); - GWEN_XMLNode_SetProperty(documentNode, - "xsi:schemaLocation", - "urn:iso:std:iso:20022:tech:xsd:pain.008.003.02 pain.008.003.02.xsd"); - GWEN_XMLNode_AddChild(root, documentNode); - - painNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CstmrDrctDbtInitn"); - GWEN_XMLNode_AddChild(documentNode, painNode); - - /* create GrpHdr */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "GrpHdr"); - if (n) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - GWEN_XMLNODE *nn; - uint32_t uid; - char numbuf[32]; - - GWEN_XMLNode_AddChild(painNode, n); - ti=GWEN_CurrentTime(); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - /* generate MsgId */ - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "MsgId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - /* generate CreDtTm */ - GWEN_Time_toUtcString(ti, "YYYY-MM-DDThh:mm:ssZ", tbuf); - GWEN_XMLNode_SetCharValue(n, "CreDtTm", GWEN_Buffer_GetStart(tbuf)); - GWEN_Time_free(ti); - GWEN_Buffer_free(tbuf); - - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - - /* InitgPty */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InitgPty"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - } - - /* generate PmtInf */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtInf"); - if (n) { - const GWEN_TIME *tti; - GWEN_XMLNODE *nn; - - GWEN_XMLNode_AddChild(painNode, n); - - /* generate PmtInfId */ - if (1) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - uint32_t uid; - char numbuf[32]; - - ti=GWEN_CurrentTime(); - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "PmtInfId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - GWEN_Time_free(ti); - } - - GWEN_XMLNode_SetCharValue(n, "PmtMtd", "DD"); - - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - /* CtrlSum */ - if (1) { - GWEN_BUFFER *tbuf; - - /* store sum */ - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(v, tbuf, 2, 0); - GWEN_XMLNode_SetCharValue(n, "CtrlSum", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - - /* PmtTpInf */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtTpInf"); - if (nn) { - GWEN_XMLNODE *nnn; - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "SvcLvl"); - if (nnn) { - GWEN_XMLNode_SetCharValue(nnn, "Cd", "SEPA"); - GWEN_XMLNode_AddChild(nn, nnn); - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "LclInstrm"); - if (nnn) { - switch(subType) { - default: - case AH_ImExportSEPA_SubType_Default: GWEN_XMLNode_SetCharValue(nnn, "Cd", "CORE"); break; - case AH_ImExportSEPA_SubType_Cor1: GWEN_XMLNode_SetCharValue(nnn, "Cd", "COR1"); break; - } - GWEN_XMLNode_AddChild(nn, nnn); - } - - switch(AB_Transaction_GetSequenceType(t)) { - case AB_Transaction_SequenceTypeUnknown: - case AB_Transaction_SequenceTypeOnce: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "OOFF"); - break; - case AB_Transaction_SequenceTypeFirst: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FRST"); - break; - case AB_Transaction_SequenceTypeFollowing: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "RCUR"); - break; - case AB_Transaction_SequenceTypeFinal: - GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FNAL"); - break; - } - - GWEN_XMLNode_AddChild(n, nn); - } - - /* create ReqdColltnDt" */ - tti=AB_Transaction_GetDate(t); - if (tti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - GWEN_Time_toString(tti, "YYYY-MM-DD", tbuf); - GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - else { - GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", "1999-01-01"); - } - - /* create "Cdtr" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Cdtr"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - - /* create "CdtrAcct" */ - s=AB_ImExporterAccountInfo_GetIban(ai); - if (!s) - s=AB_Transaction_GetLocalIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No local IBAN"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "CdtrAcct/Id/IBAN", s); - - /* create "CdtrAgt" */ - s=AB_ImExporterAccountInfo_GetBic(ai); - if (!s) - s=AB_Transaction_GetLocalBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No BIC"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "CdtrAgt/FinInstnId/BIC", s); - - GWEN_XMLNode_SetCharValue(n, "ChrgBr", "SLEV"); - - /* create "CdtrSchmeId" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrSchmeId"); - if (nn) { - GWEN_XMLNode_AddChild(n, nn); - - s=AB_Transaction_GetCreditorSchemeId(t); - - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No CreditorSchemeId"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/Id", s); - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/SchmeNm/Prtry", "SEPA"); - } - - - /* DrctDbtTxInf */ - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - GWEN_XMLNODE *nn; - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTxInf"); - if (nn) { - GWEN_XMLNODE *nnn; - const AB_VALUE *tv; - - GWEN_XMLNode_AddChild(n, nn); - - /* create "PmtId/EndToEndId" */ - s=AB_Transaction_GetEndToEndReference(t); - if (!( s && *s)) - s=AB_Transaction_GetCustomerReference(t); - if (!s) - s="NOTPROVIDED"; - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "PmtId/EndToEndId", s); - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InstdAmt"); - if (nnn) { - GWEN_BUFFER *tbuf; - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(tv, tbuf, 2, 0); - s=AB_Value_GetCurrency(tv); - if (!s) - s="EUR"; - GWEN_XMLNode_SetProperty(nnn, "Ccy", s); - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeData, GWEN_Buffer_GetStart(tbuf)); - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_Buffer_free(tbuf); - } - - /* DrctDbtTx */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTx"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - /* add mandate info */ - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "MndtRltdInf"); - if (nnnn) { - const char *credSchemId; - const char *mandateId; - const char *origCredSchemId; - const char *origMandateId; - const char *origCreditorName; - const GWEN_DATE *dt; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nnn, nnnn); - - credSchemId=AB_Transaction_GetCreditorSchemeId(t); - if (!credSchemId) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing Creditor Scheme Id"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - dt=AB_Transaction_GetMandateDate(t); - if (!dt) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate date for direct debit"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - mandateId=AB_Transaction_GetMandateId(t); - if (!mandateId) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate id for direct debit"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - origCredSchemId=AB_Transaction_GetOriginalCreditorSchemeId(t); - origMandateId=AB_Transaction_GetOriginalMandateId(t); - origCreditorName=AB_Transaction_GetOriginalCreditorName(t); - - /* MndtId */ - GWEN_XMLNode_SetCharValue(nnnn, "MndtId", mandateId); - - /* DtOfSgntr */ - tbuf=GWEN_Buffer_new(0, 32, 0, 1); - rv=GWEN_Date_toStringWithTemplate(dt, "YYYY-MM-DD", tbuf); - if (rv<0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Error converting date to string"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return rv; - } - GWEN_XMLNode_SetCharValue(nnnn, "DtOfSgntr", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - if ((origCredSchemId && *origCredSchemId) || - (origMandateId && *origMandateId) || - (origCreditorName && *origCreditorName)) { - GWEN_XMLNODE *n5; - - GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "true"); - - n5=GWEN_XMLNode_GetNodeByXPath(nnnn, "AmdmntInfDtls/OrgnlCdtrSchmeId", 0); - if (n5) { - - if (origMandateId && *origMandateId) - GWEN_XMLNode_SetCharValue(n5, "OrgnlMndtId", origMandateId); - - if (origCreditorName && *origCreditorName) - GWEN_XMLNode_SetCharValue(n5, "Nm", origCreditorName); - - if (origCredSchemId && *origCredSchemId) { - GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/Id", origCredSchemId); - GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "Id/PrvtId/Othr/SchmeNm/Prtry", "SEPA"); - } - } - } - else { - GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "false"); - } - } - } - - /* create "DbtrAgt" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAgt"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote BIC"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "FinInstnId"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "BIC", s); - } - } - - /* create "Dbtr" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Dbtr"); - if (nnn) { - const GWEN_STRINGLIST *sl; - const char *s=NULL; - - GWEN_XMLNode_AddChild(nn, nnn); - sl=AB_Transaction_GetRemoteName(t); - if (sl) - s=GWEN_StringList_FirstString(sl); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote name"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nnn, "Nm", s); - } - - /* create "DbtrAcct" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAcct"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote IBAN"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "IBAN", s); - } - } - - /* add "Ultimate Debitor Name", if given */ - s=AB_Transaction_GetMandateDebitorName(t); - if (s && *s) - GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "UltmtDbtr/Nm", s); - - /* create "RmtInf" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "RmtInf"); - if (nnn) { - const GWEN_STRINGLIST *sl; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 140, 0, 1); - sl=AB_Transaction_GetPurpose(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - while(se) { - s=GWEN_StringListEntry_Data(se); - assert(s); - if (GWEN_Buffer_GetUsedBytes(tbuf)) - GWEN_Buffer_AppendByte(tbuf, ' '); - GWEN_Buffer_AppendString(tbuf, s); - se=GWEN_StringListEntry_Next(se); - } - if (GWEN_Buffer_GetUsedBytes(tbuf)>140) - GWEN_Buffer_Crop(tbuf, 0, 140); - } - - if (GWEN_Buffer_GetUsedBytes(tbuf)<1) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing purpose in transaction"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nnn, "Ustrd", GWEN_Buffer_GetStart(tbuf)); - - GWEN_Buffer_free(tbuf); - } - } - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } /* while t */ - } - - xmlctx=GWEN_XmlCtxStore_new(root, - GWEN_XML_FLAGS_INDENT | - GWEN_XML_FLAGS_SIMPLE | - GWEN_XML_FLAGS_HANDLE_HEADERS); - - rv=GWEN_XMLNode_WriteToStream(root, xmlctx, sio); - if (rv) { - DBG_INFO(AQBANKING_LOGDOMAIN, "here (%d)", rv); - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return rv; - } - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - AB_Value_free(v); - - return 0; -} - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_123.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_123.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_123.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_123.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,449 +0,0 @@ - - -#include - - - -int AH_ImExporterSEPA_Export_001_002_03(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params){ - GWEN_XMLNODE *root; - GWEN_XMLNODE *documentNode; - GWEN_XMLNODE *painNode; - GWEN_XMLNODE *n; - AB_IMEXPORTER_ACCOUNTINFO *ai; - const AB_TRANSACTION *t; - AB_VALUE *v; - int tcount=0; - GWEN_XML_CONTEXT *xmlctx; - int rv; - - ai=AB_ImExporterContext_GetFirstAccountInfo(ctx); - if (ai==0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No account info"); - return GWEN_ERROR_NO_DATA; - } - - v=AB_Value_new(); - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - const AB_VALUE *tv; - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - AB_Value_AddValue(v, tv); - tcount++; - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } - - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - - root=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "root"); - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "?xml"); - if (n) { - GWEN_XMLNode_AddHeader(root, n); - GWEN_XMLNode_SetProperty(n, "version", "1.0"); - GWEN_XMLNode_SetProperty(n, "encoding", "UTF-8"); - } - - documentNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Document"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns", - "urn:iso:std:iso:20022:tech:xsd:pain.001.002.03"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns:xsi", - "http://www.w3.org/2001/XMLSchema-instance"); - GWEN_XMLNode_SetProperty(documentNode, - "xsi:schemaLocation", - "urn:iso:std:iso:20022:tech:xsd:pain.001.002.03 pain.001.002.03.xsd"); - GWEN_XMLNode_AddChild(root, documentNode); - - painNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CstmrCdtTrfInitn"); - GWEN_XMLNode_AddChild(documentNode, painNode); - - /* create GrpHdr */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "GrpHdr"); - if (n) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - uint32_t uid; - char numbuf[32]; - GWEN_XMLNODE *nn; - - GWEN_XMLNode_AddChild(painNode, n); - ti=GWEN_CurrentTime(); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - /* generate MsgId */ - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "MsgId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - /* generate CreDtTm */ - GWEN_Time_toUtcString(ti, "YYYY-MM-DDThh:mm:ssZ", tbuf); - GWEN_XMLNode_SetCharValue(n, "CreDtTm", GWEN_Buffer_GetStart(tbuf)); - GWEN_Time_free(ti); - GWEN_Buffer_free(tbuf); - - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InitgPty"); - if (nn) { - const char *s; - - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - } - - /* generate PmtInf */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtInf"); - if (n) { - const GWEN_TIME *tti; - GWEN_XMLNODE *nn; - - GWEN_XMLNode_AddChild(painNode, n); - - /* generate PmtInfId */ - if (1) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - uint32_t uid; - char numbuf[32]; - - ti=GWEN_CurrentTime(); - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "PmtInfId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - GWEN_Time_free(ti); - } - - GWEN_XMLNode_SetCharValue(n, "PmtMtd", "TRF"); - - GWEN_XMLNode_SetCharValue(n, "BtchBookg", "true"); - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - if (1) { - GWEN_BUFFER *tbuf; - - /* store sum */ - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(v, tbuf, 2, 0); - GWEN_XMLNode_SetCharValue(n, "CtrlSum", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtTpInf"); - if (nn) { - GWEN_XMLNODE *nnn; - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "SvcLvl"); - if (nnn) { - GWEN_XMLNode_SetCharValue(nnn, "Cd", "SEPA"); - GWEN_XMLNode_AddChild(nn, nnn); - } - - GWEN_XMLNode_AddChild(n, nn); - } - - /* create ReqdExctnDt" */ - tti=AB_Transaction_GetDate(t); - if (tti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - GWEN_Time_toString(tti, "YYYY-MM-DD", tbuf); - GWEN_XMLNode_SetCharValue(n, "ReqdExctnDt", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - else { - GWEN_XMLNode_SetCharValue(n, "ReqdExctnDt", "1999-01-01"); - } - - /* create "Dbtr" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Dbtr"); - if (nn) { - const char *s; - - GWEN_XMLNode_AddChild(n, nn); - - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - - /* create "DbtrAcct" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAcct"); - if (nn) { - const char *s; - GWEN_XMLNODE *nnn; - - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetIban(ai); - if (!s) - s=AB_Transaction_GetLocalIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No local IBAN"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); - if (nnn) { - GWEN_XMLNode_AddChild(nn, nnn); - GWEN_XMLNode_SetCharValue(nnn, "IBAN", s); - } - } - - /* create "DbtrAgt" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAgt"); - if (nn) { - const char *s; - GWEN_XMLNODE *nnn; - - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetBic(ai); - if (!s) - s=AB_Transaction_GetLocalBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No BIC"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "FinInstnId"); - if (nnn) { - GWEN_XMLNode_AddChild(nn, nnn); - GWEN_XMLNode_SetCharValue(nnn, "BIC", s); - } - } - - GWEN_XMLNode_SetCharValue(n, "ChrgBr", "SLEV"); - - - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - GWEN_XMLNODE *nn; - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtTrfTxInf"); - if (nn) { - GWEN_XMLNODE *nnn; - const AB_VALUE *tv; - - GWEN_XMLNode_AddChild(n, nn); - - /* create "PmtId" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtId"); - if (nnn) { - const char *s; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetEndToEndReference(t); - if (!( s && *s)) - s=AB_Transaction_GetCustomerReference(t); - if (!s) - s="NOTPROVIDED"; - GWEN_XMLNode_SetCharValue(nnn, "EndToEndId", s); - } - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Amt"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InstdAmt"); - if (nnnn) { - GWEN_BUFFER *tbuf; - const char *s; - GWEN_XMLNODE *nnnnn; - - GWEN_XMLNode_AddChild(nnn, nnnn); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(tv, tbuf, 2, 0); - s=AB_Value_GetCurrency(tv); - if (!s) - s="EUR"; - GWEN_XMLNode_SetProperty(nnnn, "Ccy", s); - - nnnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeData, GWEN_Buffer_GetStart(tbuf)); - GWEN_XMLNode_AddChild(nnnn, nnnnn); - GWEN_Buffer_free(tbuf); - } - } - - /* create "DbtrAgt" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrAgt"); - if (nnn) { - const char *s; - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote BIC"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "FinInstnId"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "BIC", s); - } - } - - /* create "Cdtr" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Cdtr"); - if (nnn) { - const GWEN_STRINGLIST *sl; - const char *s=NULL; - - GWEN_XMLNode_AddChild(nn, nnn); - sl=AB_Transaction_GetRemoteName(t); - if (sl) - s=GWEN_StringList_FirstString(sl); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote name"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nnn, "Nm", s); - } - - /* create "CdtrAcct" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrAcct"); - if (nnn) { - const char *s; - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote IBAN"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "IBAN", s); - } - } - - /* create "RmtInf" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "RmtInf"); - if (nnn) { - const GWEN_STRINGLIST *sl; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 140, 0, 1); - sl=AB_Transaction_GetPurpose(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - while(se) { - const char *s; - - s=GWEN_StringListEntry_Data(se); - assert(s); - if (GWEN_Buffer_GetUsedBytes(tbuf)) - GWEN_Buffer_AppendByte(tbuf, ' '); - GWEN_Buffer_AppendString(tbuf, s); - se=GWEN_StringListEntry_Next(se); - } - if (GWEN_Buffer_GetUsedBytes(tbuf)>140) - GWEN_Buffer_Crop(tbuf, 0, 140); - } - - if (GWEN_Buffer_GetUsedBytes(tbuf)<1) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing purpose in transaction"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nnn, "Ustrd", GWEN_Buffer_GetStart(tbuf)); - - GWEN_Buffer_free(tbuf); - } - } - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } /* while t */ - } - AB_Value_free(v); - - xmlctx=GWEN_XmlCtxStore_new(root, - GWEN_XML_FLAGS_INDENT | - GWEN_XML_FLAGS_SIMPLE | - GWEN_XML_FLAGS_HANDLE_HEADERS); - - rv=GWEN_XMLNode_WriteToStream(root, xmlctx, sio); - if (rv) { - DBG_INFO(AQBANKING_LOGDOMAIN, "here (%d)", rv); - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - return rv; - } - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - - return 0; -} - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_ccm.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_ccm.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_exp_ccm.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_exp_ccm.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,429 +0,0 @@ - - -#include - - - -int AH_ImExporterSEPA_Export_Ccm(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params){ - GWEN_XMLNODE *root; - GWEN_XMLNODE *documentNode; - GWEN_XMLNODE *painNode; - GWEN_XMLNODE *n; - AB_IMEXPORTER_ACCOUNTINFO *ai; - const AB_TRANSACTION *t; - AB_VALUE *v; - int tcount=0; - GWEN_XML_CONTEXT *xmlctx; - int rv; - - ai=AB_ImExporterContext_GetFirstAccountInfo(ctx); - if (ai==0) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No account info"); - return GWEN_ERROR_NO_DATA; - } - - v=AB_Value_new(); - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - const AB_VALUE *tv; - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - AB_Value_AddValue(v, tv); - tcount++; - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } - - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - - root=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "root"); - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "?xml"); - if (n) { - GWEN_XMLNode_AddHeader(root, n); - GWEN_XMLNode_SetProperty(n, "version", "1.0"); - GWEN_XMLNode_SetProperty(n, "encoding", "UTF-8"); - } - - documentNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Document"); -#if 0 - GWEN_XMLNode_SetProperty(documentNode, - "xmlns", - "urn:sepade:xsd:pain.001.001.02"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns:xsi", - "http://www.w3.org/2001/XMLSchema-instance"); - GWEN_XMLNode_SetProperty(documentNode, - "xsi:schemaLocation", - "urn:sepade:xsd:pain.001.001.02 pain.001.001.02.xsd"); -#else - GWEN_XMLNode_SetProperty(documentNode, - "xmlns", - "urn:swift:xsd:$pain.001.002.02"); - GWEN_XMLNode_SetProperty(documentNode, - "xmlns:xsi", - "http://www.w3.org/2001/XMLSchema-instance"); - GWEN_XMLNode_SetProperty(documentNode, - "xsi:schemaLocation", - "urn:swift:xsd:$pain.001.001.02 pain.001.001.02.xsd"); -#endif - GWEN_XMLNode_AddChild(root, documentNode); - - painNode=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "pain.001.001.02"); - GWEN_XMLNode_AddChild(documentNode, painNode); - - /* create GrpHdr */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "GrpHdr"); - if (n) { - GWEN_TIME *ti; - GWEN_BUFFER *tbuf; - uint32_t uid; - char numbuf[32]; - GWEN_XMLNODE *nn; - - GWEN_XMLNode_AddChild(painNode, n); - ti=GWEN_CurrentTime(); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - - /* generate MsgId */ - uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); - GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); - snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); - GWEN_Buffer_AppendString(tbuf, numbuf); - GWEN_XMLNode_SetCharValue(n, "MsgId", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_Reset(tbuf); - - /* generate CreDtTm */ - GWEN_Time_toUtcString(ti, "YYYY-MM-DDThh:mm:ssZ", tbuf); - GWEN_XMLNode_SetCharValue(n, "CreDtTm", GWEN_Buffer_GetStart(tbuf)); - GWEN_Time_free(ti); - GWEN_Buffer_Reset(tbuf); - - /* store NbOfTxs */ - GWEN_XMLNode_SetIntValue(n, "NbOfTxs", tcount); - - /* store sum */ - AB_Value_toHumanReadableString2(v, tbuf, 2, 0); - GWEN_XMLNode_SetCharValue(n, "CtrlSum", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - - GWEN_XMLNode_SetCharValue(n, "Grpg", "GRPD"); - //GWEN_XMLNode_SetCharValue(n, "Grpg", "MIXD"); - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InitgPty"); - if (nn) { - const char *s; - - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - AB_Value_free(v); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - - } - } - AB_Value_free(v); - - /* generate PmtInf */ - n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtInf"); - if (n) { - const GWEN_TIME *tti; - GWEN_XMLNODE *nn; - - GWEN_XMLNode_AddChild(painNode, n); - GWEN_XMLNode_SetCharValue(n, "PmtInfId", ""); - GWEN_XMLNode_SetCharValue(n, "PmtMtd", "TRF"); - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtTpInf"); - if (nn) { - GWEN_XMLNODE *nnn; - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "SvcLvl"); - if (nnn) { - GWEN_XMLNode_SetCharValue(nnn, "Cd", "SEPA"); - GWEN_XMLNode_AddChild(nn, nnn); - } - - GWEN_XMLNode_AddChild(n, nn); - } - - /* create ReqdExctnDt" */ - tti=AB_Transaction_GetDate(t); - if (tti) { - GWEN_BUFFER *tbuf; - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - GWEN_Time_toString(tti, "YYYY-MM-DD", tbuf); - GWEN_XMLNode_SetCharValue(n, "ReqdExctnDt", GWEN_Buffer_GetStart(tbuf)); - GWEN_Buffer_free(tbuf); - } - else { - GWEN_XMLNode_SetCharValue(n, "ReqdExctnDt", "1999-01-01"); - } - - /* create "Dbtr" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Dbtr"); - if (nn) { - const char *s; - - GWEN_XMLNode_AddChild(n, nn); - - s=AB_ImExporterAccountInfo_GetOwner(ai); - if (!s) - s=AB_Transaction_GetLocalName(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No owner"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nn, "Nm", s); - } - - /* create "DbtrAcct" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAcct"); - if (nn) { - const char *s; - GWEN_XMLNODE *nnn; - - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetIban(ai); - if (!s) - s=AB_Transaction_GetLocalIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No local IBAN"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); - if (nnn) { - GWEN_XMLNode_AddChild(nn, nnn); - GWEN_XMLNode_SetCharValue(nnn, "IBAN", s); - } - } - - /* create "DbtrAgt" */ - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAgt"); - if (nn) { - const char *s; - GWEN_XMLNODE *nnn; - - GWEN_XMLNode_AddChild(n, nn); - s=AB_ImExporterAccountInfo_GetBic(ai); - if (!s) - s=AB_Transaction_GetLocalBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No BIC"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "FinInstnId"); - if (nnn) { - GWEN_XMLNode_AddChild(nn, nnn); - GWEN_XMLNode_SetCharValue(nnn, "BIC", s); - } - } - - GWEN_XMLNode_SetCharValue(n, "ChrgBr", "SLEV"); - - - t=AB_ImExporterAccountInfo_GetFirstTransaction(ai); - while(t) { - GWEN_XMLNODE *nn; - - nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtTrfTxInf"); - if (nn) { - GWEN_XMLNODE *nnn; - const AB_VALUE *tv; - - GWEN_XMLNode_AddChild(n, nn); - - /* create "PmtId" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtId"); - if (nnn) { - const char *s; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetEndToEndReference(t); - if (!( s && *s)) - s=AB_Transaction_GetCustomerReference(t); - if (!s) - s="NOTPROVIDED"; - GWEN_XMLNode_SetCharValue(nnn, "EndToEndId", s); - } - - tv=AB_Transaction_GetValue(t); - if (tv==NULL) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Amt"); - if (nnn) { - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InstdAmt"); - if (nnnn) { - GWEN_BUFFER *tbuf; - const char *s; - GWEN_XMLNODE *nnnnn; - - GWEN_XMLNode_AddChild(nnn, nnnn); - - tbuf=GWEN_Buffer_new(0, 64, 0, 1); - AB_Value_toHumanReadableString2(tv, tbuf, 2, 0); - s=AB_Value_GetCurrency(tv); - if (!s) - s="EUR"; - GWEN_XMLNode_SetProperty(nnnn, "Ccy", s); - - nnnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeData, GWEN_Buffer_GetStart(tbuf)); - GWEN_XMLNode_AddChild(nnnn, nnnnn); - GWEN_Buffer_free(tbuf); - } - } - - /* create "DbtrAgt" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrAgt"); - if (nnn) { - const char *s; - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteBic(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote BIC"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "FinInstnId"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "BIC", s); - } - } - - /* create "Cdtr" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Cdtr"); - if (nnn) { - const GWEN_STRINGLIST *sl; - const char *s=NULL; - - GWEN_XMLNode_AddChild(nn, nnn); - sl=AB_Transaction_GetRemoteName(t); - if (sl) - s=GWEN_StringList_FirstString(sl); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote name"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - GWEN_XMLNode_SetCharValue(nnn, "Nm", s); - } - - /* create "CdtrAcct" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrAcct"); - if (nnn) { - const char *s; - GWEN_XMLNODE *nnnn; - - GWEN_XMLNode_AddChild(nn, nnn); - s=AB_Transaction_GetRemoteIban(t); - if (!s) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote IBAN"); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); - if (nnnn) { - GWEN_XMLNode_AddChild(nnn, nnnn); - GWEN_XMLNode_SetCharValue(nnnn, "IBAN", s); - } - } - - /* create "RmtInf" */ - nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "RmtInf"); - if (nnn) { - const GWEN_STRINGLIST *sl; - GWEN_BUFFER *tbuf; - - GWEN_XMLNode_AddChild(nn, nnn); - - tbuf=GWEN_Buffer_new(0, 140, 0, 1); - sl=AB_Transaction_GetPurpose(t); - if (sl) { - GWEN_STRINGLISTENTRY *se; - - se=GWEN_StringList_FirstEntry(sl); - while(se) { - const char *s; - - s=GWEN_StringListEntry_Data(se); - assert(s); - if (GWEN_Buffer_GetUsedBytes(tbuf)) - GWEN_Buffer_AppendByte(tbuf, ' '); - GWEN_Buffer_AppendString(tbuf, s); - se=GWEN_StringListEntry_Next(se); - } - if (GWEN_Buffer_GetUsedBytes(tbuf)>140) - GWEN_Buffer_Crop(tbuf, 0, 140); - } - - if (GWEN_Buffer_GetUsedBytes(tbuf)<1) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing purpose in transaction"); - GWEN_Buffer_free(tbuf); - GWEN_XMLNode_free(root); - return GWEN_ERROR_BAD_DATA; - } - - GWEN_XMLNode_SetCharValue(nnn, "Ustrd", GWEN_Buffer_GetStart(tbuf)); - - GWEN_Buffer_free(tbuf); - } - } - - t=AB_ImExporterAccountInfo_GetNextTransaction(ai); - } /* while t */ - } - - xmlctx=GWEN_XmlCtxStore_new(root, - GWEN_XML_FLAGS_DEFAULT | - GWEN_XML_FLAGS_SIMPLE | - GWEN_XML_FLAGS_HANDLE_HEADERS); - - rv=GWEN_XMLNode_WriteToStream(root, xmlctx, sio); - if (rv) { - DBG_INFO(AQBANKING_LOGDOMAIN, "here (%d)", rv); - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - return rv; - } - GWEN_XmlCtx_free(xmlctx); - GWEN_XMLNode_free(root); - - return 0; -} - - - - diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_pain_001.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_pain_001.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_pain_001.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_pain_001.c 2014-08-19 19:31:31.000000000 +0000 @@ -0,0 +1,296 @@ + + +#include + + + +int AH_ImExporterSEPA_Export_Pain_001(AB_IMEXPORTER *ie, + AB_IMEXPORTER_CONTEXT *ctx, + GWEN_XMLNODE *painNode, + uint32_t doctype[], + GWEN_DB_NODE *params){ + GWEN_XMLNODE *n; + AH_IMEXPORTER_SEPA_PMTINF_LIST *pl; + AH_IMEXPORTER_SEPA_PMTINF *pmtinf; + int post_1_1_2=(doctype[1]>1 || doctype[2]>2); + const char *s; + int rv; + + rv=AH_ImExporterSEPA_Export_Pain_Setup(ie, ctx, painNode, doctype, &pl); + if (rv) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "here %d", rv); + return rv; + } + + /* generate PmtInf blocks */ + pmtinf=AH_ImExporter_Sepa_PmtInf_List_First(pl); + while(pmtinf) { + const GWEN_TIME *tti; + GWEN_XMLNODE *nn; + AB_TRANSACTION *t; + AB_TRANSACTION_LIST2_ITERATOR *it; + + n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtInf"); + GWEN_XMLNode_AddChild(painNode, n); + + /* generate PmtInfId */ + if (1) { + GWEN_TIME *ti; + GWEN_BUFFER *tbuf; + uint32_t uid; + char numbuf[32]; + + ti=GWEN_CurrentTime(); + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + + uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); + GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); + snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); + GWEN_Buffer_AppendString(tbuf, numbuf); + GWEN_XMLNode_SetCharValue(n, "PmtInfId", GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + GWEN_Time_free(ti); + } + + GWEN_XMLNode_SetCharValue(n, "PmtMtd", "TRF"); + + if (post_1_1_2) { + /* store BtchBookg */ + GWEN_XMLNode_SetCharValue(n, "BtchBookg", + GWEN_DB_GetIntValue(params, + "singleBookingWanted", 0, 1) + ? "false" + : "true"); + /* store NbOfTxs */ + GWEN_XMLNode_SetIntValue(n, "NbOfTxs", pmtinf->tcount); + /* store CtrlSum */ + GWEN_XMLNode_SetCharValue(n, "CtrlSum", pmtinf->ctrlsum); + } + + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtTpInf"); + if (nn) { + GWEN_XMLNODE *nnn; + + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "SvcLvl"); + if (nnn) { + GWEN_XMLNode_SetCharValue(nnn, "Cd", "SEPA"); + GWEN_XMLNode_AddChild(nn, nnn); + } + + GWEN_XMLNode_AddChild(n, nn); + } + + /* create ReqdExctnDt" */ + tti=pmtinf->date; + if (tti) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + GWEN_Time_toString(tti, "YYYY-MM-DD", tbuf); + GWEN_XMLNode_SetCharValue(n, "ReqdExctnDt", GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + else { + GWEN_XMLNode_SetCharValue(n, "ReqdExctnDt", "1999-01-01"); + } + + /* create "Dbtr" */ + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Dbtr"); + if (nn) { + GWEN_XMLNode_AddChild(n, nn); + GWEN_XMLNode_SetCharValue(nn, "Nm", pmtinf->localName); + } + + /* create "DbtrAcct" */ + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAcct"); + if (nn) { + GWEN_XMLNODE *nnn; + + GWEN_XMLNode_AddChild(n, nn); + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); + if (nnn) { + GWEN_XMLNode_AddChild(nn, nnn); + GWEN_XMLNode_SetCharValue(nnn, "IBAN", pmtinf->localIban); + } + } + + /* create "DbtrAgt" */ + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAgt"); + if (nn) { + GWEN_XMLNODE *nnn; + + GWEN_XMLNode_AddChild(n, nn); + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "FinInstnId"); + if (nnn) { + GWEN_XMLNode_AddChild(nn, nnn); + GWEN_XMLNode_SetCharValue(nnn, "BIC", pmtinf->localBic); + } + } + + GWEN_XMLNode_SetCharValue(n, "ChrgBr", "SLEV"); + + + it=AB_Transaction_List2_First(pmtinf->transactions); + assert(it); + t=AB_Transaction_List2Iterator_Data(it); + while(t) { + GWEN_XMLNODE *nn; + + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtTrfTxInf"); + if (nn) { + GWEN_XMLNODE *nnn; + const AB_VALUE *tv; + + GWEN_XMLNode_AddChild(n, nn); + + /* create "PmtId" */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtId"); + if (nnn) { + GWEN_XMLNode_AddChild(nn, nnn); + s=AB_Transaction_GetEndToEndReference(t); + if (!( s && *s)) + s=AB_Transaction_GetCustomerReference(t); + if (!s) + s="NOTPROVIDED"; + GWEN_XMLNode_SetCharValue(nnn, "EndToEndId", s); + } + + tv=AB_Transaction_GetValue(t); + if (tv==NULL) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Amt"); + if (nnn) { + GWEN_XMLNODE *nnnn; + + GWEN_XMLNode_AddChild(nn, nnn); + + nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InstdAmt"); + if (nnnn) { + GWEN_BUFFER *tbuf; + GWEN_XMLNODE *nnnnn; + + GWEN_XMLNode_AddChild(nnn, nnnn); + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + AB_Value_toHumanReadableString2(tv, tbuf, 2, 0); + s=AB_Value_GetCurrency(tv); + if (!s) + s="EUR"; + GWEN_XMLNode_SetProperty(nnnn, "Ccy", s); + + nnnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeData, GWEN_Buffer_GetStart(tbuf)); + GWEN_XMLNode_AddChild(nnnn, nnnnn); + GWEN_Buffer_free(tbuf); + } + } + + /* create "CdtrAgt" */ + s=AB_Transaction_GetRemoteBic(t); + if (s && *s) + GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "CdtrAgt/FinInstnId/BIC", s); + else if (doctype[1]<3) { /* BIC not required since 001.003.03 */ + DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote BIC"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + /* create "Cdtr" */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Cdtr"); + if (nnn) { + const GWEN_STRINGLIST *sl; + + s=NULL; + GWEN_XMLNode_AddChild(nn, nnn); + sl=AB_Transaction_GetRemoteName(t); + if (sl) + s=GWEN_StringList_FirstString(sl); + if (!s) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote name"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + GWEN_XMLNode_SetCharValue(nnn, "Nm", s); + } + + /* create "CdtrAcct" */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "CdtrAcct"); + if (nnn) { + GWEN_XMLNODE *nnnn; + + GWEN_XMLNode_AddChild(nn, nnn); + s=AB_Transaction_GetRemoteIban(t); + if (!s) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote IBAN"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); + if (nnnn) { + GWEN_XMLNode_AddChild(nnn, nnnn); + GWEN_XMLNode_SetCharValue(nnnn, "IBAN", s); + } + } + + /* create "RmtInf" */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "RmtInf"); + if (nnn) { + const GWEN_STRINGLIST *sl; + GWEN_BUFFER *tbuf; + + GWEN_XMLNode_AddChild(nn, nnn); + + tbuf=GWEN_Buffer_new(0, 140, 0, 1); + sl=AB_Transaction_GetPurpose(t); + if (sl) { + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(sl); + while(se) { + s=GWEN_StringListEntry_Data(se); + assert(s); + if (GWEN_Buffer_GetUsedBytes(tbuf)) + GWEN_Buffer_AppendByte(tbuf, ' '); + GWEN_Buffer_AppendString(tbuf, s); + se=GWEN_StringListEntry_Next(se); + } + if (GWEN_Buffer_GetUsedBytes(tbuf)>140) + GWEN_Buffer_Crop(tbuf, 0, 140); + } + + if (GWEN_Buffer_GetUsedBytes(tbuf)<1) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing purpose in transaction"); + GWEN_Buffer_free(tbuf); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + GWEN_XMLNode_SetCharValue(nnn, "Ustrd", GWEN_Buffer_GetStart(tbuf)); + + GWEN_Buffer_free(tbuf); + } + } + + t=AB_Transaction_List2Iterator_Next(it); + } /* while t */ + AB_Transaction_List2Iterator_free(it); + pmtinf=AH_ImExporter_Sepa_PmtInf_List_Next(pmtinf); + } /* while pmtinf */ + AH_ImExporter_Sepa_PmtInf_List_free(pl); + + return 0; +} + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_pain_008.c libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_pain_008.c --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_pain_008.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_pain_008.c 2014-08-19 19:31:31.000000000 +0000 @@ -0,0 +1,418 @@ + + +#include + + + +int AH_ImExporterSEPA_Export_Pain_008(AB_IMEXPORTER *ie, + AB_IMEXPORTER_CONTEXT *ctx, + GWEN_XMLNODE *painNode, + uint32_t doctype[], + GWEN_DB_NODE *params){ + GWEN_XMLNODE *n; + AH_IMEXPORTER_SEPA_PMTINF_LIST *pl; + AH_IMEXPORTER_SEPA_PMTINF *pmtinf; + int is_8_1_1=(doctype[1]==1 && doctype[2]==1); + const char *s; + int rv; + + rv=AH_ImExporterSEPA_Export_Pain_Setup(ie, ctx, painNode, doctype, &pl); + if (rv) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "here %d", rv); + return rv; + } + + /* generate PmtInf blocks */ + pmtinf=AH_ImExporter_Sepa_PmtInf_List_First(pl); + while(pmtinf) { + const GWEN_TIME *tti; + GWEN_XMLNODE *nn; + AB_TRANSACTION *t; + AB_TRANSACTION_LIST2_ITERATOR *it; + + n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtInf"); + GWEN_XMLNode_AddChild(painNode, n); + + /* generate PmtInfId */ + if (1) { + GWEN_TIME *ti; + GWEN_BUFFER *tbuf; + uint32_t uid; + char numbuf[32]; + + ti=GWEN_CurrentTime(); + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + + uid=AB_Banking_GetUniqueId(AB_ImExporter_GetBanking(ie)); + GWEN_Time_toUtcString(ti, "YYYYMMDD-hh:mm:ss-", tbuf); + snprintf(numbuf, sizeof(numbuf)-1, "%08x", uid); + GWEN_Buffer_AppendString(tbuf, numbuf); + GWEN_XMLNode_SetCharValue(n, "PmtInfId", GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + GWEN_Time_free(ti); + } + + GWEN_XMLNode_SetCharValue(n, "PmtMtd", "DD"); + + if (!is_8_1_1) { + /* store BtchBookg */ + GWEN_XMLNode_SetCharValue(n, "BtchBookg", + GWEN_DB_GetIntValue(params, + "singleBookingWanted", 0, 1) + ? "false" + : "true"); + /* store NbOfTxs */ + GWEN_XMLNode_SetIntValue(n, "NbOfTxs", pmtinf->tcount); + /* store CtrlSum */ + GWEN_XMLNode_SetCharValue(n, "CtrlSum", pmtinf->ctrlsum); + } + + /* PmtTpInf */ + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "PmtTpInf"); + if (nn) { + GWEN_XMLNODE *nnn; + + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "SvcLvl"); + if (nnn) { + GWEN_XMLNode_SetCharValue(nnn, "Cd", "SEPA"); + GWEN_XMLNode_AddChild(nn, nnn); + } + + if (!is_8_1_1) { + s=GWEN_DB_GetCharValue(params, "LocalInstrumentSEPACode", 0, "CORE"); + if ((doctype[1]>=3 && !strcmp(s, "COR1")) || /* new in 008.003.02 */ + !strcmp(s, "CORE") || + !strcmp(s, "B2B")) + GWEN_XMLNode_SetCharValueByPath(nn, + GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "LclInstrm/Cd", s); + else { + DBG_ERROR(AQBANKING_LOGDOMAIN, + "Invalid Local InstrumentCode"); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + } + + switch(pmtinf->sequenceType) { + case AB_Transaction_SequenceTypeOnce: + GWEN_XMLNode_SetCharValue(nn, "SeqTp", "OOFF"); + break; + case AB_Transaction_SequenceTypeFirst: + GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FRST"); + break; + case AB_Transaction_SequenceTypeFollowing: + GWEN_XMLNode_SetCharValue(nn, "SeqTp", "RCUR"); + break; + case AB_Transaction_SequenceTypeFinal: + GWEN_XMLNode_SetCharValue(nn, "SeqTp", "FNAL"); + break; + default: + DBG_ERROR(AQBANKING_LOGDOMAIN, "Sequence type of debit note unknown"); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + GWEN_XMLNode_AddChild(n, nn); + } + + /* create "ReqdColltnDt" */ + tti=pmtinf->date; + if (tti) { + GWEN_BUFFER *tbuf; + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + GWEN_Time_toString(tti, "YYYY-MM-DD", tbuf); + GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + } + else { + GWEN_XMLNode_SetCharValue(n, "ReqdColltnDt", "1999-01-01"); + } + + /* create "Cdtr" */ + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Cdtr"); + if (nn) { + GWEN_XMLNode_AddChild(n, nn); + GWEN_XMLNode_SetCharValue(nn, "Nm", pmtinf->localName); + } + + /* create "CdtrAcct" */ + GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "CdtrAcct/Id/IBAN", pmtinf->localIban); + + /* create "CdtrAgt" */ + GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "CdtrAgt/FinInstnId/BIC", pmtinf->localBic); + + GWEN_XMLNode_SetCharValue(n, "ChrgBr", "SLEV"); + + /* create "CdtrSchmeId" */ + if (!is_8_1_1) { /* Otherwise set on DrctDbtTx level */ + GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "CdtrSchmeId/Id/PrvtId/Othr/Id", + pmtinf->creditorSchemeId); + GWEN_XMLNode_SetCharValueByPath(n, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "CdtrSchmeId/Id/PrvtId/Othr/SchmeNm/Prtry", "SEPA"); + } + + + /* DrctDbtTxInf */ + it=AB_Transaction_List2_First(pmtinf->transactions); + assert(it); + t=AB_Transaction_List2Iterator_Data(it); + while(t) { + GWEN_XMLNODE *nn; + + nn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTxInf"); + if (nn) { + GWEN_XMLNODE *nnn; + const AB_VALUE *tv; + + GWEN_XMLNode_AddChild(n, nn); + + /* create "PmtId/EndToEndId" */ + s=AB_Transaction_GetEndToEndReference(t); + if (!( s && *s)) + s=AB_Transaction_GetCustomerReference(t); + if (!s) + s="NOTPROVIDED"; + GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "PmtId/EndToEndId", s); + + tv=AB_Transaction_GetValue(t); + if (tv==NULL) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No value in transaction"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "InstdAmt"); + if (nnn) { + GWEN_BUFFER *tbuf; + GWEN_XMLNODE *nnnn; + + GWEN_XMLNode_AddChild(nn, nnn); + + tbuf=GWEN_Buffer_new(0, 64, 0, 1); + AB_Value_toHumanReadableString2(tv, tbuf, 2, 0); + s=AB_Value_GetCurrency(tv); + if (!s) + s="EUR"; + GWEN_XMLNode_SetProperty(nnn, "Ccy", s); + + nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeData, GWEN_Buffer_GetStart(tbuf)); + GWEN_XMLNode_AddChild(nnn, nnnn); + GWEN_Buffer_free(tbuf); + } + + /* DrctDbtTx */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DrctDbtTx"); + if (nnn) { + GWEN_XMLNODE *nnnn; + + GWEN_XMLNode_AddChild(nn, nnn); + + /* add mandate info */ + nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "MndtRltdInf"); + if (nnnn) { + const char *mandateId; + const char *origCredSchemId; + const char *origMandateId; + const char *origCreditorName; + const GWEN_DATE *dt; + GWEN_BUFFER *tbuf; + + GWEN_XMLNode_AddChild(nnn, nnnn); + + dt=AB_Transaction_GetMandateDate(t); + if (!dt) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate date for direct debit"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + mandateId=AB_Transaction_GetMandateId(t); + if (!mandateId) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing mandate id for direct debit"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + origCredSchemId=AB_Transaction_GetOriginalCreditorSchemeId(t); + origMandateId=AB_Transaction_GetOriginalMandateId(t); + origCreditorName=AB_Transaction_GetOriginalCreditorName(t); + + /* MndtId */ + GWEN_XMLNode_SetCharValue(nnnn, "MndtId", mandateId); + + /* DtOfSgntr */ + tbuf=GWEN_Buffer_new(0, 32, 0, 1); + rv=GWEN_Date_toStringWithTemplate(dt, "YYYY-MM-DD", tbuf); + if (rv<0) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "Error converting date to string"); + GWEN_Buffer_free(tbuf); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return rv; + } + GWEN_XMLNode_SetCharValue(nnnn, "DtOfSgntr", GWEN_Buffer_GetStart(tbuf)); + GWEN_Buffer_free(tbuf); + + if ((origCredSchemId && *origCredSchemId) || + (origMandateId && *origMandateId) || + (origCreditorName && *origCreditorName)) { + GWEN_XMLNODE *n5; + + GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "true"); + + n5=GWEN_XMLNode_GetNodeByXPath(nnnn, "AmdmntInfDtls/OrgnlCdtrSchmeId", 0); + if (n5) { + + if (origMandateId && *origMandateId) + GWEN_XMLNode_SetCharValue(n5, "OrgnlMndtId", origMandateId); + + if (origCreditorName && *origCreditorName) + GWEN_XMLNode_SetCharValue(n5, "Nm", origCreditorName); + + if (origCredSchemId && *origCredSchemId) { + GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + !is_8_1_1 + ? "Id/PrvtId/Othr/Id" + : "Id/PrvtId/OthrId/Id", + origCredSchemId); + GWEN_XMLNode_SetCharValueByPath(n5, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + !is_8_1_1 + ? "Id/PrvtId/Othr/SchmeNm/Prtry" + : "Id/PrvtId/OthrId/IdTp", + "SEPA"); + } + } + } + else { + GWEN_XMLNode_SetCharValue(nnnn, "AmdmntInd", "false"); + } + } + + /* create "CdtrSchmeId" */ + if (is_8_1_1) { /* Otherwise set on PmtInf level */ + GWEN_XMLNode_SetCharValueByPath(nnn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "CdtrSchmeId/Id/PrvtId/OthrId/Id", + pmtinf->creditorSchemeId); + GWEN_XMLNode_SetCharValueByPath(nnn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "CdtrSchmeId/Id/PrvtId/OthrId/IdTp", "SEPA"); + } + } + + /* create "DbtrAgt" */ + s=AB_Transaction_GetRemoteBic(t); + if (s && *s) + GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, + "DbtrAgt/FinInstnId/BIC", s); + else if (doctype[1]<3) { /* BIC not required since 008.003.02 */ + DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote BIC"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + /* create "Dbtr" */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Dbtr"); + if (nnn) { + const GWEN_STRINGLIST *sl; + const char *s=NULL; + + GWEN_XMLNode_AddChild(nn, nnn); + sl=AB_Transaction_GetRemoteName(t); + if (sl) + s=GWEN_StringList_FirstString(sl); + if (!s) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote name"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + GWEN_XMLNode_SetCharValue(nnn, "Nm", s); + } + + /* create "DbtrAcct" */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "DbtrAcct"); + if (nnn) { + GWEN_XMLNODE *nnnn; + + GWEN_XMLNode_AddChild(nn, nnn); + s=AB_Transaction_GetRemoteIban(t); + if (!s) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "No remote IBAN"); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + nnnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "Id"); + if (nnnn) { + GWEN_XMLNode_AddChild(nnn, nnnn); + GWEN_XMLNode_SetCharValue(nnnn, "IBAN", s); + } + } + + /* add "Ultimate Debitor Name", if given */ + s=AB_Transaction_GetMandateDebitorName(t); + if (s && *s) + GWEN_XMLNode_SetCharValueByPath(nn, GWEN_XML_PATH_FLAGS_OVERWRITE_VALUES, "UltmtDbtr/Nm", s); + + /* create "RmtInf" */ + nnn=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "RmtInf"); + if (nnn) { + const GWEN_STRINGLIST *sl; + GWEN_BUFFER *tbuf; + + GWEN_XMLNode_AddChild(nn, nnn); + + tbuf=GWEN_Buffer_new(0, 140, 0, 1); + sl=AB_Transaction_GetPurpose(t); + if (sl) { + GWEN_STRINGLISTENTRY *se; + + se=GWEN_StringList_FirstEntry(sl); + while(se) { + s=GWEN_StringListEntry_Data(se); + assert(s); + if (GWEN_Buffer_GetUsedBytes(tbuf)) + GWEN_Buffer_AppendByte(tbuf, ' '); + GWEN_Buffer_AppendString(tbuf, s); + se=GWEN_StringListEntry_Next(se); + } + if (GWEN_Buffer_GetUsedBytes(tbuf)>140) + GWEN_Buffer_Crop(tbuf, 0, 140); + } + + if (GWEN_Buffer_GetUsedBytes(tbuf)<1) { + DBG_ERROR(AQBANKING_LOGDOMAIN, "Missing purpose in transaction"); + GWEN_Buffer_free(tbuf); + AB_Transaction_List2Iterator_free(it); + AH_ImExporter_Sepa_PmtInf_List_free(pl); + return GWEN_ERROR_BAD_DATA; + } + + GWEN_XMLNode_SetCharValue(nnn, "Ustrd", GWEN_Buffer_GetStart(tbuf)); + + GWEN_Buffer_free(tbuf); + } + } + + t=AB_Transaction_List2Iterator_Next(it); + } /* while t */ + AB_Transaction_List2Iterator_free(it); + pmtinf=AH_ImExporter_Sepa_PmtInf_List_Next(pmtinf); + } /* while pmtinf */ + AH_ImExporter_Sepa_PmtInf_List_free(pl); + + return 0; +} + + + + diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_p.h libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_p.h --- libaqbanking-5.4.3beta/src/plugins/imexporters/sepa/sepa_p.h 2014-03-24 20:44:13.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa_p.h 2014-07-23 20:29:51.000000000 +0000 @@ -20,13 +20,26 @@ int dummy; }; - - -enum { - AH_ImExportSEPA_SubType_Default=0, - AH_ImExportSEPA_SubType_Cor1 +typedef struct AH_IMEXPORTER_SEPA_PMTINF AH_IMEXPORTER_SEPA_PMTINF; +struct AH_IMEXPORTER_SEPA_PMTINF { + GWEN_LIST_ELEMENT(AH_IMEXPORTER_SEPA_PMTINF) + int tcount; + AB_VALUE *value; + char *ctrlsum; + const GWEN_TIME *date; + uint32_t transDate; + const char *localName; + const char *localIban; + const char *localBic; + AB_TRANSACTION_SEQUENCETYPE sequenceType; + const char *creditorSchemeId; + AB_TRANSACTION_LIST2 *transactions; }; +/* these functions are not part of the public API */ +static void AH_ImExporter_Sepa_PmtInf_free(AH_IMEXPORTER_SEPA_PMTINF *pmtinf); +GWEN_LIST_FUNCTION_DEFS(AH_IMEXPORTER_SEPA_PMTINF, AH_ImExporter_Sepa_PmtInf) + AQBANKING_EXPORT GWEN_PLUGIN *imexporter_sepa_factory(GWEN_PLUGIN_MANAGER *pm, @@ -59,38 +72,18 @@ static -int AH_ImExporterSEPA_Export_Ccm(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params); - -static -int AH_ImExporterSEPA_Export_001_002_03(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params); - -static -int AH_ImExporterSEPA_Export_008_001_01(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params, - int subType); - -static -int AH_ImExporterSEPA_Export_008_002_02(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params, - int subType); - +int AH_ImExporterSEPA_Export_Pain_001(AB_IMEXPORTER *ie, + AB_IMEXPORTER_CONTEXT *ctx, + GWEN_XMLNODE *painNode, + uint32_t doctype[], + GWEN_DB_NODE *params); static -int AH_ImExporterSEPA_Export_008_003_02(AB_IMEXPORTER *ie, - AB_IMEXPORTER_CONTEXT *ctx, - GWEN_SYNCIO *sio, - GWEN_DB_NODE *params, - int subType); +int AH_ImExporterSEPA_Export_Pain_008(AB_IMEXPORTER *ie, + AB_IMEXPORTER_CONTEXT *ctx, + GWEN_XMLNODE *painNode, + uint32_t doctype[], + GWEN_DB_NODE *params); #endif /* AQHBCI_IMEX_SEPA_P_H */ diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/swift/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/swift/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/swift/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/swift/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/swift -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/swift.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/swift.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,31 +132,57 @@ swift_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_swift_la_OBJECTS = swift.lo swift_la_OBJECTS = $(am_swift_la_OBJECTS) -swift_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(swift_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +swift_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(swift_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(swift_la_SOURCES) DIST_SOURCES = $(swift_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +192,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -173,6 +247,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -261,6 +336,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -477,6 +553,7 @@ $(am__aclocal_m4_deps): swift.xml: $(top_builddir)/config.status $(srcdir)/swift.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -503,14 +580,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + swift.la: $(swift_la_OBJECTS) $(swift_la_DEPENDENCIES) $(EXTRA_swift_la_DEPENDENCIES) - $(swift_la_LINK) -rpath $(imexporterplugindir) $(swift_la_OBJECTS) $(swift_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(swift_la_LINK) -rpath $(imexporterplugindir) $(swift_la_OBJECTS) $(swift_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -521,25 +601,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swift.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -569,22 +649,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -599,57 +682,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -665,12 +703,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -682,15 +715,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -699,6 +728,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -869,25 +913,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/swift/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/swift/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/swift/profiles/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/swift/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/swift/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/amro940.conf.in $(srcdir)/amro942.conf.in \ - $(srcdir)/swiftmt940.conf.in $(srcdir)/swiftmt942.conf.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/swiftmt940.conf.in $(srcdir)/swiftmt942.conf.in \ + $(srcdir)/amro940.conf.in $(srcdir)/amro942.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -70,6 +97,18 @@ CONFIG_CLEAN_FILES = swiftmt940.conf swiftmt942.conf amro940.conf \ amro942.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -106,10 +145,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -198,6 +239,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -439,11 +481,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -582,16 +624,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/xmldb/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/xmldb/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/xmldb/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/xmldb/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/xmldb -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/xmldb.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/xmldb.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,31 +132,57 @@ xmldb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_xmldb_la_OBJECTS = xmldb.lo xmldb_la_OBJECTS = $(am_xmldb_la_OBJECTS) -xmldb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xmldb_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +xmldb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xmldb_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xmldb_la_SOURCES) DIST_SOURCES = $(xmldb_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +192,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -173,6 +247,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -261,6 +336,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -477,6 +553,7 @@ $(am__aclocal_m4_deps): xmldb.xml: $(top_builddir)/config.status $(srcdir)/xmldb.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -503,14 +580,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + xmldb.la: $(xmldb_la_OBJECTS) $(xmldb_la_DEPENDENCIES) $(EXTRA_xmldb_la_DEPENDENCIES) - $(xmldb_la_LINK) -rpath $(imexporterplugindir) $(xmldb_la_OBJECTS) $(xmldb_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(xmldb_la_LINK) -rpath $(imexporterplugindir) $(xmldb_la_OBJECTS) $(xmldb_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -521,25 +601,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmldb.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -569,22 +649,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -599,57 +682,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -665,12 +703,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -682,15 +715,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -699,6 +728,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -869,25 +913,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/xmldb/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/xmldb/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/xmldb/profiles/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/xmldb/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/xmldb/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -431,11 +473,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -574,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/yellownet/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/yellownet/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/yellownet/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/yellownet/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/yellownet -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/yellownet.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/yellownet.xml.in $(top_srcdir)/depcomp \ + $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -105,31 +133,57 @@ $(am__DEPENDENCIES_1) am_yellownet_la_OBJECTS = yellownet.lo yellownet_la_OBJECTS = $(am_yellownet_la_OBJECTS) -yellownet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +yellownet_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(yellownet_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(yellownet_la_SOURCES) DIST_SOURCES = $(yellownet_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -139,9 +193,29 @@ HEADERS = $(noinst_HEADERS) 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -174,6 +248,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -262,6 +337,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -478,6 +554,7 @@ $(am__aclocal_m4_deps): yellownet.xml: $(top_builddir)/config.status $(srcdir)/yellownet.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-imexporterpluginLTLIBRARIES: $(imexporterplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(imexporterplugin_LTLIBRARIES)'; test -n "$(imexporterplugindir)" || list=; \ @@ -504,14 +581,17 @@ clean-imexporterpluginLTLIBRARIES: -test -z "$(imexporterplugin_LTLIBRARIES)" || rm -f $(imexporterplugin_LTLIBRARIES) - @list='$(imexporterplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(imexporterplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + yellownet.la: $(yellownet_la_OBJECTS) $(yellownet_la_DEPENDENCIES) $(EXTRA_yellownet_la_DEPENDENCIES) - $(yellownet_la_LINK) -rpath $(imexporterplugindir) $(yellownet_la_OBJECTS) $(yellownet_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(yellownet_la_LINK) -rpath $(imexporterplugindir) $(yellownet_la_OBJECTS) $(yellownet_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -522,25 +602,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yellownet.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -570,22 +650,25 @@ dir='$(DESTDIR)$(imexporterplugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -600,57 +683,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -666,12 +704,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -683,15 +716,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -700,6 +729,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -870,25 +914,23 @@ uninstall-am: uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-imexporterpluginLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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-imexporterpluginDATA \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-imexporterpluginLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir 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-imexporterpluginDATA \ install-imexporterpluginLTLIBRARIES 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-imexporterpluginDATA \ uninstall-imexporterpluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/imexporters/yellownet/profiles/Makefile.in libaqbanking-5.6.1beta/src/plugins/imexporters/yellownet/profiles/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/imexporters/yellownet/profiles/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/imexporters/yellownet/profiles/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/imexporters/yellownet/profiles -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/default.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ @@ -68,6 +95,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,10 +143,12 @@ } am__installdirs = "$(DESTDIR)$(profilesdir)" DATA = $(profiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -196,6 +237,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -431,11 +473,11 @@ @list='$(profiles_DATA)'; test -n "$(profilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(profilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -574,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir 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-profilesDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-profilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir 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-profilesDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-profilesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/src/plugins/Makefile.in libaqbanking-5.6.1beta/src/plugins/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/Makefile.in 2014-04-17 20:57:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/Makefile.in 2015-06-01 16:31:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -205,6 +266,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/parsers/dtaus/Makefile.in libaqbanking-5.6.1beta/src/plugins/parsers/dtaus/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/parsers/dtaus/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/parsers/dtaus/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/parsers/dtaus -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/dtaus.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/dtaus.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,22 +132,47 @@ dtaus_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_dtaus_la_OBJECTS = dtaus.lo dtaus-import.lo dtaus-export.lo dtaus_la_OBJECTS = $(am_dtaus_la_OBJECTS) -dtaus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dtaus_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +dtaus_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(dtaus_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(dtaus_la_SOURCES) DIST_SOURCES = $(dtaus_la_SOURCES) am__can_run_installinfo = \ @@ -129,12 +182,30 @@ esac DATA = $(dbioplugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -223,6 +294,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -450,6 +522,7 @@ $(am__aclocal_m4_deps): dtaus.xml: $(top_builddir)/config.status $(srcdir)/dtaus.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-dbiopluginLTLIBRARIES: $(dbioplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(dbioplugin_LTLIBRARIES)'; test -n "$(dbioplugindir)" || list=; \ @@ -476,14 +549,17 @@ clean-dbiopluginLTLIBRARIES: -test -z "$(dbioplugin_LTLIBRARIES)" || rm -f $(dbioplugin_LTLIBRARIES) - @list='$(dbioplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(dbioplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + dtaus.la: $(dtaus_la_OBJECTS) $(dtaus_la_DEPENDENCIES) $(EXTRA_dtaus_la_DEPENDENCIES) - $(dtaus_la_LINK) -rpath $(dbioplugindir) $(dtaus_la_OBJECTS) $(dtaus_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(dtaus_la_LINK) -rpath $(dbioplugindir) $(dtaus_la_OBJECTS) $(dtaus_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -496,25 +572,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtaus.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -543,26 +619,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dbioplugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -574,15 +639,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -591,6 +652,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -735,12 +811,12 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-dbiopluginLTLIBRARIES clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dbiopluginDATA \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-dbiopluginLTLIBRARIES clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dbiopluginDATA \ install-dbiopluginLTLIBRARIES install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ @@ -748,7 +824,7 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dbiopluginDATA \ + tags tags-am uninstall uninstall-am uninstall-dbiopluginDATA \ uninstall-dbiopluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/parsers/Makefile.in libaqbanking-5.6.1beta/src/plugins/parsers/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/parsers/Makefile.in 2014-04-17 20:57:26.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/parsers/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/parsers -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -116,6 +176,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -204,6 +265,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/src/plugins/parsers/swift/Makefile.in libaqbanking-5.6.1beta/src/plugins/parsers/swift/Makefile.in --- libaqbanking-5.4.3beta/src/plugins/parsers/swift/Makefile.in 2014-04-17 20:57:27.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/parsers/swift/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,8 +81,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/plugins/parsers/swift -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/swift.xml.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/swift.xml.in $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -104,22 +132,47 @@ swift_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_swift_la_OBJECTS = swift.lo swift940.lo swift_la_OBJECTS = $(am_swift_la_OBJECTS) -swift_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(swift_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +swift_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(swift_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(swift_la_SOURCES) DIST_SOURCES = $(swift_la_SOURCES) am__can_run_installinfo = \ @@ -129,12 +182,30 @@ esac DATA = $(dbioplugin_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -223,6 +294,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -450,6 +522,7 @@ $(am__aclocal_m4_deps): swift.xml: $(top_builddir)/config.status $(srcdir)/swift.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-dbiopluginLTLIBRARIES: $(dbioplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(dbioplugin_LTLIBRARIES)'; test -n "$(dbioplugindir)" || list=; \ @@ -476,14 +549,17 @@ clean-dbiopluginLTLIBRARIES: -test -z "$(dbioplugin_LTLIBRARIES)" || rm -f $(dbioplugin_LTLIBRARIES) - @list='$(dbioplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(dbioplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + swift.la: $(swift_la_OBJECTS) $(swift_la_DEPENDENCIES) $(EXTRA_swift_la_DEPENDENCIES) - $(swift_la_LINK) -rpath $(dbioplugindir) $(swift_la_OBJECTS) $(swift_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(swift_la_LINK) -rpath $(dbioplugindir) $(swift_la_OBJECTS) $(swift_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -495,25 +571,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swift940.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -542,26 +618,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dbioplugindir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -573,15 +638,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -590,6 +651,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -734,12 +810,12 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-dbiopluginLTLIBRARIES clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dbiopluginDATA \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-dbiopluginLTLIBRARIES clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dbiopluginDATA \ install-dbiopluginLTLIBRARIES install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ @@ -747,7 +823,7 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dbiopluginDATA \ + tags tags-am uninstall uninstall-am uninstall-dbiopluginDATA \ uninstall-dbiopluginLTLIBRARIES diff -Nru libaqbanking-5.4.3beta/src/plugins/parsers/swift/swift940.c libaqbanking-5.6.1beta/src/plugins/parsers/swift/swift940.c --- libaqbanking-5.4.3beta/src/plugins/parsers/swift/swift940.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/parsers/swift/swift940.c 2015-06-01 17:16:28.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** begin : Fri Apr 02 2004 - copyright : (C) 2004-2010 by Martin Preuss + copyright : (C) 2004-2015 by Martin Preuss email : martin@libchipcard.de *************************************************************************** @@ -29,6 +29,11 @@ #include + +/* #define ENABLE_FULL_SEPA_LOG */ + + + #define CENTURY_CUTOFF_YEAR 79 @@ -112,9 +117,9 @@ int AHB_SWIFT940_Parse_86(const AHB_SWIFT_TAG *tg, - uint32_t flags, - GWEN_DB_NODE *data, - GWEN_DB_NODE *cfg){ + uint32_t flags, + GWEN_DB_NODE *data, + GWEN_DB_NODE *cfg){ const char *p; int isStructured; int code; @@ -137,7 +142,6 @@ } if (isStructured) { -#if 1 AHB_SWIFT_SUBTAG_LIST *stlist; int rv; @@ -153,11 +157,15 @@ else { if (code<900) { AHB_SWIFT_SUBTAG *stg; - char identifier[6]; - GWEN_BUFFER *tbuf=NULL; + GWEN_DB_NODE *dbSepaTags=NULL; + GWEN_BUFFER *bufFullPurpose; + int realSepaTagCount=0; + + bufFullPurpose=GWEN_Buffer_new(0, 256, 0, 1); + + /* SEPA transaction, needs special handling */ + dbSepaTags=GWEN_DB_Group_new("sepa-tags"); - /* SEPA transaction, needs special handling */ - identifier[0]=0; stg=AHB_SWIFT_SubTag_List_First(stlist); while(stg) { const char *s; @@ -188,57 +196,13 @@ case 61: case 62: case 63: /* Verwendungszweck */ - if (strlen(s)>5 && s[4]=='+') { - if (identifier[0] && tbuf && GWEN_Buffer_GetUsedBytes(tbuf)) { - /* close previous identifier */ - if (strcasecmp(identifier, "EREF+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "endToEndReference", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "KREF+")==0) { - /* content of PmtInfId */ - AHB_SWIFT__SetCharValue(data, flags, "customerReference", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "MREF+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "mandateReference", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "CRED+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "creditorIdentifier", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "DEBT+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "originatorIdentifier", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "SVWZ+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "purpose", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "ABWA+")==0) { - } - } - - /* start of an identifier */ - strncpy(identifier, s, 5); - identifier[5]=0; - if (tbuf==NULL) - tbuf=GWEN_Buffer_new(0, 54, 0, 1); - else - GWEN_Buffer_Reset(tbuf); - GWEN_Buffer_AppendString(tbuf, s+5); - } - else { - /* no identifier here */ - if (identifier[0] && tbuf && GWEN_Buffer_GetUsedBytes(tbuf)) { - /* continuation of previous identifier, add to buffer */ - if (strcasecmp(identifier, "SVWZ+")==0) { - /* add a space for purpose */ - GWEN_Buffer_AppendString(tbuf, " "); - } - GWEN_Buffer_AppendString(tbuf, s); - } - else { - AHB_SWIFT__SetCharValue(data, flags, "purpose", s); - } - } + /* store purpose in any case, if the transaction doesn't have SEPA tags + * we can just use what we produced here */ + AHB_SWIFT__SetCharValue(data, flags, "purpose", s); + /* possibly handle full purpose later */ + GWEN_Buffer_AppendString(bufFullPurpose, s); break; - + case 30: /* BLZ Gegenseite */ AHB_SWIFT__SetCharValue(data, flags, "remoteBankCode", s); break; @@ -274,31 +238,181 @@ stg=AHB_SWIFT_SubTag_List_Next(stg); } /* while */ - /* close possibly open identifieres */ - if (identifier[0] && tbuf && GWEN_Buffer_GetUsedBytes(tbuf)) { - /* close previous identifier */ - if (strcasecmp(identifier, "EREF+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "endToEndReference", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "KREF+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "customerReference", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "MREF+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "mandateReference", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "CRED+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "creditorIdentifier", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "DEBT+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "originatorIdentifier", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "SVWZ+")==0) { - AHB_SWIFT__SetCharValue(data, flags, "purpose", GWEN_Buffer_GetStart(tbuf)); - } - else if (strcasecmp(identifier, "ABWA+")==0) { + if (GWEN_Buffer_GetUsedBytes(bufFullPurpose)) { + const char *s; + const char *sLastTagStart; + +#ifdef ENABLE_FULL_SEPA_LOG + DBG_ERROR(0, "FullPurposeBuffer:"); + GWEN_Buffer_Dump(bufFullPurpose, 2); +#endif + + s=GWEN_Buffer_GetStart(bufFullPurpose); + sLastTagStart=s; + + /* sample all SEPA fields from concatenated string of purpose lines */ + while(*s) { + /* look for begin of next tag */ + while(*s) { + if ((*s && isalpha(*s)) && + (s[1] && isalpha(s[1])) && + (s[2] && isalpha(s[2])) && + (s[3] && isalpha(s[3])) && + s[4]=='+') + break; + /* not the beginning of a SEPA field, just skip */ + s++; + } + + /* found begin of the next SEPA field or end of buffer */ + if (s > sLastTagStart) { + int tagLen; + + /* we currently have a field, close that first */ + tagLen=s-sLastTagStart; + +#ifdef ENABLE_FULL_SEPA_LOG + DBG_ERROR(0, "Current tag:"); + GWEN_Text_LogString(sLastTagStart, tagLen, 0, GWEN_LoggerLevel_Error); +#endif + + /* check tag length (must be long enough for 'XXX+', i.e. at least 5 bytes) */ + if (tagLen>5 && sLastTagStart[4]=='+') { + char sIdentifier[6]; + const char *sPayload; + + /* ok, 5 bytes or more, 4 alphas and a plus sign, should be the begin of a SEPA tag */ + strncpy(sIdentifier, sLastTagStart, 5); + sIdentifier[5]=0; + + /* remove leading blanks */ + sPayload=sLastTagStart+5; + tagLen-=5; + while(tagLen>0 && *sPayload && isblank(*sPayload)) { + sPayload++; + tagLen--; + } + + /* remove trailing blanks */ + if (tagLen>0) { + while(tagLen>0) { + if (!isblank(sPayload[tagLen-1])) + break; + tagLen--; + } + } + + /* store tag, if still data left */ + if (tagLen>0) { + char *sCopyPayload; + + sCopyPayload=strndup(sPayload, tagLen); + GWEN_DB_SetCharValue(dbSepaTags, GWEN_DB_FLAGS_DEFAULT, sIdentifier, sCopyPayload); + free(sCopyPayload); + realSepaTagCount++; + } + else { + DBG_WARN(GWEN_LOGDOMAIN, "Ignoring empty SEPA field \"%s\"", sIdentifier); + } + } + else { + /* tag is shorter than 5 bytes or pos 4 doesn't contain a plus, treat as normal purpose */ + if (tagLen>0) { + char *sCopyPayload; + + sCopyPayload=strndup(sLastTagStart, tagLen); + GWEN_DB_SetCharValue(dbSepaTags, GWEN_DB_FLAGS_DEFAULT, "_purpose", sCopyPayload); + free(sCopyPayload); + } + } + } + + if (*s) { + /* save start of next tag */ + sLastTagStart=s; + /* skip XXX+ at the beginning, otherwise we would immediately stop in next loop + * we know that the next 5 bytes are valid, so it is safe to skip them */ + s+=5; + } + } /* while */ + + } /* if GWEN_Buffer_GetUsedBytes(bufFullPurpose) */ + /* buffer no longer needed */ + GWEN_Buffer_free(bufFullPurpose); + + /* handle SEPA tags, iterate through them and parse according to variable name */ + if (realSepaTagCount>0 && GWEN_DB_Variables_Count(dbSepaTags)) { + GWEN_DB_NODE *dbVar; + +#ifdef ENABLE_FULL_SEPA_LOG + DBG_ERROR(0, "Got these SEPA tags:"); + GWEN_DB_Dump(dbSepaTags, 2); +#endif + + /* clear purpose variable, since we are about to add it back from SEPA tags */ + GWEN_DB_DeleteVar(data, "purpose"); + + dbVar=GWEN_DB_GetFirstVar(dbSepaTags); + while(dbVar) { + const char *sVarName; + + sVarName=GWEN_DB_VariableName(dbVar); + if (sVarName && *sVarName) { + GWEN_BUFFER *tbuf; + GWEN_DB_NODE *dbValue; + + /* sample all values into a buffer and concatenate */ + tbuf=GWEN_Buffer_new(0, 128, 0, 1); + dbValue=GWEN_DB_GetFirstValue(dbVar); + while(dbValue) { + const char *s; + + s=GWEN_DB_GetCharValueFromNode(dbValue); + if (s && *s) + GWEN_Buffer_AppendString(tbuf, s); + + dbValue=GWEN_DB_GetNextValue(dbValue); + } + + if (strcasecmp(sVarName, "EREF+")==0) { + AHB_SWIFT__SetCharValue(data, flags, "endToEndReference", GWEN_Buffer_GetStart(tbuf)); + } + else if (strcasecmp(sVarName, "KREF+")==0) { + AHB_SWIFT__SetCharValue(data, flags, "customerReference", GWEN_Buffer_GetStart(tbuf)); + } + else if (strcasecmp(sVarName, "MREF+")==0) { + AHB_SWIFT__SetCharValue(data, flags, "mandateId", GWEN_Buffer_GetStart(tbuf)); + } + else if (strcasecmp(sVarName, "CRED+")==0) { + AHB_SWIFT__SetCharValue(data, flags, "creditorSchemeId", GWEN_Buffer_GetStart(tbuf)); + } + else if (strcasecmp(sVarName, "DEBT+")==0) { + AHB_SWIFT__SetCharValue(data, flags, "originatorIdentifier", GWEN_Buffer_GetStart(tbuf)); + } + else if (strcasecmp(sVarName, "SVWZ+")==0) { + AHB_SWIFT__SetCharValue(data, flags, "purpose", GWEN_Buffer_GetStart(tbuf)); + } + else if (strcasecmp(sVarName, "ABWA+")==0) { + } + else if (strcasecmp(sVarName, "_purpose")==0) { + /* manually added tag (i.e. data outside a tag) + * TODO: only add if there was no real purpose field (i.e. no "SVWZ+") */ + AHB_SWIFT__SetCharValue(data, flags, "purpose", GWEN_Buffer_GetStart(tbuf)); + } + + GWEN_Buffer_free(tbuf); + } + + dbVar=GWEN_DB_GetNextVar(dbVar); } } - GWEN_Buffer_free(tbuf); + +#ifdef ENABLE_FULL_SEPA_LOG + DBG_ERROR(0, "SEPA Tags:"); + GWEN_DB_Dump(dbSepaTags, 2); +#endif + + GWEN_DB_Group_free(dbSepaTags); } /* if sepa */ else { AHB_SWIFT_SUBTAG *stg; @@ -374,123 +488,8 @@ } } /* if really structured */ AHB_SWIFT_SubTag_List_free(stlist); -#else - const char *p2; - char *s; - int id; - - /* store code */ - GWEN_DB_SetIntValue(data, flags, "textkey", code); - - while(*p) { - int intVal; - - if (strlen(p)<3) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Bad field in :86: tag (%s)", p); - GWEN_Gui_ProgressLog(0, GWEN_LoggerLevel_Error, - "SWIFT: Bad field in :86: tag"); - return -1; - } - p++; /* skip '?' */ - /* read field id */ - if (*p==10) - p++; - if (!*p) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Partial field id"); - GWEN_Gui_ProgressLog(0, GWEN_LoggerLevel_Error, - "SWIFT: Partial field id"); - return -1; - } - id=((*p-'0')*10); - p++; - - if (*p==10) - p++; - if (!*p) { - DBG_ERROR(AQBANKING_LOGDOMAIN, "Partial field id"); - GWEN_Gui_ProgressLog(0, GWEN_LoggerLevel_Error, - "SWIFT: Partial field id"); - return -1; - } - id+=(*p-'0'); - p++; - - p2=p; - - /* find end of field/beginning of next field */ - while(*p2 && *p2!='?') p2++; - s=(char*)GWEN_Memory_malloc(p2-p+1); - memmove(s, p, p2-p+1); - s[p2-p]=0; - AHB_SWIFT_Condense(s, keepMultipleBlanks); - DBG_DEBUG(AQBANKING_LOGDOMAIN, "Current field is %02d (%s)", id, s); - /* now id is the field id, s points to the field content */ - if (*s) { - switch(id) { - case 0: /* Buchungstext */ - AHB_SWIFT__SetCharValue(data, flags, "transactionText", s); - break; - case 10: /* Primanota */ - AHB_SWIFT__SetCharValue(data, flags, "primanota", s); - break; - - case 20: - case 21: - case 22: - case 23: - case 24: - case 25: - case 26: - case 27: - case 28: - case 29: - case 60: - case 61: - case 62: - case 63: /* Verwendungszweck */ - AHB_SWIFT__SetCharValue(data, flags, "purpose", s); - break; - - case 30: /* BLZ Gegenseite */ - AHB_SWIFT__SetCharValue(data, flags, "remoteBankCode", s); - break; - - case 31: /* Kontonummer Gegenseite */ - AHB_SWIFT__SetCharValue(data, flags, "remoteAccountNumber", s); - break; - - case 32: - case 33: /* Name Auftraggeber */ - AHB_SWIFT__SetCharValue(data, flags, "remoteName", s); - break; - - case 34: /* Textschluesselergaenzung */ - if (1==sscanf(s, "%d", &intVal)) { - GWEN_DB_SetIntValue(data, flags, "textkeyExt", intVal); - } - else { - DBG_WARN(AQBANKING_LOGDOMAIN, - "Value [%s] is not a number (textkeyext)", s); - } - break; - - case 38: /* IBAN */ - AHB_SWIFT__SetCharValue(data, flags, "remoteIban", s); - break; - - default: /* ignore all other fields (if any) */ - DBG_WARN(AQBANKING_LOGDOMAIN, "Unknown :86: field \"%02d\" (%s) (%s)", id, s, - AHB_SWIFT_Tag_GetData(tg)); - break; - } /* switch */ - } - p=p2; - GWEN_Memory_dealloc(s); - } /* while */ -#endif - } /* if structured */ - - if (!isStructured) { + } /* if isStructured */ + else { char *pcopy=strdup(p); char *p1; @@ -504,6 +503,9 @@ *p2=0; p2++; } + + /* look for pattern "KTO/BLZ", if found try to extract remote account info + * from unstructured purpose string */ if (-1!=GWEN_Text_ComparePattern(p1, "*KTO/BLZ */*", 0)) { char *p3; char *kto; @@ -1099,7 +1101,10 @@ } - +/* Import SWIFT MT940 data. + @param tl input: list of tags. Tags are lines in a SWIFT data block (block 4). A tag has an + id and content. See the AHB_SWIFT_Tag_new function for more information. + */ int AHB_SWIFT940_Import(AHB_SWIFT_TAG_LIST *tl, GWEN_DB_NODE *data, GWEN_DB_NODE *cfg, @@ -1289,6 +1294,18 @@ } } } + else if (strcmp(id, "21")==0) { + const char *p; + + p=AHB_SWIFT_Tag_GetData(tg); + assert (p); + if (0==strcmp(p, "NONREF")) { + DBG_INFO(AQBANKING_LOGDOMAIN, "Ignoring related reference '%s' in document tag 21.", p); + } + else { + DBG_WARN(AQBANKING_LOGDOMAIN, "Unexpected related reference '%s' in document tag 21 encountered.", p); + } + } else { DBG_WARN(AQBANKING_LOGDOMAIN, "Unexpected tag '%s' found.", id) DBG_WARN(AQBANKING_LOGDOMAIN, "To debug set environment variable AQBANKING_LOGLEVEL=info and rerun"); diff -Nru libaqbanking-5.4.3beta/src/plugins/parsers/swift/swift940_p.h libaqbanking-5.6.1beta/src/plugins/parsers/swift/swift940_p.h --- libaqbanking-5.4.3beta/src/plugins/parsers/swift/swift940_p.h 2008-10-03 16:41:23.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/parsers/swift/swift940_p.h 2015-05-17 10:22:47.000000000 +0000 @@ -1,9 +1,6 @@ /*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id$ begin : Fri Apr 02 2004 - copyright : (C) 2004 by Martin Preuss + copyright : (C) 2004-2015 by Martin Preuss email : martin@libchipcard.de *************************************************************************** diff -Nru libaqbanking-5.4.3beta/src/plugins/parsers/swift/swift.c libaqbanking-5.6.1beta/src/plugins/parsers/swift/swift.c --- libaqbanking-5.4.3beta/src/plugins/parsers/swift/swift.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/plugins/parsers/swift/swift.c 2015-05-17 07:37:03.000000000 +0000 @@ -85,7 +85,17 @@ +/* Create a tag object from a tag ID and the content of the tag. Example: + Given the following line inside a SWIFT data block: + :28C:7/1 + + You'd call AHB_SWIFT_Tag_new like this: + + AHB_SWIFT_Tag_new("28C", "7/1") + + @return a new AHB_SWIFT_TAG + */ AHB_SWIFT_TAG *AHB_SWIFT_Tag_new(const char *id, const char *content){ AHB_SWIFT_TAG *tg; @@ -298,7 +308,11 @@ - +/* This reads a line within a SWIFT data block (block 4) + @param *fb pointer to a GWEN_FAST_BUFFER input buffer + @param *buffer pointer to a char* output buffer + @param s size of the output buffer + */ int AHB_SWIFT_ReadLine(GWEN_FAST_BUFFER *fb, char *buffer, unsigned int s){ @@ -368,8 +382,10 @@ - -int AHB_SWIFT__ReadDocument(GWEN_FAST_BUFFER *fb, +/* This will read the contents of a SWIFT data block ({4: ... }) + inside of a SWIFT document + */ +int AHB_SWIFT_ReadTextBlock(GWEN_FAST_BUFFER *fb, AHB_SWIFT_TAG_LIST *tl, unsigned int maxTags) { GWEN_BUFFER *lbuf; @@ -621,7 +637,7 @@ } /* for */ } - rv=AHB_SWIFT__ReadDocument(fb, tl, maxTags); + rv=AHB_SWIFT_ReadTextBlock(fb, tl, maxTags); if (rv) return rv; @@ -761,7 +777,7 @@ if (c==GWEN_ERROR_EOF) { DBG_INFO(AQBANKING_LOGDOMAIN, "EOF met, empty block"); if (subDocs>0) { - DBG_INFO(AQBANKING_LOGDOMAIN, "We got %d data blocks, returning", subDocs); + DBG_INFO(AQBANKING_LOGDOMAIN, "We got %d text blocks, returning", subDocs); return 0; } return 1; @@ -794,7 +810,7 @@ DBG_DEBUG(0, "Reading block %d", swhead[1]-'0'); if (swhead[1]=='4') { /* read document from block 4 */ - rv=AHB_SWIFT__ReadDocument(fb, tl, maxTags); + rv=AHB_SWIFT_ReadTextBlock(fb, tl, maxTags); if (rv) { DBG_INFO(AQBANKING_LOGDOMAIN, "here (%d)", rv); return rv; @@ -828,7 +844,7 @@ } else { /* not a full swift document, just read the SWIFT document directly */ - rv=AHB_SWIFT__ReadDocument(fb, tl, maxTags); + rv=AHB_SWIFT_ReadTextBlock(fb, tl, maxTags); if (rv) return rv; } diff -Nru libaqbanking-5.4.3beta/src/test/Makefile.in libaqbanking-5.6.1beta/src/test/Makefile.in --- libaqbanking-5.4.3beta/src/test/Makefile.in 2014-04-17 20:57:27.000000000 +0000 +++ libaqbanking-5.6.1beta/src/test/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,7 +82,8 @@ @WITH_GWENGUI_GTK2_TRUE@noinst_PROGRAMS = abtest$(EXEEXT) \ @WITH_GWENGUI_GTK2_TRUE@ test-dlg-setup$(EXEEXT) subdir = src/test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -75,6 +103,10 @@ abtest_OBJECTS = $(am_abtest_OBJECTS) am__DEPENDENCIES_1 = abtest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am__test_dlg_setup_SOURCES_DIST = test-dlg-setup.c @WITH_GWENGUI_GTK2_TRUE@am_test_dlg_setup_OBJECTS = \ @WITH_GWENGUI_GTK2_TRUE@ test-dlg-setup.$(OBJEXT) @@ -84,19 +116,40 @@ @WITH_GWENGUI_GTK2_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_GWENGUI_GTK2_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_GWENGUI_GTK2_TRUE@ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(abtest_SOURCES) $(test_dlg_setup_SOURCES) DIST_SOURCES = $(abtest_SOURCES) $(am__test_dlg_setup_SOURCES_DIST) am__can_run_installinfo = \ @@ -104,12 +157,30 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -198,6 +269,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -422,12 +494,14 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + abtest$(EXEEXT): $(abtest_OBJECTS) $(abtest_DEPENDENCIES) $(EXTRA_abtest_DEPENDENCIES) @rm -f abtest$(EXEEXT) - $(LINK) $(abtest_OBJECTS) $(abtest_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(abtest_OBJECTS) $(abtest_LDADD) $(LIBS) + test-dlg-setup$(EXEEXT): $(test_dlg_setup_OBJECTS) $(test_dlg_setup_DEPENDENCIES) $(EXTRA_test_dlg_setup_DEPENDENCIES) @rm -f test-dlg-setup$(EXEEXT) - $(LINK) $(test_dlg_setup_OBJECTS) $(test_dlg_setup_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_dlg_setup_OBJECTS) $(test_dlg_setup_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -439,25 +513,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dlg-setup.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -465,26 +539,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -496,15 +559,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -513,6 +572,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -654,18 +728,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am #cpptest_SOURCES=cpptest.cpp diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/addsepadebitnote.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/addsepadebitnote.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/addsepadebitnote.c 2014-03-01 19:43:29.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/addsepadebitnote.c 2014-10-12 13:40:15.000000000 +0000 @@ -270,10 +270,12 @@ al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); if (al==NULL || AB_Account_List2_GetSize(al)==0) { DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); return 2; } else if (AB_Account_List2_GetSize(al)>1) { DBG_ERROR(0, "Ambiguous account specification"); + AB_Account_List2_free(al); AB_Banking_OnlineFini(ab); AB_Banking_Fini(ab); return 2; @@ -311,7 +313,7 @@ return 1; } rv=AB_Banking_CheckIban(rIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid remote IBAN (%s)", rIBAN); AB_Transaction_free(t); AB_Banking_OnlineFini(ab); @@ -335,7 +337,7 @@ return 1; } rv=AB_Banking_CheckIban(lIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid local IBAN (%s)", rIBAN); AB_Transaction_free(t); AB_Banking_OnlineFini(ab); diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/addtransaction.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/addtransaction.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/addtransaction.c 2014-03-01 19:44:49.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/addtransaction.c 2014-11-01 17:30:41.000000000 +0000 @@ -33,7 +33,8 @@ int argc, char **argv) { GWEN_DB_NODE *db; - int rv, transferType; + int rv; + AB_JOB_TYPE transferType; const char *ctxFile; const char *bankId; const char *accountId; @@ -228,12 +229,9 @@ /* get account */ al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); - if (!al) { - DBG_ERROR(0, "Account not found"); - return 2; - } if (al==NULL || AB_Account_List2_GetSize(al)==0) { DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); return 2; } else if (AB_Account_List2_GetSize(al)>1) { diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/chkiban.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/chkiban.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/chkiban.c 2010-08-05 20:53:41.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/chkiban.c 2014-10-12 13:40:15.000000000 +0000 @@ -94,7 +94,7 @@ } res=AB_Banking_CheckIban(iban); - if (res) { + if (res != 0) { DBG_ERROR(0, "IBAN is invalid"); return 3; diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/debitnote.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/debitnote.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/debitnote.c 2014-03-01 19:43:52.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/debitnote.c 2014-11-01 17:30:41.000000000 +0000 @@ -44,7 +44,8 @@ AB_TRANSACTION *t; AB_JOB_LIST2 *jobList; AB_JOB *j; - int rvExec, transferType; + int rvExec; + AB_JOB_TYPE transferType; const char *rBankId; const char *rAccountId; int forceCheck; @@ -239,6 +240,7 @@ al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); if (al==NULL || AB_Account_List2_GetSize(al)==0) { DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); return 2; } else if (AB_Account_List2_GetSize(al)>1) { diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/globals.h libaqbanking-5.6.1beta/src/tools/aqbanking-cli/globals.h --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/globals.h 2013-12-29 12:41:40.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/globals.h 2014-11-01 17:30:41.000000000 +0000 @@ -32,7 +32,7 @@ AB_IMEXPORTER_CONTEXT **pCtx, int mustExist); int writeContext(const char *ctxFile, const AB_IMEXPORTER_CONTEXT *ctx); -AB_TRANSACTION *mkTransfer(AB_ACCOUNT *a, GWEN_DB_NODE *db, int *transferType); +AB_TRANSACTION *mkTransfer(AB_ACCOUNT *a, GWEN_DB_NODE *db, AB_JOB_TYPE *jobType); AB_TRANSACTION *mkSepaTransfer(AB_ACCOUNT *a, GWEN_DB_NODE *db, int expTransferType); AB_TRANSACTION *mkSepaDebitNote(AB_ACCOUNT *a, GWEN_DB_NODE *db); diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/main.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/main.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/main.c 2014-03-25 21:18:09.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/main.c 2014-10-12 13:40:15.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** begin : Tue May 03 2005 - copyright : (C) 2005-2010 by Martin Preuss + copyright : (C) 2005-2014 by Martin Preuss email : martin@libchipcard.de *************************************************************************** @@ -48,7 +48,7 @@ #include "sepatransfer.c" #include "addsepadebitnote.c" #include "sepadebitnote.c" -#include "sepadebitnotes.c" +#include "sepamultijobs.c" #include "separecurtransfer.c" @@ -217,6 +217,9 @@ cmdAddHelpStr(ubuf, "listtrans", I18N("Export transactions from a context file.")); + cmdAddHelpStr(ubuf, "listtransfers", + I18N("Export transactions from a context file which match certain status.")); + cmdAddHelpStr(ubuf, "request", I18N("Requests transactions, balances, standing orders etc.")); @@ -235,30 +238,48 @@ cmdAddHelpStr(ubuf, "transfers", I18N("Issue a number of transfers (data from a file)")); + cmdAddHelpStr(ubuf, "sepatransfer", + I18N("Issue a single SEPA transfer (data from command line)")); + + cmdAddHelpStr(ubuf, "sepatransfers", + I18N("Issue a number of SEPA transfers (data from a file)")); + cmdAddHelpStr(ubuf, "debitnote", I18N("Issue a single debit note (data from command line)")); cmdAddHelpStr(ubuf, "debitnotes", I18N("Issue a number of debit notes (data from a file)")); - cmdAddHelpStr(ubuf, "sepatransfer", - I18N("Issue a single SEPA transfer (data from command line)")); - cmdAddHelpStr(ubuf, "sepadebitnote", I18N("Issue a single SEPA debit note (data from command line)")); + cmdAddHelpStr(ubuf, "sepaflashdebitnote", + I18N("Issue a single flash SEPA debit note COR1 (data from command line)")); + cmdAddHelpStr(ubuf, "sepadebitnotes", I18N("Issue a number of SEPA debit notes (data from a file)")); cmdAddHelpStr(ubuf, "addtrans", I18N("Add a transfer to an existing import context file")); + cmdAddHelpStr(ubuf, "addsepadebitnote", + I18N("Add a SEPA debit note to an existing import context file")); + + cmdAddHelpStr(ubuf, "sepacreatesto", + I18N("Create SEPA standing order")); + cmdAddHelpStr(ubuf, "fillgaps", I18N("Fill gaps in an import context file from configuration settings")); cmdAddHelpStr(ubuf, "updateconf", I18N("Update configuration from previous AqBanking versions")); + cmdAddHelpStr(ubuf, "listprofiles", + I18N("Print existing profiles")); + + cmdAddHelpStr(ubuf, "versions", + I18N("Print the program and library versions")); + GWEN_Buffer_AppendString(ubuf, "\n"); fprintf(stderr, "%s\n", GWEN_Buffer_GetStart(ubuf)); @@ -330,6 +351,9 @@ else if (strcasecmp(cmd, "listtrans")==0) { rv=listTrans(ab, db, argc, argv); } + else if (strcasecmp(cmd, "listtransfers")==0) { + rv=listTransfers(ab, db, argc, argv); + } else if (strcasecmp(cmd, "request")==0) { rv=request(ab, db, argc, argv); } @@ -342,17 +366,17 @@ else if (strcasecmp(cmd, "import")==0) { rv=import(ab, db, argc, argv); } - else if (strcasecmp(cmd, "transfers")==0) { - rv=transfers(ab, db, argc, argv); - } else if (strcasecmp(cmd, "transfer")==0) { rv=transfer(ab, db, argc, argv); } + else if (strcasecmp(cmd, "transfers")==0) { + rv=transfers(ab, db, argc, argv); + } else if (strcasecmp(cmd, "sepatransfer")==0) { rv=sepaTransfer(ab, db, argc, argv); } - else if (strcasecmp(cmd, "listtransfers")==0) { - rv=listTransfers(ab, db, argc, argv); + else if (strcasecmp(cmd, "sepatransfers")==0) { + rv=sepaMultiJobs(ab, db, argc, argv, AQBANKING_TOOL_SEPA_TRANSFERS); } else if (strcasecmp(cmd, "debitnote")==0) { rv=debitNote(ab, db, argc, argv); @@ -360,8 +384,14 @@ else if (strcasecmp(cmd, "debitnotes")==0) { rv=debitNotes(ab, db, argc, argv); } - else if (strcasecmp(cmd, "versions")==0) { - rv=versions(ab, db, argc, argv); + else if (strcasecmp(cmd, "sepadebitnote")==0) { + rv=sepaDebitNote(ab, db, argc, argv, 0); + } + else if (strcasecmp(cmd, "sepaFlashDebitNote")==0) { + rv=sepaDebitNote(ab, db, argc, argv, 1); + } + else if (strcasecmp(cmd, "sepadebitnotes")==0) { + rv=sepaMultiJobs(ab, db, argc, argv, AQBANKING_TOOL_SEPA_DEBITNOTES); } else if (strcasecmp(cmd, "addtrans")==0) { rv=addTransaction(ab, db, argc, argv); @@ -369,12 +399,6 @@ else if (strcasecmp(cmd, "addsepadebitnote")==0) { rv=addSepaDebitNote(ab, db, argc, argv); } - else if (strcasecmp(cmd, "sepadebitnote")==0) { - rv=sepaDebitNote(ab, db, argc, argv); - } - else if (strcasecmp(cmd, "sepadebitnotes")==0) { - rv=sepaDebitNotes(ab, db, argc, argv); - } else if (strcasecmp(cmd, "sepacreatesto")==0) { rv=sepaRecurTransfer(ab, db, argc, argv); } @@ -387,6 +411,9 @@ else if (strcasecmp(cmd, "listprofiles")==0) { rv=listProfiles(ab, db, argc, argv); } + else if (strcasecmp(cmd, "versions")==0) { + rv=versions(ab, db, argc, argv); + } else { fprintf(stderr, "ERROR: Unknown command \"%s\".\n", cmd); rv=1; diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/Makefile.am libaqbanking-5.6.1beta/src/tools/aqbanking-cli/Makefile.am --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/Makefile.am 2014-03-25 21:16:47.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/Makefile.am 2014-10-12 13:40:15.000000000 +0000 @@ -1,6 +1,8 @@ #EXTRA_DIST= -INCLUDES = -I$(aqbanking_symlinkdir) $(gwenhywfar_includes) $(aqfinance_includes) +INCLUDES = -I$(aqbanking_symlinkdir) $(gwenhywfar_includes) $(aqfinance_includes) \ + -I$(top_srcdir)/src/plugins/backends/aqhbci/plugin/banking \ + -I$(top_srcdir)/src/plugins/backends/aqhbci/plugin/msglayer AM_CFLAGS=@visibility_cflags@ @@ -42,7 +44,7 @@ updateconf.c \ sepatransfer.c \ sepadebitnote.c \ - sepadebitnotes.c \ + sepamultijobs.c \ separecurtransfer.c diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/Makefile.in libaqbanking-5.6.1beta/src/tools/aqbanking-cli/Makefile.in --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/Makefile.in 2014-04-17 20:57:27.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -19,23 +18,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,8 +84,8 @@ bin_PROGRAMS = aqbanking-cli$(EXEEXT) @IS_WINDOWS_TRUE@am__append_1 = -mconsole subdir = src/tools/aqbanking-cli -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -80,22 +107,47 @@ am__DEPENDENCIES_1 = aqbanking_cli_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -aqbanking_cli_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +aqbanking_cli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(aqbanking_cli_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(aqbanking_cli_SOURCES) DIST_SOURCES = $(aqbanking_cli_SOURCES) am__can_run_installinfo = \ @@ -104,12 +156,30 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -200,6 +270,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -370,7 +441,10 @@ visibility_cflags = @visibility_cflags@ with_aqebics = @with_aqebics@ with_aqhbci = @with_aqhbci@ -INCLUDES = -I$(aqbanking_symlinkdir) $(gwenhywfar_includes) $(aqfinance_includes) +INCLUDES = -I$(aqbanking_symlinkdir) $(gwenhywfar_includes) $(aqfinance_includes) \ + -I$(top_srcdir)/src/plugins/backends/aqhbci/plugin/banking \ + -I$(top_srcdir)/src/plugins/backends/aqhbci/plugin/msglayer + AM_CFLAGS = @visibility_cflags@ aqbanking_cli_LDADD = \ $(aqhbci_internal_libs) \ @@ -405,7 +479,7 @@ updateconf.c \ sepatransfer.c \ sepadebitnote.c \ - sepadebitnotes.c \ + sepamultijobs.c \ separecurtransfer.c all: all-am @@ -451,10 +525,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -475,7 +551,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -488,9 +565,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + aqbanking-cli$(EXEEXT): $(aqbanking_cli_OBJECTS) $(aqbanking_cli_DEPENDENCIES) $(EXTRA_aqbanking_cli_DEPENDENCIES) @rm -f aqbanking-cli$(EXEEXT) - $(aqbanking_cli_LINK) $(aqbanking_cli_OBJECTS) $(aqbanking_cli_LDADD) $(LIBS) + $(AM_V_CCLD)$(aqbanking_cli_LINK) $(aqbanking_cli_OBJECTS) $(aqbanking_cli_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -501,25 +579,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -527,26 +605,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -558,15 +625,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -575,6 +638,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -718,19 +796,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS sources: diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/request.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/request.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/request.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/request.c 2014-08-04 19:32:44.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** begin : Tue May 03 2005 - copyright : (C) 2005-2010 by Martin Preuss + copyright : (C) 2005-2014 by Martin Preuss email : martin@libchipcard.de *************************************************************************** @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -43,6 +44,7 @@ int reqTrans=0; int reqBalance=0; int reqSto=0; + int reqSepaSto=0; int reqDT=0; GWEN_TIME *fromTime=0; GWEN_TIME *toTime=0; @@ -150,6 +152,17 @@ { 0, /* flags */ GWEN_ArgsType_Int, /* type */ + "reqSepaSto", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "sepaSto", /* long option */ + "Request SEPA standing orders", /* short description */ + "Request SEPA standing orders" /* long description */ + }, + { + 0, /* flags */ + GWEN_ArgsType_Int, /* type */ "reqDT", /* name */ 0, /* minnum */ 1, /* maxnum */ @@ -218,6 +231,7 @@ reqTrans=GWEN_DB_GetIntValue(db, "reqTrans", 0, 0); reqBalance=GWEN_DB_GetIntValue(db, "reqBalance", 0, 0); reqSto=GWEN_DB_GetIntValue(db, "reqSto", 0, 0); + reqSepaSto=GWEN_DB_GetIntValue(db, "reqSepaSto", 0, 0); reqDT=GWEN_DB_GetIntValue(db, "reqDT", 0, 0); ctxFile=GWEN_DB_GetCharValue(db, "ctxfile", 0, 0); s=GWEN_DB_GetCharValue(db, "fromDate", 0, 0); @@ -383,6 +397,27 @@ AB_Account_GetBankCode(a), AB_Account_GetAccountNumber(a), rv); + AB_Account_List2Iterator_free(ait); + AB_Account_List2_free(al); + AB_Job_List2_FreeAll(jobList); + GWEN_Time_free(toTime); + GWEN_Time_free(fromTime); + return 3; + } + AB_Job_List2_PushBack(jobList, j); + requests++; + } + if (reqSepaSto) { + AB_JOB *j; + + j=AB_JobSepaGetStandingOrders_new(a); + rv=AB_Job_CheckAvailability(j); + if (rv<0) { + DBG_ERROR(0, + "Error requesting SEPA standing order for %s/%s: %d", + AB_Account_GetBankCode(a), + AB_Account_GetAccountNumber(a), + rv); AB_Account_List2Iterator_free(ait); AB_Account_List2_free(al); AB_Job_List2_FreeAll(jobList); diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/senddtazv.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/senddtazv.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/senddtazv.c 2014-03-01 19:23:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/senddtazv.c 2014-07-23 20:29:51.000000000 +0000 @@ -16,6 +16,9 @@ #include "globals.h" +/* The code below uses the private symbol AH_Provider_SendDtazv from libaqhbci */ +#include "hbci_l.h" +#include "provider_l.h" #include #include @@ -34,20 +37,6 @@ #endif -/* this is a more or less secret job which is not declared in AqHBCI, so - * we must do it here. The AQHBCI_API makes this file import that symbol - * from the libaqhbci library. - */ -AQHBCI_API -int AH_Provider_SendDtazv(AB_PROVIDER *pro, - AB_ACCOUNT *a, - AB_IMEXPORTER_CONTEXT *ctx, - const uint8_t *dataPtr, - uint32_t dataLen, - int nounmount, - uint32_t guiid); - - static int _incrementUniqueId(AB_ACCOUNT *a, const char *path) { GWEN_BUFFER *pbuf; const char *s; @@ -371,7 +360,7 @@ rv=AH_Provider_SendDtazv(pro, a, ctx, (const uint8_t*)GWEN_Buffer_GetStart(dtazv), GWEN_Buffer_GetUsedBytes(dtazv), - 1, 0); + 1, 1, 0); /* write ctx file */ if (ctxFile) { GWEN_DB_NODE *dbCtx; diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepadebitnote.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepadebitnote.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepadebitnote.c 2014-03-25 21:47:09.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepadebitnote.c 2014-10-12 13:40:15.000000000 +0000 @@ -15,6 +15,7 @@ #include #include +#include #include @@ -31,7 +32,7 @@ int sepaDebitNote(AB_BANKING *ab, GWEN_DB_NODE *dbArgs, int argc, - char **argv) { + char **argv, int use_flash_debitnote) { GWEN_DB_NODE *db; int rv; const char *ctxFile; @@ -46,7 +47,6 @@ AB_JOB *j; int rvExec; const char *rIBAN; - const char *rBIC; const char *lIBAN; const char *lBIC; const GWEN_ARGS args[]={ @@ -109,7 +109,7 @@ GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ "remoteBIC", /* name */ - 1, /* minnum */ + 0, /* minnum */ 1, /* maxnum */ 0, /* short option */ "rbic", /* long option */ @@ -271,6 +271,7 @@ al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); if (al==NULL || AB_Account_List2_GetSize(al)==0) { DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); return 2; } else if (AB_Account_List2_GetSize(al)>1) { @@ -292,22 +293,16 @@ AB_Transaction_SetType(t, AB_Transaction_TypeSepaDebitNote); rIBAN=AB_Transaction_GetRemoteIban(t); - rBIC=AB_Transaction_GetRemoteBic(t); lIBAN=AB_Transaction_GetLocalIban(t); lBIC=AB_Transaction_GetLocalBic(t); - if (!rBIC || !(*rBIC)) { - DBG_ERROR(0, "Missing remote BIC"); - AB_Transaction_free(t); - return 1; - } if (!rIBAN || !(*rIBAN)) { DBG_ERROR(0, "Missing remote IBAN"); AB_Transaction_free(t); return 1; } rv=AB_Banking_CheckIban(rIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid remote IBAN (%s)", rIBAN); AB_Transaction_free(t); return 3; @@ -325,14 +320,16 @@ return 1; } rv=AB_Banking_CheckIban(lIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid local IBAN (%s)", lIBAN); AB_Transaction_free(t); return 3; } - j=AB_JobSepaDebitNote_new(a); + j= use_flash_debitnote + ? AB_JobSepaFlashDebitNote_new(a) + : AB_JobSepaDebitNote_new(a); rv=AB_Job_CheckAvailability(j); if (rv<0) { DBG_ERROR(0, "Job not supported."); diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepadebitnotes.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepadebitnotes.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepadebitnotes.c 2014-03-25 21:46:55.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepadebitnotes.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,409 +0,0 @@ -/*************************************************************************** - begin : Tue Mar 25 2014 - copyright : (C) 2014 by Martin Preuss - email : martin@libchipcard.de - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "globals.h" - -#include - -#include - -#include -#include -#include -#include -#include -#include - - - -static -int sepaDebitNotes(AB_BANKING *ab, - GWEN_DB_NODE *dbArgs, - int argc, - char **argv) { - GWEN_DB_NODE *db; - int rv; - const char *ctxFile; - const char *inFile; - const char *importerName; - const char *profileName; - const char *profileFile; - const char *bankId; - const char *accountId; - const char *subAccountId; - int fillGaps; - AB_IMEXPORTER_CONTEXT *ctx=0; - AB_IMEXPORTER_ACCOUNTINFO *iea; - AB_ACCOUNT *forcedAccount=NULL; - AB_JOB_LIST2 *jobList; - int rvExec; - const GWEN_ARGS args[]={ - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "ctxFile", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - "c", /* short option */ - "ctxfile", /* long option */ - "Specify the file to store the context in", /* short description */ - "Specify the file to store the context in" /* long description */ - }, - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "inFile", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - "f", /* short option */ - "infile", /* long option */ - "Specify the file to read the data from", /* short description */ - "Specify the file to read the data from" /* long description */ - }, - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "importerName", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - 0, /* short option */ - "importer", /* long option */ - "Specify the importer to use", /* short description */ - "Specify the importer to use" /* long description */ - }, - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "profileName", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - 0, /* short option */ - "profile", /* long option */ - "Specify the export profile to use", /* short description */ - "Specify the export profile to use" /* long description */ - }, - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "profileFile", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - 0, /* short option */ - "profile-file", /* long option */ - "Specify the file to load the export profile from",/* short description */ - "Specify the file to load the export profile from" /* long description */ - }, - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "bankId", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - "b", /* short option */ - "bank", /* long option */ - "overwrite the bank code", /* short description */ - "overwrite the bank code" /* long description */ - }, - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "accountId", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - "a", /* short option */ - "account", /* long option */ - "overwrite the account number", /* short description */ - "overwrite the account number" /* long description */ - }, - { - GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ - GWEN_ArgsType_Char, /* type */ - "subAccountId", /* name */ - 0, /* minnum */ - 1, /* maxnum */ - "aa", /* short option */ - "subaccount", /* long option */ - "Specify the sub account id (Unterkontomerkmal)", /* short description */ - "Specify the sub account id (Unterkontomerkmal)" /* long description */ - }, - { - 0, - GWEN_ArgsType_Int, - "fillGaps", - 0, - 1, - 0, - "fill-gaps", - "let AqBanking fill-in missing account information if possible", - "let AqBanking fill-in missing account information if possible", - }, - { - GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ - GWEN_ArgsType_Int, /* type */ - "help", /* name */ - 0, /* minnum */ - 0, /* maxnum */ - "h", /* short option */ - "help", /* long option */ - "Show this help screen", /* short description */ - "Show this help screen" /* long description */ - } - }; - - db=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, "local"); - rv=GWEN_Args_Check(argc, argv, 1, - 0 /*GWEN_ARGS_MODE_ALLOW_FREEPARAM*/, - args, - db); - if (rv==GWEN_ARGS_RESULT_ERROR) { - fprintf(stderr, "ERROR: Could not parse arguments\n"); - return 1; - } - else if (rv==GWEN_ARGS_RESULT_HELP) { - GWEN_BUFFER *ubuf; - - ubuf=GWEN_Buffer_new(0, 1024, 0, 1); - if (GWEN_Args_Usage(args, ubuf, GWEN_ArgsOutType_Txt)) { - fprintf(stderr, "ERROR: Could not create help string\n"); - return 1; - } - fprintf(stderr, "%s\n", GWEN_Buffer_GetStart(ubuf)); - GWEN_Buffer_free(ubuf); - return 0; - } - - bankId=GWEN_DB_GetCharValue(db, "bankId", 0, 0); - accountId=GWEN_DB_GetCharValue(db, "accountId", 0, 0); - subAccountId=GWEN_DB_GetCharValue(db, "subAccountId", 0, 0); - importerName=GWEN_DB_GetCharValue(db, "importerName", 0, "csv"); - profileName=GWEN_DB_GetCharValue(db, "profileName", 0, "default"); - profileFile=GWEN_DB_GetCharValue(db, "profileFile", 0, NULL); - ctxFile=GWEN_DB_GetCharValue(db, "ctxfile", 0, 0); - fillGaps=GWEN_DB_GetIntValue(db, "fillGaps", 0, 0); - inFile=GWEN_DB_GetCharValue(db, "inFile", 0, 0); - - rv=AB_Banking_Init(ab); - if (rv) { - DBG_ERROR(0, "Error on init (%d)", rv); - return 2; - } - - rv=AB_Banking_OnlineInit(ab); - if (rv) { - DBG_ERROR(0, "Error on init (%d)", rv); - return 2; - } - - /* find local account to set later if requested */ - if (bankId || accountId) { - AB_ACCOUNT_LIST2 *al; - - /* get account */ - al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); - if (al==NULL || AB_Account_List2_GetSize(al)==0) { - DBG_ERROR(0, "Account not found"); - return 2; - } - else if (AB_Account_List2_GetSize(al)>1) { - DBG_ERROR(0, "Ambiguous account specification"); - AB_Account_List2_free(al); - return 2; - } - forcedAccount=AB_Account_List2_GetFront(al); - AB_Account_List2_free(al); - } - - /* import new context */ - ctx=AB_ImExporterContext_new(); - rv=AB_Banking_ImportFileWithProfile(ab, importerName, ctx, - profileName, profileFile, - inFile); - if (rv<0) { - DBG_ERROR(0, "Error reading file: %d", rv); - AB_ImExporterContext_free(ctx); - return 4; - } - - /* fill gaps */ - if (fillGaps) - AB_Banking_FillGapsInImExporterContext(ab, ctx); - - /* populate job list */ - jobList=AB_Job_List2_new(); - iea=AB_ImExporterContext_GetFirstAccountInfo(ctx); - while(iea) { - AB_ACCOUNT *a; - AB_TRANSACTION *t; - - if (forcedAccount) - a=forcedAccount; - else { - a=AB_Banking_GetAccountByCodeAndNumber(ab, - AB_ImExporterAccountInfo_GetBankCode(iea), - AB_ImExporterAccountInfo_GetAccountNumber(iea)); - if (!a) { - DBG_ERROR(0, "Account %s/%s not found, aborting", - AB_ImExporterAccountInfo_GetBankCode(iea), - AB_ImExporterAccountInfo_GetAccountNumber(iea)); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - } - - t=AB_ImExporterAccountInfo_GetFirstTransaction(iea); - while(t) { - AB_JOB *j; - const char *rIBAN; - const char *rBIC; - const char *lIBAN; - const char *lBIC; - - if (forcedAccount) { - AB_Transaction_SetLocalIban(t, AB_Account_GetIBAN(forcedAccount)); - AB_Transaction_SetLocalBic(t, AB_Account_GetBIC(forcedAccount)); - } - - rIBAN=AB_Transaction_GetRemoteIban(t); - rBIC=AB_Transaction_GetRemoteBic(t); - lIBAN=AB_Transaction_GetLocalIban(t); - lBIC=AB_Transaction_GetLocalBic(t); - - /* preset local BIC and IBAN from account, if not set */ - if (!lBIC || !(*lBIC)) - lBIC=AB_Account_GetBIC(a); - - if (!lIBAN || !(*lIBAN)) - lIBAN=AB_Account_GetIBAN(a); - - /* check remote account */ - if (!rBIC || !(*rBIC)) { - DBG_ERROR(0, "Missing remote BIC"); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - if (!rIBAN || !(*rIBAN)) { - DBG_ERROR(0, "Missing remote IBAN"); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - rv=AB_Banking_CheckIban(rIBAN); - if (rv<0) { - DBG_ERROR(0, "Invalid remote IBAN (%s)", rIBAN); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - - /* check local account */ - if (!lBIC || !(*lBIC)) { - DBG_ERROR(0, "Missing local BIC"); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - if (!lIBAN || !(*lIBAN)) { - DBG_ERROR(0, "Missing local IBAN"); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - rv=AB_Banking_CheckIban(lIBAN); - if (rv<0) { - DBG_ERROR(0, "Invalid local IBAN (%s)", lIBAN); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - - /* create job */ - j=AB_JobSepaDebitNote_new(a); - rv=AB_Job_CheckAvailability(j); - if (rv<0) { - DBG_ERROR(0, "Job not supported."); - AB_Job_free(j); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - rv=AB_Job_SetTransaction(j, t); - if (rv<0) { - DBG_ERROR(0, "Unable to add transaction for account %s/%s, aborting", - AB_ImExporterAccountInfo_GetBankCode(iea), - AB_ImExporterAccountInfo_GetAccountNumber(iea)); - AB_Job_free(j); - AB_Job_List2_FreeAll(jobList); - AB_ImExporterContext_free(ctx); - return 3; - } - AB_Job_List2_PushBack(jobList, j); - t=AB_ImExporterAccountInfo_GetNextTransaction(iea); - } /* while t */ - - iea=AB_ImExporterContext_GetNextAccountInfo(ctx); - } /* while */ - AB_ImExporterContext_free(ctx); - - /* execute jobs */ - rvExec=0; - ctx=AB_ImExporterContext_new(); - rv=AB_Banking_ExecuteJobs(ab, jobList, ctx); - if (rv) { - fprintf(stderr, "Error on executeQueue (%d)\n", rv); - rvExec=3; - } - AB_Job_List2_FreeAll(jobList); - - /* write context */ - rv=writeContext(ctxFile, ctx); - if (rv<0) { - AB_ImExporterContext_free(ctx); - AB_Banking_OnlineFini(ab); - AB_Banking_Fini(ab); - return 4; - } - AB_ImExporterContext_free(ctx); - - /* that's is */ - rv=AB_Banking_OnlineFini(ab); - if (rv) { - fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); - AB_Banking_Fini(ab); - if (rvExec) - return rvExec; - else - return 5; - } - - rv=AB_Banking_Fini(ab); - if (rv) { - fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); - if (rvExec) - return rvExec; - else - return 5; - } - - if (rvExec) - return rvExec; - else - return 0; -} - - - - - - diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepamultijobs.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepamultijobs.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepamultijobs.c 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepamultijobs.c 2014-10-12 13:40:15.000000000 +0000 @@ -0,0 +1,422 @@ +/*************************************************************************** + begin : Tue Mar 25 2014 + copyright : (C) 2014 by Martin Preuss + email : martin@libchipcard.de + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "globals.h" + +#include + +#include + +#include +#include +#include +#include +#include +#include + + +typedef enum +{ + AQBANKING_TOOL_SEPA_TRANSFERS + , AQBANKING_TOOL_SEPA_DEBITNOTES +} AQBANKING_TOOL_MULTISEPA_TYPE; + +static +int sepaMultiJobs(AB_BANKING *ab, + GWEN_DB_NODE *dbArgs, + int argc, + char **argv, + AQBANKING_TOOL_MULTISEPA_TYPE multisepa_type) { + GWEN_DB_NODE *db; + int rv; + const char *ctxFile; + const char *inFile; + const char *importerName; + const char *profileName; + const char *profileFile; + const char *bankId; + const char *accountId; + const char *subAccountId; + int fillGaps, use_flash_debitnote; + AB_IMEXPORTER_CONTEXT *ctx=0; + AB_IMEXPORTER_ACCOUNTINFO *iea; + AB_ACCOUNT *forcedAccount=NULL; + AB_JOB_LIST2 *jobList; + int rvExec, reallyExecute = 1, transactionLine = 0; + const GWEN_ARGS args[]={ + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "ctxFile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "c", /* short option */ + "ctxfile", /* long option */ + "Specify the file to store the context in", /* short description */ + "Specify the file to store the context in" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "inFile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "f", /* short option */ + "infile", /* long option */ + "Specify the file to read the data from", /* short description */ + "Specify the file to read the data from" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "importerName", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "importer", /* long option */ + "Specify the importer to use", /* short description */ + "Specify the importer to use" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "profileName", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "profile", /* long option */ + "Specify the import profile to use", /* short description */ + "Specify the import profile to use" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "profileFile", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "profile-file", /* long option */ + "Specify the file to load the import profile from (WATCH OUT: Feature might be broken)",/* short description */ + "Specify the file to load the import profile from" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "bankId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "b", /* short option */ + "bank", /* long option */ + "overwrite the bank code", /* short description */ + "overwrite the bank code" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "accountId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "a", /* short option */ + "account", /* long option */ + "overwrite the account number", /* short description */ + "overwrite the account number" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "subAccountId", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "aa", /* short option */ + "subaccount", /* long option */ + "Specify the sub account id (Unterkontomerkmal)", /* short description */ + "Specify the sub account id (Unterkontomerkmal)" /* long description */ + }, + { + 0, + GWEN_ArgsType_Int, + "fillGaps", + 0, + 1, + 0, + "fill-gaps", + "let AqBanking fill-in missing account information if possible", + "let AqBanking fill-in missing account information if possible", + }, + { + 0, /* flags */ + GWEN_ArgsType_Int, /* type */ + "useCOR1", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + 0, /* short option */ + "use-COR1", /* long option */ + "If given, use COR1 variant of debit notes (faster), otherwise CORE (slower)", /* short description */ + "If given, use COR1 variant of debit notes (faster), otherwise CORE (slower)" /* long description */ + }, + { + GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ + GWEN_ArgsType_Int, /* type */ + "help", /* name */ + 0, /* minnum */ + 0, /* maxnum */ + "h", /* short option */ + "help", /* long option */ + "Show this help screen", /* short description */ + "Show this help screen" /* long description */ + } + }; + + db=GWEN_DB_GetGroup(dbArgs, GWEN_DB_FLAGS_DEFAULT, "local"); + rv=GWEN_Args_Check(argc, argv, 1, + 0 /*GWEN_ARGS_MODE_ALLOW_FREEPARAM*/, + args, + db); + if (rv==GWEN_ARGS_RESULT_ERROR) { + fprintf(stderr, "ERROR: Could not parse arguments\n"); + return 1; + } + else if (rv==GWEN_ARGS_RESULT_HELP) { + GWEN_BUFFER *ubuf; + + ubuf=GWEN_Buffer_new(0, 1024, 0, 1); + if (GWEN_Args_Usage(args, ubuf, GWEN_ArgsOutType_Txt)) { + fprintf(stderr, "ERROR: Could not create help string\n"); + return 1; + } + fprintf(stderr, "%s\n", GWEN_Buffer_GetStart(ubuf)); + GWEN_Buffer_free(ubuf); + return 0; + } + + bankId=GWEN_DB_GetCharValue(db, "bankId", 0, 0); + accountId=GWEN_DB_GetCharValue(db, "accountId", 0, 0); + subAccountId=GWEN_DB_GetCharValue(db, "subAccountId", 0, 0); + importerName=GWEN_DB_GetCharValue(db, "importerName", 0, "csv"); + profileName=GWEN_DB_GetCharValue(db, "profileName", 0, + (multisepa_type == AQBANKING_TOOL_SEPA_TRANSFERS) + ? "default" + : "sepadebitnotes"); + profileFile=GWEN_DB_GetCharValue(db, "profileFile", 0, NULL); + ctxFile=GWEN_DB_GetCharValue(db, "ctxfile", 0, 0); + fillGaps=GWEN_DB_GetIntValue(db, "fillGaps", 0, 0); + inFile=GWEN_DB_GetCharValue(db, "inFile", 0, 0); + use_flash_debitnote = GWEN_DB_GetIntValue(db, "useCOR1", 0, 0); + + rv=AB_Banking_Init(ab); + if (rv) { + DBG_ERROR(0, "Error on init (%d)", rv); + return 2; + } + + rv=AB_Banking_OnlineInit(ab); + if (rv) { + DBG_ERROR(0, "Error on init (%d)", rv); + return 2; + } + + /* find local account to set later if requested */ + if (bankId || accountId) { + AB_ACCOUNT_LIST2 *al; + + /* get account */ + al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); + if (al==NULL || AB_Account_List2_GetSize(al)==0) { + DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); + return 2; + } + else if (AB_Account_List2_GetSize(al)>1) { + DBG_ERROR(0, "Ambiguous account specification"); + AB_Account_List2_free(al); + return 2; + } + forcedAccount=AB_Account_List2_GetFront(al); + AB_Account_List2_free(al); + } + + /* import new context */ + ctx=AB_ImExporterContext_new(); + rv=AB_Banking_ImportFileWithProfile(ab, importerName, ctx, + profileName, profileFile, + inFile); + if (rv<0) { + DBG_ERROR(0, "Error reading file: %d", rv); + AB_ImExporterContext_free(ctx); + return 4; + } + + /* fill gaps */ + if (fillGaps) + AB_Banking_FillGapsInImExporterContext(ab, ctx); + + /* populate job list */ + jobList=AB_Job_List2_new(); + iea=AB_ImExporterContext_GetFirstAccountInfo(ctx); + while(iea) { + AB_ACCOUNT *a; + AB_TRANSACTION *t; + + if (forcedAccount) + a=forcedAccount; + else { + a=AB_Banking_GetAccountByCodeAndNumber(ab, + AB_ImExporterAccountInfo_GetBankCode(iea), + AB_ImExporterAccountInfo_GetAccountNumber(iea)); + if (!a) { + DBG_ERROR(0, "Local account %s/%s not found, aborting", + AB_ImExporterAccountInfo_GetBankCode(iea), + AB_ImExporterAccountInfo_GetAccountNumber(iea)); + AB_Job_List2_FreeAll(jobList); + AB_ImExporterContext_free(ctx); + return 3; + } + } + + t=AB_ImExporterAccountInfo_GetFirstTransaction(iea); + while(t) { + AB_JOB *j; + const char *rIBAN; + const char *lIBAN; + const char *lBIC; + transactionLine++; + + if (forcedAccount) { + AB_Transaction_SetLocalIban(t, AB_Account_GetIBAN(forcedAccount)); + AB_Transaction_SetLocalBic(t, AB_Account_GetBIC(forcedAccount)); + } + + rIBAN=AB_Transaction_GetRemoteIban(t); + lIBAN=AB_Transaction_GetLocalIban(t); + lBIC=AB_Transaction_GetLocalBic(t); + + /* preset local BIC and IBAN from account, if not set */ + if (!lBIC || !(*lBIC)) + lBIC=AB_Account_GetBIC(a); + + if (!lIBAN || !(*lIBAN)) + lIBAN=AB_Account_GetIBAN(a); + + /* check remote account */ + if (!rIBAN || !(*rIBAN)) { + DBG_ERROR(0, "Missing remote IBAN, in line %d", transactionLine); + reallyExecute = 0; + } + rv=AB_Banking_CheckIban(rIBAN); + if (rv != 0) { + DBG_ERROR(0, "Invalid remote IBAN (%s), in line %d", rIBAN, transactionLine); + reallyExecute = 0; + } + + /* check local account */ + if (!lBIC || !(*lBIC)) { + DBG_ERROR(0, "Missing local BIC, in line %d", transactionLine); + reallyExecute = 0; + } + if (!lIBAN || !(*lIBAN)) { + DBG_ERROR(0, "Missing local IBAN, in line %d", transactionLine); + reallyExecute = 0; + } + rv=AB_Banking_CheckIban(lIBAN); + if (rv != 0) { + DBG_ERROR(0, "Invalid local IBAN (%s), in line %d", lIBAN, transactionLine); + reallyExecute = 0; + } + + /* Create job */ + j = (multisepa_type == AQBANKING_TOOL_SEPA_TRANSFERS) + // The command was sepatransfers, so we create JobSepaTransfer + ? AB_JobSepaTransfer_new(a) + // The command was sepadebitnotes, so we create some debit note + : (use_flash_debitnote + // Did we have --use-COR1? Use this extra job type + ? AB_JobSepaFlashDebitNote_new(a) + // No COR1, just standard CORE debit note + : AB_JobSepaDebitNote_new(a)); + rv=AB_Job_CheckAvailability(j); + if (rv<0) { + DBG_ERROR(0, "Job not supported, in line %d.", transactionLine); + reallyExecute = 0; + } + rv=AB_Job_SetTransaction(j, t); + if (rv<0) { + DBG_ERROR(0, "Unable to add transaction for account %s/%s, line %d, aborting", + AB_ImExporterAccountInfo_GetBankCode(iea), + AB_ImExporterAccountInfo_GetAccountNumber(iea), + transactionLine); + reallyExecute = 0; + } + AB_Job_List2_PushBack(jobList, j); + t=AB_ImExporterAccountInfo_GetNextTransaction(iea); + } /* while t */ + + iea=AB_ImExporterContext_GetNextAccountInfo(ctx); + } /* while */ + AB_ImExporterContext_free(ctx); + + if (reallyExecute != 1) + { + AB_Job_List2_FreeAll(jobList); + return 3; + } + + /* execute jobs */ + rvExec=0; + ctx=AB_ImExporterContext_new(); + rv=AB_Banking_ExecuteJobs(ab, jobList, ctx); + if (rv) { + fprintf(stderr, "Error on executeQueue (%d)\n", rv); + rvExec=3; + } + AB_Job_List2_FreeAll(jobList); + + /* write context */ + rv=writeContext(ctxFile, ctx); + AB_ImExporterContext_free(ctx); + if (rv<0) { + AB_Banking_OnlineFini(ab); + AB_Banking_Fini(ab); + return 4; + } + + /* that's it */ + rv=AB_Banking_OnlineFini(ab); + if (rv) { + fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); + AB_Banking_Fini(ab); + if (rvExec) + return rvExec; + else + return 5; + } + + rv=AB_Banking_Fini(ab); + if (rv) { + fprintf(stderr, "ERROR: Error on deinit (%d)\n", rv); + if (rvExec) + return rvExec; + else + return 5; + } + + if (rvExec) + return rvExec; + else + return 0; +} + + + + + + diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/separecurtransfer.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/separecurtransfer.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/separecurtransfer.c 2014-03-01 19:44:15.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/separecurtransfer.c 2014-10-12 13:40:15.000000000 +0000 @@ -108,7 +108,7 @@ GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ "remoteBIC", /* name */ - 1, /* minnum */ + 0, /* minnum */ 1, /* maxnum */ 0, /* short option */ "rbic", /* long option */ @@ -270,6 +270,7 @@ al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); if (al==NULL || AB_Account_List2_GetSize(al)==0) { DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); return 2; } else if (AB_Account_List2_GetSize(al)>1) { @@ -363,7 +364,7 @@ return 1; } rv=AB_Banking_CheckIban(rIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid remote IBAN (%s)", rIBAN); AB_Job_free(j); AB_Transaction_free(t); @@ -373,7 +374,7 @@ /* check local IBAN */ lIBAN=AB_Transaction_GetLocalIban(t); rv=AB_Banking_CheckIban(lIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid local IBAN (%s)", rIBAN); AB_Job_free(j); AB_Transaction_free(t); @@ -390,7 +391,6 @@ /* populate job list */ jobList=AB_Job_List2_new(); - assert(jobList); AB_Job_List2_PushBack(jobList, j); diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepatransfer.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepatransfer.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/sepatransfer.c 2014-03-01 20:16:22.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/sepatransfer.c 2014-10-12 13:40:15.000000000 +0000 @@ -49,7 +49,6 @@ AB_JOB *j; int rvExec; const char *rIBAN; - const char *rBIC; const char *lIBAN; const char *lBIC; const GWEN_ARGS args[]={ @@ -112,7 +111,7 @@ GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ "remoteBIC", /* name */ - 1, /* minnum */ + 0, /* minnum */ 1, /* maxnum */ 0, /* short option */ "rbic", /* long option */ @@ -219,6 +218,7 @@ al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); if (al==NULL || AB_Account_List2_GetSize(al)==0) { DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); return 2; } else if (AB_Account_List2_GetSize(al)>1) { @@ -237,22 +237,16 @@ } rIBAN=AB_Transaction_GetRemoteIban(t); - rBIC=AB_Transaction_GetRemoteBic(t); lIBAN=AB_Transaction_GetLocalIban(t); lBIC=AB_Transaction_GetLocalBic(t); - if (!rBIC || !(*rBIC)) { - DBG_ERROR(0, "Missing remote BIC"); - AB_Transaction_free(t); - return 1; - } if (!rIBAN || !(*rIBAN)) { DBG_ERROR(0, "Missing remote IBAN"); AB_Transaction_free(t); return 1; } rv=AB_Banking_CheckIban(rIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid remote IBAN (%s)", rIBAN); AB_Transaction_free(t); return 3; @@ -270,7 +264,7 @@ return 1; } rv=AB_Banking_CheckIban(lIBAN); - if (rv<0) { + if (rv != 0) { DBG_ERROR(0, "Invalid local IBAN (%s)", rIBAN); AB_Transaction_free(t); return 3; @@ -296,7 +290,6 @@ /* populate job list */ jobList=AB_Job_List2_new(); - assert(jobList); AB_Job_List2_PushBack(jobList, j); diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/transfer.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/transfer.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/transfer.c 2014-04-02 15:31:16.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/transfer.c 2014-11-01 17:30:41.000000000 +0000 @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -40,7 +41,7 @@ const char *bankId; const char *accountId; const char *subAccountId; - int transferType=0; + AB_JOB_TYPE jobType; AB_IMEXPORTER_CONTEXT *ctx=0; AB_ACCOUNT_LIST2 *al; AB_ACCOUNT *a; @@ -252,6 +253,17 @@ "set execution period (standing orders)" }, { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, + GWEN_ArgsType_Char, + "fiId", /* HKDAL */ + 0, + 1, + 0, + "fiId", + "set the fiId (standing orders)", + "set the fiId (standing orders) - Auftragsidentifikation fuer HKDAL" + }, + { GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ GWEN_ArgsType_Int, /* type */ "help", /* name */ @@ -308,6 +320,7 @@ al=AB_Banking_FindAccounts(ab, "*", "*", bankId, accountId, subAccountId); if (al==NULL || AB_Account_List2_GetSize(al)==0) { DBG_ERROR(0, "Account not found"); + AB_Account_List2_free(al); return 2; } else if (AB_Account_List2_GetSize(al)>1) { @@ -319,7 +332,7 @@ AB_Account_List2_free(al); /* create transaction from arguments */ - t=mkTransfer(a, db, &transferType); + t=mkTransfer(a, db, &jobType); if (t==NULL) { DBG_ERROR(0, "Could not create transaction from arguments"); return 2; @@ -368,14 +381,16 @@ return 4; } - if (transferType == 0) + if (jobType==AB_Job_TypeTransfer) j=AB_JobSingleTransfer_new(a); - else if (transferType == 1) + else if (jobType==AB_Job_TypeCreateDatedTransfer) j=AB_JobCreateDatedTransfer_new(a); - else if (transferType == 2) + else if (jobType==AB_Job_TypeCreateStandingOrder) j=AB_JobCreateStandingOrder_new(a); + else if (jobType==AB_Job_TypeDeleteStandingOrder) + j=AB_JobDeleteStandingOrder_new(a); else { - DBG_ERROR(0, "Unknown transfer type: %d", transferType); + DBG_ERROR(0, "Unknown job type"); AB_Transaction_free(t); return 6; } @@ -398,7 +413,6 @@ /* populate job list */ jobList=AB_Job_List2_new(); - assert(jobList); AB_Job_List2_PushBack(jobList, j); /* execute job */ diff -Nru libaqbanking-5.4.3beta/src/tools/aqbanking-cli/util.c libaqbanking-5.6.1beta/src/tools/aqbanking-cli/util.c --- libaqbanking-5.4.3beta/src/tools/aqbanking-cli/util.c 2014-03-01 20:15:56.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/aqbanking-cli/util.c 2014-11-01 17:30:41.000000000 +0000 @@ -139,7 +139,7 @@ -AB_TRANSACTION *mkTransfer(AB_ACCOUNT *a, GWEN_DB_NODE *db, int *transferType) { +AB_TRANSACTION *mkTransfer(AB_ACCOUNT *a, GWEN_DB_NODE *db, AB_JOB_TYPE *jobType) { AB_BANKING *ab; AB_TRANSACTION *t; const char *s; @@ -147,7 +147,7 @@ GWEN_TIME *d; AB_TRANSACTION_PERIOD period=AB_Transaction_PeriodUnknown; - *transferType = 0; // single transfer + *jobType=AB_Job_TypeTransfer; // single transfer assert(a); assert(db); @@ -252,7 +252,7 @@ } AB_Transaction_SetDate(t, d); GWEN_Time_free(d); - *transferType = 1; + *jobType=AB_Job_TypeCreateDatedTransfer; return t; } @@ -277,7 +277,7 @@ } else return t; // single transfer - *transferType = 2; + *jobType=AB_Job_TypeCreateStandingOrder; s=GWEN_DB_GetCharValue(db, "lastExecutionDate", 0, 0); if (s && *s) { GWEN_BUFFER *dbuf; @@ -326,6 +326,12 @@ } AB_Transaction_SetExecutionDay(t, i); + s=GWEN_DB_GetCharValue(db, "fiId", 0, 0); + if (s && *s) { + AB_Transaction_SetFiId(t, s); + *jobType=AB_Job_TypeDeleteStandingOrder; + } + return t; } @@ -372,8 +378,9 @@ s=GWEN_DB_GetCharValue(db, "remoteBic", 0, 0); if (s && *s) AB_Transaction_SetRemoteBic(t, s); - else { - DBG_ERROR(0, "No remote BIC id given"); + else if (strncmp(AB_Transaction_GetLocalIban(t), + AB_Transaction_GetRemoteIban(t), 2)) { + DBG_ERROR(0, "Remote BIC id required for international transaction"); AB_Transaction_free(t); return NULL; } diff -Nru libaqbanking-5.4.3beta/src/tools/Makefile.in libaqbanking-5.6.1beta/src/tools/Makefile.in --- libaqbanking-5.4.3beta/src/tools/Makefile.in 2014-04-17 20:57:27.000000000 +0000 +++ libaqbanking-5.6.1beta/src/tools/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -66,15 +93,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +122,29 @@ esac 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 \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -116,6 +176,7 @@ ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -204,6 +265,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -417,22 +479,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -447,57 +512,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -513,12 +533,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -530,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -547,6 +558,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,22 +733,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir 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-am uninstall uninstall-am sources: diff -Nru libaqbanking-5.4.3beta/test-driver libaqbanking-5.6.1beta/test-driver --- libaqbanking-5.4.3beta/test-driver 1970-01-01 00:00:00.000000000 +0000 +++ libaqbanking-5.6.1beta/test-driver 2014-01-02 19:14:59.000000000 +0000 @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru libaqbanking-5.4.3beta/TODO libaqbanking-5.6.1beta/TODO --- libaqbanking-5.4.3beta/TODO 2012-06-03 17:02:14.000000000 +0000 +++ libaqbanking-5.6.1beta/TODO 2014-10-12 13:39:54.000000000 +0000 @@ -1,4 +1,25 @@ +Mid-term +======== + +- types/*.xml: convert to typemaker2 +- remove job for EU transfers (no longer needed + + +Long-term +========= + +- very much simplify API (just jobs, accounts and probably bank info) +- probably remove country info stuff +- remove data storage stuff (APPS should store their info themselves) +- remove message engine stuff, use gparser instead + + + + +Old +=== + - loganalyzer: read messages from FASTBUFFER instead from IO CAVEATS: @@ -33,3 +54,5 @@ - noBase64 - omitSmsAccount + +Test diff -Nru libaqbanking-5.4.3beta/tutorials/Makefile.in libaqbanking-5.6.1beta/tutorials/Makefile.in --- libaqbanking-5.4.3beta/tutorials/Makefile.in 2014-04-17 20:57:27.000000000 +0000 +++ libaqbanking-5.6.1beta/tutorials/Makefile.in 2015-06-01 16:31:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,7 +81,8 @@ noinst_PROGRAMS = tutorial1$(EXEEXT) tutorial2$(EXEEXT) \ tutorial3$(EXEEXT) tutorial4$(EXEEXT) subdir = tutorials -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_compile_warn.m4 \ $(top_srcdir)/m4/as-scrub-include.m4 \ @@ -76,6 +104,10 @@ tutorial1_DEPENDENCIES = \ $(top_builddir)/src/libs/aqbanking/libaqbanking.la \ $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_tutorial2_OBJECTS = tutorial2.$(OBJEXT) tutorial2_OBJECTS = $(am_tutorial2_OBJECTS) tutorial2_DEPENDENCIES = \ @@ -91,19 +123,40 @@ tutorial4_DEPENDENCIES = \ $(top_builddir)/src/libs/aqbanking/libaqbanking.la \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(tutorial1_SOURCES) $(tutorial2_SOURCES) \ $(tutorial3_SOURCES) $(tutorial4_SOURCES) DIST_SOURCES = $(tutorial1_SOURCES) $(tutorial2_SOURCES) \ @@ -113,12 +166,30 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADD_ACLOCAL_FLAGS = @ADD_ACLOCAL_FLAGS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AQBANKING_CLI_VERSION_STRING = @AQBANKING_CLI_VERSION_STRING@ AQBANKING_SO_AGE = @AQBANKING_SO_AGE@ AQBANKING_SO_CURRENT = @AQBANKING_SO_CURRENT@ @@ -207,6 +278,7 @@ GTK2_LIBS = @GTK2_LIBS@ GWENGUI_GTK2_CFLAGS = @GWENGUI_GTK2_CFLAGS@ GWENGUI_GTK2_LIBS = @GWENGUI_GTK2_LIBS@ +GWENHYWFAR_MINIMUM_VERSION = @GWENHYWFAR_MINIMUM_VERSION@ HAVE_GWENGUI_GTK2 = @HAVE_GWENGUI_GTK2@ HAVE_I18N = @HAVE_I18N@ INSTALL = @INSTALL@ @@ -441,18 +513,22 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + tutorial1$(EXEEXT): $(tutorial1_OBJECTS) $(tutorial1_DEPENDENCIES) $(EXTRA_tutorial1_DEPENDENCIES) @rm -f tutorial1$(EXEEXT) - $(LINK) $(tutorial1_OBJECTS) $(tutorial1_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(tutorial1_OBJECTS) $(tutorial1_LDADD) $(LIBS) + tutorial2$(EXEEXT): $(tutorial2_OBJECTS) $(tutorial2_DEPENDENCIES) $(EXTRA_tutorial2_DEPENDENCIES) @rm -f tutorial2$(EXEEXT) - $(LINK) $(tutorial2_OBJECTS) $(tutorial2_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(tutorial2_OBJECTS) $(tutorial2_LDADD) $(LIBS) + tutorial3$(EXEEXT): $(tutorial3_OBJECTS) $(tutorial3_DEPENDENCIES) $(EXTRA_tutorial3_DEPENDENCIES) @rm -f tutorial3$(EXEEXT) - $(LINK) $(tutorial3_OBJECTS) $(tutorial3_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(tutorial3_OBJECTS) $(tutorial3_LDADD) $(LIBS) + tutorial4$(EXEEXT): $(tutorial4_OBJECTS) $(tutorial4_DEPENDENCIES) $(EXTRA_tutorial4_DEPENDENCIES) @rm -f tutorial4$(EXEEXT) - $(LINK) $(tutorial4_OBJECTS) $(tutorial4_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(tutorial4_OBJECTS) $(tutorial4_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -466,25 +542,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tutorial4.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -492,26 +568,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - 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; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -523,15 +588,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -540,6 +601,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -681,18 +757,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libaqbanking-5.4.3beta/version.h libaqbanking-5.6.1beta/version.h --- libaqbanking-5.4.3beta/version.h 2014-04-17 20:57:33.000000000 +0000 +++ libaqbanking-5.6.1beta/version.h 2015-06-01 16:31:40.000000000 +0000 @@ -12,18 +12,18 @@ #define AQBANKING_VERSION_H #define AQBANKING_VERSION_MAJOR 5 -#define AQBANKING_VERSION_MINOR 4 -#define AQBANKING_VERSION_PATCHLEVEL 3 +#define AQBANKING_VERSION_MINOR 6 +#define AQBANKING_VERSION_PATCHLEVEL 1 #define AQBANKING_VERSION_BUILD 0 #define AQBANKING_VERSION_TAG "beta" -#define AQBANKING_VERSION_FULL_STRING "5.4.3.0beta" -#define AQBANKING_VERSION_STRING "5.4.3" +#define AQBANKING_VERSION_FULL_STRING "5.6.1.0beta" +#define AQBANKING_VERSION_STRING "5.6.1" -#define AQBANKING_SO_CURRENT 38 -#define AQBANKING_SO_REVISION 3 -#define AQBANKING_SO_AGE 4 -#define AQBANKING_SO_EFFECTIVE 34 +#define AQBANKING_SO_CURRENT 40 +#define AQBANKING_SO_REVISION 1 +#define AQBANKING_SO_AGE 5 +#define AQBANKING_SO_EFFECTIVE 35 #endif /* AQBANKING_VERSION_H */