From 54162c6b686c71946016b498c36da865433ec813 Mon Sep 17 00:00:00 2001 From: Andrew Karcher Date: Fri, 10 Jul 2020 15:16:44 -0400 Subject: [PATCH] Uploading changes to build system --- Makefile.am | 8 +- Makefile.in | 21 +- aclocal.m4 | 193 +++++++-------- app/Makefile.am | 4 +- app/Makefile.in | 101 ++++++-- configure | 453 ++++++++++++++++++++++++++---------- configure.ac | 118 +++++++--- safe_c_stub/Makefile.in | 17 +- safe_c_stub/lib/Makefile.in | 56 +++-- src/Makefile.in | 157 ++++++++++--- test/Makefile.in | 221 ++++++++++++++---- 11 files changed, 934 insertions(+), 415 deletions(-) diff --git a/Makefile.am b/Makefile.am index 27a16606..869640f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,5 +15,11 @@ else APP_DIR=app endif -SUBDIRS = safe_c_stub src $(APP_DIR) $(TEST_DIR) +if LIB_NOT_SUPPORTED +LIB_DIR= +else +LIB_DIR=src +endif + +SUBDIRS = safe_c_stub $(LIB_DIR) $(APP_DIR) $(TEST_DIR) diff --git a/Makefile.in b/Makefile.in index 6507d3b9..e5b851ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 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, @@ -166,7 +166,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) # 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,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBACVP_CFLAGS = @LIBACVP_CFLAGS@ +LIBACVP_LDFLAGS = @LIBACVP_LDFLAGS@ LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ LIBCURL_LDFLAGS = @LIBCURL_LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -372,7 +374,9 @@ EXTRA_DIST = ms docker certs scripts docs metadata murl @UNIT_TEST_SUPPORTED_TRUE@TEST_DIR = test @APP_NOT_SUPPORTED_FALSE@APP_DIR = app @APP_NOT_SUPPORTED_TRUE@APP_DIR = -SUBDIRS = safe_c_stub src $(APP_DIR) $(TEST_DIR) +@LIB_NOT_SUPPORTED_FALSE@LIB_DIR = src +@LIB_NOT_SUPPORTED_TRUE@LIB_DIR = +SUBDIRS = safe_c_stub $(LIB_DIR) $(APP_DIR) $(TEST_DIR) all: all-recursive .SUFFIXES: @@ -397,8 +401,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) @@ -546,7 +550,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'`; \ diff --git a/aclocal.m4 b/aclocal.m4 index 7587397e..8440a97e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 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-2017 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.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,12 +51,12 @@ 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.1])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]))]) -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,7 +118,7 @@ AC_SUBST([AR])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 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, @@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 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, @@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 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, @@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 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], @@ -406,49 +405,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 @@ -457,18 +448,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-2017 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, @@ -555,8 +545,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. @@ -623,7 +613,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 @@ -665,7 +655,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-2017 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, @@ -686,7 +676,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 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, @@ -708,7 +698,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2017 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, @@ -743,7 +733,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 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, @@ -751,49 +741,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # 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-2017 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, @@ -832,7 +815,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 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, @@ -861,7 +844,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 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, @@ -908,7 +891,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 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, @@ -927,7 +910,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 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, @@ -1008,7 +991,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2017 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, @@ -1068,7 +1051,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 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, @@ -1096,7 +1079,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 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, @@ -1115,7 +1098,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 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/app/Makefile.am b/app/Makefile.am index 6fcd96c0..73ab581b 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -18,8 +18,8 @@ acvp_app_SOURCES = app_main.c \ app_fips_init_lcl.h \ app_lcl.h \ ketopt.h -acvp_app_CFLAGS = -g -fPIE -I$(top_srcdir)/include $(SSL_CFLAGS) $(FOM_CFLAGS) $(SAFEC_CFLAGS) -acvp_app_LDFLAGS = -L../src/.libs -ldl -lacvp $(SSL_LDFLAGS) $(FOM_LDFLAGS) +acvp_app_CFLAGS = -g -fPIE $(LIBACVP_CFLAGS) $(SSL_CFLAGS) $(FOM_CFLAGS) $(SAFEC_CFLAGS) +acvp_app_LDFLAGS = $(LIBACVP_LDFLAGS) -ldl -lacvp $(SSL_LDFLAGS) $(FOM_LDFLAGS) if USE_FOM acvp_app_LDADD = $(FOM_OBJ_DIR)/fipscanister.o endif diff --git a/app/Makefile.in b/app/Makefile.in index 8962a741..86166d1d 100644 --- a/app/Makefile.in +++ b/app/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 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, @@ -134,7 +134,21 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/acvp_app-app_aes.Po \ + ./$(DEPDIR)/acvp_app-app_cli.Po \ + ./$(DEPDIR)/acvp_app-app_cmac.Po \ + ./$(DEPDIR)/acvp_app-app_des.Po \ + ./$(DEPDIR)/acvp_app-app_drbg.Po \ + ./$(DEPDIR)/acvp_app-app_dsa.Po \ + ./$(DEPDIR)/acvp_app-app_ecdsa.Po \ + ./$(DEPDIR)/acvp_app-app_hmac.Po \ + ./$(DEPDIR)/acvp_app-app_kas.Po \ + ./$(DEPDIR)/acvp_app-app_kdf.Po \ + ./$(DEPDIR)/acvp_app-app_main.Po \ + ./$(DEPDIR)/acvp_app-app_rsa.Po \ + ./$(DEPDIR)/acvp_app-app_sha.Po \ + ./$(DEPDIR)/acvp_app-app_utils.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -221,6 +235,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBACVP_CFLAGS = @LIBACVP_CFLAGS@ +LIBACVP_LDFLAGS = @LIBACVP_LDFLAGS@ LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ LIBCURL_LDFLAGS = @LIBCURL_LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -330,8 +346,8 @@ acvp_app_SOURCES = app_main.c \ app_lcl.h \ ketopt.h -acvp_app_CFLAGS = -g -fPIE -I$(top_srcdir)/include $(SSL_CFLAGS) $(FOM_CFLAGS) $(SAFEC_CFLAGS) -acvp_app_LDFLAGS = -L../src/.libs -ldl -lacvp $(SSL_LDFLAGS) $(FOM_LDFLAGS) +acvp_app_CFLAGS = -g -fPIE $(LIBACVP_CFLAGS) $(SSL_CFLAGS) $(FOM_CFLAGS) $(SAFEC_CFLAGS) +acvp_app_LDFLAGS = $(LIBACVP_LDFLAGS) -ldl -lacvp $(SSL_LDFLAGS) $(FOM_LDFLAGS) @USE_FOM_TRUE@acvp_app_LDADD = $(FOM_OBJ_DIR)/fipscanister.o all: all-am @@ -354,8 +370,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) @@ -426,20 +442,26 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_aes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_cli.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_cmac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_des.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_drbg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_dsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_ecdsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_hmac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_kas.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_kdf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_rsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_sha.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_aes.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_cli.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_cmac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_des.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_drbg.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_dsa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_ecdsa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_hmac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_kas.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_kdf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_rsa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_sha.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_app-app_utils.Po@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)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -719,7 +741,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)'; \ @@ -792,7 +817,20 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/acvp_app-app_aes.Po + -rm -f ./$(DEPDIR)/acvp_app-app_cli.Po + -rm -f ./$(DEPDIR)/acvp_app-app_cmac.Po + -rm -f ./$(DEPDIR)/acvp_app-app_des.Po + -rm -f ./$(DEPDIR)/acvp_app-app_drbg.Po + -rm -f ./$(DEPDIR)/acvp_app-app_dsa.Po + -rm -f ./$(DEPDIR)/acvp_app-app_ecdsa.Po + -rm -f ./$(DEPDIR)/acvp_app-app_hmac.Po + -rm -f ./$(DEPDIR)/acvp_app-app_kas.Po + -rm -f ./$(DEPDIR)/acvp_app-app_kdf.Po + -rm -f ./$(DEPDIR)/acvp_app-app_main.Po + -rm -f ./$(DEPDIR)/acvp_app-app_rsa.Po + -rm -f ./$(DEPDIR)/acvp_app-app_sha.Po + -rm -f ./$(DEPDIR)/acvp_app-app_utils.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -838,7 +876,20 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/acvp_app-app_aes.Po + -rm -f ./$(DEPDIR)/acvp_app-app_cli.Po + -rm -f ./$(DEPDIR)/acvp_app-app_cmac.Po + -rm -f ./$(DEPDIR)/acvp_app-app_des.Po + -rm -f ./$(DEPDIR)/acvp_app-app_drbg.Po + -rm -f ./$(DEPDIR)/acvp_app-app_dsa.Po + -rm -f ./$(DEPDIR)/acvp_app-app_ecdsa.Po + -rm -f ./$(DEPDIR)/acvp_app-app_hmac.Po + -rm -f ./$(DEPDIR)/acvp_app-app_kas.Po + -rm -f ./$(DEPDIR)/acvp_app-app_kdf.Po + -rm -f ./$(DEPDIR)/acvp_app-app_main.Po + -rm -f ./$(DEPDIR)/acvp_app-app_rsa.Po + -rm -f ./$(DEPDIR)/acvp_app-app_sha.Po + -rm -f ./$(DEPDIR)/acvp_app-app_utils.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -859,7 +910,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles 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 \ diff --git a/configure b/configure index aa12b421..2c735faa 100755 --- a/configure +++ b/configure @@ -789,9 +789,13 @@ USE_FOM_FALSE USE_FOM_TRUE FOM_LDFLAGS FOM_CFLAGS +LIBACVP_CFLAGS +LIBACVP_LDFLAGS FOM_OBJ_DIR SSL_LDFLAGS SSL_CFLAGS +LIB_NOT_SUPPORTED_FALSE +LIB_NOT_SUPPORTED_TRUE APP_NOT_SUPPORTED_FALSE APP_NOT_SUPPORTED_TRUE CPP @@ -830,7 +834,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -907,7 +910,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -921,8 +925,10 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_app +enable_lib with_ssl_dir with_fom_dir +with_libacvp_dir enable_kdf enable_offline with_libcurl_dir @@ -1574,6 +1580,7 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-app To build library only and not app code + --disable-lib To build acvp_app only without library --disable-kdf For use if using a FOM with no KDF support, such as OpenSSL 1.0.2 FOM --enable-offline Flag to indicate use of offline mode @@ -1589,6 +1596,8 @@ Optional Packages: --with-ssl-dir location of OpenSSL install folder, defaults to /usr/local/ssl --with-fom-dir Path to FOM install directory + --with-libacvp-dir Path to libacvp install directory, for use when + building the app only --with-libcurl-dir enable support for client proxy using libcurl --with-libmurl-dir enable support for client proxy using libmurl --with-criterion-dir location of Criterion install folder @@ -2361,7 +2370,7 @@ fi MAINT=$MAINTAINER_MODE_TRUE -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 @@ -2877,8 +2886,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 @@ -2929,7 +2938,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 @@ -3793,45 +3802,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 : @@ -4834,13 +4843,13 @@ if ${lt_cv_nm_interface+:} false; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4837: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4846: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4840: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4849: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4843: output\"" >&5) + (eval echo "\"\$as_me:4852: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6045,7 +6054,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6048 "configure"' > conftest.$ac_ext + echo '#line 6057 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7574,11 +7583,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7577: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7586: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7581: \$? = $ac_status" >&5 + echo "$as_me:7590: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7913,11 +7922,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7916: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7925: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7920: \$? = $ac_status" >&5 + echo "$as_me:7929: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8018,11 +8027,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8021: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8030: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8025: \$? = $ac_status" >&5 + echo "$as_me:8034: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8073,11 +8082,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8076: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8085: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8080: \$? = $ac_status" >&5 + echo "$as_me:8089: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10443,7 +10452,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10446 "configure" +#line 10455 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10539,7 +10548,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10542 "configure" +#line 10551 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10808,6 +10817,25 @@ else fi +## +# Option to disable library builds (app only) +## +# Check whether --enable-lib was given. +if test "${enable_lib+set}" = set; then : + enableval=$enable_lib; disable_lib="yes" +else + disable_lib="no" +fi + + if test "x$disable_lib" == "xyes"; then + LIB_NOT_SUPPORTED_TRUE= + LIB_NOT_SUPPORTED_FALSE='#' +else + LIB_NOT_SUPPORTED_TRUE='#' + LIB_NOT_SUPPORTED_FALSE= +fi + + if test "x$disable_app" = "xno" ; then ## @@ -11097,6 +11125,103 @@ fi fi +## +# libacvp library installation dir - only used when building just the app +## +if test "x$disable_lib" = "xyes" ; then + +# Check whether --with-libacvp-dir was given. +if test "${with_libacvp_dir+set}" = set; then : + withval=$with_libacvp_dir; libacvpdir="$withval" +else + with_libacvpdir=no +fi + + if test "x$libacvpdir" ; then + LDFLAGS="$LDFLAGS -L$libacvpdir/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acvp_create_test_session" >&5 +$as_echo_n "checking for library containing acvp_create_test_session... " >&6; } +if ${ac_cv_search_acvp_create_test_session+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char acvp_create_test_session (); +int +main () +{ +return acvp_create_test_session (); + ; + return 0; +} +_ACEOF +for ac_lib in '' acvp; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_acvp_create_test_session=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_acvp_create_test_session+:} false; then : + break +fi +done +if ${ac_cv_search_acvp_create_test_session+:} false; then : + +else + ac_cv_search_acvp_create_test_session=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acvp_create_test_session" >&5 +$as_echo "$ac_cv_search_acvp_create_test_session" >&6; } +ac_res=$ac_cv_search_acvp_create_test_session +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "can't find libacvp library +See \`config.log' for more details" "$LINENO" 5; } +fi + + else + #Cannot test for lib here as relative paths will confused ld later on, and absolute paths make Makefile immoveable + LDFLAGS="$LDFLAGS -L../src/.libs" + fi +fi + +# If given a libacvp_dir, use that when building things dependent on library, otherwise, use defaults +if test "x$libacvpdir" ; then + LIBACVP_LDFLAGS="-L$libacvpdir/lib" + + LIBACVP_CFLAGS="-I$libacvpdir/include" + +else + LIBACVP_LDFLAGS="-L../src/.libs" + + LIBACVP_CFLAGS="-I../include" + +fi + +## +# Option to disable KDF functionality (useful for FOM without KDF support) +## # Check whether --enable-kdf was given. if test "${enable_kdf+set}" = set; then : enableval=$enable_kdf; no-kdf="$enableval" @@ -11158,8 +11283,9 @@ fi ## -# Libcurl installation directory path - not needed for offline mode +# Libcurl/murl installation path. Check for Curl first, use murl if no curl ## +if test "x$enable_offline" = "xfalse" && test "x$disable_lib" = "xno" ; then # Check whether --with-libcurl-dir was given. if test "${with_libcurl_dir+set}" = set; then : @@ -11169,18 +11295,16 @@ else fi -if test "x$with_libcurldir" != xno; then : - LIBCURL_CFLAGS="-I$libcurldir/include" - - LIBCURL_LDFLAGS="-L$libcurldir/lib -lcurl" - - LDFLAGS="$LDFLAGS -L$libcurldir/lib" + if test "x$with_libcurldir" != xno && test "x$with_libcurldir" != ""; then + LIBCURL_CFLAGS="-I$libcurldir/include" + LIBCURL_LDFLAGS="-L$libcurldir/lib -lcurl" -fi + LDFLAGS="$LDFLAGS -L$libcurldir/lib" -if test "x$enable_offline" = "xfalse" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing curl_easy_init" >&5 + #only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies + if test "x$disable_app" = xno ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing curl_easy_init" >&5 $as_echo_n "checking for library containing curl_easy_init... " >&6; } if ${ac_cv_search_curl_easy_init+:} false; then : $as_echo_n "(cached) " >&6 @@ -11242,11 +11366,8 @@ See \`config.log' for more details" "$LINENO" 5; } fi -fi - -## -# Libmurl installation directory path -## + fi + else # Check whether --with-libmurl-dir was given. if test "${with_libmurl_dir+set}" = set; then : @@ -11256,11 +11377,84 @@ else fi -if test "x$with_libmurldir" != xno; then : - CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL" - LDFLAGS="$LDFLAGS -L$libmurldir -lmurl" + if test "x$with_libmurldir" != xno && test "x$with_libmurldir" != "" ; then + CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL" + LDFLAGS="$LDFLAGS -L$libmurldir -lmurl" + #only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies + if test "x$disable_app" = xno ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing curl_easy_init" >&5 +$as_echo_n "checking for library containing curl_easy_init... " >&6; } +if ${ac_cv_search_curl_easy_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_easy_init (); +int +main () +{ +return curl_easy_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' murl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_curl_easy_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_curl_easy_init+:} false; then : + break fi +done +if ${ac_cv_search_curl_easy_init+:} false; then : + +else + ac_cv_search_curl_easy_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_curl_easy_init" >&5 +$as_echo "$ac_cv_search_curl_easy_init" >&6; } +ac_res=$ac_cv_search_curl_easy_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "test for murl failed - please define ensure murl dir given is valid +See \`config.log' for more details" "$LINENO" 5; } + +fi + + fi + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "either --with-libcurl-dir or --with-libmurl-dir must be defined and valid! +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi + + # Check whether --enable-cflags was given. if test "${enable_cflags+set}" = set; then : @@ -11524,6 +11718,10 @@ if test -z "${APP_NOT_SUPPORTED_TRUE}" && test -z "${APP_NOT_SUPPORTED_FALSE}"; as_fn_error $? "conditional \"APP_NOT_SUPPORTED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${LIB_NOT_SUPPORTED_TRUE}" && test -z "${LIB_NOT_SUPPORTED_FALSE}"; then + as_fn_error $? "conditional \"LIB_NOT_SUPPORTED\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_FOM_TRUE}" && test -z "${USE_FOM_FALSE}"; then as_fn_error $? "conditional \"USE_FOM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -12094,7 +12292,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 @@ -12800,29 +12998,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 @@ -12840,53 +13044,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) diff --git a/configure.ac b/configure.ac index daa4a095..2c692277 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,15 @@ AC_ARG_ENABLE([app], [disable_app="no"]) AM_CONDITIONAL([APP_NOT_SUPPORTED], [test "x$disable_app" == "xyes"]) +## +# Option to disable library builds (app only) +## +AC_ARG_ENABLE([lib], +[AS_HELP_STRING([--disable-lib], [To build acvp_app only without library])], +[disable_lib="yes"], +[disable_lib="no"]) +AM_CONDITIONAL([LIB_NOT_SUPPORTED], [test "x$disable_lib" == "xyes"]) + if test "x$disable_app" = "xno" ; then ## @@ -114,6 +123,37 @@ AC_ARG_WITH([fom-dir], fi +## +# libacvp library installation dir - only used when building just the app +## +if test "x$disable_lib" = "xyes" ; then + AC_ARG_WITH([libacvp-dir], + [AS_HELP_STRING([--with-libacvp-dir], + [Path to libacvp install directory, for use when building the app only])], + [libacvpdir="$withval"], + [with_libacvpdir=no]) + if test "x$libacvpdir" ; then + LDFLAGS="$LDFLAGS -L$libacvpdir/lib" + AC_SEARCH_LIBS([acvp_create_test_session], [acvp], [], + [AC_MSG_FAILURE([can't find libacvp library])], [-ldl]) + else + #Cannot test for lib here as relative paths will confused ld later on, and absolute paths make Makefile immoveable + LDFLAGS="$LDFLAGS -L../src/.libs" + fi +fi + +# If given a libacvp_dir, use that when building things dependent on library, otherwise, use defaults +if test "x$libacvpdir" ; then + AC_SUBST([LIBACVP_LDFLAGS], ["-L$libacvpdir/lib"]) + AC_SUBST([LIBACVP_CFLAGS], ["-I$libacvpdir/include"]) +else + AC_SUBST([LIBACVP_LDFLAGS], ["-L../src/.libs"]) + AC_SUBST([LIBACVP_CFLAGS], ["-I../include"]) +fi + +## +# Option to disable KDF functionality (useful for FOM without KDF support) +## AC_ARG_ENABLE([kdf], [AS_HELP_STRING([--disable-kdf], [For use if using a FOM with no KDF support, such as OpenSSL 1.0.2 FOM])], @@ -155,41 +195,49 @@ AS_IF( ## -# Libcurl installation directory path - not needed for offline mode +# Libcurl/murl installation path. Check for Curl first, use murl if no curl ## -AC_ARG_WITH([libcurl-dir], - [AS_HELP_STRING([--with-libcurl-dir], - [enable support for client proxy using libcurl])], - [libcurldir="$withval"], - [with_libcurldir=no]) - -AS_IF([test "x$with_libcurldir" != xno], - [AC_SUBST([LIBCURL_CFLAGS], "-I$libcurldir/include") - AC_SUBST([LIBCURL_LDFLAGS], "-L$libcurldir/lib -lcurl") - LDFLAGS="$LDFLAGS -L$libcurldir/lib" - ] - ) - -if test "x$enable_offline" = "xfalse" ; then - AC_SEARCH_LIBS([curl_easy_init], [curl], [], - [AC_MSG_FAILURE([test for libcurl failed - please define --with-libcurl-dir and ensure it is valid])] - ) +if test "x$enable_offline" = "xfalse" && test "x$disable_lib" = "xno" ; then + AC_ARG_WITH([libcurl-dir], + [AS_HELP_STRING([--with-libcurl-dir], + [enable support for client proxy using libcurl])], + [libcurldir="$withval"], + [with_libcurldir=no]) + + if test "x$with_libcurldir" != xno && test "x$with_libcurldir" != ""; then + AC_SUBST([LIBCURL_CFLAGS], "-I$libcurldir/include") + AC_SUBST([LIBCURL_LDFLAGS], "-L$libcurldir/lib -lcurl") + LDFLAGS="$LDFLAGS -L$libcurldir/lib" + + #only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies + if test "x$disable_app" = xno ; then + AC_SEARCH_LIBS([curl_easy_init], [curl], [], + [AC_MSG_FAILURE([test for libcurl failed - please define --with-libcurl-dir and ensure it is valid])] + ) + fi + else + AC_ARG_WITH([libmurl-dir], + [AS_HELP_STRING([--with-libmurl-dir], + [enable support for client proxy using libmurl])], + [libmurldir="$withval"], + [with_libmurldir=no]) + + if test "x$with_libmurldir" != xno && test "x$with_libmurldir" != "" ; then + CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL" + LDFLAGS="$LDFLAGS -L$libmurldir -lmurl" + #only run this test if we are building app; otherwise configure tries to link an example executable and fails because missing dependencies + if test "x$disable_app" = xno ; then + AC_SEARCH_LIBS([curl_easy_init], [murl], [], + [AC_MSG_FAILURE([test for murl failed - please define ensure murl dir given is valid])] + ) + fi + else + AC_MSG_FAILURE([either --with-libcurl-dir or --with-libmurl-dir must be defined and valid!]) + fi + fi fi -## -# Libmurl installation directory path -## -AC_ARG_WITH([libmurl-dir], - [AS_HELP_STRING([--with-libmurl-dir], - [enable support for client proxy using libmurl])], - [libmurldir="$withval"], - [with_libmurldir=no]) -AS_IF( - [test "x$with_libmurldir" != xno], - [[CFLAGS="$CFLAGS -I$libmurldir -DUSE_MURL"] - [LDFLAGS="$LDFLAGS -L$libmurldir -lmurl"]] - ) AC_ARG_ENABLE([cflags], [AS_HELP_STRING([--enable-cflags], @@ -225,10 +273,10 @@ if test "x$enable_gcov" != "xfalse" ; then fi AC_ARG_WITH([criterion-dir], - [AS_HELP_STRING([--with-criterion-dir], - [location of Criterion install folder])], - [criteriondir="$withval"], - [with_criteriondir="no"]) + [AS_HELP_STRING([--with-criterion-dir], + [location of Criterion install folder])], + [criteriondir="$withval"], + [with_criteriondir="no"]) AS_IF([test "x$with_criterion" != xno], [AC_SUBST([CRITERION_CFLAGS], "-I$criteriondir/include") diff --git a/safe_c_stub/Makefile.in b/safe_c_stub/Makefile.in index 8884ebf3..64274f08 100644 --- a/safe_c_stub/Makefile.in +++ b/safe_c_stub/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 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, @@ -133,7 +133,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 @@ -219,6 +219,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBACVP_CFLAGS = @LIBACVP_CFLAGS@ +LIBACVP_LDFLAGS = @LIBACVP_LDFLAGS@ LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ LIBCURL_LDFLAGS = @LIBCURL_LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -330,8 +332,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) @@ -448,7 +450,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/safe_c_stub/lib/Makefile.in b/safe_c_stub/lib/Makefile.in index 421d376b..7c130c3f 100644 --- a/safe_c_stub/lib/Makefile.in +++ b/safe_c_stub/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 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, @@ -128,7 +128,10 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = \ + ../src/$(DEPDIR)/libsafe_lib_la-safe_mem_stub.Plo \ + ../src/$(DEPDIR)/libsafe_lib_la-safe_str_stub.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -214,6 +217,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBACVP_CFLAGS = @LIBACVP_CFLAGS@ +LIBACVP_LDFLAGS = @LIBACVP_LDFLAGS@ LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ LIBCURL_LDFLAGS = @LIBCURL_LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -339,8 +344,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) @@ -384,8 +389,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libsafe_lib_la-safe_mem_stub.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libsafe_lib_la-safe_str_stub.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libsafe_lib_la-safe_mem_stub.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/libsafe_lib_la-safe_str_stub.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)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -484,7 +495,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)'; \ @@ -557,7 +571,8 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ../src/$(DEPDIR) + -rm -f ../src/$(DEPDIR)/libsafe_lib_la-safe_mem_stub.Plo + -rm -f ../src/$(DEPDIR)/libsafe_lib_la-safe_str_stub.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -603,7 +618,8 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ../src/$(DEPDIR) + -rm -f ../src/$(DEPDIR)/libsafe_lib_la-safe_mem_stub.Plo + -rm -f ../src/$(DEPDIR)/libsafe_lib_la-safe_str_stub.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -624,16 +640,16 @@ uninstall-am: .MAKE: install-am install-strip -.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 \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles 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 diff --git a/src/Makefile.in b/src/Makefile.in index 1ac37dc8..23fcd48d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 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, @@ -162,7 +162,25 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/acvp.Plo ./$(DEPDIR)/acvp_aes.Plo \ + ./$(DEPDIR)/acvp_build_register.Plo \ + ./$(DEPDIR)/acvp_capabilities.Plo ./$(DEPDIR)/acvp_cmac.Plo \ + ./$(DEPDIR)/acvp_des.Plo ./$(DEPDIR)/acvp_drbg.Plo \ + ./$(DEPDIR)/acvp_dsa.Plo ./$(DEPDIR)/acvp_ecdsa.Plo \ + ./$(DEPDIR)/acvp_hash.Plo ./$(DEPDIR)/acvp_hmac.Plo \ + ./$(DEPDIR)/acvp_kas_ecc.Plo ./$(DEPDIR)/acvp_kas_ffc.Plo \ + ./$(DEPDIR)/acvp_kdf108.Plo ./$(DEPDIR)/acvp_kdf135_ikev1.Plo \ + ./$(DEPDIR)/acvp_kdf135_ikev2.Plo \ + ./$(DEPDIR)/acvp_kdf135_snmp.Plo \ + ./$(DEPDIR)/acvp_kdf135_srtp.Plo \ + ./$(DEPDIR)/acvp_kdf135_ssh.Plo \ + ./$(DEPDIR)/acvp_kdf135_tls.Plo \ + ./$(DEPDIR)/acvp_kdf135_x963.Plo \ + ./$(DEPDIR)/acvp_operating_env.Plo \ + ./$(DEPDIR)/acvp_rsa_keygen.Plo ./$(DEPDIR)/acvp_rsa_sig.Plo \ + ./$(DEPDIR)/acvp_transport.Plo ./$(DEPDIR)/acvp_util.Plo \ + ./$(DEPDIR)/parson.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -249,6 +267,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBACVP_CFLAGS = @LIBACVP_CFLAGS@ +LIBACVP_LDFLAGS = @LIBACVP_LDFLAGS@ LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ LIBCURL_LDFLAGS = @LIBCURL_LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -395,8 +415,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) @@ -452,33 +472,39 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_aes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_build_register.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_capabilities.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_cmac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_drbg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_dsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_ecdsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_hash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_hmac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kas_ecc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kas_ffc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf108.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_ikev1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_ikev2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_snmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_srtp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_ssh.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_tls.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_x963.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_operating_env.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_rsa_keygen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_rsa_sig.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_transport.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parson.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_aes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_build_register.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_capabilities.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_cmac.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_des.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_drbg.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_dsa.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_ecdsa.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_hash.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_hmac.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kas_ecc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kas_ffc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf108.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_ikev1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_ikev2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_snmp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_srtp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_ssh.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_tls.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_kdf135_x963.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_operating_env.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_rsa_keygen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_rsa_sig.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_transport.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acvp_util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parson.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)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -583,7 +609,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)'; \ @@ -657,7 +686,33 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/acvp.Plo + -rm -f ./$(DEPDIR)/acvp_aes.Plo + -rm -f ./$(DEPDIR)/acvp_build_register.Plo + -rm -f ./$(DEPDIR)/acvp_capabilities.Plo + -rm -f ./$(DEPDIR)/acvp_cmac.Plo + -rm -f ./$(DEPDIR)/acvp_des.Plo + -rm -f ./$(DEPDIR)/acvp_drbg.Plo + -rm -f ./$(DEPDIR)/acvp_dsa.Plo + -rm -f ./$(DEPDIR)/acvp_ecdsa.Plo + -rm -f ./$(DEPDIR)/acvp_hash.Plo + -rm -f ./$(DEPDIR)/acvp_hmac.Plo + -rm -f ./$(DEPDIR)/acvp_kas_ecc.Plo + -rm -f ./$(DEPDIR)/acvp_kas_ffc.Plo + -rm -f ./$(DEPDIR)/acvp_kdf108.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_ikev1.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_ikev2.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_snmp.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_srtp.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_ssh.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_tls.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_x963.Plo + -rm -f ./$(DEPDIR)/acvp_operating_env.Plo + -rm -f ./$(DEPDIR)/acvp_rsa_keygen.Plo + -rm -f ./$(DEPDIR)/acvp_rsa_sig.Plo + -rm -f ./$(DEPDIR)/acvp_transport.Plo + -rm -f ./$(DEPDIR)/acvp_util.Plo + -rm -f ./$(DEPDIR)/parson.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -703,7 +758,33 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/acvp.Plo + -rm -f ./$(DEPDIR)/acvp_aes.Plo + -rm -f ./$(DEPDIR)/acvp_build_register.Plo + -rm -f ./$(DEPDIR)/acvp_capabilities.Plo + -rm -f ./$(DEPDIR)/acvp_cmac.Plo + -rm -f ./$(DEPDIR)/acvp_des.Plo + -rm -f ./$(DEPDIR)/acvp_drbg.Plo + -rm -f ./$(DEPDIR)/acvp_dsa.Plo + -rm -f ./$(DEPDIR)/acvp_ecdsa.Plo + -rm -f ./$(DEPDIR)/acvp_hash.Plo + -rm -f ./$(DEPDIR)/acvp_hmac.Plo + -rm -f ./$(DEPDIR)/acvp_kas_ecc.Plo + -rm -f ./$(DEPDIR)/acvp_kas_ffc.Plo + -rm -f ./$(DEPDIR)/acvp_kdf108.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_ikev1.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_ikev2.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_snmp.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_srtp.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_ssh.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_tls.Plo + -rm -f ./$(DEPDIR)/acvp_kdf135_x963.Plo + -rm -f ./$(DEPDIR)/acvp_operating_env.Plo + -rm -f ./$(DEPDIR)/acvp_rsa_keygen.Plo + -rm -f ./$(DEPDIR)/acvp_rsa_sig.Plo + -rm -f ./$(DEPDIR)/acvp_transport.Plo + -rm -f ./$(DEPDIR)/acvp_util.Plo + -rm -f ./$(DEPDIR)/parson.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -725,9 +806,9 @@ uninstall-am: 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 \ diff --git a/test/Makefile.in b/test/Makefile.in index 41d87434..226e3a24 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 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, @@ -164,7 +164,45 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/runtest-create_session.Po \ + ./$(DEPDIR)/runtest-test_acvp.Po \ + ./$(DEPDIR)/runtest-test_acvp_aes.Po \ + ./$(DEPDIR)/runtest-test_acvp_build_register.Po \ + ./$(DEPDIR)/runtest-test_acvp_capabilities.Po \ + ./$(DEPDIR)/runtest-test_acvp_cmac.Po \ + ./$(DEPDIR)/runtest-test_acvp_des.Po \ + ./$(DEPDIR)/runtest-test_acvp_drbg.Po \ + ./$(DEPDIR)/runtest-test_acvp_dsa.Po \ + ./$(DEPDIR)/runtest-test_acvp_ecdsa.Po \ + ./$(DEPDIR)/runtest-test_acvp_hash.Po \ + ./$(DEPDIR)/runtest-test_acvp_hmac.Po \ + ./$(DEPDIR)/runtest-test_acvp_kas_ecc.Po \ + ./$(DEPDIR)/runtest-test_acvp_kas_ffc.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf108.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf135_ikev1.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf135_ikev2.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf135_snmp.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf135_srtp.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf135_ssh.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf135_tls.Po \ + ./$(DEPDIR)/runtest-test_acvp_kdf135_x963.Po \ + ./$(DEPDIR)/runtest-test_acvp_operating_env.Po \ + ./$(DEPDIR)/runtest-test_acvp_rsa_keygen.Po \ + ./$(DEPDIR)/runtest-test_acvp_rsa_sig.Po \ + ./$(DEPDIR)/runtest-test_acvp_transport.Po \ + ./$(DEPDIR)/runtest-test_acvp_utils.Po \ + ./$(DEPDIR)/runtest-test_app_aes.Po \ + ./$(DEPDIR)/runtest-test_app_cmac.Po \ + ./$(DEPDIR)/runtest-test_app_des.Po \ + ./$(DEPDIR)/runtest-test_app_ecdsa.Po \ + ./$(DEPDIR)/runtest-test_app_hmac.Po \ + ./$(DEPDIR)/runtest-test_app_kas_ecc.Po \ + ./$(DEPDIR)/runtest-test_app_kas_ffc.Po \ + ./$(DEPDIR)/runtest-test_app_rsa_keygen.Po \ + ./$(DEPDIR)/runtest-test_app_rsa_sig.Po \ + ./$(DEPDIR)/runtest-test_app_sha.Po \ + ./$(DEPDIR)/runtest-ut_common.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -279,6 +317,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBACVP_CFLAGS = @LIBACVP_CFLAGS@ +LIBACVP_LDFLAGS = @LIBACVP_LDFLAGS@ LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ LIBCURL_LDFLAGS = @LIBCURL_LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -449,8 +489,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) @@ -481,44 +521,50 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-create_session.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_aes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_build_register.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_capabilities.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_cmac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_des.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_drbg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_dsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_ecdsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_hash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_hmac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kas_ecc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kas_ffc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf108.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_ikev1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_ikev2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_snmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_srtp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_ssh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_tls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_x963.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_operating_env.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_rsa_keygen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_rsa_sig.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_transport.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_aes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_cmac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_des.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_ecdsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_hmac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_kas_ecc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_kas_ffc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_rsa_keygen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_rsa_sig.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_sha.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-ut_common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-create_session.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_aes.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_build_register.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_capabilities.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_cmac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_des.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_drbg.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_dsa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_ecdsa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_hash.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_hmac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kas_ecc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kas_ffc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf108.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_ikev1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_ikev2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_snmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_srtp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_ssh.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_tls.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_kdf135_x963.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_operating_env.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_rsa_keygen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_rsa_sig.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_transport.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_acvp_utils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_aes.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_cmac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_des.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_ecdsa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_hmac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_kas_ecc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_kas_ffc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_rsa_keygen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_rsa_sig.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-test_app_sha.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest-ut_common.Po@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)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1155,7 +1201,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)'; \ @@ -1229,7 +1278,44 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/runtest-create_session.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_aes.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_build_register.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_capabilities.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_cmac.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_des.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_drbg.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_dsa.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_ecdsa.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_hash.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_hmac.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kas_ecc.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kas_ffc.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf108.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_ikev1.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_ikev2.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_snmp.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_srtp.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_ssh.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_tls.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_x963.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_operating_env.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_rsa_keygen.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_rsa_sig.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_transport.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_utils.Po + -rm -f ./$(DEPDIR)/runtest-test_app_aes.Po + -rm -f ./$(DEPDIR)/runtest-test_app_cmac.Po + -rm -f ./$(DEPDIR)/runtest-test_app_des.Po + -rm -f ./$(DEPDIR)/runtest-test_app_ecdsa.Po + -rm -f ./$(DEPDIR)/runtest-test_app_hmac.Po + -rm -f ./$(DEPDIR)/runtest-test_app_kas_ecc.Po + -rm -f ./$(DEPDIR)/runtest-test_app_kas_ffc.Po + -rm -f ./$(DEPDIR)/runtest-test_app_rsa_keygen.Po + -rm -f ./$(DEPDIR)/runtest-test_app_rsa_sig.Po + -rm -f ./$(DEPDIR)/runtest-test_app_sha.Po + -rm -f ./$(DEPDIR)/runtest-ut_common.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1275,7 +1361,44 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/runtest-create_session.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_aes.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_build_register.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_capabilities.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_cmac.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_des.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_drbg.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_dsa.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_ecdsa.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_hash.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_hmac.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kas_ecc.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kas_ffc.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf108.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_ikev1.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_ikev2.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_snmp.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_srtp.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_ssh.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_tls.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_kdf135_x963.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_operating_env.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_rsa_keygen.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_rsa_sig.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_transport.Po + -rm -f ./$(DEPDIR)/runtest-test_acvp_utils.Po + -rm -f ./$(DEPDIR)/runtest-test_app_aes.Po + -rm -f ./$(DEPDIR)/runtest-test_app_cmac.Po + -rm -f ./$(DEPDIR)/runtest-test_app_des.Po + -rm -f ./$(DEPDIR)/runtest-test_app_ecdsa.Po + -rm -f ./$(DEPDIR)/runtest-test_app_hmac.Po + -rm -f ./$(DEPDIR)/runtest-test_app_kas_ecc.Po + -rm -f ./$(DEPDIR)/runtest-test_app_kas_ffc.Po + -rm -f ./$(DEPDIR)/runtest-test_app_rsa_keygen.Po + -rm -f ./$(DEPDIR)/runtest-test_app_rsa_sig.Po + -rm -f ./$(DEPDIR)/runtest-test_app_sha.Po + -rm -f ./$(DEPDIR)/runtest-ut_common.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1296,9 +1419,9 @@ uninstall-am: uninstall-runtestHEADERS .MAKE: install-am install-strip -.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 \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles 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 \