From addcf1d20042e5cacefabc4aab50d05a4113f87b Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Tue, 3 Nov 2020 13:53:28 +0100 Subject: [PATCH 1/8] updating autotools scripts --- Makefile.in | 25 +++-- aclocal.m4 | 191 +++++++++++++++---------------- configure | 212 ++++++++++++++++++----------------- demo/Makefile.in | 17 ++- doc/html/Makefile.in | 15 ++- src/Makefile.in | 261 +++++++++++++++++++++++++++++++++---------- 6 files changed, 432 insertions(+), 289 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0cb01a96..70be6e2f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -177,7 +177,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am 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, @@ -417,8 +417,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -585,7 +585,10 @@ 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) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -650,7 +653,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -676,7 +679,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives 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 + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -694,7 +697,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -704,7 +707,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -907,4 +910,4 @@ uninstall-am: uninstall-pkgconfigDATA # 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: \ No newline at end of file +.NOEXPORT: diff --git a/aclocal.m4 b/aclocal.m4 index e41b4761..f73d7d01 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ 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'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # 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.15' +[am__api_version='1.16' 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.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # 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.15])dnl +[AM_AUTOMAKE_VERSION([1.16.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-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 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_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -346,49 +345,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # 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 - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # 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'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -397,18 +388,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # 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 -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -495,8 +485,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])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 (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -563,7 +553,7 @@ 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: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -605,7 +595,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +616,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -647,7 +637,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -655,49 +645,42 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -738,7 +721,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -765,7 +748,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -794,7 +777,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -841,7 +824,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -860,7 +843,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -941,7 +924,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1001,7 +984,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1029,7 +1012,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1048,7 +1031,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/configure b/configure index 386140b5..a1a27538 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ocilib 4.7.1. +# Generated by GNU Autoconf 2.69 for ocilib 4.7.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ocilib' PACKAGE_TARNAME='ocilib' -PACKAGE_VERSION='4.7.1' -PACKAGE_STRING='ocilib 4.7.1' +PACKAGE_VERSION='4.7.2' +PACKAGE_STRING='ocilib 4.7.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -677,7 +677,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -761,7 +760,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -1342,7 +1342,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ocilib 4.7.1 to adapt to many kinds of systems. +\`configure' configures ocilib 4.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1413,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ocilib 4.7.1:";; + short | recursive ) echo "Configuration of ocilib 4.7.2:";; esac cat <<\_ACEOF @@ -1529,7 +1529,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ocilib configure 4.7.1 +ocilib configure 4.7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1807,7 +1807,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ocilib $as_me 4.7.1, which was +It was created by ocilib $as_me 4.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2191,7 +2191,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_headers="$ac_config_headers config.h" -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2677,7 +2677,7 @@ fi # Define the identity of the package. PACKAGE='ocilib' - VERSION='4.7.1' + VERSION='4.7.2' cat >>confdefs.h <<_ACEOF @@ -2707,8 +2707,8 @@ 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 (and possibly the TAP driver). The @@ -2759,7 +2759,7 @@ 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: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -2940,45 +2940,45 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -13759,7 +13759,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ocilib $as_me 4.7.1, which was +This file was extended by ocilib $as_me 4.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13825,7 +13825,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ocilib config.status 4.7.1 +ocilib config.status 4.7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13944,7 +13944,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -14846,29 +14846,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # 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 - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14886,53 +14892,48 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # 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'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) @@ -15516,3 +15517,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/demo/Makefile.in b/demo/Makefile.in index faf3c635..ecaf833d 100644 --- a/demo/Makefile.in +++ b/demo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -174,7 +174,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am 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 @@ -276,6 +276,7 @@ OBJEXT = @OBJEXT@ OCILIB_CHARSET = @OCILIB_CHARSET@ OCILIB_DEMO_SOURCES = @OCILIB_DEMO_SOURCES@ OCILIB_DOCS = @OCILIB_DOCS@ +OCILIB_EXTRA_FLAGS = @OCILIB_EXTRA_FLAGS@ OCILIB_IMPORT = @OCILIB_IMPORT@ OCILIB_LD_FLAG = @OCILIB_LD_FLAG@ OCILIB_PREFIX = @OCILIB_PREFIX@ @@ -343,6 +344,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -377,8 +379,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -518,7 +520,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index d7797fff..0be34f6c 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -216,6 +216,7 @@ OBJEXT = @OBJEXT@ OCILIB_CHARSET = @OCILIB_CHARSET@ OCILIB_DEMO_SOURCES = @OCILIB_DEMO_SOURCES@ OCILIB_DOCS = @OCILIB_DOCS@ +OCILIB_EXTRA_FLAGS = @OCILIB_EXTRA_FLAGS@ OCILIB_IMPORT = @OCILIB_IMPORT@ OCILIB_LD_FLAG = @OCILIB_LD_FLAG@ OCILIB_PREFIX = @OCILIB_PREFIX@ @@ -283,6 +284,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -315,8 +317,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -361,7 +363,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/src/Makefile.in b/src/Makefile.in index ff0b7384..cfd00896 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -195,7 +195,53 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libocilib_la-agent.Plo \ + ./$(DEPDIR)/libocilib_la-array.Plo \ + ./$(DEPDIR)/libocilib_la-bind.Plo \ + ./$(DEPDIR)/libocilib_la-callback.Plo \ + ./$(DEPDIR)/libocilib_la-collection.Plo \ + ./$(DEPDIR)/libocilib_la-column.Plo \ + ./$(DEPDIR)/libocilib_la-connection.Plo \ + ./$(DEPDIR)/libocilib_la-database.Plo \ + ./$(DEPDIR)/libocilib_la-date.Plo \ + ./$(DEPDIR)/libocilib_la-define.Plo \ + ./$(DEPDIR)/libocilib_la-dequeue.Plo \ + ./$(DEPDIR)/libocilib_la-dirpath.Plo \ + ./$(DEPDIR)/libocilib_la-element.Plo \ + ./$(DEPDIR)/libocilib_la-enqueue.Plo \ + ./$(DEPDIR)/libocilib_la-environment.Plo \ + ./$(DEPDIR)/libocilib_la-error.Plo \ + ./$(DEPDIR)/libocilib_la-event.Plo \ + ./$(DEPDIR)/libocilib_la-exception.Plo \ + ./$(DEPDIR)/libocilib_la-file.Plo \ + ./$(DEPDIR)/libocilib_la-format.Plo \ + ./$(DEPDIR)/libocilib_la-handle.Plo \ + ./$(DEPDIR)/libocilib_la-hash.Plo \ + ./$(DEPDIR)/libocilib_la-helpers.Plo \ + ./$(DEPDIR)/libocilib_la-interval.Plo \ + ./$(DEPDIR)/libocilib_la-iterator.Plo \ + ./$(DEPDIR)/libocilib_la-list.Plo \ + ./$(DEPDIR)/libocilib_la-lob.Plo \ + ./$(DEPDIR)/libocilib_la-long.Plo \ + ./$(DEPDIR)/libocilib_la-memory.Plo \ + ./$(DEPDIR)/libocilib_la-message.Plo \ + ./$(DEPDIR)/libocilib_la-mutex.Plo \ + ./$(DEPDIR)/libocilib_la-number.Plo \ + ./$(DEPDIR)/libocilib_la-object.Plo \ + ./$(DEPDIR)/libocilib_la-ocilib.Plo \ + ./$(DEPDIR)/libocilib_la-pool.Plo \ + ./$(DEPDIR)/libocilib_la-queue.Plo \ + ./$(DEPDIR)/libocilib_la-reference.Plo \ + ./$(DEPDIR)/libocilib_la-resultset.Plo \ + ./$(DEPDIR)/libocilib_la-statement.Plo \ + ./$(DEPDIR)/libocilib_la-stringutils.Plo \ + ./$(DEPDIR)/libocilib_la-subscription.Plo \ + ./$(DEPDIR)/libocilib_la-thread.Plo \ + ./$(DEPDIR)/libocilib_la-threadkey.Plo \ + ./$(DEPDIR)/libocilib_la-timestamp.Plo \ + ./$(DEPDIR)/libocilib_la-transaction.Plo \ + ./$(DEPDIR)/libocilib_la-typeinfo.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -523,8 +569,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -580,52 +626,58 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-agent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-array.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-bind.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-callback.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-collection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-column.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-connection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-database.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-date.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-define.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-dequeue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-dirpath.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-element.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-enqueue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-environment.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-event.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-exception.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-format.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-handle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-hash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-helpers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-interval.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-iterator.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-list.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-lob.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-long.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-memory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-message.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-mutex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-number.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-object.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-ocilib.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-pool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-queue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-reference.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-resultset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-statement.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-stringutils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-subscription.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-thread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-threadkey.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-timestamp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-transaction.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-typeinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-agent.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-array.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-bind.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-callback.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-collection.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-column.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-connection.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-database.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-date.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-define.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-dequeue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-dirpath.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-element.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-enqueue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-environment.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-event.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-exception.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-file.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-format.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-handle.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-hash.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-helpers.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-interval.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-iterator.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-list.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-lob.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-long.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-memory.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-message.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-mutex.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-number.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-object.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-ocilib.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-pool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-queue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-reference.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-resultset.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-statement.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-stringutils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-subscription.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-thread.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-threadkey.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-timestamp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-transaction.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libocilib_la-typeinfo.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1154,7 +1206,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1228,7 +1283,52 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libocilib_la-agent.Plo + -rm -f ./$(DEPDIR)/libocilib_la-array.Plo + -rm -f ./$(DEPDIR)/libocilib_la-bind.Plo + -rm -f ./$(DEPDIR)/libocilib_la-callback.Plo + -rm -f ./$(DEPDIR)/libocilib_la-collection.Plo + -rm -f ./$(DEPDIR)/libocilib_la-column.Plo + -rm -f ./$(DEPDIR)/libocilib_la-connection.Plo + -rm -f ./$(DEPDIR)/libocilib_la-database.Plo + -rm -f ./$(DEPDIR)/libocilib_la-date.Plo + -rm -f ./$(DEPDIR)/libocilib_la-define.Plo + -rm -f ./$(DEPDIR)/libocilib_la-dequeue.Plo + -rm -f ./$(DEPDIR)/libocilib_la-dirpath.Plo + -rm -f ./$(DEPDIR)/libocilib_la-element.Plo + -rm -f ./$(DEPDIR)/libocilib_la-enqueue.Plo + -rm -f ./$(DEPDIR)/libocilib_la-environment.Plo + -rm -f ./$(DEPDIR)/libocilib_la-error.Plo + -rm -f ./$(DEPDIR)/libocilib_la-event.Plo + -rm -f ./$(DEPDIR)/libocilib_la-exception.Plo + -rm -f ./$(DEPDIR)/libocilib_la-file.Plo + -rm -f ./$(DEPDIR)/libocilib_la-format.Plo + -rm -f ./$(DEPDIR)/libocilib_la-handle.Plo + -rm -f ./$(DEPDIR)/libocilib_la-hash.Plo + -rm -f ./$(DEPDIR)/libocilib_la-helpers.Plo + -rm -f ./$(DEPDIR)/libocilib_la-interval.Plo + -rm -f ./$(DEPDIR)/libocilib_la-iterator.Plo + -rm -f ./$(DEPDIR)/libocilib_la-list.Plo + -rm -f ./$(DEPDIR)/libocilib_la-lob.Plo + -rm -f ./$(DEPDIR)/libocilib_la-long.Plo + -rm -f ./$(DEPDIR)/libocilib_la-memory.Plo + -rm -f ./$(DEPDIR)/libocilib_la-message.Plo + -rm -f ./$(DEPDIR)/libocilib_la-mutex.Plo + -rm -f ./$(DEPDIR)/libocilib_la-number.Plo + -rm -f ./$(DEPDIR)/libocilib_la-object.Plo + -rm -f ./$(DEPDIR)/libocilib_la-ocilib.Plo + -rm -f ./$(DEPDIR)/libocilib_la-pool.Plo + -rm -f ./$(DEPDIR)/libocilib_la-queue.Plo + -rm -f ./$(DEPDIR)/libocilib_la-reference.Plo + -rm -f ./$(DEPDIR)/libocilib_la-resultset.Plo + -rm -f ./$(DEPDIR)/libocilib_la-statement.Plo + -rm -f ./$(DEPDIR)/libocilib_la-stringutils.Plo + -rm -f ./$(DEPDIR)/libocilib_la-subscription.Plo + -rm -f ./$(DEPDIR)/libocilib_la-thread.Plo + -rm -f ./$(DEPDIR)/libocilib_la-threadkey.Plo + -rm -f ./$(DEPDIR)/libocilib_la-timestamp.Plo + -rm -f ./$(DEPDIR)/libocilib_la-transaction.Plo + -rm -f ./$(DEPDIR)/libocilib_la-typeinfo.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1278,7 +1378,52 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libocilib_la-agent.Plo + -rm -f ./$(DEPDIR)/libocilib_la-array.Plo + -rm -f ./$(DEPDIR)/libocilib_la-bind.Plo + -rm -f ./$(DEPDIR)/libocilib_la-callback.Plo + -rm -f ./$(DEPDIR)/libocilib_la-collection.Plo + -rm -f ./$(DEPDIR)/libocilib_la-column.Plo + -rm -f ./$(DEPDIR)/libocilib_la-connection.Plo + -rm -f ./$(DEPDIR)/libocilib_la-database.Plo + -rm -f ./$(DEPDIR)/libocilib_la-date.Plo + -rm -f ./$(DEPDIR)/libocilib_la-define.Plo + -rm -f ./$(DEPDIR)/libocilib_la-dequeue.Plo + -rm -f ./$(DEPDIR)/libocilib_la-dirpath.Plo + -rm -f ./$(DEPDIR)/libocilib_la-element.Plo + -rm -f ./$(DEPDIR)/libocilib_la-enqueue.Plo + -rm -f ./$(DEPDIR)/libocilib_la-environment.Plo + -rm -f ./$(DEPDIR)/libocilib_la-error.Plo + -rm -f ./$(DEPDIR)/libocilib_la-event.Plo + -rm -f ./$(DEPDIR)/libocilib_la-exception.Plo + -rm -f ./$(DEPDIR)/libocilib_la-file.Plo + -rm -f ./$(DEPDIR)/libocilib_la-format.Plo + -rm -f ./$(DEPDIR)/libocilib_la-handle.Plo + -rm -f ./$(DEPDIR)/libocilib_la-hash.Plo + -rm -f ./$(DEPDIR)/libocilib_la-helpers.Plo + -rm -f ./$(DEPDIR)/libocilib_la-interval.Plo + -rm -f ./$(DEPDIR)/libocilib_la-iterator.Plo + -rm -f ./$(DEPDIR)/libocilib_la-list.Plo + -rm -f ./$(DEPDIR)/libocilib_la-lob.Plo + -rm -f ./$(DEPDIR)/libocilib_la-long.Plo + -rm -f ./$(DEPDIR)/libocilib_la-memory.Plo + -rm -f ./$(DEPDIR)/libocilib_la-message.Plo + -rm -f ./$(DEPDIR)/libocilib_la-mutex.Plo + -rm -f ./$(DEPDIR)/libocilib_la-number.Plo + -rm -f ./$(DEPDIR)/libocilib_la-object.Plo + -rm -f ./$(DEPDIR)/libocilib_la-ocilib.Plo + -rm -f ./$(DEPDIR)/libocilib_la-pool.Plo + -rm -f ./$(DEPDIR)/libocilib_la-queue.Plo + -rm -f ./$(DEPDIR)/libocilib_la-reference.Plo + -rm -f ./$(DEPDIR)/libocilib_la-resultset.Plo + -rm -f ./$(DEPDIR)/libocilib_la-statement.Plo + -rm -f ./$(DEPDIR)/libocilib_la-stringutils.Plo + -rm -f ./$(DEPDIR)/libocilib_la-subscription.Plo + -rm -f ./$(DEPDIR)/libocilib_la-thread.Plo + -rm -f ./$(DEPDIR)/libocilib_la-threadkey.Plo + -rm -f ./$(DEPDIR)/libocilib_la-timestamp.Plo + -rm -f ./$(DEPDIR)/libocilib_la-transaction.Plo + -rm -f ./$(DEPDIR)/libocilib_la-typeinfo.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1303,9 +1448,9 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libLTLIBRARIES 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 \ @@ -1332,4 +1477,4 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \ # 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: \ No newline at end of file +.NOEXPORT: From 074fde1781cc2006d6635954e91d7457f48e9381 Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Thu, 5 Nov 2020 09:44:51 +0100 Subject: [PATCH 2/8] Simplified OcilibTimestampSysTimestamp() implementation --- src/timestamp.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/timestamp.c b/src/timestamp.c index db22239c..b20e62ab 100644 --- a/src/timestamp.c +++ b/src/timestamp.c @@ -1132,14 +1132,13 @@ boolean OcilibTimestampSysTimestamp /* context */ OCI_IPC_TIMESTAMP, tmsp ) - OCI_Timestamp *tmp = NULL; - OCIDateTime *handle = NULL; + OCI_Timestamp *tmp_tmsp = tmsp; CHECK_PTR(OCI_IPC_TIMESTAMP, tmsp) CHECK_TIMESTAMP_ENABLED(tmsp->con) #if OCI_VERSION_COMPILE >= OCI_9_0 - + /* Filling a timestamp handle of type OCI_TIMESTAMP with OCIDateTimeSysTimestamp() can lead later to an error ORA-01483 when binding the given timestamp to some SQL Statement (Oracle BUG). @@ -1150,42 +1149,34 @@ boolean OcilibTimestampSysTimestamp if (OCI_TIMESTAMP == tmsp->type) { - tmp = OcilibTimestampCreate(tmsp->con, OCI_TIMESTAMP_TZ); - CHECK_NULL(tmp) - - handle = tmp->handle; - } - else - { - handle = tmsp->handle; + tmp_tmsp = OcilibTimestampCreate(tmsp->con, OCI_TIMESTAMP_TZ); } CHECK_OCI ( - tmsp->err, + tmp_tmsp->err, OCIDateTimeSysTimeStamp, - (dvoid *) tmsp->env, tmsp->err, handle + (dvoid *)tmp_tmsp->env, tmp_tmsp->err, tmp_tmsp->handle ) if (OCI_TIMESTAMP == tmsp->type) { - CHECK(OcilibTimestampConvert(tmsp, tmp)) + CHECK(OcilibTimestampConvert(tmsp, tmp_tmsp)) } - + SET_SUCCESS() #else - OCI_NOT_USED(tmp) - OCI_NOT_USED(handle) + OCI_NOT_USED(tmp_tmsp) #endif CLEANUP_AND_EXIT_FUNC ( - if (NULL != tmp && tmsp != tmp) + if (NULL != tmp_tmsp && tmsp != tmp_tmsp) { - OcilibTimestampFree(tmp); + OcilibTimestampFree(tmp_tmsp); } ) } From eb16d9eb3a6bc5bbe99df2ed1732620b14342835 Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Thu, 5 Nov 2020 09:48:54 +0100 Subject: [PATCH 3/8] Updated test suite --- tests/TestReference.cpp | 78 ++++++++++++++++++++++++++++++++++-- tests/TestReportedIssues.cpp | 2 +- tests/ocilib_tests.h | 4 +- 3 files changed, 78 insertions(+), 6 deletions(-) diff --git a/tests/TestReference.cpp b/tests/TestReference.cpp index b587d302..f436e0ac 100644 --- a/tests/TestReference.cpp +++ b/tests/TestReference.cpp @@ -1,9 +1,21 @@ #include "ocilib_tests.h" -// requires DDL from /demo/ref.sql +static void IniTestRef() +{ + ExecDML(OTEXT("create type vendor_t as object(code number, name varchar2(30))")); + ExecDML(OTEXT("create table vendors of vendor_t")); + ExecDML(OTEXT("insert into vendors values (vendor_t(1, 'John Doe'))")); +} + +static void CleanupTestRef() +{ + ExecDML(OTEXT("drop table vendors")); +} TEST(TestRef, CreateAndFree) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -15,10 +27,14 @@ TEST(TestRef, CreateAndFree) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, ArrayCreateAndFree) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -34,11 +50,14 @@ TEST(TestRef, ArrayCreateAndFree) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } - TEST(TestRef, Assign) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -58,10 +77,14 @@ TEST(TestRef, Assign) ASSERT_TRUE(OCI_RefFree(ref2)); ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, GetTypeInfo) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -72,10 +95,14 @@ TEST(TestRef, GetTypeInfo) ASSERT_TRUE(OCI_RefFree(ref)); ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, GetObjectFetch) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -94,10 +121,13 @@ TEST(TestRef, GetObjectFetch) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + CleanupTestRef(); } TEST(TestRef, GetObjectNull) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -110,10 +140,14 @@ TEST(TestRef, GetObjectNull) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, IsNullTrue) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -126,10 +160,14 @@ TEST(TestRef, IsNullTrue) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, IsNullFalse) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -146,11 +184,14 @@ TEST(TestRef, IsNullFalse) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); -} + CleanupTestRef(); +} TEST(TestRef, ToTextNotNull) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -172,10 +213,14 @@ TEST(TestRef, ToTextNotNull) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, ToTextNull) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -191,10 +236,14 @@ TEST(TestRef, ToTextNull) ASSERT_TRUE(OCI_RefFree(ref)); ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, SetNullWhenNotNullWithoutPinningOject) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -213,10 +262,14 @@ TEST(TestRef, SetNullWhenNotNullWithoutPinningOject) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, RefFetch) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -233,11 +286,14 @@ TEST(TestRef, RefFetch) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); -} + CleanupTestRef(); +} TEST(TestRef, RefBindInOut) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -262,10 +318,14 @@ TEST(TestRef, RefBindInOut) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, RefRegister) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -295,10 +355,14 @@ TEST(TestRef, RefRegister) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, SetNullWhenNotNullWithPinningOject) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -319,10 +383,14 @@ TEST(TestRef, SetNullWhenNotNullWithPinningOject) ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } TEST(TestRef, SetNullWhenNull) { + IniTestRef(); + ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); const auto conn = OCI_ConnectionCreate(DBS, USR, PWD, OCI_SESSION_DEFAULT); @@ -336,4 +404,6 @@ TEST(TestRef, SetNullWhenNull) ASSERT_TRUE(OCI_RefFree(ref)); ASSERT_TRUE(OCI_ConnectionFree(conn)); ASSERT_TRUE(OCI_Cleanup()); + + CleanupTestRef(); } diff --git a/tests/TestReportedIssues.cpp b/tests/TestReportedIssues.cpp index 8b1416a5..5646350a 100644 --- a/tests/TestReportedIssues.cpp +++ b/tests/TestReportedIssues.cpp @@ -72,7 +72,7 @@ TEST(ReportedIssues, Issue222) { ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); - const auto pool = OCI_PoolCreate(DBS, USR, PWD, OCI_POOL_SESSION, OCI_SESSION_SYSDBA, 0, 1, 1); + const auto pool = OCI_PoolCreate(DBS, SYS_USR, SYS_PWD, OCI_POOL_SESSION, OCI_SESSION_SYSDBA, 0, 1, 1); ASSERT_NE(nullptr, pool); const auto conn = OCI_PoolGetConnection(pool, nullptr); diff --git a/tests/ocilib_tests.h b/tests/ocilib_tests.h index e76b6f74..b8a8033d 100644 --- a/tests/ocilib_tests.h +++ b/tests/ocilib_tests.h @@ -28,9 +28,11 @@ #define OCI_API __stdcall #include "../include/ocilib.h" -#define DBS OTEXT("db18c") +#define DBS OTEXT("localhost:1521/db19c") #define USR OTEXT("usr") #define PWD OTEXT("pwd") +#define SYS_USR OTEXT("sys") +#define SYS_PWD OTEXT("sys") #define HOME OTEXT("") #define PWD_WRONG OTEXT("pwd_wrong") #define ARRAY_SIZE 10 From c47ab32d5a2f23351edb83f7b0fb6f22de52f33a Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Tue, 10 Nov 2020 14:14:28 +0100 Subject: [PATCH 4/8] updated test suite: - added specific configurations for ANSI and Unicode - reenabled TestDate.GetNextDay() test - updated to gtest 1.8.1.3 --- tests/TestDate.cpp | 3 -- tests/ocilib_tests.h | 10 +---- tests/ocilib_tests.sln | 22 +++++++---- tests/ocilib_tests.vcxproj | 62 +++++++++++++++++++++++++++--- tests/ocilib_tests.vcxproj.filters | 6 +-- tests/packages.config | 2 +- 6 files changed, 76 insertions(+), 29 deletions(-) diff --git a/tests/TestDate.cpp b/tests/TestDate.cpp index 4fba5219..d4450826 100644 --- a/tests/TestDate.cpp +++ b/tests/TestDate.cpp @@ -213,8 +213,6 @@ TEST(TestDate, GetLastDay) ASSERT_TRUE(OCI_Cleanup()); } -#ifndef OCI_CHAR_WIDE - TEST(TestDate, GetNextDay) { ASSERT_TRUE(OCI_Initialize(nullptr, HOME, OCI_ENV_DEFAULT)); @@ -233,7 +231,6 @@ TEST(TestDate, GetNextDay) ASSERT_TRUE(OCI_Cleanup()); } -#endif TEST(TestDate, SetGetDateTime) { diff --git a/tests/ocilib_tests.h b/tests/ocilib_tests.h index b8a8033d..61956520 100644 --- a/tests/ocilib_tests.h +++ b/tests/ocilib_tests.h @@ -7,18 +7,12 @@ #include #include -#ifdef _UNICODE - #ifndef OCI_CHARSET_WIDE - #define OCI_CHARSET_WIDE - #endif +#ifdef OCI_CHARSET_WIDE #define TO_STRING std::to_wstring using ostring = std::wstring; #define osprintf wsprintf #define ostrlen wcslen #else - #ifndef OCI_CHARSET_ANSI - #define OCI_CHARSET_ANSI - #endif #define TO_STRING std::to_string using ostring = std::string; #define osprintf sprintf @@ -37,7 +31,7 @@ #define PWD_WRONG OTEXT("pwd_wrong") #define ARRAY_SIZE 10 #define STRING_SIZE 20 -#define NLS_LANGUAGE_SUNDAY_NAME OTEXT("Dimanche") +#define NLS_LANGUAGE_SUNDAY_NAME OTEXT("Sunday") #include "mutex" diff --git a/tests/ocilib_tests.sln b/tests/ocilib_tests.sln index 5ae04a1e..cb1f272a 100644 --- a/tests/ocilib_tests.sln +++ b/tests/ocilib_tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30621.155 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ocilib_tests", "ocilib_tests.vcxproj", "{67E42ECA-64D1-4E39-916E-919E2DC991AC}" EndProject @@ -9,18 +9,24 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 + Release - ANSI|x64 = Release - ANSI|x64 + Release - ANSI|x86 = Release - ANSI|x86 + Release - UNICODE|x64 = Release - UNICODE|x64 + Release - UNICODE|x86 = Release - UNICODE|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Debug|x64.ActiveCfg = Debug|x64 {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Debug|x64.Build.0 = Debug|x64 {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Debug|x86.ActiveCfg = Debug|Win32 {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Debug|x86.Build.0 = Debug|Win32 - {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release|x64.ActiveCfg = Release|x64 - {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release|x64.Build.0 = Release|x64 - {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release|x86.ActiveCfg = Release|Win32 - {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release|x86.Build.0 = Release|Win32 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - ANSI|x64.ActiveCfg = Release - ANSI|x64 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - ANSI|x64.Build.0 = Release - ANSI|x64 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - ANSI|x86.ActiveCfg = Release - ANSI|Win32 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - ANSI|x86.Build.0 = Release - ANSI|Win32 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - UNICODE|x64.ActiveCfg = Release|x64 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - UNICODE|x64.Build.0 = Release|x64 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - UNICODE|x86.ActiveCfg = Release|Win32 + {67E42ECA-64D1-4E39-916E-919E2DC991AC}.Release - UNICODE|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/ocilib_tests.vcxproj b/tests/ocilib_tests.vcxproj index a4e6ab02..a296f284 100644 --- a/tests/ocilib_tests.vcxproj +++ b/tests/ocilib_tests.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + Release - ANSI + Win32 + + + Release - ANSI + x64 + Release Win32 @@ -24,7 +32,7 @@ 10.0.17763.0 Application v141 - MultiByte + Unicode @@ -35,12 +43,18 @@ ..\src;..\include;$(IncludePath) + + ..\src;..\include;$(IncludePath) + ..\src;..\include;$(IncludePath) ..\src;..\include;$(IncludePath) + + ..\src;..\include;$(IncludePath) + ..\src;..\include;$(IncludePath) @@ -98,6 +112,7 @@ NotUsing NotUsing NotUsing + NotUsing @@ -121,15 +136,16 @@ - + - + + @@ -152,7 +168,7 @@ NotUsing pch.h Disabled - X64;__DEBUG;_CONSOLE;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions) + X64;__DEBUG;_CONSOLE;OCI_CHARSET_ANSI;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Level3 @@ -180,11 +196,45 @@ true + + + Use + pch.h + WIN32;NDEBUG;_CONSOLE; OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ProgramDatabase + 4996 + + + true + Console + true + true + + NotUsing pch.h - X64;NDEBUG;_CONSOLE;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions) + X64;NDEBUG;_CONSOLE;OCI_CHARSET_WIDE;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ProgramDatabase + 4996 + + + true + Console + true + true + + + + + NotUsing + pch.h + X64;NDEBUG;_CONSOLE;OCI_CHARSET_ANSI;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions) MultiThreaded Level3 ProgramDatabase @@ -201,6 +251,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/tests/ocilib_tests.vcxproj.filters b/tests/ocilib_tests.vcxproj.filters index ce595f61..a5e86d99 100644 --- a/tests/ocilib_tests.vcxproj.filters +++ b/tests/ocilib_tests.vcxproj.filters @@ -212,9 +212,6 @@ Sources - - - {dd240098-c9aa-4f76-9b0d-50e653c6086b} @@ -231,4 +228,7 @@ Header files + + + \ No newline at end of file diff --git a/tests/packages.config b/tests/packages.config index 1dcab876..cbf03ab8 100644 --- a/tests/packages.config +++ b/tests/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From cd1a3aac34b991b8a982a27897fcf09d6aa03ac3 Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Tue, 10 Nov 2020 14:16:39 +0100 Subject: [PATCH 5/8] updated changelog --- ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cc26261..09eb429e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2020-11-01 Version 4.7.2 Vincent Rogier vince.rogier@ocilib.net +2020-11-10 Version 4.7.2 Vincent Rogier vince.rogier@ocilib.net * Fixes (C API) @@ -8,7 +8,8 @@ * Miscellaneous - - Re-Ran successfully test suite with OCILIB compiled in 8i, 9i, 10g, 11g, 12c, 18c modes + - Updated C API test suite + * Re-Ran successfully test suite with OCILIB compiled in 8i, 9i, 10g, 11g, 12c, 18c modes (ANSI and Unicode) 2020-10-27 Version 4.7.1 Vincent Rogier vince.rogier@ocilib.net From 056a555a138546fb6ff95f9c71a862b2406eb495 Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Tue, 10 Nov 2020 14:22:04 +0100 Subject: [PATCH 6/8] fixed a complier warning in 64bits --- src/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/memory.c b/src/memory.c index f4f4d54d..87e2fb58 100644 --- a/src/memory.c +++ b/src/memory.c @@ -139,7 +139,7 @@ void * OcilibMemoryRealloc block = (OCI_MemoryBlock*)ptr_new; - const big_int size_diff = (big_int)size - block->size; + const size_t size_diff = (big_int)size - block->size; block->type = ptr_type; block->size = (unsigned int)size; From 868d430425ecc58d5413ee5813dbb48ca647895e Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Tue, 10 Nov 2020 14:22:51 +0100 Subject: [PATCH 7/8] Updated Windows DLL project to treat warnings as errors (while keeping level warning to -Wall) --- proj/dll/ocilib_dll_vs2019.vcxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/proj/dll/ocilib_dll_vs2019.vcxproj b/proj/dll/ocilib_dll_vs2019.vcxproj index a81bc3ee..3d534c2d 100644 --- a/proj/dll/ocilib_dll_vs2019.vcxproj +++ b/proj/dll/ocilib_dll_vs2019.vcxproj @@ -115,7 +115,7 @@ EnableAllWarnings - false + true CompileAsC @@ -172,6 +172,7 @@ CompileAsC 4255;4668;4996;4710;4711;4738;4774;4820;5045 + true OCI_CHARSET_ANSI;%(PreprocessorDefinitions) @@ -221,7 +222,7 @@ CompileAsC 4255;4668;4996;4710;4711;4738;4774;4820;5045 - false + true OCI_CHARSET_WIDE;%(PreprocessorDefinitions) @@ -274,6 +275,7 @@ CompileAsC 4255;4668;4996;4710;4711;4738;4774;4820;5045 + true OCI_CHARSET_WIDE;%(PreprocessorDefinitions) From c5c5156c1d863181d04bd1f65224b8009329ec34 Mon Sep 17 00:00:00 2001 From: Vincent Rogier Date: Tue, 10 Nov 2020 14:31:03 +0100 Subject: [PATCH 8/8] update demo makefile --- demo/Makefile_demo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/Makefile_demo b/demo/Makefile_demo index 6b0b9cd0..8bbf2794 100644 --- a/demo/Makefile_demo +++ b/demo/Makefile_demo @@ -10,7 +10,7 @@ INCS = -I/usr/local/include CFLAGS = -DOCI_IMPORT_LINKAGE -DOCI_CHARSET_ANSI -LDFLAGS= -L/data/oracle/10g/lib -lclntsh -L/usr/local/lib -locilib +LDFLAGS= -L/home/vincent/dev/oracle/instantclient_19_9/ -lclntsh -L/usr/local/lib -locilib CC = gcc SRCS = ocilib_demo.c OBJS = $(SRCS:.c=.o)