add wdm update in wdm
This commit includes
--add data management support in mobile client side includng genericdatasink
and wdmclient
--add python API for datamanagement in client side
--add update server support which includes updatable data source and update
request handing and update response generation.
--add woble connection support in binding and configure
test instructions:
make -f Makefile-Standalone TIMESTAMP=1 BLUEZ=1
setup btvirt:
sudo ./build/x86_64-unknown-linux-gnu/third_party/bluez/repo/emulator/btvirt -L -l2
peripheral:
sudo ./output/x86_64-unknown-linux-gnu/bin/mock-device --enable-bluez-peripheral --peripheral-name N0003 --peripheral-address 00:AA:01:00:00:23 --wdm-resp-mutual-sub --test-case 11 --total-count 0 --wdm-update-timing NoSub
central:
ble-adapter-select 00:AA:01:01:00:24
ble-scan-connect -t 120 00:AA:01:00:00:23
connect -b -p TEST
create-wdm-client
new-data-sink 20 0 "/"
set-data "/1" "en-US"
set-data "/" "{1: 'en-US'}"
flush-update
refresh-data
get-data "/1"
close
diff --git a/Makefile.in b/Makefile.in
index dab8519..3effa25 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -103,26 +113,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(dist_doc_DATA) \
- third_party/nlbuild-autotools/repo/third_party/autoconf/ar-lib \
- third_party/nlbuild-autotools/repo/third_party/autoconf/compile \
- third_party/nlbuild-autotools/repo/third_party/autoconf/config.guess \
- third_party/nlbuild-autotools/repo/third_party/autoconf/config.sub \
- third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- third_party/nlbuild-autotools/repo/third_party/autoconf/install-sh \
- third_party/nlbuild-autotools/repo/third_party/autoconf/missing \
- third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- third_party/nlbuild-autotools/repo/third_party/autoconf/py-compile \
- third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/compile \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/config.guess \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/config.sub \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/install-sh \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -141,18 +131,20 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(dist_doc_DATA) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) \
@@ -223,7 +215,7 @@
$(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
@@ -245,6 +237,23 @@
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/compile \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/config.guess \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/config.sub \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/install-sh \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/missing \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/ar-lib \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/compile \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/config.guess \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/config.sub \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/install-sh \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/missing \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
+ third_party/nlbuild-autotools/repo/third_party/autoconf/py-compile
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -375,6 +384,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -534,6 +544,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -680,15 +691,14 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*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)
@@ -836,7 +846,10 @@
-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'`; \
@@ -904,7 +917,7 @@
! -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
@@ -920,17 +933,17 @@
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @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
@@ -948,7 +961,7 @@
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*) \
@@ -958,23 +971,23 @@
*.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
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1161,6 +1174,8 @@
ps ps-am tags tags-am uninstall uninstall-am \
uninstall-dist_docDATA
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/aclocal.m4 b/aclocal.m4
index f303f5f..c44b161 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2013 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,
@@ -14,13 +14,51 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+# been defined and thus are available for use. This avoids random issues
+# where a macro isn't expanded. Instead the configure script emits a
+# non-fatal:
+#
+# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+# It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+# Here's an example:
+#
+# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 2
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+ m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
+
+# 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 +70,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[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.14.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +89,14 @@
# 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.14.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]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 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,
@@ -103,15 +141,14 @@
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 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,
@@ -142,7 +179,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 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,
@@ -333,13 +370,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 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],
@@ -347,49 +383,41 @@
# 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
@@ -398,18 +426,17 @@
# -----------------------------
# 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-2013 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,
@@ -496,11 +523,11 @@
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:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -564,7 +591,7 @@
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: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -573,7 +600,11 @@
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +633,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 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,
@@ -613,7 +644,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +654,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 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,
@@ -645,7 +676,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 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,
@@ -680,7 +711,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 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,
@@ -688,49 +719,42 @@
# 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-2013 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,
@@ -769,7 +793,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 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,
@@ -798,7 +822,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 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,
@@ -845,7 +869,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 1999-2013 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,
@@ -879,8 +903,11 @@
dnl Find a Python interpreter. Python versions prior to 2.0 are not
dnl supported. (2.0 was released on October 16, 2000).
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
- python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
+[python python2 python3 dnl
+ python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
+ python3.2 python3.1 python3.0 dnl
+ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
+ python2.0])
AC_ARG_VAR([PYTHON], [the Python interpreter])
@@ -1080,7 +1107,7 @@
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-# Copyright (C) 2001-2013 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,
@@ -1099,7 +1126,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 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,
@@ -1180,7 +1207,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2013 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,
@@ -1240,7 +1267,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 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,
@@ -1268,7 +1295,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 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,
@@ -1287,7 +1314,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 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,
@@ -1435,12 +1462,12 @@
m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4])
m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4])
m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4])
-m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4])
-m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4])
-m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4])
-m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4])
-m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4])
m4_include([third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4])
+m4_include([build/autoconf/m4/libtool.m4])
+m4_include([build/autoconf/m4/ltoptions.m4])
+m4_include([build/autoconf/m4/ltsugar.m4])
+m4_include([build/autoconf/m4/ltversion.m4])
+m4_include([build/autoconf/m4/lt~obsolete.m4])
m4_include([build/autoconf/m4/nl_check_project_config_includes.m4])
m4_include([build/autoconf/m4/nl_enable_long_tests.m4])
m4_include([build/autoconf/m4/nl_with_lwip.m4])
diff --git a/configure b/configure
index 1ada3b3..c326317 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Weave g9c6721d9-dirty.
+# Generated by GNU Autoconf 2.69 for Weave g465c8a33-dirty.
#
# Report bugs to <weave.support@nestlabs.com>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Weave'
PACKAGE_TARNAME='weave'
-PACKAGE_VERSION='g9c6721d9-dirty'
-PACKAGE_STRING='Weave g9c6721d9-dirty'
+PACKAGE_VERSION='g465c8a33-dirty'
+PACKAGE_STRING='Weave g465c8a33-dirty'
PACKAGE_BUGREPORT='weave.support@nestlabs.com'
PACKAGE_URL='https://developer.nest.com/'
@@ -848,6 +868,7 @@
CROSS_SYSROOT
WEAVE_WITH_ANDROID_FALSE
WEAVE_WITH_ANDROID_TRUE
+LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
LIPO
@@ -911,7 +932,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -1007,6 +1027,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -1026,7 +1047,8 @@
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-NL_PROJECT_CONFIG_INCLUDES'
+NL_PROJECT_CONFIG_INCLUDES
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1038,6 +1060,7 @@
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -1124,6 +1147,7 @@
OBJCXX
OBJCXXFLAGS
PYTHON
+LT_SYS_LIBRARY_PATH
OBJCXXCPP
JAVA_HOME
JNI_CPPFLAGS
@@ -1208,6 +1232,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1460,6 +1485,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1597,7 +1631,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1625,8 +1659,6 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1712,7 +1744,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Weave g9c6721d9-dirty to adapt to many kinds of systems.
+\`configure' configures Weave g465c8a33-dirty to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1752,6 +1784,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1783,7 +1816,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Weave g9c6721d9-dirty:";;
+ short | recursive ) echo "Configuration of Weave g465c8a33-dirty:";;
esac
cat <<\_ACEOF
@@ -1860,9 +1893,12 @@
or unix [default=auto].
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).
+ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
--with-logging-style=STYLE
Specify the logging style from one of: auto,
android, stdio, stdio-weak, or external
@@ -2014,6 +2050,8 @@
OBJCXX Objective C++ compiler command
OBJCXXFLAGS Objective C++ compiler flags
PYTHON the Python interpreter
+ LT_SYS_LIBRARY_PATH
+ User-defined run-time library search path.
OBJCXXCPP Objective C++ preprocessor
JAVA_HOME Java SDK root directory
JNI_CPPFLAGS
@@ -2152,10 +2190,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Weave configure g9c6721d9-dirty
-generated by GNU Autoconf 2.68
+Weave configure g465c8a33-dirty
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -2419,7 +2457,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2605,7 +2643,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -3013,7 +3051,8 @@
main ()
{
static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -3029,7 +3068,8 @@
{
static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
< ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -3086,7 +3126,8 @@
main ()
{
static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -3164,8 +3205,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Weave $as_me g9c6721d9-dirty, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by Weave $as_me g465c8a33-dirty, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3885,7 +3926,7 @@
# Disable silent build rules by either passing --disable-silent-rules to
# configure or passing V=1 to make
#
-am__api_version='1.14'
+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
@@ -3924,7 +3965,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -4057,8 +4098,8 @@
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -4077,7 +4118,7 @@
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4108,7 +4149,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4148,7 +4189,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4199,7 +4240,7 @@
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -4246,7 +4287,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4371,7 +4412,7 @@
# Define the identity of the package.
PACKAGE='weave'
- VERSION='g9c6721d9-dirty'
+ VERSION='g465c8a33-dirty'
# Some tools Automake needs.
@@ -4392,12 +4433,12 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4529,7 +4570,7 @@
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: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -4540,6 +4581,7 @@
fi
fi
+
#
# Silent build rules requires at least automake-1.11. Employ
# techniques for not breaking earlier versions of automake.
@@ -4845,45 +4887,45 @@
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 :
@@ -4926,7 +4968,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4966,7 +5008,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5019,7 +5061,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5060,7 +5102,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -5118,7 +5160,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5162,7 +5204,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5608,8 +5650,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -6042,7 +6083,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6082,7 +6123,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6135,7 +6176,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6176,7 +6217,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -6234,7 +6275,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6278,7 +6319,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6474,8 +6515,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -6887,7 +6927,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6931,7 +6971,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7406,7 +7446,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7450,7 +7490,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7853,7 +7893,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7897,7 +7937,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8230,7 +8270,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJCXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8274,7 +8314,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJCXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8603,7 +8643,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8643,7 +8683,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8695,7 +8735,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8735,7 +8775,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8787,7 +8827,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8827,7 +8867,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJCOPY="objcopy"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8879,7 +8919,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8919,7 +8959,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8988,7 +9028,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9028,7 +9068,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9094,7 +9134,7 @@
# Find any Python interpreter.
if test -z "$PYTHON"; then
- for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ for ac_prog in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9114,7 +9154,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10252,8 +10292,8 @@
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -10267,7 +10307,7 @@
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# Backslashify metacharacters that are still active within
# double-quoted strings.
@@ -10316,7 +10356,7 @@
$ECHO ""
}
-case "$ECHO" in
+case $ECHO in
printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
$as_echo "printf" >&6; } ;;
print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -10360,7 +10400,7 @@
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -10436,7 +10476,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -10502,7 +10542,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -10569,7 +10609,7 @@
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -10639,19 +10679,19 @@
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -10665,7 +10705,7 @@
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -10676,7 +10716,7 @@
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -10687,32 +10727,32 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -10755,33 +10795,38 @@
else
if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -10792,15 +10837,15 @@
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
@@ -10825,7 +10870,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10869,7 +10914,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10906,9 +10951,9 @@
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -10916,8 +10961,8 @@
esac
fi
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -10957,7 +11002,7 @@
$as_echo_n "(cached) " >&6
else
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -10997,7 +11042,7 @@
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -11047,22 +11092,23 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -11080,7 +11126,7 @@
fi
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
@@ -11098,30 +11144,6 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
@@ -11244,13 +11266,13 @@
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -11282,7 +11304,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11322,7 +11344,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11378,13 +11400,13 @@
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[4-9]*)
@@ -11411,8 +11433,7 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -11448,10 +11469,6 @@
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11490,11 +11507,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -11512,8 +11529,8 @@
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -11566,6 +11583,9 @@
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -11628,7 +11648,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11668,7 +11688,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11723,8 +11743,8 @@
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -11736,7 +11756,7 @@
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
@@ -11771,7 +11791,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11815,7 +11835,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11890,7 +11910,7 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -11898,7 +11918,7 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -11911,7 +11931,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
$as_echo "$lt_cv_ar_at_file" >&6; }
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -11940,7 +11960,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11980,7 +12000,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12039,7 +12059,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12079,7 +12099,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12128,7 +12148,7 @@
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -12218,7 +12238,7 @@
symcode='[ABCDGISTW]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[ABCDEGRST]'
fi
;;
@@ -12251,14 +12271,44 @@
symcode='[ABCDGIRSTW]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -12276,21 +12326,24 @@
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -12321,11 +12374,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s "$nlist"; then
+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -12338,11 +12388,11 @@
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
@@ -12368,7 +12418,7 @@
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -12388,13 +12438,13 @@
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -12415,7 +12465,7 @@
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -12468,6 +12518,16 @@
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; }
@@ -12480,9 +12540,9 @@
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -12492,8 +12552,8 @@
no|'')
;; #(
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;;
esac
@@ -12505,18 +12565,99 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -12525,24 +12666,25 @@
test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -12571,9 +12713,50 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -12587,9 +12770,19 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -12608,7 +12801,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -12626,7 +12822,7 @@
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -12666,13 +12862,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -12684,7 +12881,7 @@
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -12693,7 +12890,7 @@
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -12709,7 +12906,7 @@
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -12728,7 +12925,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12768,7 +12965,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12820,7 +13017,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
@@ -12848,7 +13045,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12888,7 +13085,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12940,7 +13137,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12980,7 +13177,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13032,7 +13229,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13072,7 +13269,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13124,7 +13321,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13164,7 +13361,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13216,7 +13413,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13256,7 +13453,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13323,7 +13520,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -13341,7 +13538,7 @@
cat conftest.err >&5
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -13380,7 +13577,7 @@
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -13409,7 +13606,7 @@
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&5
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -13422,32 +13619,32 @@
$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[012][,.]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -13455,6 +13652,41 @@
;;
esac
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -13602,9 +13834,9 @@
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
esac
} # func_stripname_cnf
@@ -13631,14 +13863,14 @@
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -13662,14 +13894,14 @@
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -13693,14 +13925,14 @@
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -13708,8 +13940,6 @@
fi
-test -z "$pic_mode" && pic_mode=default
-
@@ -13725,14 +13955,14 @@
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -13746,11 +13976,63 @@
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -13799,7 +14081,7 @@
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -13838,7 +14120,7 @@
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -13849,14 +14131,14 @@
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -13865,15 +14147,8 @@
test -z "$LD" && LD=ld
test -z "$ac_objext" && ac_objext=o
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
# Only perform the check for file, if the check method requires it
@@ -13888,22 +14163,22 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -13926,13 +14201,13 @@
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -13954,22 +14229,22 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -13992,13 +14267,13 @@
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -14019,7 +14294,7 @@
# Use C for the default configuration in the libtool script
-lt_save_CC="$CC"
+lt_save_CC=$CC
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -14081,7 +14356,7 @@
lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -14097,7 +14372,7 @@
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -14127,7 +14402,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
else
:
@@ -14145,17 +14420,18 @@
lt_prog_compiler_static=
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_static='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
fi
+ lt_prog_compiler_pic='-fPIC'
;;
amigaos*)
@@ -14166,8 +14442,8 @@
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -14183,6 +14459,11 @@
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -14253,7 +14534,7 @@
case $host_os in
aix*)
lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
else
@@ -14261,10 +14542,29 @@
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -14280,7 +14580,7 @@
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
+ lt_prog_compiler_static='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -14289,9 +14589,9 @@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -14316,6 +14616,12 @@
lt_prog_compiler_pic='-PIC'
lt_prog_compiler_static='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -14413,7 +14719,7 @@
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
lt_prog_compiler_pic='-Kconform_pic'
lt_prog_compiler_static='-Bstatic'
fi
@@ -14442,7 +14748,7 @@
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
;;
@@ -14474,7 +14780,7 @@
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -14504,7 +14810,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -14536,7 +14842,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -14555,13 +14861,13 @@
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
:
else
lt_prog_compiler_static=
@@ -14681,8 +14987,8 @@
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -14694,9 +15000,9 @@
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -14739,9 +15045,9 @@
# included in the symbol list
include_expsyms=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -14756,7 +15062,7 @@
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -14764,9 +15070,12 @@
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -14774,7 +15083,7 @@
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -14796,24 +15105,24 @@
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -14826,7 +15135,7 @@
case $host_os in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -14845,7 +15154,7 @@
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -14861,7 +15170,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs=no
fi
@@ -14871,7 +15180,7 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -14879,61 +15188,89 @@
exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs=no
fi
;;
haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -14944,42 +15281,47 @@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -14988,13 +15330,13 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -15012,8 +15354,8 @@
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -15025,7 +15367,7 @@
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -15040,9 +15382,9 @@
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -15059,15 +15401,15 @@
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
;;
esac
- if test "$ld_shlibs" = no; then
+ if test no = "$ld_shlibs"; then
runpath_var=
hardcode_libdir_flag_spec=
export_dynamic_flag_spec=
@@ -15083,7 +15425,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -15091,34 +15433,57 @@
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -15137,13 +15502,21 @@
hardcode_direct_absolute=yes
hardcode_libdir_separator=':'
link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -15162,35 +15535,42 @@
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec='${wl}-bexpall'
+ export_dynamic_flag_spec='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -15225,7 +15605,7 @@
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -15233,17 +15613,17 @@
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -15278,7 +15658,7 @@
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -15286,21 +15666,33 @@
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag=' ${wl}-bernotok'
- allow_undefined_flag=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag=' $wl-bernotok'
+ allow_undefined_flag=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -15309,7 +15701,7 @@
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -15339,16 +15731,17 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
enable_shared_with_static_runtimes=yes
@@ -15357,18 +15750,18 @@
# Don't use ranlib
old_postinstall_cmds='chmod 644 $oldlib'
postlink_cmds='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -15377,7 +15770,7 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -15396,24 +15789,24 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec=''
fi
link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
+ allow_undefined_flag=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
else
ld_shlibs=no
@@ -15455,33 +15848,33 @@
;;
hpux9*)
- if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
@@ -15489,25 +15882,25 @@
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -15519,7 +15912,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -b"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -15538,14 +15931,14 @@
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
$as_echo "$lt_cv_prog_compiler__b" >&6; }
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -15553,8 +15946,8 @@
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
case $host_cpu in
@@ -15565,7 +15958,7 @@
*)
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -15576,8 +15969,8 @@
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@ -15587,8 +15980,8 @@
if ${lt_cv_irix_exported_symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo (void) { return 0; }
@@ -15600,25 +15993,36 @@
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ link_all_deplibs=no
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
inherit_rpath=yes
link_all_deplibs=yes
;;
- netbsd*)
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -15632,7 +16036,7 @@
newsos6)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
hardcode_shlibpath_var=no
;;
@@ -15640,27 +16044,19 @@
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
hardcode_shlibpath_var=no
hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
fi
else
ld_shlibs=no
@@ -15671,33 +16067,53 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -15708,24 +16124,24 @@
solaris*)
no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -15735,11 +16151,11 @@
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
fi
@@ -15749,10 +16165,10 @@
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -15801,43 +16217,43 @@
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
+ no_undefined_flag='$wl-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
+ no_undefined_flag='$wl-z,text'
+ allow_undefined_flag='$wl-z,nodefs'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
hardcode_libdir_separator=':'
link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
+ export_dynamic_flag_spec='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -15852,10 +16268,10 @@
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- export_dynamic_flag_spec='${wl}-Blargedynsym'
+ export_dynamic_flag_spec='$wl-Blargedynsym'
;;
esac
fi
@@ -15863,7 +16279,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
with_gnu_ld=$with_gnu_ld
@@ -15889,7 +16305,7 @@
# Assume -lc should be added
archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -16104,14 +16520,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -16127,28 +16543,35 @@
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -16162,7 +16585,7 @@
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -16171,7 +16594,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -16188,14 +16611,16 @@
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -16203,41 +16628,91 @@
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -16247,18 +16722,18 @@
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -16266,8 +16741,8 @@
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -16279,7 +16754,7 @@
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -16288,8 +16763,8 @@
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -16305,17 +16780,17 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -16324,8 +16799,8 @@
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -16352,7 +16827,7 @@
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -16365,8 +16840,8 @@
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -16379,7 +16854,7 @@
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -16392,8 +16867,8 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16406,8 +16881,8 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -16425,12 +16900,13 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -16455,26 +16931,15 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -16492,14 +16957,15 @@
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -16507,8 +16973,8 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -16517,8 +16983,8 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -16531,8 +16997,8 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -16543,7 +17009,7 @@
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -16551,8 +17017,8 @@
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -16571,8 +17037,8 @@
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -16581,13 +17047,33 @@
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -16631,7 +17117,12 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -16646,17 +17137,29 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -16666,7 +17169,7 @@
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -16675,58 +17178,68 @@
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
+ else
+ need_version=yes
+ fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -16737,8 +17250,8 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -16748,11 +17261,11 @@
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -16760,8 +17273,8 @@
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -16782,24 +17295,24 @@
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -16817,7 +17330,7 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -16825,8 +17338,8 @@
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -16836,20 +17349,35 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -16946,15 +17474,15 @@
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+ test yes = "$hardcode_automatic"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
+ if test no != "$hardcode_direct" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
else
@@ -16969,12 +17497,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -16984,7 +17512,7 @@
- if test "x$enable_dlopen" != xyes; then
+ if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -16994,23 +17522,23 @@
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -17048,10 +17576,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
- lt_cv_dlopen="dyld"
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
@@ -17059,10 +17587,18 @@
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
+ lt_cv_dlopen=shl_load
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -17101,11 +17637,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -17144,7 +17680,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -17183,7 +17719,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -17222,7 +17758,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
@@ -17243,21 +17779,21 @@
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -17265,7 +17801,7 @@
if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -17312,9 +17848,9 @@
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -17344,7 +17880,7 @@
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -17364,14 +17900,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -17418,9 +17954,9 @@
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -17450,7 +17986,7 @@
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -17471,9 +18007,9 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -17517,7 +18053,7 @@
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -17545,7 +18081,7 @@
- # Report which library types will actually be built
+ # Report what library types will actually be built
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -17553,13 +18089,13 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -17567,8 +18103,12 @@
;;
aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -17578,7 +18118,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -17592,11 +18132,11 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CC="$lt_save_CC"
+CC=$lt_save_CC
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+ if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -17775,7 +18315,7 @@
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -17836,46 +18376,39 @@
CFLAGS=$CXXFLAGS
compiler=$CC
compiler_CXX=$CC
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
else
lt_prog_compiler_no_builtin_flag_CXX=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -17889,7 +18422,7 @@
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -17900,7 +18433,7 @@
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -17911,32 +18444,32 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -17972,22 +18505,22 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec_CXX=
fi
@@ -18006,7 +18539,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
GXX=no
@@ -18024,18 +18557,30 @@
ld_shlibs_CXX=no
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -18045,6 +18590,13 @@
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -18063,13 +18615,21 @@
hardcode_direct_absolute_CXX=yes
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- file_list_spec_CXX='${wl}-f,'
+ file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -18087,36 +18647,44 @@
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec_CXX='${wl}-bexpall'
+ export_dynamic_flag_spec_CXX='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
always_export_symbols_CXX=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -18151,7 +18719,7 @@
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -18159,18 +18727,18 @@
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -18205,7 +18773,7 @@
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -18213,22 +18781,34 @@
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag_CXX=' ${wl}-bernotok'
- allow_undefined_flag_CXX=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag_CXX=' $wl-bernotok'
+ allow_undefined_flag_CXX=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX='$convenience'
fi
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -18238,7 +18818,7 @@
allow_undefined_flag_CXX=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs_CXX=no
fi
@@ -18266,57 +18846,58 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
enable_shared_with_static_runtimes_CXX=yes
# Don't use ranlib
old_postinstall_cmds_CXX='chmod 644 $oldlib'
postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+ export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
allow_undefined_flag_CXX=unsupported
always_export_symbols_CXX=no
enable_shared_with_static_runtimes_CXX=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
fi
@@ -18330,27 +18911,27 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec_CXX=''
fi
link_all_deplibs_CXX=yes
- allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ allow_undefined_flag_CXX=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
else
@@ -18359,6 +18940,34 @@
;;
+ os2*)
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_minus_L_CXX=yes
+ allow_undefined_flag_CXX=unsupported
+ shrext_cmds=.dll
+ archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes_CXX=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -18393,18 +19002,15 @@
ld_shlibs_CXX=yes
;;
- gnu*)
- ;;
-
haiku*)
- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs_CXX=yes
;;
hpux9*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
hardcode_direct_CXX=yes
hardcode_minus_L_CXX=yes # Not in the search PATH,
# but as the default
@@ -18416,7 +19022,7 @@
ld_shlibs_CXX=no
;;
aCC*)
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18425,11 +19031,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -18439,15 +19045,15 @@
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
;;
esac
fi
@@ -18473,13 +19079,13 @@
aCC*)
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -18490,20 +19096,20 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -18518,22 +19124,22 @@
interix[3-9]*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}-E'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -18542,22 +19148,22 @@
old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
link_all_deplibs_CXX=yes
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -18565,8 +19171,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18575,10 +19181,10 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -18592,59 +19198,59 @@
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
archive_cmds_need_lc_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [1-5].* | *pgcpp\ [1-5].*)
prelink_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
old_archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -18658,18 +19264,18 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -18677,10 +19283,10 @@
*Sun\ C*)
# Sun C++ 5.9
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
hardcode_libdir_flag_spec_CXX='-R$libdir'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object_CXX=yes
# Not sure whether something based on
@@ -18738,22 +19344,17 @@
ld_shlibs_CXX=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- ld_shlibs_CXX=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- export_dynamic_flag_spec_CXX='${wl}-E'
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='$wl-E'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -18769,9 +19370,9 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
hardcode_libdir_separator_CXX=:
# Archives containing C++ object files must be created using
@@ -18789,17 +19390,17 @@
cxx*)
case $host in
osf3*)
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
;;
*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
esac
@@ -18814,27 +19415,27 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# FIXME: insert proper C++ library support
@@ -18874,9 +19475,9 @@
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
@@ -18884,7 +19485,7 @@
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
;;
@@ -18901,42 +19502,42 @@
;;
gcx*)
# Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ no_undefined_flag_CXX=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
fi
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -18945,52 +19546,52 @@
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_CXX='${wl}-z,text'
+ no_undefined_flag_CXX='$wl-z,text'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag_CXX='${wl}-z,text'
- allow_undefined_flag_CXX='${wl}-z,nodefs'
+ no_undefined_flag_CXX='$wl-z,text'
+ allow_undefined_flag_CXX='$wl-z,nodefs'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ export_dynamic_flag_spec_CXX='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
- '"$old_archive_cmds_CXX"
+ '"$old_archive_cmds_CXX"
reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
- '"$reload_cmds_CXX"
+ '"$reload_cmds_CXX"
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -19022,10 +19623,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
+ test no = "$ld_shlibs_CXX" && can_build_shared=no
- GCC_CXX="$GXX"
- LD_CXX="$LD"
+ GCC_CXX=$GXX
+ LD_CXX=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -19069,13 +19670,13 @@
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -19091,16 +19692,16 @@
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$compiler_lib_search_path_CXX"; then
- compiler_lib_search_path_CXX="${prev}${p}"
+ compiler_lib_search_path_CXX=$prev$p
else
- compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -19108,9 +19709,9 @@
esac
else
if test -z "$postdeps_CXX"; then
- postdeps_CXX="${prev}${p}"
+ postdeps_CXX=$prev$p
else
- postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+ postdeps_CXX="${postdeps_CXX} $prev$p"
fi
fi
prev=
@@ -19125,15 +19726,15 @@
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$predep_objects_CXX"; then
- predep_objects_CXX="$p"
+ predep_objects_CXX=$p
else
predep_objects_CXX="$predep_objects_CXX $p"
fi
else
if test -z "$postdep_objects_CXX"; then
- postdep_objects_CXX="$p"
+ postdep_objects_CXX=$p
else
postdep_objects_CXX="$postdep_objects_CXX $p"
fi
@@ -19163,51 +19764,6 @@
postdep_objects_CXX=
postdeps_CXX=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
@@ -19216,7 +19772,7 @@
esac
compiler_lib_search_dirs_CXX=
if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
@@ -19255,17 +19811,18 @@
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
fi
+ lt_prog_compiler_pic_CXX='-fPIC'
;;
amigaos*)
@@ -19276,8 +19833,8 @@
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -19292,6 +19849,11 @@
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static_CXX='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -19341,7 +19903,7 @@
case $host_os in
aix[4-9]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
else
@@ -19381,14 +19943,14 @@
case $cc_basename in
CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -19417,7 +19979,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -19425,7 +19987,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
@@ -19481,7 +20043,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -19570,7 +20132,7 @@
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
;;
@@ -19602,7 +20164,7 @@
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -19632,7 +20194,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -19658,7 +20220,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -19677,13 +20239,13 @@
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
:
else
lt_prog_compiler_static_CXX=
@@ -19797,8 +20359,8 @@
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -19810,9 +20372,9 @@
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -19829,17 +20391,21 @@
case $host_os in
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- export_symbols_cmds_CXX="$ltdll_cmds"
+ export_symbols_cmds_CXX=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -19852,6 +20418,9 @@
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -19859,7 +20428,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+test no = "$ld_shlibs_CXX" && can_build_shared=no
with_gnu_ld_CXX=$with_gnu_ld
@@ -19876,7 +20445,7 @@
# Assume -lc should be added
archive_cmds_need_lc_CXX=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds_CXX in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -20004,7 +20573,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -20021,14 +20590,16 @@
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -20036,41 +20607,91 @@
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -20080,18 +20701,18 @@
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -20099,8 +20720,8 @@
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -20112,7 +20733,7 @@
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -20121,8 +20742,8 @@
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -20138,16 +20759,16 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -20156,8 +20777,8 @@
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -20184,7 +20805,7 @@
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -20197,8 +20818,8 @@
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -20211,7 +20832,7 @@
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -20224,8 +20845,8 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -20237,8 +20858,8 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -20256,12 +20877,13 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -20286,26 +20908,15 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -20323,14 +20934,15 @@
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -20338,8 +20950,8 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -20348,8 +20960,8 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -20362,8 +20974,8 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -20374,7 +20986,7 @@
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -20382,8 +20994,8 @@
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -20402,8 +21014,8 @@
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -20412,13 +21024,33 @@
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -20462,7 +21094,12 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -20477,17 +21114,29 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -20497,7 +21146,7 @@
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -20506,58 +21155,68 @@
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
+ else
+ need_version=yes
+ fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -20568,8 +21227,8 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -20579,11 +21238,11 @@
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -20591,8 +21250,8 @@
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -20613,24 +21272,24 @@
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -20648,7 +21307,7 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -20656,8 +21315,8 @@
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -20667,20 +21326,32 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
@@ -20723,15 +21394,15 @@
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
test -n "$runpath_var_CXX" ||
- test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ test yes = "$hardcode_automatic_CXX"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct_CXX" != no &&
+ if test no != "$hardcode_direct_CXX" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+ test no != "$hardcode_minus_L_CXX"; then
# Linking always hardcodes the temporary library directory.
hardcode_action_CXX=relink
else
@@ -20746,12 +21417,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
$as_echo "$hardcode_action_CXX" >&6; }
-if test "$hardcode_action_CXX" = relink ||
- test "$inherit_rpath_CXX" = yes; then
+if test relink = "$hardcode_action_CXX" ||
+ test yes = "$inherit_rpath_CXX"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -20774,7 +21445,7 @@
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -21450,7 +22121,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path__ACJNI_JAVAC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21561,7 +22232,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21602,7 +22273,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_JAR="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21835,7 +22506,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_LCOV="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21875,7 +22546,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GENHTML="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -22910,7 +23581,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -22950,7 +23621,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -23589,7 +24260,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -23632,7 +24303,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -25342,7 +26013,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27832,60 +28503,60 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdbool.h>
-#ifndef bool
- "error: bool is not defined"
-#endif
-#ifndef false
- "error: false is not defined"
-#endif
-#if false
- "error: false is not 0"
-#endif
-#ifndef true
- "error: true is not defined"
-#endif
-#if true != 1
- "error: true is not 1"
-#endif
-#ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
-#endif
+ #include <stdbool.h>
+ #ifndef bool
+ "error: bool is not defined"
+ #endif
+ #ifndef false
+ "error: false is not defined"
+ #endif
+ #if false
+ "error: false is not 0"
+ #endif
+ #ifndef true
+ "error: true is not defined"
+ #endif
+ #if true != 1
+ "error: true is not 1"
+ #endif
+ #ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+ #endif
- struct s { _Bool s: 1; _Bool t; } s;
+ struct s { _Bool s: 1; _Bool t; } s;
- char a[true == 1 ? 1 : -1];
- char b[false == 0 ? 1 : -1];
- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
- char d[(bool) 0.5 == true ? 1 : -1];
- /* See body of main program for 'e'. */
- char f[(_Bool) 0.0 == false ? 1 : -1];
- char g[true];
- char h[sizeof (_Bool)];
- char i[sizeof s.t];
- enum { j = false, k = true, l = false * true, m = true * 256 };
- /* The following fails for
- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
- _Bool n[m];
- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
- /* Catch a bug in an HP-UX C compiler. See
- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
- */
- _Bool q = true;
- _Bool *pq = &q;
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) 0.5 == true ? 1 : -1];
+ /* See body of main program for 'e'. */
+ char f[(_Bool) 0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+ _Bool n[m];
+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+ /* Catch a bug in an HP-UX C compiler. See
+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+ */
+ _Bool q = true;
+ _Bool *pq = &q;
int
main ()
{
- bool e = &s;
- *pq |= q;
- *pq |= ! q;
- /* Refer to every declared value, to avoid compiler optimizations. */
- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
- + !m + !n + !o + !p + !q + !pq);
+ bool e = &s;
+ *pq |= q;
+ *pq |= ! q;
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ + !m + !n + !o + !p + !q + !pq);
;
return 0;
@@ -27900,7 +28571,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
$as_echo "$ac_cv_header_stdbool_h" >&6; }
-ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
if test "x$ac_cv_type__Bool" = xyes; then :
cat >>confdefs.h <<_ACEOF
@@ -27910,6 +28581,7 @@
fi
+
if test $ac_cv_header_stdbool_h = yes; then
$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
@@ -28994,7 +29666,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ax_pthread_config="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -29203,7 +29875,7 @@
#handle absolute path differently from PATH based program lookup
case "x$CC" in #(
x/*) :
- if { test -f ${CC}_r && $as_test_x ${CC}_r; }; then :
+ if as_fn_executable_p ${CC}_r; then :
PTHREAD_CC="${CC}_r"
fi ;; #(
*) :
@@ -29225,7 +29897,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_PTHREAD_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -30210,16 +30882,16 @@
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -30279,28 +30951,16 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -30321,8 +30981,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Weave $as_me g9c6721d9-dirty, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by Weave $as_me g465c8a33-dirty, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -30388,11 +31048,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Weave config.status g9c6721d9-dirty
-configured by $0, generated by GNU Autoconf 2.68,
+Weave config.status g465c8a33-dirty
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -30483,7 +31143,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -30507,7 +31167,7 @@
#
# 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
@@ -30523,6 +31183,7 @@
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -30572,10 +31233,13 @@
GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -30640,7 +31304,8 @@
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -30745,9 +31410,12 @@
compiler \
lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
nm_file_list_spec \
+lt_cv_truncate_bin \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_pic \
lt_prog_compiler_wl \
@@ -30813,7 +31481,7 @@
compiler_lib_search_path_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -30840,7 +31508,8 @@
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -30854,7 +31523,7 @@
postlink_cmds_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -30863,19 +31532,16 @@
done
ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'
@@ -31527,29 +32193,35 @@
# 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
@@ -31567,106 +32239,98 @@
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\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 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\(\/\/\)$/{
- 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)
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -31686,6 +32350,9 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -31803,18 +32470,27 @@
# Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
# Transform the output of nm in a C name address pair.
global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
# Specify filename containing input files for \$NM.
nm_file_list_spec=$lt_nm_file_list_spec
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
lt_sysroot=$lt_sysroot
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -31905,8 +32581,11 @@
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -31999,13 +32678,13 @@
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute
@@ -32071,13 +32750,72 @@
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -32086,7 +32824,7 @@
esac
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# We use sed instead of cat because bash on DJGPP gets confused if
@@ -32096,165 +32834,6 @@
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -32341,13 +32920,13 @@
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute_CXX
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e83068e..7bf2ae1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -36,7 +36,17 @@
# API and stack documentation.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -101,8 +111,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -121,18 +129,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -158,6 +167,8 @@
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -247,6 +258,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -413,6 +425,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -480,14 +493,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign doc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -511,7 +523,10 @@
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)'; \
@@ -659,6 +674,8 @@
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/Makefile.in b/src/Makefile.in
index cce24e7..af1575e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
# source code.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -123,8 +133,6 @@
@CONFIG_DEVICE_LAYER_TRUE@ $(NULL)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -143,18 +151,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -194,7 +203,7 @@
$(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
@@ -214,6 +223,8 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -331,6 +342,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -490,6 +502,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -600,14 +613,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -724,7 +736,10 @@
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)'; \
@@ -895,6 +910,8 @@
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/adaptations/device-layer/Makefile.in b/src/adaptations/device-layer/Makefile.in
index edaab23..3d14014 100644
--- a/src/adaptations/device-layer/Makefile.in
+++ b/src/adaptations/device-layer/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,
@@ -168,12 +168,12 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
@@ -327,7 +327,61 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libDeviceLayer_a-CASEAuth.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-DeviceControlServer.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-DeviceDescriptionServer.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTraitDataSource.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-DeviceNetworkInfo.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-EchoServer.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-EventLogging.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-FabricProvisioningServer.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-GeneralUtils.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-Globals.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-NetworkTelemetryManager.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-PersistedStorage.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-ServiceDirectoryManager.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-ServiceProvisioningServer.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-ServiceTunnelAgent.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-SystemEventSupport.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-SystemTimerSupport.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-TestDeviceIds.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-TimeSyncManager.Po \
+ ./$(DEPDIR)/libDeviceLayer_a-TraitManager.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-AESBlockCipher.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Config.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Utils.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-Entropy.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-Logging.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-LwIPCoreLock.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po \
+ ESP32/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po \
+ FreeRTOS/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po \
+ LwIP/$(DEPDIR)/libDeviceLayer_a-WarmSupport.Po \
+ OpenThread/$(DEPDIR)/libDeviceLayer_a-OpenThreadUtils.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-Entropy.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-Logging.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-ThreadStackManagerImpl.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Config.Po \
+ nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Utils.Po \
+ trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkTrait.Po \
+ trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWifiTrait.Po \
+ trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWpanTrait.Po \
+ trait-support/weave/trait/description/$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTrait.Po \
+ trait-support/weave/trait/telemetry/tunnel/$(DEPDIR)/libDeviceLayer_a-TelemetryTunnelTrait.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -470,6 +524,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -770,8 +825,8 @@
*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)
@@ -955,60 +1010,66 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-CASEAuth.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceControlServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceDescriptionServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTraitDataSource.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceNetworkInfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-EchoServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-EventLogging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-FabricProvisioningServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-GeneralUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-Globals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-NetworkTelemetryManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-PersistedStorage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-ServiceDirectoryManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-ServiceProvisioningServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-ServiceTunnelAgent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-SystemEventSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-SystemTimerSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-TestDeviceIds.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-TimeSyncManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-TraitManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-AESBlockCipher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Utils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-Entropy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-Logging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-LwIPCoreLock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@FreeRTOS/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@LwIP/$(DEPDIR)/libDeviceLayer_a-WarmSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@OpenThread/$(DEPDIR)/libDeviceLayer_a-OpenThreadUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-Entropy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-Logging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-ThreadStackManagerImpl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Utils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWifiTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWpanTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@trait-support/weave/trait/description/$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@trait-support/weave/trait/telemetry/tunnel/$(DEPDIR)/libDeviceLayer_a-TelemetryTunnelTrait.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-CASEAuth.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceControlServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceDescriptionServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTraitDataSource.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-DeviceNetworkInfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-EchoServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-EventLogging.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-FabricProvisioningServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-GeneralUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-Globals.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-NetworkTelemetryManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-PersistedStorage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-ServiceDirectoryManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-ServiceProvisioningServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-ServiceTunnelAgent.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-SystemEventSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-SystemTimerSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-TestDeviceIds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-TimeSyncManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDeviceLayer_a-TraitManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-AESBlockCipher.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Config.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-Entropy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-Logging.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-LwIPCoreLock.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ESP32/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@FreeRTOS/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@LwIP/$(DEPDIR)/libDeviceLayer_a-WarmSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@OpenThread/$(DEPDIR)/libDeviceLayer_a-OpenThreadUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-Entropy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-Logging.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-ThreadStackManagerImpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Config.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWifiTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWpanTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@trait-support/weave/trait/description/$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@trait-support/weave/trait/telemetry/tunnel/$(DEPDIR)/libDeviceLayer_a-TelemetryTunnelTrait.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1848,7 +1909,10 @@
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)'; \
@@ -1937,7 +2001,60 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR) ESP32/$(DEPDIR) FreeRTOS/$(DEPDIR) LwIP/$(DEPDIR) OpenThread/$(DEPDIR) nRF5/$(DEPDIR) trait-support/nest/trait/network/$(DEPDIR) trait-support/weave/trait/description/$(DEPDIR) trait-support/weave/trait/telemetry/tunnel/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-CASEAuth.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceControlServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceDescriptionServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTraitDataSource.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceNetworkInfo.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-EchoServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-EventLogging.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-FabricProvisioningServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-GeneralUtils.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-Globals.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-NetworkTelemetryManager.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-PersistedStorage.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-ServiceDirectoryManager.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-ServiceProvisioningServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-ServiceTunnelAgent.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-SystemEventSupport.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-SystemTimerSupport.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-TestDeviceIds.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-TimeSyncManager.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-TraitManager.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-AESBlockCipher.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Config.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Utils.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-Entropy.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-Logging.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-LwIPCoreLock.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po
+ -rm -f FreeRTOS/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po
+ -rm -f LwIP/$(DEPDIR)/libDeviceLayer_a-WarmSupport.Po
+ -rm -f OpenThread/$(DEPDIR)/libDeviceLayer_a-OpenThreadUtils.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-Entropy.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-Logging.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-ThreadStackManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Config.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Utils.Po
+ -rm -f trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkTrait.Po
+ -rm -f trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWifiTrait.Po
+ -rm -f trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWpanTrait.Po
+ -rm -f trait-support/weave/trait/description/$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTrait.Po
+ -rm -f trait-support/weave/trait/telemetry/tunnel/$(DEPDIR)/libDeviceLayer_a-TelemetryTunnelTrait.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1983,7 +2100,60 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR) ESP32/$(DEPDIR) FreeRTOS/$(DEPDIR) LwIP/$(DEPDIR) OpenThread/$(DEPDIR) nRF5/$(DEPDIR) trait-support/nest/trait/network/$(DEPDIR) trait-support/weave/trait/description/$(DEPDIR) trait-support/weave/trait/telemetry/tunnel/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-CASEAuth.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceControlServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceDescriptionServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTraitDataSource.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-DeviceNetworkInfo.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-EchoServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-EventLogging.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-FabricProvisioningServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-GeneralUtils.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-Globals.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-NetworkTelemetryManager.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-PersistedStorage.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-ServiceDirectoryManager.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-ServiceProvisioningServer.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-ServiceTunnelAgent.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-SystemEventSupport.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-SystemTimerSupport.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-TestDeviceIds.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-TimeSyncManager.Po
+ -rm -f ./$(DEPDIR)/libDeviceLayer_a-TraitManager.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-AESBlockCipher.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Config.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-ESP32Utils.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-Entropy.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-Logging.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-LwIPCoreLock.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po
+ -rm -f ESP32/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po
+ -rm -f FreeRTOS/$(DEPDIR)/libDeviceLayer_a-SystemTimeSupport.Po
+ -rm -f LwIP/$(DEPDIR)/libDeviceLayer_a-WarmSupport.Po
+ -rm -f OpenThread/$(DEPDIR)/libDeviceLayer_a-OpenThreadUtils.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-BLEManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-ConfigurationManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-ConnectivityManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-Entropy.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-GroupKeyStoreImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-Logging.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-NetworkProvisioningServerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-PlatformManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-SoftwareUpdateManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-ThreadStackManagerImpl.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Config.Po
+ -rm -f nRF5/$(DEPDIR)/libDeviceLayer_a-nRF5Utils.Po
+ -rm -f trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkTrait.Po
+ -rm -f trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWifiTrait.Po
+ -rm -f trait-support/nest/trait/network/$(DEPDIR)/libDeviceLayer_a-TelemetryNetworkWpanTrait.Po
+ -rm -f trait-support/weave/trait/description/$(DEPDIR)/libDeviceLayer_a-DeviceIdentityTrait.Po
+ -rm -f trait-support/weave/trait/telemetry/tunnel/$(DEPDIR)/libDeviceLayer_a-TelemetryTunnelTrait.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -2004,9 +2174,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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/src/ble/Makefile.in b/src/ble/Makefile.in
index c285c0e..5a0ac48 100644
--- a/src/ble/Makefile.in
+++ b/src/ble/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -65,7 +65,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -129,10 +139,6 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-DIST_COMMON = $(srcdir)/BleLayer.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
@WEAVE_ENABLE_WOBLE_TEST_TRUE@am__append_1 = \
@WEAVE_ENABLE_WOBLE_TEST_TRUE@ @top_builddir@/src/device-manager/WoBleTest.cpp \
@WEAVE_ENABLE_WOBLE_TEST_TRUE@ $(NULL)
@@ -160,18 +166,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -245,7 +252,14 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = \
+ @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BLEEndPoint.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleError.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleLayer.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleUUID.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-WoBle.Po \
+ @top_builddir@/src/device-manager/$(DEPDIR)/libBleLayer_a-WoBleTest.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -295,6 +309,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/BleLayer.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -384,6 +401,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -543,6 +561,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -581,16 +600,15 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ble/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/ble/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
-$(srcdir)/BleLayer.am:
+$(srcdir)/BleLayer.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -675,12 +693,18 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BLEEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleUUID.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-WoBle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/$(DEPDIR)/libBleLayer_a-WoBleTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BLEEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleUUID.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-WoBle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/$(DEPDIR)/libBleLayer_a-WoBleTest.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -848,7 +872,10 @@
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)'; \
@@ -925,7 +952,12 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf @top_builddir@/src/ble/$(DEPDIR) @top_builddir@/src/device-manager/$(DEPDIR)
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BLEEndPoint.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleError.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleLayer.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleUUID.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-WoBle.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libBleLayer_a-WoBleTest.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -971,7 +1003,12 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf @top_builddir@/src/ble/$(DEPDIR) @top_builddir@/src/device-manager/$(DEPDIR)
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BLEEndPoint.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleError.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleLayer.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-BleUUID.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libBleLayer_a-WoBle.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libBleLayer_a-WoBleTest.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -992,9 +1029,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -1006,6 +1043,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/device-manager/DeviceManager.am b/src/device-manager/DeviceManager.am
index 2109338..ba68039 100644
--- a/src/device-manager/DeviceManager.am
+++ b/src/device-manager/DeviceManager.am
@@ -34,6 +34,9 @@
nl_DeviceManager_sources += \
@top_builddir@/src/device-manager/WeaveDeviceManager.cpp \
+ @top_builddir@/src/device-manager/WeaveDataManagementClient.cpp \
+ @top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp \
+ @top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp \
$(NULL)
if CONFIG_NETWORK_LAYER_BLE
diff --git a/src/device-manager/TraitSchemaDirectory.h b/src/device-manager/TraitSchemaDirectory.h
new file mode 100644
index 0000000..15a1d3e
--- /dev/null
+++ b/src/device-manager/TraitSchemaDirectory.h
@@ -0,0 +1,61 @@
+/*
+ *
+ * Copyright (c) 2019 Google, LLC.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * TraitSchemaDirectory which locate the trait schema from different trait header files
+ */
+
+#ifndef TRAIT_SCHEMA_DIRECTORY_H_
+#define TRAIT_SCHEMA_DIRECTORY_H_
+
+#include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
+#include <Weave/Support/NLDLLUtil.h>
+#include <Weave/Profiles/data-management/DataManagement.h>
+
+#include <Weave/DeviceManager/schema/weave/trait/locale/LocaleSettingsTrait.h>
+#include <Weave/DeviceManager/schema/nest/test/trait/TestCTrait.h>
+
+namespace nl {
+namespace Weave {
+namespace DeviceManager {
+
+class TraitSchemaDirectory {
+public:
+ static const TraitSchemaEngine * GetTraitSchemaEngine(uint32_t aProfileId)
+ {
+ if (aProfileId == ::Weave::Trait::Locale::LocaleSettingsTrait::kWeaveProfileId)
+ {
+ return &::Weave::Trait::Locale::LocaleSettingsTrait::TraitSchema;
+ }
+ if (aProfileId == ::Schema::Nest::Test::Trait::TestCTrait::kWeaveProfileId)
+ {
+ return &::Schema::Nest::Test::Trait::TestCTrait::TraitSchema;
+ }
+ else
+ {
+ return NULL;
+ }
+ }
+};
+
+} // namespace DeviceManager
+} // namespace Weave
+} // namespace nl
+
+#endif // TRAIT_SCHEMA_DIRECTORY_H_
diff --git a/src/device-manager/WeaveDataManagementClient.cpp b/src/device-manager/WeaveDataManagementClient.cpp
new file mode 100644
index 0000000..c9e4ecb
--- /dev/null
+++ b/src/device-manager/WeaveDataManagementClient.cpp
@@ -0,0 +1,1096 @@
+/*
+ *
+ * Copyright (c) 2019 Google LLC.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * Generic trait data sinks.
+ */
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+
+#include <stdint.h>
+#include <inttypes.h>
+
+// Note that the choice of namespace alias must be made up front for each and every compile unit
+// This is because many include paths could set the default alias to unintended target.
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
+#include <time.h>
+
+#include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
+
+#include <Weave/Core/WeaveCore.h>
+#include <Weave/Support/Base64.h>
+#include <Weave/Support/CodeUtils.h>
+#include <Weave/Core/WeaveEncoding.h>
+#include <Weave/Profiles/WeaveProfiles.h>
+#include <Weave/Profiles/common/CommonProfile.h>
+#include <Weave/Profiles/echo/WeaveEcho.h>
+#include <Weave/Profiles/network-provisioning/NetworkProvisioning.h>
+#include <Weave/Profiles/service-provisioning/ServiceProvisioning.h>
+#include <Weave/Profiles/fabric-provisioning/FabricProvisioning.h>
+#include <Weave/Profiles/data-management/DataManagement.h>
+#include <Weave/Profiles/device-description/DeviceDescription.h>
+#include <Weave/Profiles/device-control/DeviceControl.h>
+#include <Weave/Profiles/vendor/nestlabs/device-description/NestProductIdentifiers.hpp>
+#include <Weave/Profiles/security/WeaveSecurity.h>
+#include <Weave/Profiles/security/WeaveAccessToken.h>
+#include <Weave/Profiles/token-pairing/TokenPairing.h>
+#include <Weave/DeviceManager/WeaveDeviceManager.h>
+#include <Weave/Support/verhoeff/Verhoeff.h>
+#include <Weave/Support/crypto/WeaveCrypto.h>
+#include <Weave/Support/logging/WeaveLogging.h>
+#include <Weave/Support/ErrorStr.h>
+#include <Weave/Support/NestCerts.h>
+#include <Weave/Support/TimeUtils.h>
+#include <Weave/Profiles/vendor/nestlabs/dropcam-legacy-pairing/DropcamLegacyPairing.h>
+
+#include <Weave/Support/CodeUtils.h>
+#include <Weave/DeviceManager/WeaveDataManagementClient.h>
+#include <Weave/DeviceManager/TraitSchemaDirectory.h>
+
+namespace nl {
+namespace Weave {
+namespace DeviceManager {
+
+using namespace nl::Weave::Encoding;
+using namespace nl::Weave::Profiles;
+using namespace nl::Weave::Profiles::DataManagement;
+using namespace nl::Weave::Profiles::DeviceDescription;
+using namespace nl::Weave::Profiles::Security;
+using namespace nl::Weave::Profiles::ServiceProvisioning;
+using namespace ::nl::Weave;
+using namespace ::nl::Weave::TLV;
+using namespace Schema::Weave::Common;
+
+class GenericTraitUpdatableDataSink;
+class WDMClient;
+
+GenericTraitUpdatableDataSink::GenericTraitUpdatableDataSink(const nl::Weave::Profiles::DataManagement::TraitSchemaEngine * aEngine)
+ : TraitUpdatableDataSink(aEngine)
+{
+}
+
+GenericTraitUpdatableDataSink::~GenericTraitUpdatableDataSink()
+{
+ Close();
+}
+
+void GenericTraitUpdatableDataSink::Close(void)
+{
+ for (auto itr = mPathTlvDataMap.begin(); itr != mPathTlvDataMap.end(); ++itr)
+ {
+ if (NULL != itr->second)
+ {
+ PacketBuffer::Free(itr->second);
+ itr->second = NULL;
+ }
+ }
+
+ mPathTlvDataMap.clear();
+ ClearVersion();
+}
+
+void GenericTraitUpdatableDataSink::UpdateTLVDataMap(PropertyPathHandle aPropertyPathHandle, PacketBuffer *apMsgBuf)
+{
+ if ((mPathTlvDataMap.find(aPropertyPathHandle) != mPathTlvDataMap.end()) && (NULL != mPathTlvDataMap[aPropertyPathHandle]))
+ {
+ PacketBuffer::Free(mPathTlvDataMap[aPropertyPathHandle]);
+ }
+ mPathTlvDataMap[aPropertyPathHandle] = apMsgBuf;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::LocateTraitHandle(void* appReqState, const TraitCatalogBase<TraitDataSink> * const apCatalog, TraitDataHandle & aHandle)
+{
+ GenericTraitUpdatableDataSink * pGenericTraitUpdatableDataSink = static_cast<GenericTraitUpdatableDataSink *>(appReqState);
+ return apCatalog->Locate(pGenericTraitUpdatableDataSink, aHandle);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::RefreshData(void* appReqState, WDMClient* apWDMClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError)
+{
+ return apWDMClient->RefreshData(appReqState, this, onComplete, onError, LocateTraitHandle);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetData(const char * apPath, int64_t aValue, bool aIsConditional)
+{
+ return Set(apPath, aValue, aIsConditional);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetData(const char * apPath, uint64_t aValue, bool aIsConditional)
+{
+ return Set(apPath, aValue, aIsConditional);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetData(const char * apPath, double aValue, bool aIsConditional)
+{
+ return Set(apPath, aValue, aIsConditional);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetBoolean(const char * apPath, bool aValue, bool aIsConditional)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVWriter writer;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+ PacketBuffer *pMsgBuf = PacketBuffer::New();
+ VerifyOrExit(NULL != pMsgBuf, err = WEAVE_ERROR_NO_MEMORY);
+
+ VerifyOrExit(GetSubscriptionClient() != NULL, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ Lock(GetSubscriptionClient());
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ writer.Init(pMsgBuf);
+
+ err = writer.PutBoolean(AnonymousTag, aValue);
+ SuccessOrExit(err);
+
+ err = writer.Finalize();
+ SuccessOrExit(err);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ UpdateTLVDataMap(propertyPathHandle, pMsgBuf);
+ pMsgBuf = NULL;
+ err = SetUpdated(GetSubscriptionClient(), propertyPathHandle, aIsConditional);
+ Unlock(GetSubscriptionClient());
+
+ WeaveLogDetail(DataManagement, "<set updated> in 0x%08x", propertyPathHandle);
+
+exit:
+ WeaveLogFunctError(err);
+
+ if (NULL != pMsgBuf)
+ {
+ PacketBuffer::Free(pMsgBuf);
+ pMsgBuf = NULL;
+ }
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetString(const char * apPath, const char * aValue, bool aIsConditional)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVWriter writer;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+ PacketBuffer *pMsgBuf = PacketBuffer::New();
+ VerifyOrExit(NULL != pMsgBuf, err = WEAVE_ERROR_NO_MEMORY);
+
+ VerifyOrExit(GetSubscriptionClient() != NULL, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ Lock(GetSubscriptionClient());
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ writer.Init(pMsgBuf);
+
+ err = writer.PutString(AnonymousTag, aValue);
+ SuccessOrExit(err);
+
+ err = writer.Finalize();
+ SuccessOrExit(err);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ UpdateTLVDataMap(propertyPathHandle, pMsgBuf);
+ pMsgBuf = NULL;
+ err = SetUpdated(GetSubscriptionClient(), propertyPathHandle, aIsConditional);
+ Unlock(GetSubscriptionClient());
+
+ WeaveLogDetail(DataManagement, "<set updated> in 0x%08x", propertyPathHandle);
+
+exit:
+ WeaveLogFunctError(err);
+
+ if (NULL != pMsgBuf)
+ {
+ PacketBuffer::Free(pMsgBuf);
+ pMsgBuf = NULL;
+ }
+
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetNull(const char * apPath, bool aIsConditional)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVWriter writer;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+ PacketBuffer *pMsgBuf = PacketBuffer::New();
+ VerifyOrExit(NULL != pMsgBuf, err = WEAVE_ERROR_NO_MEMORY);
+
+ VerifyOrExit(GetSubscriptionClient() != NULL, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ Lock(GetSubscriptionClient());
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ writer.Init(pMsgBuf);
+
+ err = writer.PutNull(AnonymousTag);
+ SuccessOrExit(err);
+
+ err = writer.Finalize();
+ SuccessOrExit(err);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ UpdateTLVDataMap(propertyPathHandle, pMsgBuf);
+ pMsgBuf = NULL;
+ err = SetUpdated(GetSubscriptionClient(), propertyPathHandle, aIsConditional);
+ Unlock(GetSubscriptionClient());
+
+ WeaveLogDetail(DataManagement, "<set updated> in 0x%08x", propertyPathHandle);
+
+exit:
+ WeaveLogFunctError(err);
+
+ if (NULL != pMsgBuf)
+ {
+ PacketBuffer::Free(pMsgBuf);
+ pMsgBuf = NULL;
+ }
+
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetLeafBytes(const char * apPath, const uint8_t * dataBuf, size_t dataLen, bool aIsConditional)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVWriter writer;
+ nl::Weave::TLV::TLVReader reader;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+ PacketBuffer *pMsgBuf = PacketBuffer::New();
+ VerifyOrExit(NULL != pMsgBuf, err = WEAVE_ERROR_NO_MEMORY);
+
+ VerifyOrExit(GetSubscriptionClient() != NULL, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ Lock(GetSubscriptionClient());
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ writer.Init(pMsgBuf);
+
+ reader.Init(dataBuf, dataLen);
+ reader.Next();
+ writer.CopyElement(AnonymousTag, reader);
+
+ err = writer.Finalize();
+ SuccessOrExit(err);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ UpdateTLVDataMap(propertyPathHandle, pMsgBuf);
+ pMsgBuf = NULL;
+ err = SetUpdated(GetSubscriptionClient(), propertyPathHandle, aIsConditional);
+ Unlock(GetSubscriptionClient());
+
+ WeaveLogDetail(DataManagement, "<set updated> in 0x%08x", propertyPathHandle);
+
+exit:
+ WeaveLogFunctError(err);
+
+ if (NULL != pMsgBuf)
+ {
+ PacketBuffer::Free(pMsgBuf);
+ pMsgBuf = NULL;
+ }
+
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::SetBytes(const char * apPath, const uint8_t * dataBuf, size_t dataLen, bool aIsConditional)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ TLVReader reader;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+ TraitSchemaEngine::ISetDataDelegate *setDataDelegate = NULL;
+
+ VerifyOrExit(GetSubscriptionClient() != NULL, err = WEAVE_ERROR_INCORRECT_STATE);
+ Lock(GetSubscriptionClient());
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ reader.Init(dataBuf, dataLen);
+ err = reader.Next();
+ SuccessOrExit(err);
+
+ setDataDelegate = static_cast<TraitSchemaEngine::ISetDataDelegate *>(this);
+ err = GetSchemaEngine()->StoreData(propertyPathHandle, reader, setDataDelegate, NULL);
+ SuccessOrExit(err);
+
+ err = SetUpdated(GetSubscriptionClient(), propertyPathHandle, aIsConditional);
+
+ Unlock(GetSubscriptionClient());
+ WeaveLogDetail(DataManagement, "<set updated> in 0x%08x", propertyPathHandle);
+
+exit:
+ WeaveLogFunctError(err);
+
+ return err;
+}
+
+template <class T>
+WEAVE_ERROR GenericTraitUpdatableDataSink::Set(const char * apPath, T aValue, bool aIsConditional)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVWriter writer;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+ PacketBuffer *pMsgBuf = PacketBuffer::New();
+ VerifyOrExit(NULL != pMsgBuf, err = WEAVE_ERROR_NO_MEMORY);
+
+ VerifyOrExit(GetSubscriptionClient() != NULL, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ Lock(GetSubscriptionClient());
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ writer.Init(pMsgBuf);
+
+ err = writer.Put(AnonymousTag, aValue);
+ SuccessOrExit(err);
+
+ err = writer.Finalize();
+ SuccessOrExit(err);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ UpdateTLVDataMap(propertyPathHandle, pMsgBuf);
+ pMsgBuf = NULL;
+
+ err = SetUpdated(GetSubscriptionClient(), propertyPathHandle, aIsConditional);
+ Unlock(GetSubscriptionClient());
+
+ WeaveLogDetail(DataManagement, "<set updated> in 0x%08x", propertyPathHandle);
+
+exit:
+ WeaveLogFunctError(err);
+
+ if (NULL != pMsgBuf)
+ {
+ PacketBuffer::Free(pMsgBuf);
+ pMsgBuf = NULL;
+ }
+
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetData(const char * apPath, int64_t& aValue)
+{
+ return Get(apPath, aValue);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetData(const char * apPath, uint64_t& aValue)
+{
+ return Get(apPath, aValue);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetData(const char * apPath, double& aValue)
+{
+ return Get(apPath, aValue);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetBoolean(const char * apPath, bool& aValue)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVReader reader;
+ PacketBuffer *pMsgBuf = NULL;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;;
+ std::map<PropertyPathHandle, PacketBuffer *>::iterator it;
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ it = mPathTlvDataMap.find(propertyPathHandle);
+ VerifyOrExit(it != mPathTlvDataMap.end(), err = WEAVE_ERROR_INCORRECT_STATE);
+
+ pMsgBuf = mPathTlvDataMap[propertyPathHandle];
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ reader.Init(pMsgBuf);
+ err = reader.Next();
+ SuccessOrExit(err);
+
+ err = reader.Get(aValue);
+ SuccessOrExit(err);
+
+exit:
+ WeaveLogFunctError(err);
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetString(const char * apPath, char * aValue)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVReader reader;
+ PacketBuffer *pMsgBuf = NULL;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;;
+ std::map<PropertyPathHandle, PacketBuffer *>::iterator it;
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ it = mPathTlvDataMap.find(propertyPathHandle);
+ VerifyOrExit(it != mPathTlvDataMap.end(), err = WEAVE_ERROR_INCORRECT_STATE);
+
+ pMsgBuf = mPathTlvDataMap[propertyPathHandle];
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ reader.Init(pMsgBuf);
+ err = reader.Next();
+ SuccessOrExit(err);
+
+ err = reader.GetString(aValue, sizeof(aValue));
+ SuccessOrExit(err);
+
+exit:
+ WeaveLogFunctError(err);
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetLeafBytes(const char * apPath, ConstructBytesArrayFunct aCallback)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVReader reader;
+ PacketBuffer *pMsgBuf = NULL;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;;
+ std::map<PropertyPathHandle, PacketBuffer *>::iterator it;
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ it = mPathTlvDataMap.find(propertyPathHandle);
+ VerifyOrExit(it != mPathTlvDataMap.end(), err = WEAVE_ERROR_INCORRECT_STATE);
+
+ pMsgBuf = mPathTlvDataMap[propertyPathHandle];
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ aCallback(pMsgBuf->Start(), pMsgBuf->DataLength());
+
+exit:
+ WeaveLogFunctError(err);
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetBytes(const char * apPath, ConstructBytesArrayFunct aCallback)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ TraitSchemaEngine::IGetDataDelegate *getDataDelegate = NULL;
+ TLVType dummyContainerType;
+ nl::Weave::TLV::TLVWriter writer;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+
+ PacketBuffer *pMsgBuf = PacketBuffer::New();
+ VerifyOrExit(NULL != pMsgBuf, err = WEAVE_ERROR_NO_MEMORY);
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ writer.Init(pMsgBuf);
+ err = writer.StartContainer(AnonymousTag, kTLVType_Structure, dummyContainerType);
+ SuccessOrExit(err);
+
+ getDataDelegate = static_cast<TraitSchemaEngine::IGetDataDelegate *>(this);
+ err = GetSchemaEngine()->RetrieveData(propertyPathHandle, ContextTag(DataElement::kCsTag_Data), writer, getDataDelegate);
+ SuccessOrExit(err);
+
+ err = writer.EndContainer(dummyContainerType);
+ SuccessOrExit(err);
+
+ err = writer.Finalize();
+ SuccessOrExit(err);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ aCallback(pMsgBuf->Start(), pMsgBuf->DataLength());
+
+exit:
+ WeaveLogFunctError(err);
+
+ if (NULL != pMsgBuf)
+ {
+ PacketBuffer::Free(pMsgBuf);
+ pMsgBuf = NULL;
+ }
+
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::IsNull(const char * apPath, bool & aIsNull)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVReader reader;
+ PacketBuffer *pMsgBuf = NULL;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;;
+ std::map<PropertyPathHandle, PacketBuffer *>::iterator it;
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ it = mPathTlvDataMap.find(propertyPathHandle);
+ VerifyOrExit(it != mPathTlvDataMap.end(), err = WEAVE_ERROR_INCORRECT_STATE);
+
+ pMsgBuf = mPathTlvDataMap[propertyPathHandle];
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ reader.Init(pMsgBuf);
+ err = reader.Next();
+ SuccessOrExit(err);
+
+ if (reader.GetType() == kTLVElementType_Null)
+ {
+ aIsNull = true;
+ }
+ else {
+ aIsNull = false;
+ }
+
+exit:
+ WeaveLogFunctError(err);
+ return err;
+}
+
+template <class T>
+WEAVE_ERROR GenericTraitUpdatableDataSink::Get(const char * apPath, T &aValue)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVReader reader;
+ PacketBuffer *pMsgBuf = NULL;
+ PropertyPathHandle propertyPathHandle = kNullPropertyPathHandle;
+ std::map<PropertyPathHandle, PacketBuffer *>::iterator it;
+
+ err = GetSchemaEngine()->MapPathToHandle(apPath, propertyPathHandle);
+ SuccessOrExit(err);
+
+ it = mPathTlvDataMap.find(propertyPathHandle);
+ VerifyOrExit(it != mPathTlvDataMap.end(), err = WEAVE_ERROR_INCORRECT_STATE);
+
+ pMsgBuf = mPathTlvDataMap[propertyPathHandle];
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ reader.Init(pMsgBuf);
+ err = reader.Next();
+ SuccessOrExit(err);
+
+ err = reader.Get(aValue);
+ SuccessOrExit(err);
+
+exit:
+ WeaveLogFunctError(err);
+ return err;
+}
+
+WEAVE_ERROR
+GenericTraitUpdatableDataSink::SetLeafData(PropertyPathHandle aLeafHandle, TLVReader &aReader)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVWriter writer;
+ PacketBuffer *pMsgBuf = PacketBuffer::New();
+ VerifyOrExit(NULL != pMsgBuf, err = WEAVE_ERROR_NO_MEMORY);
+
+ writer.Init(pMsgBuf);
+
+ err = writer.CopyElement(AnonymousTag, aReader);
+ SuccessOrExit(err);
+
+ err = writer.Finalize();
+ SuccessOrExit(err);
+
+ UpdateTLVDataMap(aLeafHandle, pMsgBuf);
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ pMsgBuf = NULL;
+
+exit:
+ WeaveLogFunctError(err);
+
+ if (NULL != pMsgBuf)
+ {
+ PacketBuffer::Free(pMsgBuf);
+ pMsgBuf = NULL;
+ }
+
+ return err;
+}
+
+WEAVE_ERROR
+GenericTraitUpdatableDataSink::GetLeafData(PropertyPathHandle aLeafHandle, uint64_t aTagToWrite, TLVWriter &aWriter)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVReader reader;
+ PacketBuffer *pMsgBuf = NULL;
+
+ std::map<PropertyPathHandle, PacketBuffer *>::iterator it = mPathTlvDataMap.find(aLeafHandle);
+
+ VerifyOrExit(it != mPathTlvDataMap.end(), err = WEAVE_ERROR_INCORRECT_STATE);
+
+ pMsgBuf = mPathTlvDataMap[aLeafHandle];
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ err = DebugPrettyPrint(pMsgBuf);
+ SuccessOrExit(err);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ reader.Init(pMsgBuf);
+ err = reader.Next();
+ SuccessOrExit(err);
+ err = aWriter.CopyElement(aTagToWrite, reader);
+ SuccessOrExit(err);
+
+exit:
+ WeaveLogFunctError(err);
+ return err;
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::GetNextDictionaryItemKey(PropertyPathHandle aDictionaryHandle, uintptr_t &aContext, PropertyDictionaryKey &aKey)
+{
+ return WEAVE_END_OF_INPUT;
+}
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+void GenericTraitUpdatableDataSink::TLVPrettyPrinter(const char *aFormat, ...)
+{
+ va_list args;
+
+ va_start(args, aFormat);
+
+ vprintf(aFormat, args);
+
+ va_end(args);
+}
+
+WEAVE_ERROR GenericTraitUpdatableDataSink::DebugPrettyPrint(PacketBuffer *apMsgBuf)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVReader reader;
+ reader.Init(apMsgBuf);
+ err = reader.Next();
+ SuccessOrExit(err);
+ nl::Weave::TLV::Debug::Dump(reader, TLVPrettyPrinter);
+
+exit:
+ if (WEAVE_NO_ERROR != err)
+ {
+ WeaveLogProgress(DataManagement, "DebugPrettyPrint fails with err %d", err);
+ }
+
+ return err;
+}
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+const nl::Weave::ExchangeContext::Timeout kResponseTimeoutMsec = 15000;
+
+WDMClient::WDMClient() :
+ mpAppState(NULL),
+ mpPublisherPathList(NULL),
+ mpSubscriptionClient(NULL),
+ mpMsgLayer(NULL),
+ mpAppReqState(NULL)
+{
+ State = kState_NotInitialized;
+}
+
+void WDMClient::Close(void)
+{
+ if (mpSubscriptionClient != NULL)
+ {
+ mpSubscriptionClient->DiscardUpdates();
+ mpSubscriptionClient->Free();
+ mpSubscriptionClient = NULL;
+ }
+
+ mSinkCatalog.Iterate(ClearDataSink, this);
+
+ mSinkCatalog.Clear();
+ if (mpPublisherPathList != NULL)
+ {
+ delete[] mpPublisherPathList;
+ mpPublisherPathList = NULL;
+ }
+
+ mpAppState = NULL;
+ mpMsgLayer = NULL;
+ mpAppReqState = NULL;
+ mOnError = NULL;
+
+ State = kState_NotInitialized;
+ ClearOpState();
+}
+
+void WDMClient::ClearDataSink(void * aTraitInstance, TraitDataHandle aHandle, void * aContext)
+{
+ GenericTraitUpdatableDataSink * pGenericTraitUpdatableDataSink = NULL;
+ if (aTraitInstance != NULL)
+ {
+ pGenericTraitUpdatableDataSink = static_cast<GenericTraitUpdatableDataSink *>(aTraitInstance);
+ delete pGenericTraitUpdatableDataSink;
+ pGenericTraitUpdatableDataSink = NULL;
+ }
+}
+
+void WDMClient::ClientEventCallback (void * const aAppState, SubscriptionClient::EventID aEvent,
+ const SubscriptionClient::InEventParam & aInParam, SubscriptionClient::OutEventParam & aOutParam)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ WDMClient * const pWDMDMClient = reinterpret_cast<WDMClient *>(aAppState);
+
+ OpState savedOpState = pWDMDMClient->mOpState;
+ WeaveLogDetail(DataManagement, "WDM ClientEventCallback: current op is, %d", savedOpState);
+
+ switch (aEvent)
+ {
+ case SubscriptionClient::kEvent_OnExchangeStart:
+ WeaveLogDetail(DataManagement, "Client->kEvent_OnExchangeStart");
+ break;
+ case SubscriptionClient::kEvent_OnSubscribeRequestPrepareNeeded:
+ WeaveLogDetail(DataManagement, "Client->kEvent_OnSubscribeRequestPrepareNeeded");
+ VerifyOrExit(kOpState_RefreshData == savedOpState, err = WEAVE_ERROR_INCORRECT_STATE);
+ {
+ uint16_t pathListLen = 0;
+ uint16_t traitListLen = 0;
+ TraitDataHandle handle;
+ bool NeedSubscribeAll = true;
+
+ if (pWDMDMClient->mGetDataHandle != NULL && pWDMDMClient->mpAppState != NULL)
+ {
+ traitListLen = 1;
+ err = pWDMDMClient->mGetDataHandle(pWDMDMClient->mpAppState, &pWDMDMClient->mSinkCatalog, handle);
+ SuccessOrExit(err);
+ NeedSubscribeAll = false;
+ }
+ else
+ {
+ NeedSubscribeAll = true;
+ traitListLen = pWDMDMClient->mSinkCatalog.Count();
+ }
+
+ if (traitListLen == 0)
+ {
+ err = WEAVE_ERROR_INCORRECT_STATE;
+ WeaveLogDetail(DataManagement, "subscribe none trait data sink");
+ SuccessOrExit(err);
+ }
+
+ if (pWDMDMClient->mpPublisherPathList == NULL)
+ {
+ pWDMDMClient->mpPublisherPathList = new TraitPath[traitListLen];
+ }
+ else
+ {
+ delete[] pWDMDMClient->mpPublisherPathList;
+ pWDMDMClient->mpPublisherPathList = new TraitPath[traitListLen];
+ }
+
+ pWDMDMClient->mSinkCatalog.PrepareSubscriptionPathList(pWDMDMClient->mpPublisherPathList,
+ traitListLen,
+ pathListLen, handle, NeedSubscribeAll);
+
+ aOutParam.mSubscribeRequestPrepareNeeded.mPathList = pWDMDMClient->mpPublisherPathList;
+ aOutParam.mSubscribeRequestPrepareNeeded.mPathListSize = pathListLen;
+ aOutParam.mSubscribeRequestPrepareNeeded.mNeedAllEvents = false;
+ aOutParam.mSubscribeRequestPrepareNeeded.mLastObservedEventList = NULL;
+ aOutParam.mSubscribeRequestPrepareNeeded.mLastObservedEventListSize = 0;
+ aOutParam.mSubscribeRequestPrepareNeeded.mTimeoutSecMin = 30;
+ aOutParam.mSubscribeRequestPrepareNeeded.mTimeoutSecMax = 3600;
+ }
+ break;
+
+ case SubscriptionClient::kEvent_OnSubscriptionEstablished:
+ WeaveLogDetail(DataManagement, "Client->kEvent_OnSubscriptionEstablished");
+ pWDMDMClient->mpSubscriptionClient->AbortSubscription();
+ VerifyOrExit(kOpState_RefreshData == pWDMDMClient->mOpState, err = WEAVE_ERROR_INCORRECT_STATE);
+ pWDMDMClient->ClearOpState();
+ pWDMDMClient->mOnComplete.General(pWDMDMClient, pWDMDMClient->mpAppReqState);
+ break;
+ case SubscriptionClient::kEvent_OnNotificationRequest:
+ WeaveLogDetail(DataManagement, "Client->kEvent_OnNotificationRequest");
+ VerifyOrExit(kOpState_RefreshData == pWDMDMClient->mOpState, err = WEAVE_ERROR_INCORRECT_STATE);
+ break;
+ case SubscriptionClient::kEvent_OnNotificationProcessed:
+ WeaveLogDetail(DataManagement, "Client->kEvent_OnNotificationProcessed");
+ VerifyOrExit(kOpState_RefreshData == pWDMDMClient->mOpState, err = WEAVE_ERROR_INCORRECT_STATE);
+ break;
+ case SubscriptionClient::kEvent_OnSubscriptionTerminated:
+ WeaveLogDetail(DataManagement, "Client->kEvent_OnSubscriptionTerminated. Reason: %u, peer = 0x%" PRIX64 "\n",
+ aInParam.mSubscriptionTerminated.mReason,
+ aInParam.mSubscriptionTerminated.mClient->GetPeerNodeId());
+ pWDMDMClient->mpSubscriptionClient->AbortSubscription();
+ err = WEAVE_ERROR_INCORRECT_STATE;
+ break;
+ case SubscriptionClient::kEvent_OnUpdateComplete:
+ if ((aInParam.mUpdateComplete.mReason == WEAVE_NO_ERROR) && (nl::Weave::Profiles::kWeaveProfile_Common == aInParam.mUpdateComplete.mStatusProfileId) && (nl::Weave::Profiles::Common::kStatus_Success == aInParam.mUpdateComplete.mStatusCode))
+ {
+ WeaveLogDetail(DataManagement, "Update: path result: success");
+ }
+ else
+ {
+ WeaveLogDetail(DataManagement, "Update: path failed: %s, %s, tdh %" PRIu16", will %sretry, discard failed change",
+ ErrorStr(aInParam.mUpdateComplete.mReason),
+ nl::StatusReportStr(aInParam.mUpdateComplete.mStatusProfileId, aInParam.mUpdateComplete.mStatusCode),
+ aInParam.mUpdateComplete.mTraitDataHandle,
+ aInParam.mUpdateComplete.mWillRetry ? "" : "not ");
+ pWDMDMClient->mpSubscriptionClient->DiscardUpdates();
+ }
+
+ break;
+ case SubscriptionClient::kEvent_OnNoMorePendingUpdates:
+ WeaveLogDetail(DataManagement, "Update: no more pending updates");
+ VerifyOrExit(kOpState_FlushUpdate == savedOpState, err = WEAVE_ERROR_INCORRECT_STATE);
+ pWDMDMClient->ClearOpState();
+ pWDMDMClient->mOnComplete.General(pWDMDMClient, pWDMDMClient->mpAppReqState);
+ break;
+
+ default:
+ SubscriptionClient::DefaultEventHandler(aEvent, aInParam, aOutParam);
+ break;
+ }
+
+exit:
+ if (WEAVE_NO_ERROR != err)
+ {
+ pWDMDMClient->ClearOpState();
+ WeaveLogError(DataManagement, "WDM ClientEventCallback failure: err = %d", err);
+ pWDMDMClient->mOnError(pWDMDMClient, pWDMDMClient->mpAppReqState, err, NULL);
+ }
+
+ return;
+}
+
+WEAVE_ERROR WDMClient::Init( WeaveMessageLayer * apMsgLayer, Binding * apBinding)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ mpMsgLayer = apMsgLayer;
+
+ VerifyOrExit(State == kState_NotInitialized, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ if (mpSubscriptionClient == NULL)
+ {
+ err = SubscriptionEngine::GetInstance()->NewClient(&mpSubscriptionClient,
+ apBinding,
+ this,
+ ClientEventCallback,
+ &mSinkCatalog,
+ kResponseTimeoutMsec * 2); // max num of msec between subscribe request and subscribe response
+ SuccessOrExit(err);
+ }
+
+ mpSubscriptionClient->EnableResubscribe(NULL);
+
+ State = kState_Initialized;
+ ClearOpState();
+
+exit:
+ return WEAVE_NO_ERROR;
+}
+
+WEAVE_ERROR WDMClient::NewDataSink(const ResourceIdentifier & aResourceId, uint32_t aProfileId, uint64_t aInstanceId, const char * apPath, GenericTraitUpdatableDataSink *& apGenericTraitUpdatableDataSink)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ PropertyPathHandle handle = kNullPropertyPathHandle;
+
+ const TraitSchemaEngine * pEngine = TraitSchemaDirectory::GetTraitSchemaEngine(aProfileId);
+ VerifyOrExit(pEngine != NULL, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ VerifyOrExit(WEAVE_NO_ERROR != GetDataSink(aResourceId, aProfileId, aInstanceId, apGenericTraitUpdatableDataSink), WeaveLogDetail(DataManagement, "Trait exist"));
+
+ apGenericTraitUpdatableDataSink = new GenericTraitUpdatableDataSink(pEngine);
+ VerifyOrExit(apGenericTraitUpdatableDataSink != NULL, err = WEAVE_ERROR_NO_MEMORY);
+
+ if (apPath == NULL)
+ {
+ handle = kRootPropertyPathHandle;
+ }
+ else
+ {
+ apGenericTraitUpdatableDataSink->GetSchemaEngine()->MapPathToHandle(apPath, handle);
+ }
+
+ err = SubscribePublisherTrait(aResourceId, aInstanceId, handle, apGenericTraitUpdatableDataSink);
+ SuccessOrExit(err);
+
+ apGenericTraitUpdatableDataSink->SetSubscriptionClient(mpSubscriptionClient);
+
+exit:
+ return err;
+}
+
+WEAVE_ERROR WDMClient::GetDataSink(const ResourceIdentifier & aResourceId, uint32_t aProfileId, uint64_t aInstanceId, GenericTraitUpdatableDataSink *& apGenericTraitUpdatableDataSink)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ TraitDataSink * dataSink = NULL;
+ err = mSinkCatalog.Locate(aProfileId, aInstanceId, aResourceId, &dataSink);
+ SuccessOrExit(err);
+ apGenericTraitUpdatableDataSink = static_cast<GenericTraitUpdatableDataSink *>(dataSink);
+
+exit:
+ return err;
+}
+
+WEAVE_ERROR WDMClient::FlushUpdate(void* appReqState, void* aAppState, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ VerifyOrExit(mOpState == kOpState_Idle, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ mpAppReqState = appReqState;
+ mOnComplete.General = onComplete;
+ mOnError = onError;
+ mOpState = kOpState_FlushUpdate;
+
+ err = mpSubscriptionClient->FlushUpdate();
+ SuccessOrExit(err);
+
+exit:
+ if (err != WEAVE_NO_ERROR)
+ {
+ WeaveLogError(DataManagement, "FlushUpdate with: err = %d with OpState %d", err, mOpState);
+ ClearOpState();
+ mpAppReqState = NULL;
+ }
+
+ return err;
+}
+
+WEAVE_ERROR WDMClient::RefreshData(void* appReqState, void* aAppState, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError, GetDataHandleFunct getDataHandleCb)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ VerifyOrExit(mOpState == kOpState_Idle, err = WEAVE_ERROR_INCORRECT_STATE);
+
+ mpAppState = aAppState;
+ mpAppReqState = appReqState;
+ mOnComplete.General = onComplete;
+ mOnError = onError;
+ mOpState = kOpState_RefreshData;
+ mGetDataHandle = getDataHandleCb;
+
+ mpSubscriptionClient->InitiateSubscription();
+
+exit:
+ if (err != WEAVE_NO_ERROR)
+ {
+ WeaveLogError(DataManagement, "RefreshData with: err = %d with OpState %d", err, mOpState);
+ ClearOpState();
+ mpAppReqState = NULL;
+ }
+
+ return err;
+}
+
+void WDMClient::ClearOpState()
+{
+ mOpState = kOpState_Idle;
+}
+
+WEAVE_ERROR WDMClient::SubscribePublisherTrait(const ResourceIdentifier & aResourceId, const uint64_t & aInstanceId,
+ PropertyPathHandle aBasePathHandle, TraitDataSink * apDataSink)
+{
+ TraitDataHandle traitHandle;
+ return mSinkCatalog.Add(aResourceId, aInstanceId, aBasePathHandle, apDataSink, traitHandle);
+}
+
+WEAVE_ERROR WDMClient::UnsubscribePublisherTrait(TraitDataSink * apDataSink)
+{
+ return mSinkCatalog.Remove(apDataSink);
+}
+
+} // namespace DeviceManager
+} // namespace Weave
+} // namespace nl
+
+namespace nl {
+namespace Weave {
+namespace Profiles {
+namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNamespaceDesignation_Current) {
+
+SubscriptionEngine * SubscriptionEngine::GetInstance()
+{
+ static nl::Weave::Profiles::DataManagement::SubscriptionEngine gWdmSubscriptionEngine;
+ return &gWdmSubscriptionEngine;
+}
+
+namespace Platform {
+ void CriticalSectionEnter()
+ {
+ return;
+ }
+
+ void CriticalSectionExit()
+ {
+ return;
+ }
+
+} // Platform
+
+} // WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNamespaceDesignation_Current)
+} // Profiles
+} // Weave
+} // nl
diff --git a/src/device-manager/WeaveDataManagementClient.h b/src/device-manager/WeaveDataManagementClient.h
new file mode 100644
index 0000000..02ded2c
--- /dev/null
+++ b/src/device-manager/WeaveDataManagementClient.h
@@ -0,0 +1,182 @@
+/*
+ *
+ * Copyright (c) 2019 Google, LLC.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * Generic trait data sinks which use map to store trait data inside, and provide a list of set/get public API for
+ * application use
+ */
+
+#ifndef WEAVE_DATA_MANAGEMENT_CLIENT_H_
+#define WEAVE_DATA_MANAGEMENT_CLIENT_H_
+
+#include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
+
+#include <Weave/Support/NLDLLUtil.h>
+#include <Weave/Core/WeaveCore.h>
+#include <Weave/Core/WeaveTLV.h>
+#include <Weave/Profiles/common/WeaveMessage.h>
+#include <Weave/Profiles/data-management/DataManagement.h>
+#include <Weave/Profiles/security/WeaveSecurity.h>
+#include <Weave/Profiles/security/WeaveCASE.h>
+#include <Weave/Profiles/security/WeaveSig.h>
+#include <Weave/Profiles/service-directory/ServiceDirectory.h>
+#include <Weave/Profiles/status-report/StatusReportProfile.h>
+#include <SystemLayer/SystemPacketBuffer.h>
+#include <Weave/Profiles/data-management/SubscriptionClient.h>
+#include <map>
+
+namespace nl {
+namespace Weave {
+namespace DeviceManager {
+
+using namespace nl::Weave::Encoding;
+using namespace nl::Weave::Profiles;
+using namespace nl::Weave::Profiles::DataManagement;
+using namespace nl::Weave::Profiles::Security;
+using namespace ::nl::Weave::Profiles::DataManagement_Current;
+
+class GenericTraitUpdatableDataSink;
+class WDMClient;
+class DeviceStatus;
+
+extern "C"
+{
+typedef void (*WDMClientCompleteFunct)(WDMClient *wdmClient, void *appReqState);
+typedef void (*WDMClientErrorFunct)(WDMClient *wdmClient, void *appReqState, WEAVE_ERROR err, DeviceStatus *devStatus);
+typedef void (*ConstructBytesArrayFunct)(const uint8_t *dataBuf, uint32_t dataLen);
+typedef WEAVE_ERROR (*GetDataHandleFunct)(void* appReqState, const TraitCatalogBase<TraitDataSink> * const apCatalog, TraitDataHandle & aHandle);
+};
+
+class NL_DLL_EXPORT GenericTraitUpdatableDataSink : public nl::Weave::Profiles::DataManagement::TraitUpdatableDataSink
+{
+ friend class WDMClient;
+
+private:
+ GenericTraitUpdatableDataSink(const nl::Weave::Profiles::DataManagement::TraitSchemaEngine * aEngine);
+ ~GenericTraitUpdatableDataSink(void);
+
+public:
+ void Close(void);
+
+ WEAVE_ERROR RefreshData(void *appReqState, WDMClient* apWDMClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError);
+
+ WEAVE_ERROR SetData(const char * apPath, int64_t aValue, bool aIsConditional=false);
+ WEAVE_ERROR SetData(const char * apPath, uint64_t aValue, bool aIsConditional=false);
+ WEAVE_ERROR SetData(const char * apPath, double aValue, bool aIsConditional=false);
+
+ WEAVE_ERROR SetBoolean(const char * apPath, bool aValue, bool aIsConditional=false);
+ WEAVE_ERROR SetString(const char * apPath, const char * aValue, bool aIsConditional=false);
+ WEAVE_ERROR SetNull(const char * apPath, bool aIsConditional=false);
+ WEAVE_ERROR SetLeafBytes(const char * apPath, const uint8_t * dataBuf, size_t dataLen, bool aIsConditional=false);
+ WEAVE_ERROR SetBytes(const char * apPath, const uint8_t * dataBuf, size_t dataLen, bool aIsConditional=false);
+
+ WEAVE_ERROR GetData(const char * apPath, int64_t& aValue);
+ WEAVE_ERROR GetData(const char * apPath, uint64_t& aValue);
+ WEAVE_ERROR GetData(const char * apPath, double& aValue);
+
+ WEAVE_ERROR GetBoolean(const char * apPath, bool& aValue);
+ WEAVE_ERROR GetString(const char * apPath, char * aValue);
+ WEAVE_ERROR GetLeafBytes(const char * apPath, ConstructBytesArrayFunct aCallback);
+ WEAVE_ERROR GetBytes(const char * apPath, ConstructBytesArrayFunct aCallback);
+ WEAVE_ERROR IsNull(const char * apPath, bool & aIsNull);
+
+private:
+
+ template <class T> WEAVE_ERROR Set(const char * apPath, T aValue, bool aIsConditional=false);
+ template <class T> WEAVE_ERROR Get(const char * apPath, T &aValue);
+
+ WEAVE_ERROR SetLeafData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aLeafHandle, nl::Weave::TLV::TLVReader &aReader) __OVERRIDE;
+ WEAVE_ERROR GetLeafData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aLeafHandle, uint64_t aTagToWrite, nl::Weave::TLV::TLVWriter &aWriter) __OVERRIDE;
+ WEAVE_ERROR GetNextDictionaryItemKey(nl::Weave::Profiles::DataManagement::PropertyPathHandle aDictionaryHandle, uintptr_t &aContext, nl::Weave::Profiles::DataManagement::PropertyDictionaryKey &aKey) __OVERRIDE;
+
+ void UpdateTLVDataMap(PropertyPathHandle aPropertyPathHandle, PacketBuffer *apMsgBuf);
+ static WEAVE_ERROR LocateTraitHandle(void* appReqState, const TraitCatalogBase<TraitDataSink> * const apCatalog, TraitDataHandle & aHandle);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ static void TLVPrettyPrinter(const char *aFormat, ...);
+ static WEAVE_ERROR DebugPrettyPrint(PacketBuffer *apMsgBuf);
+#endif //WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ std::map<PropertyPathHandle, PacketBuffer *> mPathTlvDataMap;
+};
+
+class NL_DLL_EXPORT WDMClient
+{
+public:
+ enum
+ {
+ kState_NotInitialized = 0,
+ kState_Initialized = 1
+ } State; // [READ-ONLY] Current state
+
+ WDMClient(void);
+
+ WEAVE_ERROR Init(WeaveMessageLayer * apMsgLayer, Binding * apBinding);
+
+ void Close(void);
+
+ WEAVE_ERROR NewDataSink(const ResourceIdentifier & aResourceId, uint32_t aProfileId, uint64_t aInstanceId, const char * apPath, GenericTraitUpdatableDataSink *& apGenericTraitUpdatableDataSink);
+
+ WEAVE_ERROR FlushUpdate(void* appReqState, void* aAppState, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError);
+
+ WEAVE_ERROR RefreshData(void* appReqState, void* aAppState, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError, GetDataHandleFunct getDataHandleCb);
+
+ void *mpAppState;
+
+private:
+ enum OpState
+ {
+ kOpState_Idle = 0,
+ kOpState_FlushUpdate = 1,
+ kOpState_RefreshData = 2,
+ };
+
+ void ClearOpState();
+
+ union
+ {
+ WDMClientCompleteFunct General;
+ } mOnComplete;
+ WDMClientErrorFunct mOnError;
+ GetDataHandleFunct mGetDataHandle;
+
+ static void ClearDataSink(void * aTraitInstance, TraitDataHandle aHandle, void * aContext);
+ static void ClientEventCallback (void * const aAppState, SubscriptionClient::EventID aEvent,
+ const SubscriptionClient::InEventParam & aInParam, SubscriptionClient::OutEventParam & aOutParam);
+
+ WEAVE_ERROR GetDataSink(const ResourceIdentifier & aResourceId, uint32_t aProfileId, uint64_t aInstanceId, GenericTraitUpdatableDataSink *& apGenericTraitUpdatableDataSink);
+ WEAVE_ERROR SubscribePublisherTrait(const ResourceIdentifier & aResourceId, const uint64_t & aInstanceId,
+ PropertyPathHandle aBasePathHandle, TraitDataSink * apDataSink);
+
+ WEAVE_ERROR UnsubscribePublisherTrait(TraitDataSink * apDataSink);
+
+ //GenericTraitUpdatableDataSink *mpGenericTraitUpdatableDataSink;
+ GenericTraitSinkCatalog mSinkCatalog;
+ TraitPath* mpPublisherPathList;
+
+ SubscriptionClient * mpSubscriptionClient;
+ WeaveMessageLayer *mpMsgLayer;
+ void *mpAppReqState;
+ OpState mOpState;
+};
+} // namespace DeviceManager
+} // namespace Weave
+} // namespace nl
+
+#endif // WEAVE_DATA_MANAGEMENT_CLIENT_H_
diff --git a/src/device-manager/WeaveDeviceManager.cpp b/src/device-manager/WeaveDeviceManager.cpp
index d76336a..587b2b4 100644
--- a/src/device-manager/WeaveDeviceManager.cpp
+++ b/src/device-manager/WeaveDeviceManager.cpp
@@ -32,6 +32,8 @@
#include <errno.h>
#include <time.h>
+#include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
+
#include <Weave/Core/WeaveCore.h>
#include <Weave/Support/Base64.h>
#include <Weave/Support/CodeUtils.h>
@@ -42,6 +44,7 @@
#include <Weave/Profiles/network-provisioning/NetworkProvisioning.h>
#include <Weave/Profiles/service-provisioning/ServiceProvisioning.h>
#include <Weave/Profiles/fabric-provisioning/FabricProvisioning.h>
+#include <Weave/Profiles/data-management/DataManagement.h>
#include <Weave/Profiles/device-description/DeviceDescription.h>
#include <Weave/Profiles/device-control/DeviceControl.h>
#include <Weave/Profiles/vendor/nestlabs/device-description/NestProductIdentifiers.hpp>
@@ -63,7 +66,9 @@
using namespace nl::Weave::Encoding;
using namespace nl::Weave::Profiles;
+using namespace nl::Weave::Profiles::DataManagement;
using namespace nl::Weave::Profiles::DeviceDescription;
+using namespace nl::Weave::Profiles::Locale;
using namespace nl::Weave::Profiles::NetworkProvisioning;
using namespace nl::Weave::Profiles::Security;
using namespace nl::Weave::Profiles::ServiceProvisioning;
@@ -73,10 +78,13 @@
using namespace nl::Weave::Profiles::Vendor::Nestlabs::Thermostat;
using namespace nl::Weave::TLV;
+const nl::Weave::ExchangeContext::Timeout kResponseTimeoutMsec = 15000;
+
static bool IsProductWildcard(uint16_t productId);
static const uint32_t ENUMERATED_NODES_LIST_INITIAL_SIZE = 256;
+
WeaveDeviceManager *WeaveDeviceManager::sListeningDeviceMgr = NULL;
WeaveDeviceManager::WeaveDeviceManager()
@@ -142,7 +150,6 @@
mEnumeratedNodes = NULL;
mEnumeratedNodesLen = 0;
mEnumeratedNodesMaxLen = 0;
-
// By default, rendezvous messages are sent to the IPv6 link-local, all-nodes multicast address.
mRendezvousAddr = IPAddress::MakeIPv6WellKnownMulticast(kIPv6MulticastScope_Link, kIPV6MulticastGroup_AllNodes);
@@ -5056,6 +5063,40 @@
return WEAVE_NO_ERROR;
}
+WEAVE_ERROR WeaveDeviceManager::ConfigureBinding(Binding * const apBinding)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ nl::Weave::Binding::Configuration bindingConfig = apBinding->BeginConfiguration();
+
+ if (mDeviceCon != NULL)
+ {
+ bindingConfig
+ .Target_NodeId(mDeviceId)
+ .Transport_ExistingConnection(mDeviceCon)
+ .Exchange_ResponseTimeoutMsec(kResponseTimeoutMsec);
+
+ if (mSessionKeyId == WeaveKeyId::kNone)
+ {
+ bindingConfig.Security_None();
+ }
+ else
+ {
+ bindingConfig.Security_Key(mSessionKeyId);
+ bindingConfig.Security_EncryptionType(mEncType);
+ }
+
+ err = bindingConfig.PrepareBinding();
+ }
+ else
+ {
+ WeaveLogDetail(DeviceManager, "apDeviceCon is NULL");
+ err = WEAVE_ERROR_INCORRECT_STATE;
+ }
+
+ return err;
+}
+
bool IsProductWildcard(uint16_t productId)
{
return (productId >= kProductWildcardId_RangeStart && productId <= kProductWildcardId_RangeEnd);
diff --git a/src/device-manager/WeaveDeviceManager.h b/src/device-manager/WeaveDeviceManager.h
index 9633d87..3b85f2d 100644
--- a/src/device-manager/WeaveDeviceManager.h
+++ b/src/device-manager/WeaveDeviceManager.h
@@ -27,11 +27,15 @@
#ifndef __WEAVEDEVICEMANAGER_H
#define __WEAVEDEVICEMANAGER_H
+#include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
+
#include <Weave/Support/NLDLLUtil.h>
#include <Weave/Core/WeaveCore.h>
#include <Weave/Core/WeaveTLV.h>
#include <Weave/Profiles/common/WeaveMessage.h>
+#include <Weave/Profiles/data-management/DataManagement.h>
#include <Weave/Profiles/device-description/DeviceDescription.h>
+#include <Weave/Profiles/locale/LocaleProfile.hpp>
#include <Weave/Profiles/network-provisioning/NetworkProvisioning.h>
#include <Weave/Profiles/network-provisioning/NetworkInfo.h>
#include <Weave/Profiles/security/WeaveSecurity.h>
@@ -48,6 +52,7 @@
namespace DeviceManager {
using namespace nl::Weave::Profiles;
+using namespace nl::Weave::Profiles::DataManagement;
using namespace nl::Weave::Profiles::DeviceDescription;
using namespace nl::Weave::Profiles::Vendor::Nestlabs::DropcamLegacyPairing;
using namespace nl::Weave::Profiles::NetworkProvisioning;
@@ -100,7 +105,6 @@
} State; // [READ-ONLY] Current state
WeaveDeviceManager();
-
void *AppState;
WEAVE_ERROR Init(WeaveExchangeManager *exchangeMsg, WeaveSecurityManager *securityMgr);
@@ -251,6 +255,7 @@
WEAVE_ERROR SetWiFiRendezvousAddress(IPAddress addr); // DEPRECATED -- Use SetRendezvousAddress()
WEAVE_ERROR RendezvousDevice(const char *pairingCode, void* appReqState, CompleteFunct onComplete, ErrorFunct onError);
+ WEAVE_ERROR ConfigureBinding(Binding * const apBinding);
private:
enum OpState
{
@@ -297,7 +302,7 @@
kOpState_UnpairToken = 41,
kOpState_GetCameraAuthData = 42,
kOpState_EnumerateDevices = 43,
- kOpState_RemotePassiveRendezvousTimedOut = 44
+ kOpState_RemotePassiveRendezvousTimedOut = 44,
};
enum ConnectionState
@@ -617,7 +622,6 @@
kProductWildcardId_NestCam = 0xFFF2
};
-
} // namespace DeviceManager
} // namespace Weave
} // namespace nl
diff --git a/src/device-manager/cocoa/Makefile.in b/src/device-manager/cocoa/Makefile.in
index 00d1bd5..63ae9c0 100644
--- a/src/device-manager/cocoa/Makefile.in
+++ b/src/device-manager/cocoa/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -39,7 +39,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -104,11 +114,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/device-manager/cocoa
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(am__libNLWeaveDeviceManager_a_HEADERS_DIST) \
- $(am__noinst_HEADERS_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -127,18 +132,21 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am \
+ $(am__libNLWeaveDeviceManager_a_HEADERS_DIST) \
+ $(am__noinst_HEADERS_DIST) $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -226,7 +234,27 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-Base64Encoding.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLHKDF.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLIdentifyDeviceCriteria.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNetworkInfo.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNevisPairingCodeDecoding.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLPairingCodeUtils.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLProfileStatusError.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLServiceInfo.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveBleDelegate.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveConstants.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceDescriptor.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceManager.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveError.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportClient.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportSupport.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyIds.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveLogging.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeavePasscodeEncryptionSupport.Po \
+ ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveStack.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -290,6 +318,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -379,6 +410,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -538,6 +570,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -636,14 +669,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/device-manager/cocoa/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/device-manager/cocoa/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -697,25 +729,31 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-Base64Encoding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLHKDF.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLIdentifyDeviceCriteria.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNetworkInfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNevisPairingCodeDecoding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLPairingCodeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLProfileStatusError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLServiceInfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveBleDelegate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveConstants.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceDescriptor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyIds.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveLogging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeavePasscodeEncryptionSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveStack.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-Base64Encoding.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLHKDF.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLIdentifyDeviceCriteria.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNetworkInfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNevisPairingCodeDecoding.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLPairingCodeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLProfileStatusError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLServiceInfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveBleDelegate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveConstants.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceDescriptor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyIds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveLogging.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeavePasscodeEncryptionSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveStack.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.mm.o:
@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1086,7 +1124,10 @@
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)'; \
@@ -1159,7 +1200,25 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-Base64Encoding.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLHKDF.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLIdentifyDeviceCriteria.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNetworkInfo.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNevisPairingCodeDecoding.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLPairingCodeUtils.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLProfileStatusError.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLServiceInfo.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveBleDelegate.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveConstants.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceDescriptor.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceManager.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveError.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportClient.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportSupport.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyIds.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveLogging.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeavePasscodeEncryptionSupport.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveStack.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1205,7 +1264,25 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-Base64Encoding.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLHKDF.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLIdentifyDeviceCriteria.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNetworkInfo.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLNevisPairingCodeDecoding.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLPairingCodeUtils.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLProfileStatusError.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLServiceInfo.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveBleDelegate.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveConstants.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceDescriptor.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveDeviceManager.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveError.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportClient.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyExportSupport.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveKeyIds.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveLogging.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeavePasscodeEncryptionSupport.Po
+ -rm -f ./$(DEPDIR)/libNLWeaveDeviceManager_a-NLWeaveStack.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1227,9 +1304,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -1244,6 +1321,8 @@
uninstall-libLIBRARIES \
uninstall-libNLWeaveDeviceManager_aHEADERS
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/device-manager/java/Makefile.in b/src/device-manager/java/Makefile.in
index d98af4e..38c878e 100644
--- a/src/device-manager/java/Makefile.in
+++ b/src/device-manager/java/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -112,9 +122,6 @@
@WEAVE_WITH_ANDROID_TRUE@@WEAVE_WITH_JAVA_TRUE@ $(NULL)
subdir = src/device-manager/java
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -133,18 +140,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -216,7 +224,11 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBleApplicationDelegate.Plo \
+ ./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBlePlatformDelegate.Plo \
+ ./$(DEPDIR)/libWeaveDeviceManager_la-PairingCodeUtils-JNI.Plo \
+ ./$(DEPDIR)/libWeaveDeviceManager_la-WeaveDeviceManager-JNI.Plo
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -262,6 +274,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -351,6 +366,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -510,6 +526,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -603,14 +620,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/device-manager/java/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/device-manager/java/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -666,10 +682,16 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBleApplicationDelegate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBlePlatformDelegate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-PairingCodeUtils-JNI.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-WeaveDeviceManager-JNI.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBleApplicationDelegate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBlePlatformDelegate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-PairingCodeUtils-JNI.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveDeviceManager_la-WeaveDeviceManager-JNI.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -781,7 +803,10 @@
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)'; \
@@ -850,15 +875,18 @@
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@WEAVE_WITH_JAVA_FALSE@uninstall-local:
-@WEAVE_WITH_JAVA_FALSE@install-data-local:
@WEAVE_WITH_JAVA_FALSE@mostlyclean-local:
+@WEAVE_WITH_JAVA_FALSE@install-data-local:
clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBleApplicationDelegate.Plo
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBlePlatformDelegate.Plo
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-PairingCodeUtils-JNI.Plo
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-WeaveDeviceManager-JNI.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -904,7 +932,10 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBleApplicationDelegate.Plo
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-AndroidBlePlatformDelegate.Plo
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-PairingCodeUtils-JNI.Plo
+ -rm -f ./$(DEPDIR)/libWeaveDeviceManager_la-WeaveDeviceManager-JNI.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -925,21 +956,23 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local 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-data-local install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-libLTLIBRARIES \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
- tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
- uninstall-local
+.PHONY: CTAGS GTAGS TAGS all all-am all-local 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-data-local install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-libLTLIBRARIES install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-libLTLIBRARIES uninstall-local
+
+.PRECIOUS: Makefile
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/device-manager/python/Makefile.am b/src/device-manager/python/Makefile.am
index e396a29..ecc2831 100644
--- a/src/device-manager/python/Makefile.am
+++ b/src/device-manager/python/Makefile.am
@@ -31,6 +31,9 @@
openweave_PYTHON = \
openweave/__init__.py \
openweave/WeaveDeviceMgr.py \
+ openweave/WeaveDataManagementClient.py \
+ openweave/WeaveStack.py \
+ openweave/WeaveTLV.py \
openweave/WeaveBleBase.py \
openweave/WeaveCoreBluetoothMgr.py \
openweave/WeaveBluezMgr.py \
diff --git a/src/device-manager/python/Makefile.in b/src/device-manager/python/Makefile.in
index 1a3a6dc..d903e17 100644
--- a/src/device-manager/python/Makefile.in
+++ b/src/device-manager/python/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -41,7 +41,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -119,12 +129,6 @@
@WEAVE_BUILD_INSTALLABLE_PYTHON_PACKAGE_TRUE@ $(NULL)
subdir = src/device-manager/python
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(openweave_PYTHON) \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/py-compile \
- $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -143,18 +147,20 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(openweave_PYTHON) \
+ $(noinst_HEADERS) $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -225,7 +231,10 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BleApplicationDelegate.Plo \
+ ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BlePlatformDelegate.Plo \
+ ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-ScriptBinding.Plo
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -254,7 +263,7 @@
esac
am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
am__pep3147_tweak = \
- sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|'
+ sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
py_compile = $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/py-compile
HEADERS = $(noinst_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -276,6 +285,10 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/py-compile
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -365,6 +378,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -524,6 +538,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -544,6 +559,9 @@
openweave_PYTHON = \
openweave/__init__.py \
openweave/WeaveDeviceMgr.py \
+ openweave/WeaveDataManagementClient.py \
+ openweave/WeaveStack.py \
+ openweave/WeaveTLV.py \
openweave/WeaveBleBase.py \
openweave/WeaveCoreBluetoothMgr.py \
openweave/WeaveBluezMgr.py \
@@ -613,14 +631,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/device-manager/python/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/device-manager/python/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -711,9 +728,15 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BleApplicationDelegate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BlePlatformDelegate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-ScriptBinding.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BleApplicationDelegate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BlePlatformDelegate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-ScriptBinding.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -798,20 +821,15 @@
dir='$(DESTDIR)$(openweavedir)'; \
pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
- py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \
- echo "$$py_files_pep3147";\
- pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \
- pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \
st=0; \
- for files in \
- "$$py_files" \
- "$$pyc_files" \
- "$$pyo_files" \
- "$$pyc_files_pep3147" \
- "$$pyo_files_pep3147" \
- ; do \
+ for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \
$(am__uninstall_files_from_dir) || st=$$?; \
done; \
+ dir='$(DESTDIR)$(openweavedir)/__pycache__'; \
+ echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
+ while read files; do \
+ $(am__uninstall_files_from_dir) || st=$$?; \
+ done || exit $$?; \
exit $$st
ID: $(am__tagged_files)
@@ -866,7 +884,10 @@
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)'; \
@@ -934,16 +955,18 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+@WEAVE_BUILD_INSTALLABLE_PYTHON_PACKAGE_FALSE@clean-local:
@WEAVE_BUILD_INSTALLABLE_PYTHON_PACKAGE_FALSE@install-exec-local:
@WEAVE_BUILD_INSTALLABLE_PYTHON_PACKAGE_FALSE@uninstall-local:
-@WEAVE_BUILD_INSTALLABLE_PYTHON_PACKAGE_FALSE@clean-local:
clean: clean-am
clean-am: clean-generic clean-libtool clean-local \
clean-openweaveLTLIBRARIES mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BleApplicationDelegate.Plo
+ -rm -f ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BlePlatformDelegate.Plo
+ -rm -f ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-ScriptBinding.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -990,7 +1013,9 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BleApplicationDelegate.Plo
+ -rm -f ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-BlePlatformDelegate.Plo
+ -rm -f ./$(DEPDIR)/_WeaveDeviceMgr_la-WeaveDeviceManager-ScriptBinding.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1012,13 +1037,14 @@
.MAKE: install-am install-exec-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-local clean-openweaveLTLIBRARIES \
- 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-binSCRIPTS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-exec-hook \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-local \
+ clean-openweaveLTLIBRARIES 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-binSCRIPTS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-exec-hook \
install-exec-local install-html install-html-am install-info \
install-info-am install-man install-openweaveLTLIBRARIES \
install-openweavePYTHON install-pdf install-pdf-am install-ps \
@@ -1029,6 +1055,8 @@
uninstall-am uninstall-binSCRIPTS uninstall-local \
uninstall-openweaveLTLIBRARIES uninstall-openweavePYTHON
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/device-manager/python/WeaveDeviceManager-ScriptBinding.cpp b/src/device-manager/python/WeaveDeviceManager-ScriptBinding.cpp
index 6c8457a..eb076e9 100644
--- a/src/device-manager/python/WeaveDeviceManager-ScriptBinding.cpp
+++ b/src/device-manager/python/WeaveDeviceManager-ScriptBinding.cpp
@@ -1,6 +1,7 @@
/*
*
- * Copyright (c) 2013-2017 Nest Labs, Inc.
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
+ * Copyright (c) 2019 Google, LLC.
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,7 +43,7 @@
#include <Weave/Support/ErrorStr.h>
#include <Weave/Support/NLDLLUtil.h>
#include <Weave/DeviceManager/WeaveDeviceManager.h>
-
+#include <Weave/DeviceManager/WeaveDataManagementClient.h>
#include <inttypes.h>
#include <net/if.h>
@@ -58,7 +59,7 @@
using namespace nl::Weave;
using namespace nl::Weave::DeviceManager;
using namespace nl::Weave::Profiles::NetworkProvisioning;
-
+using namespace nl::Weave::Profiles::DataManagement;
using DeviceDescription::IdentifyDeviceCriteria;
extern "C" {
@@ -143,8 +144,6 @@
// Trampolined callback types
typedef void (*DeviceEnumerationResponseScriptFunct)(WeaveDeviceManager *deviceMgr, const DeviceDescription::WeaveDeviceDescriptor *devdesc, const char *deviceAddrStr);
- NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DeviceManager_Init();
- NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DeviceManager_Shutdown();
NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DeviceManager_DriveIO(uint32_t sleepTimeMS);
#if CONFIG_NETWORK_LAYER_BLE
@@ -244,10 +243,27 @@
NL_DLL_EXPORT uint64_t nl_Weave_DeviceManager_DeviceId(WeaveDeviceManager *devMgr);
NL_DLL_EXPORT const char *nl_Weave_DeviceManager_DeviceAddress(WeaveDeviceManager *devMgr);
NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DeviceManager_CloseEndpoints();
- NL_DLL_EXPORT const char *nl_Weave_DeviceManager_ErrorToString(WEAVE_ERROR err);
- NL_DLL_EXPORT const char *nl_Weave_DeviceManager_StatusReportToString(uint32_t profileId, uint16_t statusCode);
NL_DLL_EXPORT uint8_t nl_Weave_DeviceManager_GetLogFilter();
NL_DLL_EXPORT void nl_Weave_DeviceManager_SetLogFilter(uint8_t category);
+
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_Stack_Init();
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_Stack_Shutdown();
+ NL_DLL_EXPORT const char *nl_Weave_Stack_ErrorToString(WEAVE_ERROR err);
+ NL_DLL_EXPORT const char *nl_Weave_Stack_StatusReportToString(uint32_t profileId, uint16_t statusCode);
+
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DataManagementClient_Init();
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DataManagementClient_Shutdown();
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DataManagementClient_NewWDMClient(WDMClient **outWDMClient, WeaveDeviceManager *devMgr);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DataManagementClient_DeleteWDMClient(WDMClient *wdmClient);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DataManagementClient_NewDataSink(WDMClient *wdmClient, uint16_t aResourceType, const uint8_t * aResourceId, size_t aResourceIdLen, uint32_t aProfileId, uint64_t aInstanceId, const char * apPath, GenericTraitUpdatableDataSink ** outGenericTraitUpdatableDataSink);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DataManagementClient_FlushUpdate(WDMClient *wdmClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_DataManagementClient_RefreshData(WDMClient *wdmClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError);
+
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_Close(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_RefreshData(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, WDMClient *wdmClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_SetBytes(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, const char * apPath, const uint8_t * dataBuf, size_t dataLen, bool aIsConditional);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_GetLeafBytes(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, const char * apPath, ConstructBytesArrayFunct aCallback);
+ NL_DLL_EXPORT WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_GetBytes(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, const char * apPath, ConstructBytesArrayFunct aCallback);
}
static void DeviceEnumerationResponseFunctTrampoline(WeaveDeviceManager *deviceMgr, void *appReqState, const DeviceDescription::WeaveDeviceDescriptor *devdesc,
@@ -277,132 +293,6 @@
}
}
-WEAVE_ERROR nl_Weave_DeviceManager_Init()
-{
- WEAVE_ERROR err = WEAVE_NO_ERROR;
- WeaveMessageLayer::InitContext initContext;
-#if WEAVE_SYSTEM_CONFIG_USE_SOCKETS && CONFIG_NETWORK_LAYER_BLE
- int flags;
-#endif /* WEAVE_SYSTEM_CONFIG_USE_SOCKETS && CONFIG_NETWORK_LAYER_BLE */
-
-#if !WEAVE_SYSTEM_CONFIG_USE_SOCKETS
-
- ExitNow(err = WEAVE_ERROR_NOT_IMPLEMENTED);
-
-#else /* WEAVE_SYSTEM_CONFIG_USE_SOCKETS */
-
- // Initialize the underlying platform secure random source.
- err = nl::Weave::Platform::Security::InitSecureRandomDataSource(NULL, 64, NULL, 0);
- SuccessOrExit(err);
-
- if (sSystemLayer.State() == System::kLayerState_Initialized)
- ExitNow();
-
- err = sSystemLayer.Init(NULL);
- SuccessOrExit(err);
-
- if (Inet.State == InetLayer::kState_Initialized)
- ExitNow();
-
- // Initialize the InetLayer object.
- err = Inet.Init(sSystemLayer, NULL);
- SuccessOrExit(err);
-
-#if CONFIG_NETWORK_LAYER_BLE
- // Initialize the BleLayer object. For now, assume Device Manager is always a central.
- err = Ble.Init(&sBlePlatformDelegate, &sBleApplicationDelegate, &sSystemLayer);
- SuccessOrExit(err);
-
- initContext.ble = &Ble;
- initContext.listenBLE = false;
-
- // Create BLE wake pipe and make it non-blocking.
- if (pipe(BleWakePipe) == -1)
- {
- err = System::MapErrorPOSIX(errno);
- ExitNow();
- }
-
- // Make read end non-blocking.
- flags = fcntl(BleWakePipe[0], F_GETFL);
- if (flags == -1)
- {
- err = System::MapErrorPOSIX(errno);
- ExitNow();
- }
-
- flags |= O_NONBLOCK;
- if (fcntl(BleWakePipe[0], F_SETFL, flags) == -1)
- {
- err = System::MapErrorPOSIX(errno);
- ExitNow();
- }
-
- // Make write end non-blocking.
- flags = fcntl(BleWakePipe[1], F_GETFL);
- if (flags == -1)
- {
- err = System::MapErrorPOSIX(errno);
- ExitNow();
- }
-
- flags |= O_NONBLOCK;
- if (fcntl(BleWakePipe[1], F_SETFL, flags) == -1)
- {
- err = System::MapErrorPOSIX(errno);
- ExitNow();
- }
-#endif /* CONFIG_NETWORK_LAYER_BLE */
-
- // Initialize the FabricState object.
- err = FabricState.Init();
- SuccessOrExit(err);
-
- FabricState.FabricId = 0; // Not a member of any fabric
- FabricState.LocalNodeId = 1; // TODO: TEMPORARY HACK -- use a different default node id to avoid conflict with the mock device.
-
- // Initialize the WeaveMessageLayer object.
- initContext.systemLayer = &sSystemLayer;
- initContext.inet = &Inet;
- initContext.fabricState = &FabricState;
- initContext.listenTCP = false;
- initContext.listenUDP = true;
-
- err = MessageLayer.Init(&initContext);
- SuccessOrExit(err);
-
- // Initialize the Exchange Manager object.
- err = ExchangeMgr.Init(&MessageLayer);
- SuccessOrExit(err);
-
- // Initialize the Security Manager object.
- err = SecurityMgr.Init(ExchangeMgr, sSystemLayer);
- SuccessOrExit(err);
-
-#endif /* WEAVE_SYSTEM_CONFIG_USE_SOCKETS */
-
-exit:
- if (err != WEAVE_NO_ERROR)
- nl_Weave_DeviceManager_Shutdown();
- return err;
-}
-
-WEAVE_ERROR nl_Weave_DeviceManager_Shutdown()
-{
- WEAVE_ERROR err = WEAVE_NO_ERROR;
-
- if (Inet.State == InetLayer::kState_NotInitialized)
- ExitNow();
-
- if (sSystemLayer.State() == System::kLayerState_NotInitialized)
- ExitNow();
-
- // TODO: implement this
-
-exit:
- return err;
-}
-
WEAVE_ERROR nl_Weave_DeviceManager_NewDeviceManager(WeaveDeviceManager **outDevMgr)
{
WEAVE_ERROR err;
@@ -1158,6 +1048,332 @@
nl::Weave::Logging::SetLogFilter(category);
}
+WEAVE_ERROR nl_Weave_Stack_Init()
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ WeaveMessageLayer::InitContext initContext;
+#if WEAVE_SYSTEM_CONFIG_USE_SOCKETS && CONFIG_NETWORK_LAYER_BLE
+ int flags;
+#endif /* WEAVE_SYSTEM_CONFIG_USE_SOCKETS && CONFIG_NETWORK_LAYER_BLE */
+
+#if !WEAVE_SYSTEM_CONFIG_USE_SOCKETS
+
+ ExitNow(err = WEAVE_ERROR_NOT_IMPLEMENTED);
+
+#else /* WEAVE_SYSTEM_CONFIG_USE_SOCKETS */
+
+ // Initialize the underlying platform secure random source.
+ err = nl::Weave::Platform::Security::InitSecureRandomDataSource(NULL, 64, NULL, 0);
+ SuccessOrExit(err);
+
+ if (sSystemLayer.State() == System::kLayerState_Initialized)
+ ExitNow();
+
+ err = sSystemLayer.Init(NULL);
+ SuccessOrExit(err);
+
+ if (Inet.State == InetLayer::kState_Initialized)
+ ExitNow();
+
+ // Initialize the InetLayer object.
+ err = Inet.Init(sSystemLayer, NULL);
+ SuccessOrExit(err);
+
+#if CONFIG_NETWORK_LAYER_BLE
+ // Initialize the BleLayer object. For now, assume Device Manager is always a central.
+ err = Ble.Init(&sBlePlatformDelegate, &sBleApplicationDelegate, &sSystemLayer);
+ SuccessOrExit(err);
+
+ initContext.ble = &Ble;
+ initContext.listenBLE = false;
+
+ // Create BLE wake pipe and make it non-blocking.
+ if (pipe(BleWakePipe) == -1)
+ {
+ err = System::MapErrorPOSIX(errno);
+ ExitNow();
+ }
+
+ // Make read end non-blocking.
+ flags = fcntl(BleWakePipe[0], F_GETFL);
+ if (flags == -1)
+ {
+ err = System::MapErrorPOSIX(errno);
+ ExitNow();
+ }
+
+ flags |= O_NONBLOCK;
+ if (fcntl(BleWakePipe[0], F_SETFL, flags) == -1)
+ {
+ err = System::MapErrorPOSIX(errno);
+ ExitNow();
+ }
+
+ // Make write end non-blocking.
+ flags = fcntl(BleWakePipe[1], F_GETFL);
+ if (flags == -1)
+ {
+ err = System::MapErrorPOSIX(errno);
+ ExitNow();
+ }
+
+ flags |= O_NONBLOCK;
+ if (fcntl(BleWakePipe[1], F_SETFL, flags) == -1)
+ {
+ err = System::MapErrorPOSIX(errno);
+ ExitNow();
+ }
+#endif /* CONFIG_NETWORK_LAYER_BLE */
+
+ // Initialize the FabricState object.
+ err = FabricState.Init();
+ SuccessOrExit(err);
+
+ FabricState.FabricId = 0; // Not a member of any fabric
+ FabricState.LocalNodeId = 1; // TODO: TEMPORARY HACK -- use a different default node id to avoid conflict with the mock device.
+
+ // Initialize the WeaveMessageLayer object.
+ initContext.systemLayer = &sSystemLayer;
+ initContext.inet = &Inet;
+ initContext.fabricState = &FabricState;
+ initContext.listenTCP = false;
+ initContext.listenUDP = true;
+
+ err = MessageLayer.Init(&initContext);
+ SuccessOrExit(err);
+
+ // Initialize the Exchange Manager object.
+ err = ExchangeMgr.Init(&MessageLayer);
+ SuccessOrExit(err);
+
+ // Initialize the Security Manager object.
+ err = SecurityMgr.Init(ExchangeMgr, sSystemLayer);
+ SuccessOrExit(err);
+#endif /* WEAVE_SYSTEM_CONFIG_USE_SOCKETS */
+
+ exit:
+ if (err != WEAVE_NO_ERROR)
+ nl_Weave_Stack_Shutdown();
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_Stack_Shutdown()
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ if (Inet.State == InetLayer::kState_NotInitialized)
+ ExitNow();
+
+ if (sSystemLayer.State() == System::kLayerState_NotInitialized)
+ ExitNow();
+
+ // TODO: implement this
+
+ exit:
+ return err;
+}
+
+const char *nl_Weave_Stack_ErrorToString(WEAVE_ERROR err)
+{
+ return nl::ErrorStr(err);
+}
+
+const char *nl_Weave_Stack_StatusReportToString(uint32_t profileId, uint16_t statusCode)
+{
+ return nl::StatusReportStr(profileId, statusCode);
+}
+
+static void EngineEventCallback(void * const aAppState,
+ SubscriptionEngine::EventID aEvent,
+ const SubscriptionEngine::InEventParam & aInParam, SubscriptionEngine::OutEventParam & aOutParam)
+{
+ switch (aEvent)
+ {
+ default:
+ SubscriptionEngine::DefaultEventHandler(aEvent, aInParam, aOutParam);
+ break;
+ }
+}
+
+WEAVE_ERROR nl_Weave_DataManagementClient_Init()
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ err = SubscriptionEngine::GetInstance()->Init(&ExchangeMgr, NULL, EngineEventCallback);
+ SuccessOrExit(err);
+
+exit:
+ if (err != WEAVE_NO_ERROR)
+ {
+ nl_Weave_DataManagementClient_Shutdown();
+ }
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_DataManagementClient_Shutdown()
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ return err;
+}
+
+static void BindingEventCallback (void * const apAppState, const nl::Weave::Binding::EventType aEvent,
+ const nl::Weave::Binding::InEventParam & aInParam, nl::Weave::Binding::OutEventParam & aOutParam)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ Binding * binding = aInParam.Source;
+
+ WeaveLogDetail(DeviceManager, "%s: Event(%d)", __func__, aEvent);
+
+ WeaveDeviceManager * const pDeviceMgr = reinterpret_cast<WeaveDeviceManager *>(apAppState);
+
+ switch (aEvent)
+ {
+ case nl::Weave::Binding::kEvent_PrepareRequested:
+ WeaveLogDetail(DeviceManager, "kEvent_PrepareRequested");
+ err = pDeviceMgr->ConfigureBinding(binding);
+ aOutParam.PrepareRequested.PrepareError = err;
+ SuccessOrExit(err);
+ break;
+
+ case nl::Weave::Binding::kEvent_PrepareFailed:
+ err = aInParam.PrepareFailed.Reason;
+ WeaveLogDetail(DeviceManager, "kEvent_PrepareFailed: reason");
+ break;
+
+ case nl::Weave::Binding::kEvent_BindingFailed:
+ err = aInParam.BindingFailed.Reason;
+ WeaveLogDetail(DeviceManager, "kEvent_BindingFailed: reason");
+ break;
+
+ case nl::Weave::Binding::kEvent_BindingReady:
+ WeaveLogDetail(DeviceManager, "kEvent_BindingReady");
+ break;
+
+ case nl::Weave::Binding::kEvent_DefaultCheck:
+ WeaveLogDetail(DeviceManager, "kEvent_DefaultCheck");
+
+ default:
+ nl::Weave::Binding::DefaultEventHandler(apAppState, aEvent, aInParam, aOutParam);
+ }
+
+exit:
+ if (err != WEAVE_NO_ERROR)
+ {
+ WeaveLogDetail(DeviceManager, "error in BindingEventCallback");
+ }
+}
+
+WEAVE_ERROR nl_Weave_DataManagementClient_NewWDMClient(WDMClient **outWDMClient, WeaveDeviceManager *devMgr)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ Binding * pBinding = NULL;
+ pBinding = ExchangeMgr.NewBinding(BindingEventCallback, devMgr);
+ VerifyOrExit(NULL != pBinding, err = WEAVE_ERROR_NO_MEMORY);
+
+ if (pBinding->CanBePrepared())
+ {
+ err = pBinding->RequestPrepare();
+ SuccessOrExit(err);
+ }
+
+ *outWDMClient = new WDMClient();
+ VerifyOrExit(*outWDMClient != NULL, err = WEAVE_ERROR_NO_MEMORY);
+
+ err = (*outWDMClient)->Init(&MessageLayer, pBinding);
+ SuccessOrExit(err);
+
+exit:
+ if (err != WEAVE_NO_ERROR && *outWDMClient != NULL)
+ {
+ delete *outWDMClient;
+ *outWDMClient = NULL;
+ }
+
+ if (NULL != pBinding)
+ {
+ pBinding->Release();
+ }
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_DataManagementClient_DeleteWDMClient(WDMClient *wdmClient)
+{
+ if (wdmClient != NULL)
+ {
+ wdmClient->Close();
+ delete wdmClient;
+ }
+
+ return WEAVE_NO_ERROR;
+}
+
+WEAVE_ERROR nl_Weave_DataManagementClient_NewDataSink(WDMClient *wdmClient, uint16_t aResourceType, const uint8_t * aResourceId, size_t aResourceIdLen, uint32_t aProfileId, uint64_t aInstanceId, const char * apPath, GenericTraitUpdatableDataSink ** outGenericTraitUpdatableDataSink)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ ResourceIdentifier resourceId;
+ if (NULL == aResourceId)
+ {
+ resourceId = ResourceIdentifier(ResourceIdentifier::RESOURCE_TYPE_RESERVED, ResourceIdentifier::SELF_NODE_ID);
+ }
+ else
+ {
+ resourceId = ResourceIdentifier(aResourceType, aResourceId, aResourceIdLen);
+ }
+
+ err = wdmClient->NewDataSink(resourceId, aProfileId, aInstanceId, apPath, *outGenericTraitUpdatableDataSink);
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_DataManagementClient_FlushUpdate(WDMClient *wdmClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ err = wdmClient->FlushUpdate(NULL, NULL, onComplete, onError);
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_DataManagementClient_RefreshData(WDMClient *wdmClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ err = wdmClient->RefreshData(NULL, NULL, onComplete, onError, NULL);
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_Close(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink)
+{
+ if (apGenericTraitUpdatableDataSink != NULL)
+ {
+ apGenericTraitUpdatableDataSink->Close();
+ }
+
+ return WEAVE_NO_ERROR;
+}
+
+WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_RefreshData(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, WDMClient * apWDMClient, WDMClientCompleteFunct onComplete, WDMClientErrorFunct onError)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ err = apGenericTraitUpdatableDataSink->RefreshData(NULL, apWDMClient, onComplete, onError);
+
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_SetBytes(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, const char * apPath, const uint8_t * dataBuf, size_t dataLen, bool aIsConditional)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ err = apGenericTraitUpdatableDataSink->SetBytes(apPath, dataBuf, dataLen, aIsConditional);
+ return err;
+}
+
+WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_GetLeafBytes(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, const char * apPath, ConstructBytesArrayFunct aCallback)
+{
+ return apGenericTraitUpdatableDataSink->GetLeafBytes(apPath, aCallback);
+}
+
+WEAVE_ERROR nl_Weave_GenericTraitUpdatableDataSink_GetBytes(GenericTraitUpdatableDataSink * apGenericTraitUpdatableDataSink, const char * apPath, ConstructBytesArrayFunct aCallback)
+{
+ return apGenericTraitUpdatableDataSink->GetBytes(apPath, aCallback);
+}
namespace nl {
namespace Weave {
@@ -1165,10 +1381,10 @@
namespace PersistedStorage {
/*
- * Dummy implementations of PersistedStorage platform methods. These aren't
- * used in the context of the Python DeviceManager, but are required to satisfy
- * the linker.
- */
+* Dummy implementations of PersistedStorage platform methods. These aren't
+* used in the context of the Python DeviceManager, but are required to satisfy
+* the linker.
+*/
WEAVE_ERROR Read(const char *aKey, uint32_t &aValue)
{
diff --git a/src/device-manager/python/openweave/WeaveDataManagementClient.py b/src/device-manager/python/openweave/WeaveDataManagementClient.py
new file mode 100644
index 0000000..47060c2
--- /dev/null
+++ b/src/device-manager/python/openweave/WeaveDataManagementClient.py
@@ -0,0 +1,415 @@
+#
+# Copyright (c) 2019 Google, LLC.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# @file
+# Python interface for WeaveDataManagementClient
+#
+
+"""Weave Data Management Client interface
+"""
+
+import functools
+import sys
+import os
+import re
+import copy
+import binascii
+import datetime
+import time
+import glob
+import platform
+import struct
+from threading import Thread, Lock, Event
+from ctypes import *
+from WeaveStack import *
+from WeaveTLV import *
+
+
+__all__ = [ 'GenericTraitUpdatableDataSink', 'WDMClient' ]
+
+ElementTypes = {
+ 0x00:"Signed Integer 1-byte value",
+ 0x01:"Signed Integer 2-byte value",
+ 0x02:"Signed Integer 4-byte value",
+ 0x03:"Signed Integer 8-byte value",
+ 0x04:"Unsigned Integer 1-byte value",
+ 0x05:"Unsigned Integer 2-byte value",
+ 0x06:"Unsigned Integer 4-byte value",
+ 0x07:"Unsigned Integer 8-byte value",
+ 0x08:"Boolean False",
+ 0x09:"Boolean True",
+ 0x0A:"Floating Point 4-byte value",
+ 0x0B:"Floating Point 8-byte value",
+ 0x0C:"UTF-8 String 1-byte length",
+ 0x0D:"UTF-8 String 2-byte length",
+ 0x0E:"UTF-8 String 4-byte length",
+ 0x0F:"UTF-8 String 8-byte length",
+ 0x10:"Byte String 1-byte length",
+ 0x11:"Byte String 2-byte length",
+ 0x12:"Byte String 4-byte length",
+ 0x13:"Byte String 8-byte length",
+ 0x14:"Null",
+ 0x15:"Structure",
+ 0x16:"Array",
+ 0x17:"Path",
+ 0x18:"End of Collection",
+ "Signed Integer 1-byte value":0x00,
+ "Signed Integer 2-byte value":0x01,
+ "Signed Integer 4-byte value":0x02,
+ "Signed Integer 8-byte value":0x03,
+ "Unsigned Integer 1-byte value":0x04,
+ "Unsigned Integer 2-byte value":0x05,
+ "Unsigned Integer 4-byte value":0x06,
+ "Unsigned Integer 8-byte value":0x07,
+ "Boolean True":0x08,
+ "Boolean False":0x09,
+ "Floating Point 4-byte value":0x0A,
+ "Floating Point 8-byte value":0x0B,
+ "UTF-8 String 1-byte length":0x0C,
+ "UTF-8 String 2-byte length":0x0D,
+ "UTF-8 String 4-byte length":0x0E,
+ "UTF-8 String 8-byte length":0x0F,
+ "Byte String 1-byte length":0x10,
+ "Byte String 2-byte length":0x11,
+ "Byte String 4-byte length":0x12,
+ "Byte String 8-byte length":0x13,
+ "Null":0x14,
+ "Structure":0x15,
+ "Array":0x16,
+ "Path":0x17,
+ "End of Collection":0x18,
+}
+
+TagControlTypes = {
+ 0x00:"Anonymous",
+ 0x20:"Context 1-byte",
+ 0x40:"Core Profile 2-byte",
+ 0x60:"Core Profile 4-byte",
+ 0x80:"Implicit Profile 2-byte",
+ 0xA0:"Implicit Profile 4-byte",
+ 0xC0:"Fully Qualified 6-byte",
+ 0xE0:"Fully Qualified 8-byte",
+ "Anonymous":0x00,
+ "Context 1-byte":0x20,
+ "Core Profile 2-byte":0x40,
+ "Core Profile 4-byte":0x60,
+ "Implicit Profile 2-byte":0x80,
+ "Implicit Profile 4-byte":0xA0,
+ "Fully Qualified 6-byte":0xC0,
+ "Fully Qualified 8-byte":0xE0,
+}
+
+_CompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p)
+_ErrorFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_ulong, POINTER(DeviceStatusStruct))
+_ConstructBytesArrayFunct = CFUNCTYPE(None, c_void_p, c_uint32)
+
+class GenericTraitUpdatableDataSink:
+ def __init__(self, traitInstance, wdmClient):
+ self.traitInstance = traitInstance
+ self._wdmClient = wdmClient
+ self._weaveStack = WeaveStack()
+ self._generictraitupdatabledatasinkLib = None
+ self._InitLib()
+
+ def __del__(self):
+ self.close()
+
+ def close(self):
+ if self.traitInstance != None:
+ res = self._weaveStack.Call(
+ lambda: self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_Close(self.traitInstance)
+ )
+ if (res != 0):
+ raise self._weaveStack.ErrorToException(res)
+ self.traitInstance = None
+
+ self._wdmClient = None
+ self._weaveStack = None
+ self._generictraitupdatabledatasinkLib = None
+
+ def refreshData(self):
+ if self.traitInstance == None:
+ return
+
+ self._weaveStack.CallAsync(
+ lambda: self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_RefreshData(self.traitInstance, self._wdmClient, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
+ )
+
+ def setData(self, path, val, isConditional=False):
+ if self.traitInstance == None:
+ return
+ if (isConditional):
+ print "not support conditional update"
+ return
+ writer = TLVWriter()
+ writer.put(None, val)
+
+ dataBuf = WeaveStack.ByteArrayToVoidPtr(writer.encoding)
+ dataLen = len(writer.encoding) if (writer.encoding != None) else 0
+
+ res = self._weaveStack.Call(
+ lambda: self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_SetBytes(self.traitInstance, path, dataBuf, dataLen, isConditional)
+ )
+
+ del writer
+ if (res != 0):
+ raise self._weaveStack.ErrorToException(res)
+
+ def getData(self, path):
+ if self.traitInstance == None:
+ return
+
+ data = self._getLeafBytes(path)
+ try :
+ return self._getDataHelper(data)
+ except:
+ raise ValueError('fail to get data')
+
+ def _getDataHelper(self, data):
+ """
+ Unpack weave tlv data from bytestring
+ Todo: create new class tlvreader to process bytestring
+ """
+ buffer = data
+ item = {}
+
+ ### Grab control byte and parse it
+ control_byte, = struct.unpack("<B", buffer[:1])
+ controltypeIndex = control_byte & 0x20
+ item["tagcontrol"] = TagControlTypes[controltypeIndex]
+ elementtypeIndex = control_byte & 0x1f
+ item["type"] = ElementTypes[elementtypeIndex]
+ buffer = buffer[1:]
+
+ ### Grab the next few bytes as the tag
+ if "1-byte" in item["tagcontrol"]:
+ item["tag"], = struct.unpack("<B", buffer[:1])
+ item["taglength"] = 1
+ buffer = buffer[1:]
+ elif "2-byte" in item["tagcontrol"]:
+ item["tag"], = struct.unpack("<H", buffer[:2])
+ item["taglength"] = 2
+ buffer = buffer[2:]
+ elif "4-byte" in item["tagcontrol"]:
+ item["tag"], = struct.unpack("<L", buffer[:4])
+ item["taglength"] = 4
+ buffer = buffer[4:]
+ elif "8-byte" in item["tagcontrol"]:
+ item["tag"], = struct.unpack("<Q", buffer[:8])
+ item["taglength"] = 8
+ buffer = buffer[8:]
+ else:
+ item["tag"] = None
+ item["taglength"] = 0
+
+ ### If the element type needs a length field grab the next bytes as length
+ if "length" in item["type"]:
+ if "1-byte" in item["type"]:
+ item["datalength"], = struct.unpack("<B", buffer[:1])
+ item["lenlength"] = 1
+ buffer = buffer[1:]
+ elif "2-byte" in item["type"]:
+ item["datalength"], = struct.unpack("<H", buffer[:2])
+ item["lenlength"] = 2
+ buffer = buffer[2:]
+ elif "4-byte" in item["type"]:
+ item["datalength"], = struct.unpack("<L", buffer[:4])
+ item["lenlength"] = 4
+ buffer = buffer[4:]
+ elif "8-byte" in item["type"]:
+ item["datalength"], = struct.unpack("<Q", buffer[:8])
+ item["lenlength"] = 8
+ buffer = buffer[8:]
+ else:
+ item["lenlength"] = 0
+
+ ### Grab the data
+ if item["type"] == "Null" or item["type"] == "End of Collection":
+ item["value"] = None
+ elif item["type"] == "Boolean True":
+ item["value"] = True
+ elif item["type"] == "Boolean False":
+ item["value"] = False
+ elif item["type"] == "Unsigned Integer 1-byte value":
+ item["value"], = struct.unpack("<B", buffer[:1])
+ buffer = buffer[1:]
+ elif item["type"] == "Signed Integer 1-byte value":
+ item["value"], = struct.unpack("<b", buffer[:1])
+ buffer = buffer[1:]
+ elif item["type"] == "Unsigned Integer 2-byte value":
+ item["value"], = struct.unpack("<H", buffer[:2])
+ buffer = buffer[2:]
+ elif item["type"] == "Signed Integer 2-byte value":
+ item["value"], = struct.unpack("<h", buffer[:2])
+ buffer = buffer[2:]
+ elif item["type"] == "Unsigned Integer 4-byte value":
+ item["value"], = struct.unpack("<L", buffer[:4])
+ buffer = buffer[4:]
+ elif item["type"] == "Signed Integer 4-byte value":
+ item["value"], = struct.unpack("<l", buffer[:4])
+ buffer = buffer[4:]
+ elif item["type"] == "Unsigned Integer 8-byte value":
+ item["value"], = struct.unpack("<Q", buffer[:8])
+ buffer = buffer[8:]
+ elif item["type"] == "Signed Integer 8-byte value":
+ item["value"], = struct.unpack("<q", buffer[:8])
+ buffer = buffer[8:]
+ elif item["type"] == "Floating Point 4-byte value":
+ item["value"], = struct.unpack("<f", buffer[:4])
+ buffer = buffer[4:]
+ elif item["type"] == "Floating Point 8-byte value":
+ item["value"], = struct.unpack("<d", buffer[:8])
+ buffer = buffer[8:]
+ elif "String" in item["type"]:
+ item["value"], = struct.unpack("<%ds" % item["datalength"], buffer[:item["datalength"]])
+ buffer = buffer[item["datalength"]:]
+ else:
+ raise ValueError('Attempt to TLV decode unsupported value')
+
+ return item["value"]
+
+ def _getLeafBytes(self, path):
+ def HandleConstructBytesArray(dataBuf, dataLen):
+ self._weaveStack.callbackRes = WeaveStack.VoidPtrToByteArray(dataBuf, dataLen)
+
+ cbHandleConstructBytesArray = _ConstructBytesArrayFunct(HandleConstructBytesArray)
+ if self.traitInstance != None:
+ return self._weaveStack.Call(
+ lambda: self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_GetLeafBytes(self.traitInstance, path, cbHandleConstructBytesArray)
+ )
+
+ def getBytes(self, path):
+ def HandleConstructBytesArray(dataBuf, dataLen):
+ self._weaveStack.callbackRes = WeaveStack.VoidPtrToByteArray(dataBuf, dataLen)
+
+ cbHandleConstructBytesArray = _ConstructBytesArrayFunct(HandleConstructBytesArray)
+ if self.traitInstance != None:
+ return self._weaveStack.Call(
+ lambda: self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_GetBytes(self.traitInstance, path, cbHandleConstructBytesArray)
+ )
+ # ----- Private Members -----
+ def _InitLib(self):
+ if (self._generictraitupdatabledatasinkLib == None):
+ self._generictraitupdatabledatasinkLib = CDLL(self._weaveStack.LocateWeaveDLL())
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_RefreshData.argtypes = [ c_void_p, c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_RefreshData.restype = c_uint32
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_SetBytes.argtypes = [ c_void_p, c_char_p, c_void_p, c_uint32, c_bool ]
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_SetBytes.restype = c_uint32
+
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_GetLeafBytes.argtypes = [ c_void_p, c_char_p, _ConstructBytesArrayFunct ]
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_GetLeafBytes.restype = c_uint32
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_GetBytes.argtypes = [ c_void_p, c_char_p, _ConstructBytesArrayFunct ]
+ self._generictraitupdatabledatasinkLib.nl_Weave_GenericTraitUpdatableDataSink_GetBytes.restype = c_uint32
+
+class WDMClient():
+ def __init__(self):
+ self._wdmClient = None
+ self._weaveStack = WeaveStack()
+ self._datamanagmentLib = None
+ self._traitTable = {}
+ self._InitLib()
+
+ wdmClient = c_void_p(None)
+ res = self._datamanagmentLib.nl_Weave_DataManagementClient_NewWDMClient(pointer(wdmClient), self._weaveStack.devMgr)
+ if (res != 0):
+ raise self._weaveStack.ErrorToException(res)
+
+ self._wdmClient = wdmClient
+
+ def __del__(self):
+ self.close()
+
+ def close(self):
+ if (self._wdmClient != None):
+ for val in self._traitTable.values():
+ val.close()
+ self._traitTable.clear()
+ self._traitTable = None
+ self._weaveStack.Call(
+ lambda: self._datamanagmentLib.nl_Weave_DataManagementClient_DeleteWDMClient(self._wdmClient)
+ )
+ self._wdmClient = None
+
+ self._weaveStack = None
+ self._datamanagmentLib = None
+
+ def newDataSink(self, resourceType, resourceId, resourceIdLen, profileId, instanceId, path):
+ traitInstance = c_void_p(None)
+ if (self._wdmClient == None):
+ print "wdmClient is not ready"
+ return
+
+ res = self._weaveStack.Call(
+ lambda: self._datamanagmentLib.nl_Weave_DataManagementClient_NewDataSink(self._wdmClient, resourceType, resourceId, resourceIdLen, profileId, instanceId, path, pointer(traitInstance))
+ )
+ if (res != 0):
+ raise self._weaveStack.ErrorToException(res)
+
+ addr = id(traitInstance)
+ if addr not in self._traitTable.keys():
+ self._traitTable[addr] = GenericTraitUpdatableDataSink(traitInstance, self._wdmClient)
+
+ return self._traitTable[addr]
+
+ def flushUpdate(self):
+ if (self._wdmClient == None):
+ print "wdmClient is not ready"
+ return
+
+ self._weaveStack.CallAsync(
+ lambda: self._datamanagmentLib.nl_Weave_DataManagementClient_FlushUpdate(self._wdmClient, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
+ )
+
+ def refreshData(self):
+ if (self._wdmClient == None):
+ print "wdmClient is not ready"
+ return
+
+ self._weaveStack.CallAsync(
+ lambda: self._datamanagmentLib.nl_Weave_DataManagementClient_RefreshData(self._wdmClient, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
+ )
+
+ # ----- Private Members -----
+ def _InitLib(self):
+ if (self._datamanagmentLib == None):
+ self._datamanagmentLib = CDLL(self._weaveStack.LocateWeaveDLL())
+
+ self._datamanagmentLib.nl_Weave_DataManagementClient_Init.argtypes = [ ]
+ self._datamanagmentLib.nl_Weave_DataManagementClient_Init.restype = c_uint32
+
+ self._datamanagmentLib.nl_Weave_DataManagementClient_Shutdown.argtypes = [ ]
+ self._datamanagmentLib.nl_Weave_DataManagementClient_Shutdown.restype = c_uint32
+
+ self._datamanagmentLib.nl_Weave_DataManagementClient_NewWDMClient.argtypes = [ POINTER(c_void_p), c_void_p]
+ self._datamanagmentLib.nl_Weave_DataManagementClient_NewWDMClient.restype = c_uint32
+
+ self._datamanagmentLib.nl_Weave_DataManagementClient_DeleteWDMClient.argtypes = [ c_void_p ]
+ self._datamanagmentLib.nl_Weave_DataManagementClient_DeleteWDMClient.restype = c_uint32
+
+ self._datamanagmentLib.nl_Weave_DataManagementClient_NewDataSink.argtypes = [ c_void_p, c_uint16, c_void_p, c_uint32, c_uint32, c_uint64, c_char_p, c_void_p ]
+ self._datamanagmentLib.nl_Weave_DataManagementClient_NewDataSink.restype = c_uint32
+
+ self._datamanagmentLib.nl_Weave_DataManagementClient_FlushUpdate.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._datamanagmentLib.nl_Weave_DataManagementClient_FlushUpdate.restype = c_uint32
+
+ self._datamanagmentLib.nl_Weave_DataManagementClient_RefreshData.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._datamanagmentLib.nl_Weave_DataManagementClient_RefreshData.restype = c_uint32
+
+ res = self._datamanagmentLib.nl_Weave_DataManagementClient_Init()
+ if (res != 0):
+ raise self._weaveStack.ErrorToException(res)
diff --git a/src/device-manager/python/openweave/WeaveDeviceMgr.py b/src/device-manager/python/openweave/WeaveDeviceMgr.py
index 2e5feff..3acb80b 100644
--- a/src/device-manager/python/openweave/WeaveDeviceMgr.py
+++ b/src/device-manager/python/openweave/WeaveDeviceMgr.py
@@ -1,5 +1,6 @@
#
-# Copyright (c) 2013-2017 Nest Labs, Inc.
+# Copyright (c) 2013-2018 Nest Labs, Inc.
+# Copyright (c) 2019 Google, LLC.
# All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,10 +34,12 @@
import time
import glob
import platform
+import ast
from threading import Thread, Lock, Event
from ctypes import *
+from WeaveStack import *
-__all__ = [ 'WeaveDeviceManager', 'NetworkInfo', 'DeviceManagerException', 'DeviceError', 'DeviceManagerError' ]
+__all__ = [ 'WeaveDeviceManager', 'NetworkInfo', 'DeviceDescriptor' ]
NetworkType_WiFi = 1
NetworkType_Thread = 2
@@ -85,66 +88,6 @@
DeviceDescriptorFlag_IsRendezvousWiFiESSIDSuffix = 0x01
-
-def _VoidPtrToByteArray(ptr, len):
- if ptr:
- v = bytearray(len)
- memmove((c_byte * len).from_buffer(v), ptr, len)
- return v
- else:
- return None
-
-def _ByteArrayToVoidPtr(array):
- if array != None:
- if not (isinstance(array, str) or isinstance(array, bytearray)):
- raise TypeError("Array must be an str or a bytearray")
- return cast( (c_byte * len(array)) .from_buffer_copy(array), c_void_p)
- else:
- return c_void_p(0)
-
-def _IsByteArrayAllZeros(array):
- for i in range(len(array)):
- if (array[i] != 0):
- return False
- return True
-
-def _ByteArrayToHex(array):
- return binascii.hexlify(bytes(array))
-WeaveDeviceMgrDLLBaseName = '_WeaveDeviceMgr.so'
-
-def _AllDirsToRoot(dir):
- dir = os.path.abspath(dir)
- while True:
- yield dir
- parent = os.path.dirname(dir)
- if parent == '' or parent == dir:
- break
- dir = parent
-
-def _LocateWeaveDLL():
- scriptDir = os.path.dirname(os.path.abspath(__file__))
-
- # When properly installed in the weave package, the Weave Device Manager DLL will
- # be located in the package root directory, along side the package's
- # modules.
- dmDLLPath = os.path.join(scriptDir, WeaveDeviceMgrDLLBaseName)
- if os.path.exists(dmDLLPath):
- return dmDLLPath
-
- # For the convenience of developers, search the list of parent paths relative to the
- # running script looking for an OpenWeave build directory containing the Weave Device
- # Manager DLL. This makes it possible to import and use the WeaveDeviceMgr module
- # directly from a built copy of the OpenWeave source tree.
- buildMachineGlob = '%s-*-%s*' % (platform.machine(), platform.system().lower())
- relDMDLLPathGlob = os.path.join('build', buildMachineGlob, 'src/device-manager/python/.libs', WeaveDeviceMgrDLLBaseName)
- for dir in _AllDirsToRoot(scriptDir):
- dmDLLPathGlob = os.path.join(dir, relDMDLLPathGlob)
- for dmDLLPath in glob.glob(dmDLLPathGlob):
- if os.path.exists(dmDLLPath):
- return dmDLLPath
-
- raise Exception("Unable to locate Weave Device Manager DLL (%s); expected location: %s" % (WeaveDeviceMgrDLLBaseName, scriptDir))
-
class NetworkInfo:
def __init__(self, networkType=None, networkId=None, wifiSSID=None, wifiMode=None, wifiRole=None,
wifiSecurityType=None, wifiKey=None,
@@ -182,11 +125,11 @@
if self.ThreadNetworkName != None:
print "%sThread Network Name: \"%s\"" % (prefix, self.ThreadNetworkName)
if self.ThreadExtendedPANId != None:
- print "%sThread Extended PAN Id: %s" % (prefix, _ByteArrayToHex(self.ThreadExtendedPANId))
+ print "%sThread Extended PAN Id: %s" % (prefix, WeaveStack.ByteArrayToHex(self.ThreadExtendedPANId))
if self.ThreadNetworkKey != None:
- print "%sThread Network Key: %s" % (prefix, _ByteArrayToHex(self.ThreadNetworkKey))
+ print "%sThread Network Key: %s" % (prefix, WeaveStack.ByteArrayToHex(self.ThreadNetworkKey))
if self.ThreadPSKc != None:
- print "%sThread Network PSKc: %s" % (prefix, _ByteArrayToHex(self.ThreadPSKc))
+ print "%sThread Network PSKc: %s" % (prefix, WeaveStack.ByteArrayToHex(self.ThreadPSKc))
if self.ThreadPANId != None:
print "%sThread PAN Id: %04x" % (prefix, self.ThreadPANId)
if self.ThreadChannel != None:
@@ -280,9 +223,9 @@
else:
print "%sManufacturing Date: %04d/%02d" % (prefix, self.ManufacturingYear, self.ManufacturingMonth)
if self.Primary802154MACAddress != None:
- print "%sPrimary 802.15.4 MAC Address: %s" % (prefix, _ByteArrayToHex(self.Primary802154MACAddress))
+ print "%sPrimary 802.15.4 MAC Address: %s" % (prefix, WeaveStack.ByteArrayToHex(self.Primary802154MACAddress))
if self.PrimaryWiFiMACAddress != None:
- print "%sPrimary WiFi MAC Address: %s" % (prefix, _ByteArrayToHex(self.PrimaryWiFiMACAddress))
+ print "%sPrimary WiFi MAC Address: %s" % (prefix, WeaveStack.ByteArrayToHex(self.PrimaryWiFiMACAddress))
if self.RendezvousWiFiESSID != None:
print "%sRendezvous WiFi ESSID%s: %s" % (prefix, " Suffix" if self.IsRendezvousWiFiESSIDSuffix else "", self.RendezvousWiFiESSID)
if self.PairingCode != None:
@@ -298,45 +241,6 @@
def IsRendezvousWiFiESSIDSuffix(self):
return (self.Flags & DeviceDescriptorFlag_IsRendezvousWiFiESSIDSuffix) != 0
-
-class DeviceManagerException(Exception):
- pass
-
-class DeviceManagerError(DeviceManagerException):
- def __init__(self, err, msg=None):
- self.err = err
- if msg != None:
- self.msg = msg
- else:
- self.msg = "Device Manager Error %ld" % (err)
-
- def __str__(self):
- return self.msg
-
-class DeviceError(DeviceManagerException):
- def __init__(self, profileId, statusCode, systemErrorCode, msg=None):
- self.profileId = profileId
- self.statusCode = statusCode
- self.systemErrorCode = systemErrorCode
- if (msg == None):
- if (systemErrorCode):
- return "[ %08X:%d ] (system err %d)" % (profileId, statusCode, systemErrorCode)
- else:
- return "[ %08X:%d ]" % (profileId, statusCode)
- self.message = msg
-
- def __str__(self):
- return "Device Error: " + self.message
-
-
-class _DeviceStatusStruct(Structure):
- _fields_ = [
- ("ProfileId", c_uint32),
- ("StatusCode", c_uint16),
- ("SysErrorCode", c_uint32)
- ]
-
-
class _IdentifyDeviceCriteriaStruct(Structure):
_fields_ = [
("TargetFabricId", c_uint64),
@@ -374,11 +278,11 @@
wifiMode = self.WiFiMode if self.WiFiMode != -1 else None,
wifiRole = self.WiFiRole if self.WiFiRole != -1 else None,
wifiSecurityType = self.WiFiSecurityType if self.WiFiSecurityType != -1 else None,
- wifiKey = _VoidPtrToByteArray(self.WiFiKey, self.WiFiKeyLen),
+ wifiKey = WeaveStack.VoidPtrToByteArray(self.WiFiKey, self.WiFiKeyLen),
threadNetworkName = self.ThreadNetworkName,
- threadExtendedPANId = _VoidPtrToByteArray(self.ThreadExtendedPANId, 8),
- threadNetworkKey = _VoidPtrToByteArray(self.ThreadNetworkKey, 16),
- threadPSKc = _VoidPtrToByteArray(self.ThreadPSKc, 16),
+ threadExtendedPANId = WeaveStack.VoidPtrToByteArray(self.ThreadExtendedPANId, 8),
+ threadNetworkKey = WeaveStack.VoidPtrToByteArray(self.ThreadNetworkKey, 16),
+ threadPSKc = WeaveStack.VoidPtrToByteArray(self.ThreadPSKc, 16),
threadPANId = self.ThreadPANId if self.ThreadPANId != ThreadPANId_NotSpecified else None,
threadChannel = self.ThreadChannel if self.ThreadChannel != ThreadChannel_NotSpecified else None,
wirelessSignalStrength = self.WirelessSignalStrength if self.WirelessSignalStrength != -32768 else None
@@ -393,12 +297,12 @@
networkInfoStruct.WiFiMode = networkInfo.WiFiMode if networkInfo.WiFiMode != None else -1
networkInfoStruct.WiFiRole = networkInfo.WiFiRole if networkInfo.WiFiRole != None else -1
networkInfoStruct.WiFiSecurityType = networkInfo.WiFiSecurityType if networkInfo.WiFiSecurityType != None else -1
- networkInfoStruct.WiFiKey = _ByteArrayToVoidPtr(networkInfo.WiFiKey)
+ networkInfoStruct.WiFiKey = WeaveStack.ByteArrayToVoidPtr(networkInfo.WiFiKey)
networkInfoStruct.WiFiKeyLen = len(networkInfo.WiFiKey) if (networkInfo.WiFiKey != None) else 0
networkInfoStruct.ThreadNetworkName = networkInfo.ThreadNetworkName
- networkInfoStruct.ThreadExtendedPANId = _ByteArrayToVoidPtr(networkInfo.ThreadExtendedPANId)
- networkInfoStruct.ThreadNetworkKey = _ByteArrayToVoidPtr(networkInfo.ThreadNetworkKey)
- networkInfoStruct.ThreadPSKc = _ByteArrayToVoidPtr(networkInfo.ThreadPSKc)
+ networkInfoStruct.ThreadExtendedPANId = WeaveStack.ByteArrayToVoidPtr(networkInfo.ThreadExtendedPANId)
+ networkInfoStruct.ThreadNetworkKey = WeaveStack.ByteArrayToVoidPtr(networkInfo.ThreadNetworkKey)
+ networkInfoStruct.ThreadPSKc = WeaveStack.ByteArrayToVoidPtr(networkInfo.ThreadPSKc)
networkInfoStruct.ThreadPANId = networkInfo.ThreadPANId if networkInfo.ThreadPANId != None else ThreadPANId_NotSpecified
networkInfoStruct.ThreadChannel = networkInfo.ThreadChannel if networkInfo.ThreadChannel != None else ThreadChannel_NotSpecified
networkInfoStruct.WirelessSignalStrength = networkInfo.WirelessSignalStrength if networkInfo.WirelessSignalStrength != None else -32768
@@ -436,8 +340,8 @@
manufacturingYear = self.ManufacturingYear if self.ManufacturingYear != 0 else None,
manufacturingMonth = self.ManufacturingMonth if self.ManufacturingMonth != 0 else None,
manufacturingDay = self.ManufacturingDay if self.ManufacturingDay != 0 else None,
- primary802154MACAddress = bytearray(self.Primary802154MACAddress) if not _IsByteArrayAllZeros(self.Primary802154MACAddress) else None,
- primaryWiFiMACAddress = bytearray(self.PrimaryWiFiMACAddress) if not _IsByteArrayAllZeros(self.PrimaryWiFiMACAddress) else None,
+ primary802154MACAddress = bytearray(self.Primary802154MACAddress) if not WeaveStack.IsByteArrayAllZeros(self.Primary802154MACAddress) else None,
+ primaryWiFiMACAddress = bytearray(self.PrimaryWiFiMACAddress) if not WeaveStack.IsByteArrayAllZeros(self.PrimaryWiFiMACAddress) else None,
serialNumber = self.SerialNumber if len(self.SerialNumber) != 0 else None,
softwareVersion = self.SoftwareVersion if len(self.SoftwareVersion) != 0 else None,
rendezvousWiFiESSID = self.RendezvousWiFiESSID if len(self.RendezvousWiFiESSID) != 0 else None,
@@ -447,8 +351,6 @@
deviceFeatures = self.DeviceFeatures,
flags = self.Flags)
-
-_dmLib = None
_CompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p)
_IdentifyDeviceCompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p, POINTER(_DeviceDescriptorStruct))
_PairTokenCompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_uint32)
@@ -459,7 +361,7 @@
_GetCameraAuthDataCompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_char_p, c_char_p)
_GetRendezvousModeCompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_uint16)
_GetFabricConfigCompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_uint32)
-_ErrorFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_ulong, POINTER(_DeviceStatusStruct))
+_ErrorFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_ulong, POINTER(DeviceStatusStruct))
_GetBleEventFunct = CFUNCTYPE(c_void_p)
_WriteBleCharacteristicFunct = CFUNCTYPE(c_bool, c_void_p, c_void_p, c_void_p, c_void_p, c_uint16)
_SubscribeBleCharacteristicFunct = CFUNCTYPE(c_bool, c_void_p, c_void_p, c_void_p, c_bool)
@@ -478,35 +380,25 @@
def __init__(self, startNetworkThread=True):
self.devMgr = None
- self.callbackRes = None
self.networkThread = None
self.networkThreadRunable = False
- self.networkLock = Lock()
- self.completeEvent = Event()
+ self._weaveStack = WeaveStack()
+ self._dmLib = None
self._InitLib()
devMgr = c_void_p(None)
- res = _dmLib.nl_Weave_DeviceManager_NewDeviceManager(pointer(devMgr))
+ res = self._dmLib.nl_Weave_DeviceManager_NewDeviceManager(pointer(devMgr))
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
self.devMgr = devMgr
-
- def HandleComplete(devMgr, reqState):
- self.callbackRes = True
- self.completeEvent.set()
-
- def HandleError(devMgr, reqState, err, devStatusPtr):
- self.callbackRes = self._ErrorToException(err, devStatusPtr)
- self.completeEvent.set()
+ self._weaveStack.devMgr = devMgr
def HandleDeviceEnumerationResponse(devMgr, deviceDescPtr, deviceAddrStr):
print " Enumerated device IP: %s" % (deviceAddrStr)
deviceDescPtr.contents.toDeviceDescriptor().Print(" ")
- self.cbHandleComplete = _CompleteFunct(HandleComplete)
- self.cbHandleError = _ErrorFunct(HandleError)
self.cbHandleDeviceEnumerationResponse = _DeviceEnumerationResponseFunct(HandleDeviceEnumerationResponse)
self.blockingCB = None # set by other modules(BLE) that require service by thread while thread blocks.
self.cbHandleBleEvent = None # set by other modules (BLE) that provide event callback to Weave.
@@ -519,35 +411,35 @@
def __del__(self):
if (self.devMgr != None):
- _dmLib.nl_Weave_DeviceManager_DeleteDeviceManager(self.devMgr)
+ self._dmLib.nl_Weave_DeviceManager_DeleteDeviceManager(self.devMgr)
self.StopNetworkThread()
def DriveBleIO(self):
# perform asynchronous write to pipe in IO thread's select() to wake for BLE input
- res = _dmLib.nl_Weave_DeviceManager_WakeForBleIO()
+ res = self._dmLib.nl_Weave_DeviceManager_WakeForBleIO()
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def SetBleEventCB(self, bleEventCB):
if (self.devMgr != None):
self.cbHandleBleEvent = _GetBleEventFunct(bleEventCB)
- _dmLib.nl_Weave_DeviceManager_SetBleEventCB(self.cbHandleBleEvent)
+ self._dmLib.nl_Weave_DeviceManager_SetBleEventCB(self.cbHandleBleEvent)
def SetBleWriteCharCB(self, bleWriteCharCB):
if (self.devMgr != None):
self.cbHandleBleWriteChar = _WriteBleCharacteristicFunct(bleWriteCharCB)
- _dmLib.nl_Weave_DeviceManager_SetBleWriteCharacteristic(self.cbHandleBleWriteChar)
+ self._dmLib.nl_Weave_DeviceManager_SetBleWriteCharacteristic(self.cbHandleBleWriteChar)
def SetBleSubscribeCharCB(self, bleSubscribeCharCB):
if (self.devMgr != None):
self.cbHandleBleSubscribeChar = _SubscribeBleCharacteristicFunct(bleSubscribeCharCB)
- _dmLib.nl_Weave_DeviceManager_SetBleSubscribeCharacteristic(self.cbHandleBleSubscribeChar)
+ self._dmLib.nl_Weave_DeviceManager_SetBleSubscribeCharacteristic(self.cbHandleBleSubscribeChar)
def SetBleCloseCB(self, bleCloseCB):
if (self.devMgr != None):
self.cbHandleBleClose = _CloseBleFunct(bleCloseCB)
- _dmLib.nl_Weave_DeviceManager_SetBleClose(self.cbHandleBleClose)
+ self._dmLib.nl_Weave_DeviceManager_SetBleClose(self.cbHandleBleClose)
def StartNetworkThread(self):
if (self.networkThread != None):
@@ -555,9 +447,9 @@
def RunNetworkThread():
while (self.networkThreadRunable):
- self.networkLock.acquire()
- _dmLib.nl_Weave_DeviceManager_DriveIO(50)
- self.networkLock.release()
+ self._weaveStack.networkLock.acquire()
+ self._dmLib.nl_Weave_DeviceManager_DriveIO(50)
+ self._weaveStack.networkLock.release()
time.sleep(0.005)
self.networkThread = Thread(target=RunNetworkThread, name="WeaveNetworkThread")
@@ -572,52 +464,52 @@
self.networkThread = None
def IsConnected(self):
- return self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_IsConnected(self.devMgr)
+ return self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_IsConnected(self.devMgr)
)
def DeviceId(self):
- return self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_DeviceId(self.devMgr)
+ return self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_DeviceId(self.devMgr)
)
def DeviceAddress(self):
- return self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_DeviceAddress(self.devMgr)
+ return self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_DeviceAddress(self.devMgr)
)
def SetRendezvousAddress(self, addr):
if addr is not None and "\x00" in addr:
raise ValueError("Unexpected NUL character in addr");
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_SetRendezvousAddress(self.devMgr, addr)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_SetRendezvousAddress(self.devMgr, addr)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def SetConnectTimeout(self, timeoutMS):
if timeoutMS < 0 or timeoutMS > pow(2,32):
raise ValueError("timeoutMS must be an unsigned 32-bit integer")
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_SetConnectTimeout(self.devMgr, timeoutMS)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_SetConnectTimeout(self.devMgr, timeoutMS)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def SetAutoReconnect(self, autoReconnect):
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_SetAutoReconnect(self.devMgr, autoReconnect)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_SetAutoReconnect(self.devMgr, autoReconnect)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def SetRendezvousLinkLocal(self, RendezvousLinkLocal):
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_SetRendezvousLinkLocal(self.devMgr, RendezvousLinkLocal)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_SetRendezvousLinkLocal(self.devMgr, RendezvousLinkLocal)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def StartDeviceEnumeration(self, targetFabricId=TargetFabricId_AnyFabric,
targetModes=TargetDeviceMode_Any,
@@ -632,13 +524,13 @@
deviceCriteria.TargetProductId = targetProductId
deviceCriteria.TargetDeviceId = targetDeviceId
- self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_StartDeviceEnumeration(self.devMgr, deviceCriteria, self.cbHandleDeviceEnumerationResponse, self.cbHandleError)
+ self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_StartDeviceEnumeration(self.devMgr, deviceCriteria, self.cbHandleDeviceEnumerationResponse, self._weaveStack.cbHandleError)
)
def StopDeviceEnumeration(self):
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_StopDeviceEnumeration(self.devMgr)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_StopDeviceEnumeration(self.devMgr)
)
def ConnectDevice(self, deviceId, deviceAddr=None,
@@ -653,16 +545,16 @@
raise ValueError('Must specify only one of pairingCode or accessToken when calling WeaveDeviceManager.ConnectDevice')
if (pairingCode == None and accessToken == None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ConnectDevice_NoAuth(self.devMgr, deviceId, deviceAddr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ConnectDevice_NoAuth(self.devMgr, deviceId, deviceAddr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
elif (pairingCode != None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ConnectDevice_PairingCode(self.devMgr, deviceId, deviceAddr, pairingCode, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ConnectDevice_PairingCode(self.devMgr, deviceId, deviceAddr, pairingCode, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
else:
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ConnectDevice_AccessToken(self.devMgr, deviceId, deviceAddr, _ByteArrayToVoidPtr(accessToken), len(accessToken), self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ConnectDevice_AccessToken(self.devMgr, deviceId, deviceAddr, WeaveStack.ByteArrayToVoidPtr(accessToken), len(accessToken), self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def RendezvousDevice(self, pairingCode=None, accessToken=None,
@@ -686,46 +578,46 @@
deviceCriteria.TargetDeviceId = targetDeviceId
if (pairingCode == None and accessToken == None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RendezvousDevice_NoAuth(self.devMgr, deviceCriteria, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_NoAuth(self.devMgr, deviceCriteria, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
elif (pairingCode != None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RendezvousDevice_PairingCode(self.devMgr, pairingCode, deviceCriteria, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_PairingCode(self.devMgr, pairingCode, deviceCriteria, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
else:
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RendezvousDevice_AccessToken(self.devMgr, _ByteArrayToVoidPtr(accessToken), len(accessToken), deviceCriteria, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_AccessToken(self.devMgr, WeaveStack.ByteArrayToVoidPtr(accessToken), len(accessToken), deviceCriteria, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
# methods for testing BLE performance are not a part of the Weave Device Manager API, but rather are considered internal.
def TestBle(self, connObj, count, duration, delay, ack, size, rx):
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_TestBle(self.devMgr, connObj, self.cbHandleComplete, self.cbHandleError, count, duration, delay, ack, size, rx)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_TestBle(self.devMgr, connObj, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError, count, duration, delay, ack, size, rx)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def TestResultBle(self, connObj, local):
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_TestResultBle(self.devMgr, connObj, local)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_TestResultBle(self.devMgr, connObj, local)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def TestAbortBle(self, connObj):
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_TestAbortBle(self.devMgr, connObj)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_TestAbortBle(self.devMgr, connObj)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
def TxTimingBle(self, connObj, enabled, remote):
- res = self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_TxTimingBle(self.devMgr, connObj, enabled, remote)
+ res = self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_TxTimingBle(self.devMgr, connObj, enabled, remote)
)
if (res != 0):
- raise self._ErrorToException(res)
+ raise self._weaveStack.ErrorToException(res)
# end of BLE testing methods
@@ -737,16 +629,16 @@
raise ValueError('Must specify only one of pairingCode or accessToken when calling WeaveDeviceManager.ConnectBle')
if (pairingCode == None and accessToken == None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ConnectBle_NoAuth(self.devMgr, bleConnection, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ConnectBle_NoAuth(self.devMgr, bleConnection, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
elif (pairingCode != None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ConnectBle_PairingCode(self.devMgr, bleConnection, pairingCode, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ConnectBle_PairingCode(self.devMgr, bleConnection, pairingCode, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
else:
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ConnectBle_AccessToken(self.devMgr, bleConnection, _ByteArrayToVoidPtr(accessToken), len(accessToken), self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ConnectBle_AccessToken(self.devMgr, bleConnection, WeaveStack.ByteArrayToVoidPtr(accessToken), len(accessToken), self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def PassiveRendezvousDevice(self, pairingCode=None, accessToken=None):
@@ -757,16 +649,16 @@
raise ValueError('Must specify only one of pairingCode or accessToken when calling WeaveDeviceManager.PassiveRendezvousDevice')
if (pairingCode == None and accessToken == None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_NoAuth(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_NoAuth(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
elif (pairingCode != None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_PairingCode(self.devMgr, pairingCode, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_PairingCode(self.devMgr, pairingCode, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
else:
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_AccessToken(self.devMgr, _ByteArrayToVoidPtr(accessToken), len(accessToken), self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_AccessToken(self.devMgr, WeaveStack.ByteArrayToVoidPtr(accessToken), len(accessToken), self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def RemotePassiveRendezvous(self, rendezvousDeviceAddr=None, pairingCode=None, accessToken=None, rendezvousTimeout=None, inactivityTimeout=None):
@@ -780,26 +672,26 @@
raise ValueError("Unexpected NUL character in pairingCode")
if (pairingCode == None and accessToken == None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_NoAuth(self.devMgr, rendezvousDeviceAddr, rendezvousTimeout, inactivityTimeout, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_NoAuth(self.devMgr, rendezvousDeviceAddr, rendezvousTimeout, inactivityTimeout, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
elif (pairingCode != None):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_PASEAuth(self.devMgr, rendezvousDeviceAddr, pairingCode, rendezvousTimeout, inactivityTimeout, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_PASEAuth(self.devMgr, rendezvousDeviceAddr, pairingCode, rendezvousTimeout, inactivityTimeout, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
else:
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_CASEAuth(self.devMgr, rendezvousDeviceAddr, _ByteArrayToVoidPtr(accessToken), len(accessToken), rendezvousTimeout, inactivityTimeout, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_CASEAuth(self.devMgr, rendezvousDeviceAddr, WeaveStack.ByteArrayToVoidPtr(accessToken), len(accessToken), rendezvousTimeout, inactivityTimeout, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def ReconnectDevice(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ReconnectDevice(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ReconnectDevice(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def Close(self):
- self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_Close(self.devMgr)
+ self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_Close(self.devMgr)
)
def EnableConnectionMonitor(self, interval, timeout):
@@ -809,68 +701,68 @@
if timeout < 0 or timeout > pow(2,16):
raise ValueError("timeout must be an unsigned 16-bit unsigned value")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_EnableConnectionMonitor(self.devMgr, interval, timeout, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_EnableConnectionMonitor(self.devMgr, interval, timeout, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def DisableConnectionMonitor(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_DisableConnectionMonitor(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_DisableConnectionMonitor(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def IdentifyDevice(self):
def HandleIdentifyDeviceComplete(devMgr, reqState, deviceDescPtr):
- self.callbackRes = deviceDescPtr.contents.toDeviceDescriptor()
- self.completeEvent.set()
+ self._weaveStack.callbackRes = deviceDescPtr.contents.toDeviceDescriptor()
+ self._weaveStack.completeEvent.set()
cbHandleIdentifyDeviceComplete = _IdentifyDeviceCompleteFunct(HandleIdentifyDeviceComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_IdentifyDevice(self.devMgr, cbHandleIdentifyDeviceComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_IdentifyDevice(self.devMgr, cbHandleIdentifyDeviceComplete, self._weaveStack.cbHandleError)
)
def PairToken(self, pairingToken):
def HandlePairTokenComplete(devMgr, reqState, tokenPairingBundlePtr, tokenPairingBundleLen):
- self.callbackRes = _VoidPtrToByteArray(tokenPairingBundlePtr, tokenPairingBundleLen)
- self.completeEvent.set()
+ self._weaveStack.callbackRes = WeaveStack.VoidPtrToByteArray(tokenPairingBundlePtr, tokenPairingBundleLen)
+ self._weaveStack.completeEvent.set()
cbHandlePairTokenComplete = _PairTokenCompleteFunct(HandlePairTokenComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_PairToken(self.devMgr, _ByteArrayToVoidPtr(pairingToken), len(pairingToken), cbHandlePairTokenComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_PairToken(self.devMgr, WeaveStack.ByteArrayToVoidPtr(pairingToken), len(pairingToken), cbHandlePairTokenComplete, self._weaveStack.cbHandleError)
)
def UnpairToken(self):
def HandleUnpairTokenComplete(devMgr, reqState):
- self.callbackRes = True
- self.completeEvent.set()
+ self._weaveStack.callbackRes = True
+ self._weaveStack.completeEvent.set()
cbHandleUnpairTokenComplete = _UnpairTokenCompleteFunct(HandleUnpairTokenComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_UnpairToken(self.devMgr, cbHandleUnpairTokenComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_UnpairToken(self.devMgr, cbHandleUnpairTokenComplete, self._weaveStack.cbHandleError)
)
def ScanNetworks(self, networkType):
def HandleScanNetworksComplete(devMgr, reqState, netCount, netInfoPtr):
- self.callbackRes = [ netInfoPtr[i].toNetworkInfo() for i in range(netCount) ]
- self.completeEvent.set()
+ self._weaveStack.callbackRes = [ netInfoPtr[i].toNetworkInfo() for i in range(netCount) ]
+ self._weaveStack.completeEvent.set()
cbHandleScanNetworksComplete = _NetworkScanCompleteFunct(HandleScanNetworksComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ScanNetworks(self.devMgr, networkType, cbHandleScanNetworksComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ScanNetworks(self.devMgr, networkType, cbHandleScanNetworksComplete, self._weaveStack.cbHandleError)
)
def GetNetworks(self, getFlags):
def HandleGetNetworksComplete(devMgr, reqState, netCount, netInfoPtr):
- self.callbackRes = [ netInfoPtr[i].toNetworkInfo() for i in range(netCount) ]
- self.completeEvent.set()
+ self._weaveStack.callbackRes = [ netInfoPtr[i].toNetworkInfo() for i in range(netCount) ]
+ self._weaveStack.completeEvent.set()
cbHandleGetNetworksComplete = _GetNetworksCompleteFunct(HandleGetNetworksComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_GetNetworks(self.devMgr, getFlags, cbHandleGetNetworksComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_GetNetworks(self.devMgr, getFlags, cbHandleGetNetworksComplete, self._weaveStack.cbHandleError)
)
def GetCameraAuthData(self, nonce):
@@ -878,41 +770,41 @@
raise ValueError("Unexpected NUL character in nonce")
def HandleGetCameraAuthDataComplete(devMgr, reqState, macAddress, signedCameraPayload):
- self.callbackRes = [ macAddress, signedCameraPayload ]
- self.completeEvent.set()
+ self._weaveStack.callbackRes = [ macAddress, signedCameraPayload ]
+ self._weaveStack.completeEvent.set()
cbHandleGetCameraAuthDataComplete = _GetCameraAuthDataCompleteFunct(HandleGetCameraAuthDataComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_GetCameraAuthData(self.devMgr, nonce, cbHandleGetCameraAuthDataComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_GetCameraAuthData(self.devMgr, nonce, cbHandleGetCameraAuthDataComplete, self._weaveStack.cbHandleError)
)
def AddNetwork(self, networkInfo):
def HandleAddNetworkComplete(devMgr, reqState, networkId):
- self.callbackRes = networkId
- self.completeEvent.set()
+ self._weaveStack.callbackRes = networkId
+ self._weaveStack.completeEvent.set()
cbHandleAddNetworkComplete = _AddNetworkCompleteFunct(HandleAddNetworkComplete)
networkInfoStruct = _NetworkInfoStruct.fromNetworkInfo(networkInfo)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_AddNetwork(self.devMgr, networkInfoStruct, cbHandleAddNetworkComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_AddNetwork(self.devMgr, networkInfoStruct, cbHandleAddNetworkComplete, self._weaveStack.cbHandleError)
)
def UpdateNetwork(self, networkInfo):
networkInfoStruct = _NetworkInfoStruct.fromNetworkInfo(networkInfo)
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_UpdateNetwork(self.devMgr, networkInfoStruct, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_UpdateNetwork(self.devMgr, networkInfoStruct, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def RemoveNetwork(self, networkId):
if networkId < 0 or networkId > pow(2,32):
raise ValueError("networkId must be an unsigned 32-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RemoveNetwork(self.devMgr, networkId, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RemoveNetwork(self.devMgr, networkId, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def EnableNetwork(self, networkId):
@@ -920,103 +812,103 @@
if networkId < 0 or networkId > pow(2,32):
raise ValueError("networkId must be an unsigned 32-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_EnableNetwork(self.devMgr, networkId, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_EnableNetwork(self.devMgr, networkId, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def DisableNetwork(self, networkId):
if networkId < 0 or networkId > pow(2,32):
raise ValueError("networkId must be an unsigned 32-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_DisableNetwork(self.devMgr, networkId, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_DisableNetwork(self.devMgr, networkId, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def TestNetworkConnectivity(self, networkId):
if networkId < 0 or networkId > pow(2,32):
raise ValueError("networkId must be an unsigned 32-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_TestNetworkConnectivity(self.devMgr, networkId, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_TestNetworkConnectivity(self.devMgr, networkId, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def GetRendezvousMode(self):
def HandleGetRendezvousModeComplete(devMgr, reqState, modeFlags):
- self.callbackRes = modeFlags
- self.completeEvent.set()
+ self._weaveStack.callbackRes = modeFlags
+ self._weaveStack.completeEvent.set()
cbHandleGetRendezvousModeComplete = _GetRendezvousModeCompleteFunct(HandleGetRendezvousModeComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_GetRendezvousMode(self.devMgr, cbHandleGetRendezvousModeComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_GetRendezvousMode(self.devMgr, cbHandleGetRendezvousModeComplete, self._weaveStack.cbHandleError)
)
def SetRendezvousMode(self, modeFlags):
if modeFlags < 0 or modeFlags > pow(2,16):
raise ValueError("modeFlags must be an unsigned 16-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_SetRendezvousMode(self.devMgr, modeFlags, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_SetRendezvousMode(self.devMgr, modeFlags, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def GetLastNetworkProvisioningResult(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_GetLastNetworkProvisioningResult(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_GetLastNetworkProvisioningResult(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def CreateFabric(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_CreateFabric(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_CreateFabric(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def LeaveFabric(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_LeaveFabric(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_LeaveFabric(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def GetFabricConfig(self):
def HandleGetFabricConfigComplete(devMgr, reqState, fabricConfigPtr, fabricConfigLen):
- self.callbackRes = _VoidPtrToByteArray(fabricConfigPtr, fabricConfigLen)
- self.completeEvent.set()
+ self._weaveStack.callbackRes = WeaveStack.VoidPtrToByteArray(fabricConfigPtr, fabricConfigLen)
+ self._weaveStack.completeEvent.set()
cbHandleGetFabricConfigComplete = _GetFabricConfigCompleteFunct(HandleGetFabricConfigComplete)
- return self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_GetFabricConfig(self.devMgr, cbHandleGetFabricConfigComplete, self.cbHandleError)
+ return self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_GetFabricConfig(self.devMgr, cbHandleGetFabricConfigComplete, self._weaveStack.cbHandleError)
)
def JoinExistingFabric(self, fabricConfig):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_JoinExistingFabric(self.devMgr, _ByteArrayToVoidPtr(fabricConfig), len(fabricConfig),
- self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_JoinExistingFabric(self.devMgr, WeaveStack.ByteArrayToVoidPtr(fabricConfig), len(fabricConfig),
+ self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def Ping(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_Ping(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_Ping(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def RegisterServicePairAccount(self, serviceId, accountId, serviceConfig, pairingToken, pairingInitData):
if accountId is not None and '\x00' in accountId:
raise ValueError("Unexpected NUL character in accountId")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_RegisterServicePairAccount(self.devMgr, serviceId, accountId,
- _ByteArrayToVoidPtr(serviceConfig), len(serviceConfig),
- _ByteArrayToVoidPtr(pairingToken), len(pairingToken),
- _ByteArrayToVoidPtr(pairingInitData), len(pairingInitData),
- self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_RegisterServicePairAccount(self.devMgr, serviceId, accountId,
+ WeaveStack.ByteArrayToVoidPtr(serviceConfig), len(serviceConfig),
+ WeaveStack.ByteArrayToVoidPtr(pairingToken), len(pairingToken),
+ WeaveStack.ByteArrayToVoidPtr(pairingInitData), len(pairingInitData),
+ self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def UpdateService(self, serviceId, serviceConfig):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_UpdateService(self.devMgr, serviceId, _ByteArrayToVoidPtr(serviceConfig),
- len(serviceConfig), self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_UpdateService(self.devMgr, serviceId, WeaveStack.ByteArrayToVoidPtr(serviceConfig),
+ len(serviceConfig), self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def UnregisterService(self, serviceId):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_UnregisterService(self.devMgr, serviceId, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_UnregisterService(self.devMgr, serviceId, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def ArmFailSafe(self, armMode, failSafeToken):
@@ -1026,47 +918,43 @@
if failSafeToken < 0 or failSafeToken > pow(2, 32):
raise ValueError("failSafeToken must be an unsigned 32-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ArmFailSafe(self.devMgr, armMode, failSafeToken, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ArmFailSafe(self.devMgr, armMode, failSafeToken, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def DisarmFailSafe(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_DisarmFailSafe(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_DisarmFailSafe(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def ResetConfig(self, resetFlags):
if resetFlags < 0 or resetFlags > pow(2, 16):
raise ValueError("resetFlags must be an unsigned 16-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_ResetConfig(self.devMgr, resetFlags, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_ResetConfig(self.devMgr, resetFlags, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def CloseEndpoints(self):
- self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_CloseEndpoints()
- )
- def Shutdown(self):
- self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_Shutdown()
+ self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_CloseEndpoints()
)
def SetLogFilter(self, category):
if category < 0 or category > pow(2, 8):
raise ValueError("category must be an unsigned 8-bit integer")
- self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_SetLogFilter(category)
+ self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_SetLogFilter(category)
)
def GetLogFilter(self):
- self._CallDevMgr(
- lambda: _dmLib.nl_Weave_DeviceManager_GetLogFilter()
+ self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_DeviceManager_GetLogFilter()
)
def SetBlockingCB(self, blockingCB):
- self.blockingCB = blockingCB
+ self._weaveStack.blockingCB = blockingCB
def StartSystemTest(self, profileId, testId):
if profileId < 0 or profileId > pow(2, 32):
@@ -1075,285 +963,229 @@
if testId < 0 or testId > pow(2, 32):
raise ValueError("testId must be an unsigned 32-bit integer")
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_StartSystemTest(self.devMgr, profileId, testId, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_StartSystemTest(self.devMgr, profileId, testId, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
def StopSystemTest(self):
- self._CallDevMgrAsync(
- lambda: _dmLib.nl_Weave_DeviceManager_StopSystemTest(self.devMgr, self.cbHandleComplete, self.cbHandleError)
+ self._weaveStack.CallAsync(
+ lambda: self._dmLib.nl_Weave_DeviceManager_StopSystemTest(self.devMgr, self._weaveStack.cbHandleComplete, self._weaveStack.cbHandleError)
)
# ----- Private Members -----
def _InitLib(self):
- global _dmLib
- if (_dmLib == None):
- _dmLib = CDLL(_LocateWeaveDLL())
- _dmLib.nl_Weave_DeviceManager_Init.argtypes = [ ]
- _dmLib.nl_Weave_DeviceManager_Init.restype = c_uint32
+ if (self._dmLib == None):
+ self._dmLib = CDLL(self._weaveStack.LocateWeaveDLL())
- _dmLib.nl_Weave_DeviceManager_Shutdown.argtypes = [ ]
- _dmLib.nl_Weave_DeviceManager_Shutdown.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_NewDeviceManager.argtypes = [ POINTER(c_void_p) ]
+ self._dmLib.nl_Weave_DeviceManager_NewDeviceManager.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_NewDeviceManager.argtypes = [ POINTER(c_void_p) ]
- _dmLib.nl_Weave_DeviceManager_NewDeviceManager.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_DeleteDeviceManager.argtypes = [ c_void_p ]
+ self._dmLib.nl_Weave_DeviceManager_DeleteDeviceManager.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_DeleteDeviceManager.argtypes = [ c_void_p ]
- _dmLib.nl_Weave_DeviceManager_DeleteDeviceManager.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_Close.argtypes = [ c_void_p ]
+ self._dmLib.nl_Weave_DeviceManager_Close.restype = None
- _dmLib.nl_Weave_DeviceManager_Close.argtypes = [ c_void_p ]
- _dmLib.nl_Weave_DeviceManager_Close.restype = None
+ self._dmLib.nl_Weave_DeviceManager_DriveIO.argtypes = [ c_uint32 ]
+ self._dmLib.nl_Weave_DeviceManager_DriveIO.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_DriveIO.argtypes = [ c_uint32 ]
- _dmLib.nl_Weave_DeviceManager_DriveIO.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_WakeForBleIO.argtypes = [ ]
+ self._dmLib.nl_Weave_DeviceManager_WakeForBleIO.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_WakeForBleIO.argtypes = [ ]
- _dmLib.nl_Weave_DeviceManager_WakeForBleIO.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_SetBleEventCB.argtypes = [ _GetBleEventFunct ]
+ self._dmLib.nl_Weave_DeviceManager_SetBleEventCB.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetBleEventCB.argtypes = [ _GetBleEventFunct ]
- _dmLib.nl_Weave_DeviceManager_SetBleEventCB.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_SetBleWriteCharacteristic.argtypes = [ _WriteBleCharacteristicFunct ]
+ self._dmLib.nl_Weave_DeviceManager_SetBleWriteCharacteristic.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetBleWriteCharacteristic.argtypes = [ _WriteBleCharacteristicFunct ]
- _dmLib.nl_Weave_DeviceManager_SetBleWriteCharacteristic.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_SetBleSubscribeCharacteristic.argtypes = [ _SubscribeBleCharacteristicFunct ]
+ self._dmLib.nl_Weave_DeviceManager_SetBleSubscribeCharacteristic.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetBleSubscribeCharacteristic.argtypes = [ _SubscribeBleCharacteristicFunct ]
- _dmLib.nl_Weave_DeviceManager_SetBleSubscribeCharacteristic.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_SetBleClose.argtypes = [ _CloseBleFunct ]
+ self._dmLib.nl_Weave_DeviceManager_SetBleClose.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetBleClose.argtypes = [ _CloseBleFunct ]
- _dmLib.nl_Weave_DeviceManager_SetBleClose.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_IsConnected.argtypes = [ c_void_p ]
+ self._dmLib.nl_Weave_DeviceManager_IsConnected.restype = c_bool
- _dmLib.nl_Weave_DeviceManager_IsConnected.argtypes = [ c_void_p ]
- _dmLib.nl_Weave_DeviceManager_IsConnected.restype = c_bool
+ self._dmLib.nl_Weave_DeviceManager_DeviceId.argtypes = [ c_void_p ]
+ self._dmLib.nl_Weave_DeviceManager_DeviceId.restype = c_uint64
- _dmLib.nl_Weave_DeviceManager_DeviceId.argtypes = [ c_void_p ]
- _dmLib.nl_Weave_DeviceManager_DeviceId.restype = c_uint64
+ self._dmLib.nl_Weave_DeviceManager_DeviceAddress.argtypes = [ c_void_p ]
+ self._dmLib.nl_Weave_DeviceManager_DeviceAddress.restype = c_char_p
- _dmLib.nl_Weave_DeviceManager_DeviceAddress.argtypes = [ c_void_p ]
- _dmLib.nl_Weave_DeviceManager_DeviceAddress.restype = c_char_p
+ self._dmLib.nl_Weave_DeviceManager_StartDeviceEnumeration.argtypes = [ c_void_p, POINTER(_IdentifyDeviceCriteriaStruct), _DeviceEnumerationResponseFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_StartDeviceEnumeration.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_StartDeviceEnumeration.argtypes = [ c_void_p, POINTER(_IdentifyDeviceCriteriaStruct), _DeviceEnumerationResponseFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_StartDeviceEnumeration.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_StopDeviceEnumeration.argtypes = [ c_void_p ]
+ self._dmLib.nl_Weave_DeviceManager_StopDeviceEnumeration.restype = None
- _dmLib.nl_Weave_DeviceManager_StopDeviceEnumeration.argtypes = [ c_void_p ]
- _dmLib.nl_Weave_DeviceManager_StopDeviceEnumeration.restype = None
+ self._dmLib.nl_Weave_DeviceManager_ConnectDevice_NoAuth.argtypes = [ c_void_p, c_uint64, c_char_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ConnectDevice_NoAuth.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ConnectDevice_NoAuth.argtypes = [ c_void_p, c_uint64, c_char_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ConnectDevice_NoAuth.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ConnectDevice_PairingCode.argtypes = [ c_void_p, c_uint64, c_char_p, c_char_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ConnectDevice_PairingCode.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ConnectDevice_PairingCode.argtypes = [ c_void_p, c_uint64, c_char_p, c_char_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ConnectDevice_PairingCode.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ConnectDevice_AccessToken.argtypes = [ c_void_p, c_uint64, c_char_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ConnectDevice_AccessToken.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ConnectDevice_AccessToken.argtypes = [ c_void_p, c_uint64, c_char_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ConnectDevice_AccessToken.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_NoAuth.argtypes = [ c_void_p, POINTER(_IdentifyDeviceCriteriaStruct), _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_NoAuth.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_RendezvousDevice_NoAuth.argtypes = [ c_void_p, POINTER(_IdentifyDeviceCriteriaStruct), _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RendezvousDevice_NoAuth.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_PairingCode.argtypes = [ c_void_p, c_char_p, POINTER(_IdentifyDeviceCriteriaStruct), _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_PairingCode.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_RendezvousDevice_PairingCode.argtypes = [ c_void_p, c_char_p, POINTER(_IdentifyDeviceCriteriaStruct), _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RendezvousDevice_PairingCode.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_AccessToken.argtypes = [ c_void_p, c_void_p, c_uint32, POINTER(_IdentifyDeviceCriteriaStruct), _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RendezvousDevice_AccessToken.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_RendezvousDevice_AccessToken.argtypes = [ c_void_p, c_void_p, c_uint32, POINTER(_IdentifyDeviceCriteriaStruct), _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RendezvousDevice_AccessToken.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_NoAuth.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_NoAuth.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_NoAuth.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_NoAuth.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_PairingCode.argtypes = [ c_void_p, c_char_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_PairingCode.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_PairingCode.argtypes = [ c_void_p, c_char_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_PairingCode.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_AccessToken.argtypes = [ c_void_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_AccessToken.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_AccessToken.argtypes = [ c_void_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_PassiveRendezvousDevice_AccessToken.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_TestBle.argtypes = [ c_void_p, c_void_p, _CompleteFunct, _ErrorFunct, c_uint32, c_uint32, c_uint16, c_uint8, c_uint16, c_bool ]
+ self._dmLib.nl_Weave_DeviceManager_TestBle.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_TestResultBle.argtypes = [ c_void_p, c_void_p, c_bool ]
+ self._dmLib.nl_Weave_DeviceManager_TestResultBle.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_TestAbortBle.argtypes = [ c_void_p, c_void_p ]
+ self._dmLib.nl_Weave_DeviceManager_TestAbortBle.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_TxTimingBle.argtypes = [ c_void_p, c_void_p, c_bool, c_bool ]
+ self._dmLib.nl_Weave_DeviceManager_TxTimingBle.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_TestBle.argtypes = [ c_void_p, c_void_p, _CompleteFunct, _ErrorFunct, c_uint32, c_uint32, c_uint16, c_uint8, c_uint16, c_bool ]
- _dmLib.nl_Weave_DeviceManager_TestBle.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_TestResultBle.argtypes = [ c_void_p, c_void_p, c_bool ]
- _dmLib.nl_Weave_DeviceManager_TestResultBle.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_TestAbortBle.argtypes = [ c_void_p, c_void_p ]
- _dmLib.nl_Weave_DeviceManager_TestAbortBle.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_TxTimingBle.argtypes = [ c_void_p, c_void_p, c_bool, c_bool ]
- _dmLib.nl_Weave_DeviceManager_TxTimingBle.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ConnectBle_NoAuth.argtypes = [ c_void_p, c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ConnectBle_NoAuth.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ConnectBle_NoAuth.argtypes = [ c_void_p, c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ConnectBle_NoAuth.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ConnectBle_PairingCode.argtypes = [ c_void_p, c_void_p, c_char_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ConnectBle_PairingCode.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ConnectBle_PairingCode.argtypes = [ c_void_p, c_void_p, c_char_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ConnectBle_PairingCode.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ConnectBle_AccessToken.argtypes = [ c_void_p, c_void_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ConnectBle_AccessToken.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ConnectBle_AccessToken.argtypes = [ c_void_p, c_void_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ConnectBle_AccessToken.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_CASEAuth.argtypes = [ c_void_p, c_char_p, c_char_p, c_uint32, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_CASEAuth.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_CASEAuth.argtypes = [ c_void_p, c_char_p, c_char_p, c_uint32, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_CASEAuth.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_PASEAuth.argtypes = [ c_void_p, c_char_p, c_char_p, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_PASEAuth.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_PASEAuth.argtypes = [ c_void_p, c_char_p, c_char_p, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_PASEAuth.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_NoAuth.argtypes = [ c_void_p, c_char_p, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_NoAuth.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_NoAuth.argtypes = [ c_void_p, c_char_p, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RemotePassiveRendezvous_NoAuth.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ReconnectDevice.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ReconnectDevice.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ReconnectDevice.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ReconnectDevice.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_EnableConnectionMonitor.argtypes = [ c_void_p, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_EnableConnectionMonitor.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_EnableConnectionMonitor.argtypes = [ c_void_p, c_uint16, c_uint16, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_EnableConnectionMonitor.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_DisableConnectionMonitor.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_DisableConnectionMonitor.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_DisableConnectionMonitor.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_DisableConnectionMonitor.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_IdentifyDevice.argtypes = [ c_void_p, _IdentifyDeviceCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_IdentifyDevice.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_IdentifyDevice.argtypes = [ c_void_p, _IdentifyDeviceCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_IdentifyDevice.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_PairToken.argtypes = [ c_void_p, c_void_p, c_uint32, _PairTokenCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_PairToken.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_PairToken.argtypes = [ c_void_p, c_void_p, c_uint32, _PairTokenCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_PairToken.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_UnpairToken.argtypes = [ c_void_p, _UnpairTokenCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_UnpairToken.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_UnpairToken.argtypes = [ c_void_p, _UnpairTokenCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_UnpairToken.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ScanNetworks.argtypes = [ c_void_p, c_int, _NetworkScanCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ScanNetworks.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ScanNetworks.argtypes = [ c_void_p, c_int, _NetworkScanCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ScanNetworks.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_GetNetworks.argtypes = [ c_void_p, c_int, _GetNetworksCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_GetNetworks.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_GetNetworks.argtypes = [ c_void_p, c_int, _GetNetworksCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_GetNetworks.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_GetCameraAuthData.argtypes = [ c_void_p, c_char_p, _GetCameraAuthDataCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_GetCameraAuthData.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_AddNetwork.argtypes = [ c_void_p, POINTER(_NetworkInfoStruct), _AddNetworkCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_AddNetwork.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_UpdateNetwork.argtypes = [ c_void_p, POINTER(_NetworkInfoStruct), _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_UpdateNetwork.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_RemoveNetwork.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RemoveNetwork.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_EnableNetwork.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_EnableNetwork.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_DisableNetwork.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_DisableNetwork.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_TestNetworkConnectivity.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_TestNetworkConnectivity.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_GetRendezvousMode.argtypes = [ c_void_p, _GetRendezvousModeCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_GetRendezvousMode.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_SetRendezvousMode.argtypes = [ c_void_p, c_uint16, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_SetRendezvousMode.restype = c_uint32
-
- _dmLib.nl_Weave_DeviceManager_GetLastNetworkProvisioningResult.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_GetLastNetworkProvisioningResult.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_GetCameraAuthData.argtypes = [ c_void_p, c_char_p, _GetCameraAuthDataCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_GetCameraAuthData.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_CreateFabric.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_CreateFabric.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_AddNetwork.argtypes = [ c_void_p, POINTER(_NetworkInfoStruct), _AddNetworkCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_AddNetwork.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_LeaveFabric.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_LeaveFabric.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_UpdateNetwork.argtypes = [ c_void_p, POINTER(_NetworkInfoStruct), _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_UpdateNetwork.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_GetFabricConfig.argtypes = [ c_void_p, _GetFabricConfigCompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_GetFabricConfig.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_RemoveNetwork.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RemoveNetwork.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_JoinExistingFabric.argtypes = [ c_void_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_JoinExistingFabric.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_EnableNetwork.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_EnableNetwork.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_Ping.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_Ping.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_DisableNetwork.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_DisableNetwork.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetRendezvousAddress.argtypes = [ c_void_p, c_char_p ]
- _dmLib.nl_Weave_DeviceManager_SetRendezvousAddress.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_TestNetworkConnectivity.argtypes = [ c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_TestNetworkConnectivity.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetConnectTimeout.argtypes = [ c_void_p, c_uint32 ]
- _dmLib.nl_Weave_DeviceManager_SetConnectTimeout.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_GetRendezvousMode.argtypes = [ c_void_p, _GetRendezvousModeCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_GetRendezvousMode.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetAutoReconnect.argtypes = [ c_void_p, c_bool ]
- _dmLib.nl_Weave_DeviceManager_SetAutoReconnect.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_SetRendezvousMode.argtypes = [ c_void_p, c_uint16, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_SetRendezvousMode.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetRendezvousLinkLocal.argtypes = [ c_void_p, c_bool ]
- _dmLib.nl_Weave_DeviceManager_SetRendezvousLinkLocal.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_GetLastNetworkProvisioningResult.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_GetLastNetworkProvisioningResult.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_RegisterServicePairAccount.argtypes = [ c_void_p, c_uint64, c_char_p, c_void_p, c_uint32, c_void_p, c_uint32, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_RegisterServicePairAccount.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_CreateFabric.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_CreateFabric.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_UpdateService.argtypes = [ c_void_p, c_uint64, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_UpdateService.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_LeaveFabric.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_LeaveFabric.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_UnregisterService.argtypes = [ c_void_p, c_uint64, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_UnregisterService.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_GetFabricConfig.argtypes = [ c_void_p, _GetFabricConfigCompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_GetFabricConfig.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ArmFailSafe.argtypes = [ c_void_p, c_uint8, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ArmFailSafe.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_JoinExistingFabric.argtypes = [ c_void_p, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_JoinExistingFabric.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_DisarmFailSafe.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_DisarmFailSafe.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_Ping.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_Ping.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ResetConfig.argtypes = [ c_void_p, c_uint16, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_ResetConfig.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_SetRendezvousAddress.argtypes = [ c_void_p, c_char_p ]
+ self._dmLib.nl_Weave_DeviceManager_SetRendezvousAddress.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_ErrorToString.argtypes = [ c_uint32 ]
- _dmLib.nl_Weave_DeviceManager_ErrorToString.restype = c_char_p
+ self._dmLib.nl_Weave_DeviceManager_SetConnectTimeout.argtypes = [ c_void_p, c_uint32 ]
+ self._dmLib.nl_Weave_DeviceManager_SetConnectTimeout.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_StatusReportToString.argtypes = [ c_uint32, c_uint16 ]
- _dmLib.nl_Weave_DeviceManager_StatusReportToString.restype = c_char_p
+ self._dmLib.nl_Weave_DeviceManager_SetAutoReconnect.argtypes = [ c_void_p, c_bool ]
+ self._dmLib.nl_Weave_DeviceManager_SetAutoReconnect.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_GetLogFilter.argtypes = [ ]
- _dmLib.nl_Weave_DeviceManager_GetLogFilter.restype = c_uint8
+ self._dmLib.nl_Weave_DeviceManager_SetRendezvousLinkLocal.argtypes = [ c_void_p, c_bool ]
+ self._dmLib.nl_Weave_DeviceManager_SetRendezvousLinkLocal.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_SetLogFilter.argtypes = [ c_uint8 ]
- _dmLib.nl_Weave_DeviceManager_SetLogFilter.restype = None
+ self._dmLib.nl_Weave_DeviceManager_RegisterServicePairAccount.argtypes = [ c_void_p, c_uint64, c_char_p, c_void_p, c_uint32, c_void_p, c_uint32, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_RegisterServicePairAccount.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_CloseEndpoints.argtypes = [ ]
- _dmLib.nl_Weave_DeviceManager_CloseEndpoints.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_UpdateService.argtypes = [ c_void_p, c_uint64, c_void_p, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_UpdateService.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_StartSystemTest.argtypes = [ c_void_p, c_uint32, c_uint32, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_StartSystemTest.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_UnregisterService.argtypes = [ c_void_p, c_uint64, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_UnregisterService.restype = c_uint32
- _dmLib.nl_Weave_DeviceManager_StopSystemTest.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
- _dmLib.nl_Weave_DeviceManager_StopSystemTest.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_ArmFailSafe.argtypes = [ c_void_p, c_uint8, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ArmFailSafe.restype = c_uint32
- res = _dmLib.nl_Weave_DeviceManager_Init()
- if (res != 0):
- raise self._ErrorToException(res)
+ self._dmLib.nl_Weave_DeviceManager_DisarmFailSafe.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_DisarmFailSafe.restype = c_uint32
- def _CallDevMgr(self, callFunct):
- # throw error if op in progress
- self.callbackRes = None
- self.completeEvent.clear()
- with self.networkLock:
- res = callFunct()
- self.completeEvent.set()
- return res
+ self._dmLib.nl_Weave_DeviceManager_ResetConfig.argtypes = [ c_void_p, c_uint16, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_ResetConfig.restype = c_uint32
- def _CallDevMgrAsync(self, callFunct):
- # throw error if op in progress
- self.callbackRes = None
- self.completeEvent.clear()
- with self.networkLock:
- res = callFunct()
+ self._dmLib.nl_Weave_DeviceManager_GetLogFilter.argtypes = [ ]
+ self._dmLib.nl_Weave_DeviceManager_GetLogFilter.restype = c_uint8
- if (res != 0):
- self.completeEvent.set()
- raise self._ErrorToException(res)
- while (not self.completeEvent.isSet()):
- if self.blockingCB:
- self.blockingCB()
+ self._dmLib.nl_Weave_DeviceManager_SetLogFilter.argtypes = [ c_uint8 ]
+ self._dmLib.nl_Weave_DeviceManager_SetLogFilter.restype = None
- self.completeEvent.wait(0.05)
- if (isinstance(self.callbackRes, DeviceManagerException)):
- raise self.callbackRes
- return self.callbackRes
+ self._dmLib.nl_Weave_DeviceManager_CloseEndpoints.argtypes = [ ]
+ self._dmLib.nl_Weave_DeviceManager_CloseEndpoints.restype = c_uint32
- def _ErrorToException(self, err, devStatusPtr=None):
- if (err == 4044 and devStatusPtr):
- devStatus = devStatusPtr.contents
- msg = _dmLib.nl_Weave_DeviceManager_StatusReportToString(devStatus.ProfileId, devStatus.StatusCode)
- sysErrorCode = devStatus.SysErrorCode if (devStatus.SysErrorCode != 0) else None
- if (sysErrorCode != None):
- msg = msg + " (system err %d)" % (sysErrorCode)
- return DeviceError(devStatus.ProfileId, devStatus.StatusCode, sysErrorCode, msg)
- else:
- return DeviceManagerError(err, _dmLib.nl_Weave_DeviceManager_ErrorToString(err))
+ self._dmLib.nl_Weave_DeviceManager_StartSystemTest.argtypes = [ c_void_p, c_uint32, c_uint32, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_StartSystemTest.restype = c_uint32
+ self._dmLib.nl_Weave_DeviceManager_StopSystemTest.argtypes = [ c_void_p, _CompleteFunct, _ErrorFunct ]
+ self._dmLib.nl_Weave_DeviceManager_StopSystemTest.restype = c_uint32
def NetworkTypeToString(val):
if (val == NetworkType_WiFi):
diff --git a/src/device-manager/python/openweave/WeaveStack.py b/src/device-manager/python/openweave/WeaveStack.py
new file mode 100644
index 0000000..de62e9f
--- /dev/null
+++ b/src/device-manager/python/openweave/WeaveStack.py
@@ -0,0 +1,249 @@
+#
+# Copyright (c) 2019 Google, LLC.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# @file
+# Python interface for Weave Stack
+#
+
+"""Weave Stack interface
+"""
+
+import functools
+import sys
+import os
+import re
+import copy
+import binascii
+import datetime
+import time
+import glob
+import platform
+import ast
+from threading import Thread, Lock, Event
+from ctypes import *
+
+__all__ = [ 'DeviceStatusStruct', 'WeaveStackException', 'DeviceError', 'WeaveStackError', 'WeaveStack' ]
+
+WeaveStackDLLBaseName = '_WeaveDeviceMgr.so'
+
+# This is a fix for WEAV-429. Jay Logue recommends revisiting this at a later
+# date to allow for truely multiple instances so this is temporary.
+def _singleton(cls):
+ instance = cls()
+ instance.__call__ = lambda: instance
+ return instance
+
+class DeviceStatusStruct(Structure):
+ _fields_ = [
+ ("ProfileId", c_uint32),
+ ("StatusCode", c_uint16),
+ ("SysErrorCode", c_uint32)
+ ]
+
+class WeaveStackException(Exception):
+ pass
+
+class WeaveStackError(WeaveStackException):
+ def __init__(self, err, msg=None):
+ self.err = err
+ if msg != None:
+ self.msg = msg
+ else:
+ self.msg = "Weave Stack Error %ld" % (err)
+
+ def __str__(self):
+ return self.msg
+
+class DeviceError(WeaveStackException):
+ def __init__(self, profileId, statusCode, systemErrorCode, msg=None):
+ self.profileId = profileId
+ self.statusCode = statusCode
+ self.systemErrorCode = systemErrorCode
+ if (msg == None):
+ if (systemErrorCode):
+ return "[ %08X:%d ] (system err %d)" % (profileId, statusCode, systemErrorCode)
+ else:
+ return "[ %08X:%d ]" % (profileId, statusCode)
+ self.message = msg
+
+ def __str__(self):
+ return "Device Error: " + self.message
+
+_CompleteFunct = CFUNCTYPE(None, c_void_p, c_void_p)
+_ErrorFunct = CFUNCTYPE(None, c_void_p, c_void_p, c_ulong, POINTER(DeviceStatusStruct))
+
+@_singleton
+class WeaveStack():
+ def __init__(self):
+ self.networkLock = Lock()
+ self.completeEvent = Event()
+ self._weaveutilityLib = None
+ self._weaveDLLPath = None
+ self.devMgr = None
+ self.callbackRes = None
+
+ self._InitLib()
+
+ def HandleComplete(appState, reqState):
+ self.callbackRes = True
+ self.completeEvent.set()
+
+ def HandleError(appState, reqState, err, devStatusPtr):
+ self.callbackRes = self.ErrorToException(err, devStatusPtr)
+ self.completeEvent.set()
+
+ self.cbHandleComplete = _CompleteFunct(HandleComplete)
+ self.cbHandleError = _ErrorFunct(HandleError)
+ self.blockingCB = None # set by other modules(BLE) that require service by thread while thread blocks.
+
+ def Shutdown(self):
+ self._weaveStack.Call(
+ lambda: self._dmLib.nl_Weave_Stack_Shutdown()
+ )
+ self.networkLock = None
+ self.completeEvent = None
+ self._weaveutilityLib = None
+ self._weaveDLLPath = None
+ self.devMgr = None
+ self.callbackRes = None
+
+ def Call(self, callFunct):
+ # throw error if op in progress
+ self.callbackRes = None
+ self.completeEvent.clear()
+ with self.networkLock:
+ res = callFunct()
+ self.completeEvent.set()
+ if res == 0 and self.callbackRes != None:
+ return self.callbackRes
+ return res
+
+ def CallAsync(self, callFunct):
+ # throw error if op in progress
+ self.callbackRes = None
+ self.completeEvent.clear()
+ with self.networkLock:
+ res = callFunct()
+
+ if (res != 0):
+ self.completeEvent.set()
+ return res
+ #raise self.ErrorToException(res)
+ while (not self.completeEvent.isSet()):
+ if self.blockingCB:
+ self.blockingCB()
+
+ self.completeEvent.wait(0.05)
+ if (isinstance(self.callbackRes, WeaveStackException)):
+ raise self.callbackRes
+ return self.callbackRes
+
+ def ErrorToException(self, err, devStatusPtr=None):
+ if (err == 4044 and devStatusPtr):
+ devStatus = devStatusPtr.contents
+ msg = self._weaveutilityLib.nl_Weave_Stack_StatusReportToString(devStatus.ProfileId, devStatus.StatusCode)
+ sysErrorCode = devStatus.SysErrorCode if (devStatus.SysErrorCode != 0) else None
+ if (sysErrorCode != None):
+ msg = msg + " (system err %d)" % (sysErrorCode)
+ return DeviceError(devStatus.ProfileId, devStatus.StatusCode, sysErrorCode, msg)
+ else:
+ return WeaveStackError(err, self._weaveutilityLib.nl_Weave_Stack_ErrorToString(err))
+
+ @staticmethod
+ def VoidPtrToByteArray(ptr, len):
+ if ptr:
+ v = bytearray(len)
+ memmove((c_byte * len).from_buffer(v), ptr, len)
+ return v
+ else:
+ return None
+
+ @staticmethod
+ def ByteArrayToVoidPtr(array):
+ if array != None:
+ if not (isinstance(array, str) or isinstance(array, bytearray)):
+ raise TypeError("Array must be an str or a bytearray")
+ return cast( (c_byte * len(array)) .from_buffer_copy(array), c_void_p)
+ else:
+ return c_void_p(0)
+
+ @staticmethod
+ def IsByteArrayAllZeros(array):
+ for i in range(len(array)):
+ if (array[i] != 0):
+ return False
+ return True
+
+ @staticmethod
+ def ByteArrayToHex(array):
+ return binascii.hexlify(bytes(array))
+
+ def LocateWeaveDLL(self):
+ if self._weaveDLLPath:
+ return self._weaveDLLPath
+
+ scriptDir = os.path.dirname(os.path.abspath(__file__))
+
+ # When properly installed in the weave package, the Weave Device Manager DLL will
+ # be located in the package root directory, along side the package's
+ # modules.
+ dmDLLPath = os.path.join(scriptDir, WeaveStackDLLBaseName)
+ if os.path.exists(dmDLLPath):
+ self._weaveDLLPath = dmDLLPath
+ return self._weaveDLLPath
+
+ # For the convenience of developers, search the list of parent paths relative to the
+ # running script looking for an OpenWeave build directory containing the Weave Device
+ # Manager DLL. This makes it possible to import and use the WeaveDeviceMgr module
+ # directly from a built copy of the OpenWeave source tree.
+ buildMachineGlob = '%s-*-%s*' % (platform.machine(), platform.system().lower())
+ relDMDLLPathGlob = os.path.join('build', buildMachineGlob, 'src/device-manager/python/.libs', WeaveStackDLLBaseName)
+ for dir in self._AllDirsToRoot(scriptDir):
+ dmDLLPathGlob = os.path.join(dir, relDMDLLPathGlob)
+ for dmDLLPath in glob.glob(dmDLLPathGlob):
+ if os.path.exists(dmDLLPath):
+ self._weaveDLLPath = dmDLLPath
+ return self._weaveDLLPath
+
+ raise Exception("Unable to locate Weave Device Manager DLL (%s); expected location: %s" % (WeaveDeviceMgrDLLBaseName, scriptDir))
+
+ # ----- Private Members -----
+ def _AllDirsToRoot(self, dir):
+ dir = os.path.abspath(dir)
+ while True:
+ yield dir
+ parent = os.path.dirname(dir)
+ if parent == '' or parent == dir:
+ break
+ dir = parent
+
+ def _InitLib(self):
+ if (self._weaveutilityLib == None):
+ self._weaveutilityLib = CDLL(self.LocateWeaveDLL())
+ self._weaveutilityLib.nl_Weave_Stack_Init.argtypes = [ ]
+ self._weaveutilityLib.nl_Weave_Stack_Init.restype = c_uint32
+ self._weaveutilityLib.nl_Weave_Stack_Shutdown.argtypes = [ ]
+ self._weaveutilityLib.nl_Weave_Stack_Shutdown.restype = c_uint32
+ self._weaveutilityLib.nl_Weave_Stack_StatusReportToString.argtypes = [ c_uint32, c_uint16 ]
+ self._weaveutilityLib.nl_Weave_Stack_StatusReportToString.restype = c_char_p
+ self._weaveutilityLib.nl_Weave_Stack_ErrorToString.argtypes = [ c_uint32 ]
+ self._weaveutilityLib.nl_Weave_Stack_ErrorToString.restype = c_char_p
+
+ res = self._weaveutilityLib.nl_Weave_Stack_Init()
+ if (res != 0):
+ raise self._weaveStack.ErrorToException(res)
\ No newline at end of file
diff --git a/src/device-manager/python/openweave/WeaveTLV.py b/src/device-manager/python/openweave/WeaveTLV.py
new file mode 100644
index 0000000..0e96b53
--- /dev/null
+++ b/src/device-manager/python/openweave/WeaveTLV.py
@@ -0,0 +1,370 @@
+#!/usr/bin/env python3
+
+#
+# Copyright (c) 2019 Google LLC.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# @file
+# This file contains definitions for working with data encoded in Weave TLV format.
+#
+
+import sys
+import struct
+from collections import Mapping, Sequence, OrderedDict
+
+
+TLVType_SignedInteger = 0x00
+TLVType_UnsignedInteger = 0x04
+TLVType_Boolean = 0x08
+TLVType_FloatingPointNumber = 0x0A
+TLVType_UTF8String = 0x0C
+TLVType_ByteString = 0x10
+TLVType_Null = 0x14
+TLVType_Structure = 0x15
+TLVType_Array = 0x16
+TLVType_Path = 0x17
+
+TLVTagControl_Anonymous = 0x00
+TLVTagControl_ContextSpecific = 0x20
+TLVTagControl_CommonProfile_2Bytes = 0x40
+TLVTagControl_CommonProfile_4Bytes = 0x60
+TLVTagControl_ImplicitProfile_2Bytes = 0x80
+TLVTagControl_ImplicitProfile_4Bytes = 0xA0
+TLVTagControl_FullyQualified_6Bytes = 0xC0
+TLVTagControl_FullyQualified_8Bytes = 0xE0
+
+TLVBoolean_False = TLVType_Boolean
+TLVBoolean_True = TLVType_Boolean + 1
+
+TLVEndOfContainer = 0x18
+
+INT8_MIN = -128
+INT16_MIN = -32768
+INT32_MIN = -2147483648
+INT64_MIN = -9223372036854775808
+
+INT8_MAX = 127
+INT16_MAX = 32767
+INT32_MAX = 2147483647
+INT64_MAX = 9223372036854775807
+
+UINT8_MAX = 255
+UINT16_MAX = 65535
+UINT32_MAX = 4294967295
+UINT64_MAX = 18446744073709551615
+
+class TLVWriter(object):
+
+ def __init__(self, encoding=bytearray(), implicitProfile=None):
+ self._encoding = encoding
+ self._implicitProfile = implicitProfile
+ self._containerStack = []
+
+ def __del__(self):
+ del self._encoding [:]
+ self._implicitProfile = None
+ self._containerStack = None
+
+ @property
+ def encoding(self):
+ '''The object into which encoded TLV data is written.
+
+ By default this is a bytearray object.
+ '''
+ return self._encoding
+
+ @encoding.setter
+ def encoding(self, val):
+ self._encoding = val
+
+ @property
+ def implicitProfile(self):
+ '''The Weave profile id used when encoding implicit profile tags.
+
+ Setting this value will result in an implicit profile tag being encoded
+ whenever the profile of the tag to be encoded matches the specified implicit
+ profile id.
+
+ Setting this value to None (the default) disabled encoding of implicit
+ profile tags.
+ '''
+ return self._implicitProfile
+
+ @implicitProfile.setter
+ def implicitProfile(self, val):
+ self._implicitProfile = val
+
+ def put(self, tag, val):
+ '''Write a value in TLV format with the specified TLV tag.
+
+ val can be a Python object which will be encoded as follows:
+ - Python bools, floats and strings are encoded as their respective TLV types.
+ - Python ints are encoded as unsigned TLV integers if zero or positive; signed TLV
+ integers if negative.
+ - None is encoded as a TLV Null.
+ - bytes and bytearray objects are encoded as TVL byte strings.
+ - Mapping-like objects (e.g. dict) are encoded as TLV structures. The keys of the
+ map object are expected to be tag values, as described below for the tag argument.
+ Map values are encoded recursively, using the same rules as defined for the val
+ argument. The encoding order of elements depends on the type of the map object.
+ Elements within a dict are automatically encoded tag numerical order. Elements
+ within other forms of mapping object (e.g. OrderedDict) are encoded in the
+ object's natural iteration order.
+ - Sequence-like objects (e.g. arrays) are written as TLV arrays. Elements within
+ the array are encoded recursively, using the same rules as defined for the val
+ argument.
+
+ tag can be a small int (0-255), a tuple of two integers, or None.
+ If tag is an integer, it is encoded as a TLV context-specific tag.
+ If tag is a two-integer tuple, it is encoded as a TLV profile-specific tag, with
+ the first integer encoded as the profile id and the second as the tag number.
+ If tag is None, it is encoded as a TLV anonymous tag.
+ '''
+ if val == None:
+ self.putNull(tag)
+ elif isinstance(val, bool):
+ self.putBool(tag, val)
+ elif isinstance(val, int):
+ if val < 0:
+ self.putSignedInt(tag, val)
+ else:
+ self.putUnsignedInt(tag, val)
+ elif isinstance(val, float):
+ self.putFloat(tag, val)
+ elif isinstance(val, str):
+ self.putString(tag, val)
+ elif isinstance(val, bytes) or isinstance(val, bytearray):
+ self.putBytes(tag, val)
+ elif isinstance(val, Mapping):
+ self.startStructure(tag)
+ if type(val) == dict:
+ val = OrderedDict(sorted(val.items(), key=lambda item: tlvTagToSortKey(item[0])))
+ for containedTag, containedVal in val.items():
+ self.put(containedTag, containedVal)
+ self.endContainer()
+ elif isinstance(val, Sequence):
+ self.startArray(tag)
+ for containedVal in val:
+ self.put(None, containedVal)
+ self.endContainer()
+ else:
+ raise ValueError('Attempt to TLV encode unsupported value')
+
+ def putSignedInt(self, tag, val):
+ '''Write a value as a TLV signed integer with the specified TLV tag.'''
+ if val >= INT8_MIN and val <= INT8_MAX:
+ format = '<b'
+ elif val >= INT16_MIN and val <= INT16_MAX:
+ format = '<h'
+ elif val >= INT32_MIN and val <= INT32_MAX:
+ format = '<l'
+ elif val >= INT64_MIN and val <= INT64_MAX:
+ format = '<q'
+ else:
+ raise ValueError('Integer value out of range')
+ val = struct.pack(format, val)
+ controlAndTag = self._encodeControlAndTag(TLVType_SignedInteger, tag, lenOfLenOrVal=len(val))
+ self._encoding.extend(controlAndTag)
+ self._encoding.extend(val)
+
+ def putUnsignedInt(self, tag, val):
+ '''Write a value as a TLV unsigned integer with the specified TLV tag.'''
+ val = self._encodeUnsignedInt(val)
+ controlAndTag = self._encodeControlAndTag(TLVType_UnsignedInteger, tag, lenOfLenOrVal=len(val))
+ self._encoding.extend(controlAndTag)
+ self._encoding.extend(val)
+
+ def putFloat(self, tag, val):
+ '''Write a value as a TLV float with the specified TLV tag.'''
+ val = struct.pack('d', val)
+ controlAndTag = self._encodeControlAndTag(TLVType_FloatingPointNumber, tag, lenOfLenOrVal=len(val))
+ self._encoding.extend(controlAndTag)
+ self._encoding.extend(val)
+
+ def putString(self, tag, val):
+ '''Write a value as a TLV string with the specified TLV tag.'''
+ val = val.encode('utf-8')
+ valLen = self._encodeUnsignedInt(len(val))
+ controlAndTag = self._encodeControlAndTag(TLVType_UTF8String, tag, lenOfLenOrVal=len(valLen))
+ self._encoding.extend(controlAndTag)
+ self._encoding.extend(valLen)
+ self._encoding.extend(val)
+
+ def putBytes(self, tag, val):
+ '''Write a value as a TLV byte string with the specified TLV tag.'''
+ valLen = self._encodeUnsignedInt(len(val))
+ controlAndTag = self._encodeControlAndTag(TLVType_ByteString, tag, lenOfLenOrVal=len(valLen))
+ self._encoding.extend(controlAndTag)
+ self._encoding.extend(valLen)
+ self._encoding.extend(val)
+
+ def putBool(self, tag, val):
+ '''Write a value as a TLV boolean with the specified TLV tag.'''
+ if val:
+ type = TLVBoolean_True
+ else:
+ type = TLVBoolean_False
+ controlAndTag = self._encodeControlAndTag(type, tag)
+ self._encoding.extend(controlAndTag)
+
+ def putNull(self, tag):
+ '''Write a TLV null with the specified TLV tag.'''
+ controlAndTag = self._encodeControlAndTag(TLVType_Null, tag)
+ self._encoding.extend(controlAndTag)
+
+ def startContainer(self, tag, containerType):
+ '''Start writing a TLV container with the specified TLV tag.
+
+ containerType can be one of TLVType_Structure, TLVType_Array or
+ TLVType_Path.
+ '''
+ self._verifyValidContainerType(containerType)
+ controlAndTag = self._encodeControlAndTag(containerType, tag)
+ self._encoding.extend(controlAndTag)
+ self._containerStack.insert(0, containerType)
+
+ def startStructure(self, tag):
+ '''Start writing a TLV structure with the specified TLV tag.'''
+ self.startContainer(tag, containerType=TLVType_Structure)
+
+ def startArray(self, tag):
+ '''Start writing a TLV array with the specified TLV tag.'''
+ self.startContainer(tag, containerType=TLVType_Array)
+
+ def startPath(self, tag):
+ '''Start writing a TLV path with the specified TLV tag.'''
+ self.startContainer(tag, containerType=TLVType_Path)
+
+ def endContainer(self):
+ '''End writing the current TLV container.'''
+ self._containerStack.pop(0)
+ controlAndTag = self._encodeControlAndTag(TLVEndOfContainer, None)
+ self._encoding.extend(controlAndTag)
+
+ def _encodeControlAndTag(self, type, tag, lenOfLenOrVal=0):
+ controlByte = type
+ if lenOfLenOrVal == 2:
+ controlByte |= 1
+ elif lenOfLenOrVal == 4:
+ controlByte |= 2
+ elif lenOfLenOrVal == 8:
+ controlByte |= 3
+ if tag == None:
+ if type != TLVEndOfContainer and len(self._containerStack) != 0 and self._containerStack[0] == TLVType_Structure:
+ raise ValueError('Attempt to encode anonymous tag within TLV structure')
+ controlByte |= TLVTagControl_Anonymous
+ return struct.pack('<B', controlByte)
+ if isinstance(tag, int):
+ if tag < 0 or tag > UINT8_MAX:
+ ValueError('Context-specific TLV tag number out of range')
+ if len(self._containerStack) == 0:
+ raise ValueError('Attempt to encode context-specific TLV tag at top level')
+ if self._containerStack[0] == TLVType_Array:
+ raise ValueError('Attempt to encode context-specific tag within TLV array')
+ controlByte |= TLVTagControl_ContextSpecific
+ return struct.pack('<BB', controlByte, tag)
+ if isinstance(tag, tuple):
+ (profile, tagNum) = tag
+ if not isinstance(tagNum, int):
+ raise ValueError('Invalid object given for TLV tag')
+ if tagNum < 0 or tagNum > UINT32_MAX:
+ raise ValueError('TLV tag number out of range')
+ if profile != None:
+ if not isinstance(profile, int):
+ raise ValueError('Invalid object given for TLV profile id')
+ if profile < 0 or profile > UINT32_MAX:
+ raise ValueError('TLV profile id value out of range')
+ if len(self._containerStack) != 0 and self._containerStack[0] == TLVType_Array:
+ raise ValueError('Attempt to encode profile-specific tag within TLV array')
+ if profile == None or profile == self._implicitProfile:
+ if tagNum <= UINT16_MAX:
+ controlByte |= TLVTagControl_ImplicitProfile_2Bytes
+ return struct.pack('<BH', controlByte, tagNum)
+ else:
+ controlByte |= TLVTagControl_ImplicitProfile_4Bytes
+ return struct.pack('<BL', controlByte, tagNum)
+ elif profile == 0:
+ if tagNum <= UINT16_MAX:
+ controlByte |= TLVTagControl_CommonProfile_2Bytes
+ return struct.pack('<BH', controlByte, tagNum)
+ else:
+ controlByte |= TLVTagControl_CommonProfile_4Bytes
+ return struct.pack('<BL', controlByte, tagNum)
+ else:
+ if tagNum <= UINT16_MAX:
+ controlByte |= TLVTagControl_FullyQualified_6Bytes
+ return struct.pack('<BLH', controlByte, profile, tagNum)
+ else:
+ controlByte |= TLVTagControl_FullyQualified_8Bytes
+ return struct.pack('<BLL', controlByte, profile, tagNum)
+ raise ValueError('Invalid object given for TLV tag')
+
+ @staticmethod
+ def _encodeUnsignedInt(val):
+ if val < 0:
+ raise ValueError('Integer value out of range')
+ if val <= UINT8_MAX:
+ format = '<B'
+ elif val <= UINT16_MAX:
+ format = '<H'
+ elif val <= UINT32_MAX:
+ format = '<L'
+ elif val <= UINT64_MAX:
+ format = '<Q'
+ else:
+ raise ValueError('Integer value out of range')
+ return struct.pack(format, val)
+
+ @staticmethod
+ def _verifyValidContainerType(containerType):
+ if containerType != TLVType_Structure and containerType != TLVType_Array and containerType != TLVType_Path:
+ raise ValueError('Invalid TLV container type')
+
+def tlvTagToSortKey(tag):
+ if tag == None:
+ return -1
+ if isinstance(tag, int):
+ majorOrder = 0;
+ elif isinstance(tag, tuple):
+ (profileId, tag) = tag
+ if profileId == None:
+ majorOrder = 1
+ else:
+ majorOrder = profileId + 2
+ else:
+ raise ValueError('Invalid TLV tag')
+ return (majorOrder << 32) + tag
+
+if __name__ == '__main__':
+ val = dict([
+ (1, 0),
+ (2, 65536),
+ (3, True),
+ (4, None),
+ (5, "Hello!"),
+ (6, bytearray([ 0xDE, 0xAD, 0xBE, 0xEF ])),
+ (7, [
+ "Goodbye!",
+ 71024724507,
+ False
+ ]),
+ ((0x235A0000, 42), "FOO"),
+ ((None, 42), "BAR"),
+ ])
+ writer = TLVWriter()
+ encodedVal = writer.put(None, val)
+ sys.stdout.write(writer.encoding)
diff --git a/src/device-manager/python/weave-device-mgr.py b/src/device-manager/python/weave-device-mgr.py
index 661520b..77ae26d 100755
--- a/src/device-manager/python/weave-device-mgr.py
+++ b/src/device-manager/python/weave-device-mgr.py
@@ -2,6 +2,7 @@
#
# Copyright (c) 2013-2018 Nest Labs, Inc.
+# Copyright (c) 2019 Google, LLC.
# All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +24,7 @@
#
from builtins import range
+import ast
import sys
import os
import platform
@@ -64,7 +66,10 @@
if os.path.isdir(os.path.join(absInstallDir, 'openweave')):
sys.path.insert(0, absInstallDir)
+from openweave import WeaveStack
from openweave import WeaveDeviceMgr
+from openweave import WeaveDataManagementClient
+
if platform.system() == 'Darwin':
from openweave.WeaveCoreBluetoothMgr import CoreBluetoothManager as BleManager
elif sys.platform.startswith('linux'):
@@ -200,13 +205,15 @@
DeviceMgrCmd.command_names.sort()
self.bleMgr = None
-
self.devMgr = WeaveDeviceMgr.WeaveDeviceManager()
+ self.wdmClient = None
+ self.traitInstance = None
+
if (rendezvousAddr):
try:
self.devMgr.SetRendezvousAddress(rendezvousAddr)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -284,7 +291,16 @@
'ble-diag-test',
'ble-diag-test-result',
'ble-diag-test-abort',
- 'ble-diag-test-timing'
+ 'ble-diag-test-timing',
+ 'create-wdm-client',
+ 'close-wdm-client',
+ 'new-data-sink',
+ 'flush-update',
+ 'refresh-data',
+ 'refresh-individual-data',
+ 'close-individual-trait',
+ 'set-data',
+ 'get-data',
]
def parseline(self, line):
@@ -403,7 +419,7 @@
targetVendorId=options.targetVendorId,
targetProductId=options.targetProductId,
targetDeviceId=options.targetDeviceId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -424,7 +440,7 @@
try:
self.devMgr.StopDeviceEnumeration()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -498,7 +514,7 @@
self.devMgr.ConnectDevice(deviceId=nodeId, deviceAddr=addr,
pairingCode=options.pairingCode,
accessToken=options.accessToken)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -845,7 +861,7 @@
targetVendorId=options.targetVendorId,
targetProductId=options.targetProductId,
targetDeviceId=options.targetDeviceId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -899,7 +915,7 @@
try:
self.devMgr.PassiveRendezvousDevice(pairingCode=options.pairingCode,
accessToken=options.accessToken)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -974,7 +990,7 @@
self.devMgr.RemotePassiveRendezvous(rendezvousDeviceAddr=options.joinerAddr,
pairingCode=options.pairingCode, accessToken=options.accessToken,
rendezvousTimeout=options.rendezvousTimeout, inactivityTimeout=options.inactivityTimeout)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -996,7 +1012,7 @@
try:
self.devMgr.ReconnectDevice()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1015,9 +1031,13 @@
return
try:
- self.devMgr.Close()
- self.devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ if self.wdmClient:
+ self.wdmClient.close()
+ self.wdmClient = None
+ if self.devMgr:
+ self.devMgr.Close()
+ self.devMgr.CloseEndpoints()
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
def do_enableconnectionmonitor(self, line):
@@ -1062,7 +1082,7 @@
try:
self.devMgr.EnableConnectionMonitor(interval, timeout)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1083,7 +1103,7 @@
try:
self.devMgr.DisableConnectionMonitor()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1113,7 +1133,7 @@
try:
scanResult = self.devMgr.ScanNetworks(networkType)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1181,7 +1201,7 @@
try:
addResult = self.devMgr.AddNetwork(networkInfo)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1305,7 +1325,7 @@
try:
addResult = self.devMgr.AddNetwork(networkInfo)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1380,7 +1400,7 @@
try:
addResult = self.devMgr.AddNetwork(networkInfo)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1439,7 +1459,7 @@
try:
self.devMgr.UpdateNetwork(networkInfo)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1475,7 +1495,7 @@
try:
self.devMgr.RemoveNetwork(networkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1504,7 +1524,7 @@
try:
getResult = self.devMgr.GetNetworks(flags)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1534,7 +1554,7 @@
try:
getResult = self.devMgr.GetCameraAuthData(args[0])
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1572,7 +1592,7 @@
try:
self.devMgr.EnableNetwork(networkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1608,7 +1628,7 @@
try:
self.devMgr.DisableNetwork(networkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1644,7 +1664,7 @@
try:
self.devMgr.TestNetworkConnectivity(networkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1669,7 +1689,7 @@
try:
self.devMgr.SetRendezvousMode(int(args[0]))
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1690,7 +1710,7 @@
try:
self.devMgr.GetLastNetworkProvisioningResult()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1711,7 +1731,7 @@
try:
self.devMgr.Ping()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1732,7 +1752,7 @@
try:
deviceDesc = self.devMgr.IdentifyDevice()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1759,7 +1779,7 @@
try:
tokenPairingBundle = self.devMgr.PairToken(args[0])
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1782,7 +1802,7 @@
try:
result = self.devMgr.UnpairToken()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1803,7 +1823,7 @@
try:
self.devMgr.CreateFabric()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1824,7 +1844,7 @@
try:
self.devMgr.LeaveFabric()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1845,7 +1865,7 @@
try:
fabricConfig = self.devMgr.GetFabricConfig()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1880,7 +1900,7 @@
try:
self.devMgr.JoinExistingFabric(fabricConfig)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1927,7 +1947,7 @@
try:
self.devMgr.RegisterServicePairAccount(options.serviceId, options.accountId, options.serviceConfig, options.pairingToken, options.pairingInitData)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1961,7 +1981,7 @@
try:
self.devMgr.UpdateService(options.serviceId, options.serviceConfig)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -1992,7 +2012,7 @@
try:
self.devMgr.UnregisterService(options.serviceId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2043,7 +2063,7 @@
try:
self.devMgr.ArmFailSafe(armMode, failSafeToken)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2064,7 +2084,7 @@
try:
self.devMgr.DisarmFailSafe()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2094,7 +2114,7 @@
try:
self.devMgr.ResetConfig(resetFlags)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2120,7 +2140,7 @@
try:
self.devMgr.SetRendezvousAddress(addr)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2149,7 +2169,7 @@
try:
self.devMgr.SetAutoReconnect(autoReconnect)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2187,7 +2207,7 @@
try:
self.devMgr.SetLogFilter(category)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2217,7 +2237,7 @@
try:
self.devMgr.SetRendezvousLinkLocal(rendezvousLinkLocal)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2247,7 +2267,7 @@
try:
self.devMgr.SetConnectTimeout(timeoutMS)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2393,7 +2413,7 @@
try:
self.devMgr.StartSystemTest(WeaveDeviceMgr.SystemTest_ProductList[productName], testId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
@@ -2415,12 +2435,184 @@
try:
self.devMgr.StopSystemTest()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
return
print "Stop system test complete"
+ def do_createwdmclient(self, line):
+ """
+ create-wdm-client
+ """
+ if self.wdmClient != None:
+ print "wdmclient has initialized"
+ return
+
+ try:
+ self.wdmClient = WeaveDataManagementClient.WDMClient()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "create wdm client complete"
+
+ def do_closewdmclient(self, line):
+ """
+ close-wdm-client
+ """
+ try:
+ if self.wdmClient:
+ self.wdmClient.close()
+ self.wdmClient = None
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "close wdm client complete"
+
+ def do_newdatasink(self, line):
+ """
+ new-data-sink <profileid, instanceid, path>
+ """
+ if self.wdmClient == None:
+ print "wdmclient not initialized"
+ return
+
+ args = shlex.split(line)
+
+ if (len(args) == 3):
+ path = args[2]
+ else:
+ path = None
+
+ try:
+ self.traitInstance = self.wdmClient.newDataSink(0, None, 0, int(args[0]), int(args[1]), path)
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "new data sink complete"
+
+ def do_flushupdate(self, line):
+ """
+ flush-update
+ """
+ if self.wdmClient == None:
+ print "wdmclient not initialized"
+ return
+
+ try:
+ self.wdmClient.flushUpdate()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "flush update complete"
+
+ def do_refreshdata(self, line):
+ """
+ refresh-data
+ """
+ if self.wdmClient == None:
+ print "wdmclient not initialized"
+ return
+
+ try:
+ self.wdmClient.refreshData()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "refresh trait data complete"
+
+ def do_refreshindividualdata(self, line):
+ """
+ refresh-individual-data for current trait instance
+ """
+ if self.wdmClient == None or self.traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ try:
+ self.traitInstance.refreshData()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "refresh individual trait data complete"
+
+ def do_closeindividualtrait(self, line):
+ """
+ close-individual-trait
+ """
+ if self.wdmClient == None or self.traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ try:
+ self.traitInstance.close()
+ self.traitInstance = None
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "close current trait"
+
+ def do_setdata(self, line):
+ """
+ set-data <path, value>
+ """
+ if self.wdmClient == None or self.traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ args = shlex.split(line)
+
+ if (len(args) != 2):
+ print "Usage:"
+ self.do_help('set-data')
+ return
+
+ isConditional = False
+
+ try:
+ val = ast.literal_eval(args[1])
+ except:
+ val = args[1]
+
+ try:
+ self.traitInstance.setData(args[0], val, isConditional)
+ print "set string data in trait complete"
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ def do_getdata(self, line):
+ """
+ get-tlv-data <path>
+ """
+
+ if self.wdmClient == None or self.traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ args = shlex.split(line)
+
+ if (len(args) != 1):
+ print "Usage:"
+ self.do_help('get-data')
+ return
+
+ try:
+ val = self.traitInstance.getData(args[0])
+ print val
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "get data in trait complete"
+
def do_history(self, line):
"""
history
diff --git a/src/device-manager/schema/nest/test/trait/TestCTrait.cpp b/src/device-manager/schema/nest/test/trait/TestCTrait.cpp
new file mode 100644
index 0000000..b64aaa5
--- /dev/null
+++ b/src/device-manager/schema/nest/test/trait/TestCTrait.cpp
@@ -0,0 +1,95 @@
+
+/**
+ * Copyright (c) 2018 Nest Labs, Inc.
+ * All rights reserved.
+ *
+ * THIS FILE IS GENERATED. DO NOT MODIFY.
+ *
+ * SOURCE TEMPLATE: trait.cpp
+ * SOURCE PROTO: nest/test/trait/test_c_trait.proto
+ *
+ */
+
+#include "TestCTrait.h"
+
+namespace Schema {
+namespace Nest {
+namespace Test {
+namespace Trait {
+namespace TestCTrait {
+
+using namespace ::nl::Weave::Profiles::DataManagement;
+
+//
+// Property Table
+//
+
+const TraitSchemaEngine::PropertyInfo PropertyMap[] = {
+ { kPropertyHandle_Root, 1 }, // tc_a
+ { kPropertyHandle_Root, 2 }, // tc_b
+ { kPropertyHandle_Root, 3 }, // tc_c
+ { kPropertyHandle_TcC, 1 }, // sc_a
+ { kPropertyHandle_TcC, 2 }, // sc_b
+ { kPropertyHandle_Root, 4 }, // tc_d
+};
+
+//
+// Supported version
+//
+const ConstSchemaVersionRange traitVersion = { .mMinVersion = 1, .mMaxVersion = 2 };
+
+//
+// Schema
+//
+
+const TraitSchemaEngine TraitSchema = {
+ {
+ kWeaveProfileId,
+ PropertyMap,
+ sizeof(PropertyMap) / sizeof(PropertyMap[0]),
+ 2,
+#if (TDM_EXTENSION_SUPPORT) || (TDM_VERSIONING_SUPPORT)
+ 2,
+#endif
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+#if (TDM_EXTENSION_SUPPORT)
+ NULL,
+#endif
+#if (TDM_VERSIONING_SUPPORT)
+ &traitVersion,
+#endif
+ }
+};
+
+//
+// Event Structs
+//
+
+const nl::FieldDescriptor StructCFieldDescriptors[] =
+{
+ {
+ NULL, offsetof(StructC, scA), SET_TYPE_AND_FLAGS(nl::SerializedFieldTypeUInt32, 0), 1
+ },
+
+ {
+ NULL, offsetof(StructC, scB), SET_TYPE_AND_FLAGS(nl::SerializedFieldTypeBoolean, 0), 2
+ },
+
+};
+
+const nl::SchemaFieldDescriptor StructC::FieldSchema =
+{
+ .mNumFieldDescriptorElements = sizeof(StructCFieldDescriptors)/sizeof(StructCFieldDescriptors[0]),
+ .mFields = StructCFieldDescriptors,
+ .mSize = sizeof(StructC)
+};
+
+} // namespace TestCTrait
+} // namespace Trait
+} // namespace Test
+} // namespace Nest
+} // namespace Schema
diff --git a/src/device-manager/schema/nest/test/trait/TestCTrait.h b/src/device-manager/schema/nest/test/trait/TestCTrait.h
new file mode 100644
index 0000000..6d15bad
--- /dev/null
+++ b/src/device-manager/schema/nest/test/trait/TestCTrait.h
@@ -0,0 +1,111 @@
+
+/**
+ * Copyright (c) 2018 Nest Labs, Inc.
+ * All rights reserved.
+ *
+ * THIS FILE IS GENERATED. DO NOT MODIFY.
+ *
+ * SOURCE TEMPLATE: trait.cpp.h
+ * SOURCE PROTO: nest/test/trait/test_c_trait.proto
+ *
+ */
+#ifndef _NEST_TEST_TRAIT__TEST_C_TRAIT_H_
+#define _NEST_TEST_TRAIT__TEST_C_TRAIT_H_
+
+#include <Weave/Profiles/data-management/DataManagement.h>
+#include <Weave/Support/SerializationUtils.h>
+
+namespace Schema {
+namespace Nest {
+namespace Test {
+namespace Trait {
+namespace TestCTrait {
+
+extern const nl::Weave::Profiles::DataManagement::TraitSchemaEngine TraitSchema;
+
+enum {
+ kWeaveProfileId = (0x235aU << 16) | 0xfe03U
+};
+
+//
+// Properties
+//
+
+enum {
+ kPropertyHandle_Root = 1,
+
+ //---------------------------------------------------------------------------------------------------------------------------//
+ // Name IDL Type TLV Type Optional? Nullable? //
+ //---------------------------------------------------------------------------------------------------------------------------//
+
+ //
+ // tc_a bool bool NO NO
+ //
+ kPropertyHandle_TcA = 2,
+
+ //
+ // tc_b EnumC int NO NO
+ //
+ kPropertyHandle_TcB = 3,
+
+ //
+ // tc_c StructC structure NO NO
+ //
+ kPropertyHandle_TcC = 4,
+
+ //
+ // sc_a uint32 uint32 NO NO
+ //
+ kPropertyHandle_TcC_ScA = 5,
+
+ //
+ // sc_b bool bool NO NO
+ //
+ kPropertyHandle_TcC_ScB = 6,
+
+ //
+ // tc_d uint32 uint32 NO NO
+ //
+ kPropertyHandle_TcD = 7,
+
+ //
+ // Enum for last handle
+ //
+ kLastSchemaHandle = 7,
+};
+
+//
+// Event Structs
+//
+
+struct StructC
+{
+ uint32_t scA;
+ bool scB;
+
+ static const nl::SchemaFieldDescriptor FieldSchema;
+
+};
+
+struct StructC_array {
+ uint32_t num;
+ StructC *buf;
+};
+
+//
+// Enums
+//
+
+enum EnumC {
+ ENUM_C_VALUE_1 = 1,
+ ENUM_C_VALUE_2 = 2,
+ ENUM_C_VALUE_3 = 3,
+};
+
+
+} // namespace TestCTrait
+} // namespace Trait
+} // namespace Test
+} // namespace Nest
+} // namespace Schema
+#endif // _NEST_TEST_TRAIT__TEST_C_TRAIT_H_
diff --git a/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp b/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp
new file mode 100644
index 0000000..cfa904d
--- /dev/null
+++ b/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp
@@ -0,0 +1,67 @@
+/*
+ *
+ * Copyright (c) 2017 Nest Labs, Inc.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * THIS FILE IS GENERATED. DO NOT MODIFY.
+ *
+ * SOURCE PROTO: weave/trait/locale/locale_settings_trait.proto
+ *
+ */
+
+#include "LocaleSettingsTrait.h"
+
+using namespace nl::Weave::Profiles::DataManagement;
+
+namespace Weave {
+namespace Trait {
+namespace Locale {
+namespace LocaleSettingsTrait {
+ TraitSchemaEngine::PropertyInfo gSchemaMap[] = {
+ /* ParentHandle ContextTag */
+ { kPropertyHandle_Root, 1 }
+ };
+
+ TraitSchemaEngine TraitSchema = {
+ {
+ kWeaveProfileId,
+ gSchemaMap,
+ sizeof(gSchemaMap) / sizeof(gSchemaMap[0]),
+ 1,
+#if (TDM_EXTENSION_SUPPORT) || (TDM_VERSIONING_SUPPORT)
+ 2,
+#endif
+#if (TDM_DICTIONARY_SUPPORT)
+ NULL,
+#endif
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+#if (TDM_EXTENSION_SUPPORT)
+ NULL,
+#endif
+#if (TDM_VERSIONING_SUPPORT)
+ NULL,
+#endif
+ }
+ };
+
+}; // LocaleSettingsTrait
+}; // Locale
+}; // Trait
+}; // Weave
diff --git a/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.h b/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.h
new file mode 100644
index 0000000..538d96f
--- /dev/null
+++ b/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.h
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * THIS FILE IS GENERATED. DO NOT MODIFY.
+ *
+ * SOURCE PROTO: weave/trait/locale/locale_settings_trait.proto
+ *
+ */
+
+#ifndef _LOCALE_SETTINGS_TRAIT_H
+#define _LOCALE_SETTINGS_TRAIT_H
+
+// We want and assume the default managed namespace is Current and that is, explicitly, the managed namespace this code desires.
+#include <Weave/Profiles/data-management/TraitData.h>
+
+namespace Weave {
+namespace Trait {
+namespace Locale {
+namespace LocaleSettingsTrait {
+ extern nl::Weave::Profiles::DataManagement::TraitSchemaEngine TraitSchema;
+
+ enum {
+ kWeaveProfileId = 0x00000014
+ };
+
+ enum {
+ kPropertyHandle_Root = 1,
+ /*
+ * Root =
+ * {
+ * active_locale = 1 (string),
+ */
+ kPropertyHandle_active_locale = 2,
+
+ /*
+ * }
+ *
+ */
+ };
+}; // LocaleSettingsTrait
+} // Locale
+} // Trait
+} // Weave
+
+#endif // _LOCALE_SETTINGS_TRAIT_H
diff --git a/src/examples/Makefile.in b/src/examples/Makefile.in
index e51bab3..2291631 100644
--- a/src/examples/Makefile.in
+++ b/src/examples/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -106,10 +116,6 @@
@WEAVE_BUILD_TESTS_TRUE@ weave-echo-requester$(EXEEXT) \
@WEAVE_BUILD_TESTS_TRUE@ weave-echo-responder$(EXEEXT)
subdir = src/examples
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -128,18 +134,20 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -200,7 +208,10 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/weave-app-common.Po \
+ echo/$(DEPDIR)/weave-echo-requester.Po \
+ echo/$(DEPDIR)/weave-echo-responder.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -249,6 +260,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -338,6 +352,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -497,6 +512,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -573,14 +589,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/examples/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -626,9 +641,15 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-app-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@echo/$(DEPDIR)/weave-echo-requester.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@echo/$(DEPDIR)/weave-echo-responder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-app-common.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@echo/$(DEPDIR)/weave-echo-requester.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@echo/$(DEPDIR)/weave-echo-responder.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -712,7 +733,10 @@
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)'; \
@@ -784,7 +808,9 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR) echo/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/weave-app-common.Po
+ -rm -f echo/$(DEPDIR)/weave-echo-requester.Po
+ -rm -f echo/$(DEPDIR)/weave-echo-responder.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -830,7 +856,9 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR) echo/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/weave-app-common.Po
+ -rm -f echo/$(DEPDIR)/weave-echo-requester.Po
+ -rm -f echo/$(DEPDIR)/weave-echo-responder.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -851,9 +879,9 @@
.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 \
@@ -865,6 +893,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/include/BuildConfig.h.in b/src/include/BuildConfig.h.in
index bc716d1..f41f554 100644
--- a/src/include/BuildConfig.h.in
+++ b/src/include/BuildConfig.h.in
@@ -352,8 +352,7 @@
/* Define to 1 if you want to use Weave with IPv4. */
#undef INET_WANT_IPV4
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 35cea57..e4a287a 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -603,6 +603,7 @@
$(nl_public_WeaveProfiles_source_dirstem)/data-management/ViewClient.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/TraitData.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/TraitCatalog.h \
+$(nl_public_WeaveProfiles_source_dirstem)/data-management/GenericTraitCatalogImp.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/TraitPathStore.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/SubscriptionEngine.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/SubscriptionClient.h \
@@ -642,6 +643,7 @@
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/ViewClient.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/TraitData.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/TraitCatalog.h \
+$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/GenericTraitCatalogImp.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/TraitPathStore.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/SubscriptionEngine.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/SubscriptionClient.h \
@@ -959,6 +961,10 @@
nl_public_WeaveDeviceManager_header_sources = \
$(nl_public_WeaveDeviceManager_source_dirstem)/WeaveDeviceManager.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/WeaveDataManagementClient.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/TraitSchemaDirectory.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/schema/weave/trait/locale/LocaleSettingsTrait.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/schema/nest/test/trait/TestCTrait.h \
$(NULL)
nl_public_WeaveDeviceManager_header_paths = $(subst $(nl_public_WeaveDeviceManager_source_dirstem)/,,$(nl_public_WeaveDeviceManager_header_sources))
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index a49005a..9098de7 100644
--- a/src/include/Makefile.in
+++ b/src/include/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,
@@ -151,12 +151,12 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
@@ -504,6 +504,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -1069,6 +1070,7 @@
$(nl_public_WeaveProfiles_source_dirstem)/data-management/ViewClient.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/TraitData.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/TraitCatalog.h \
+$(nl_public_WeaveProfiles_source_dirstem)/data-management/GenericTraitCatalogImp.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/TraitPathStore.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/SubscriptionEngine.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/SubscriptionClient.h \
@@ -1108,6 +1110,7 @@
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/ViewClient.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/TraitData.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/TraitCatalog.h \
+$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/GenericTraitCatalogImp.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/TraitPathStore.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/SubscriptionEngine.h \
$(nl_public_WeaveProfiles_source_dirstem)/data-management/Current/SubscriptionClient.h \
@@ -1356,6 +1359,10 @@
nl_public_WeaveDeviceManager_destination_dirstem = Weave/DeviceManager
nl_public_WeaveDeviceManager_header_sources = \
$(nl_public_WeaveDeviceManager_source_dirstem)/WeaveDeviceManager.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/WeaveDataManagementClient.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/TraitSchemaDirectory.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/schema/weave/trait/locale/LocaleSettingsTrait.h \
+$(nl_public_WeaveDeviceManager_source_dirstem)/schema/nest/test/trait/TestCTrait.h \
$(NULL)
nl_public_WeaveDeviceManager_header_paths = $(subst $(nl_public_WeaveDeviceManager_source_dirstem)/,,$(nl_public_WeaveDeviceManager_header_sources))
@@ -1666,8 +1673,8 @@
*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)
@@ -3033,7 +3040,10 @@
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/src/inet/Makefile.in b/src/inet/Makefile.in
index daf2bf1..e28f846 100644
--- a/src/inet/Makefile.in
+++ b/src/inet/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -64,7 +64,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -128,10 +138,6 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-DIST_COMMON = $(srcdir)/InetLayer.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
@INET_WANT_ENDPOINT_DNS_TRUE@am__append_1 = @top_builddir@/src/inet/DNSResolver.cpp
@INET_WANT_ENDPOINT_RAW_TRUE@am__append_2 = @top_builddir@/src/inet/RawEndPoint.cpp
@INET_WANT_ENDPOINT_TCP_TRUE@am__append_3 = @top_builddir@/src/inet/TCPEndPoint.cpp
@@ -158,18 +164,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -269,7 +276,25 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-AsyncDNSResolverSockets.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-DNSResolver.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-EndPointBasis.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress-StringFuncts.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPEndPointBasis.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPPrefix.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetError.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetFaultInjection.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetInterface.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayer.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayerBasis.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetTimer.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetUtils.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-RawEndPoint.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TCPEndPoint.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TunEndPoint.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-UDPEndPoint.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -319,6 +344,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/InetLayer.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -408,6 +436,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -567,6 +596,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -634,16 +664,15 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/inet/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/inet/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
-$(srcdir)/InetLayer.am:
+$(srcdir)/InetLayer.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -757,24 +786,30 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-AsyncDNSResolverSockets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-DNSResolver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-EndPointBasis.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress-StringFuncts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPEndPointBasis.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPPrefix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetFaultInjection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetInterface.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayerBasis.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-RawEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TCPEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TunEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-UDPEndPoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-AsyncDNSResolverSockets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-DNSResolver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-EndPointBasis.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress-StringFuncts.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPEndPointBasis.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPPrefix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetFaultInjection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetInterface.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayerBasis.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetTimer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-RawEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TCPEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TunEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-UDPEndPoint.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1110,7 +1145,10 @@
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)'; \
@@ -1185,7 +1223,24 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf @top_builddir@/src/inet/$(DEPDIR)
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-AsyncDNSResolverSockets.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-DNSResolver.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-EndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress-StringFuncts.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPEndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPPrefix.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetError.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetFaultInjection.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetInterface.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayerBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetTimer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetUtils.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-RawEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TCPEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TunEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-UDPEndPoint.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1231,7 +1286,24 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf @top_builddir@/src/inet/$(DEPDIR)
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-AsyncDNSResolverSockets.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-DNSResolver.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-EndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress-StringFuncts.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPAddress.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPEndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-IPPrefix.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetError.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetFaultInjection.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetInterface.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetLayerBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetTimer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-InetUtils.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-RawEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TCPEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-TunEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libInetLayer_a-UDPEndPoint.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1252,9 +1324,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -1266,6 +1338,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 251ddcb..881914e 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -246,7 +246,17 @@
# Manager code altogether.
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -310,14 +320,6 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-DIST_COMMON = $(srcdir)/../system/SystemLayer.am \
- $(srcdir)/../inet/InetLayer.am $(srcdir)/../ble/BleLayer.am \
- $(srcdir)/core/WeaveCore.am $(srcdir)/support/WeaveSupport.am \
- $(srcdir)/profiles/WeaveProfiles.am $(srcdir)/../warm/Warm.am \
- $(srcdir)/../device-manager/DeviceManager.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
@WEAVE_WITH_NLFAULTINJECTION_TRUE@am__append_1 = @top_builddir@/src/system/SystemFaultInjection.cpp
@INET_WANT_ENDPOINT_DNS_TRUE@am__append_2 = @top_builddir@/src/inet/DNSResolver.cpp
@INET_WANT_ENDPOINT_RAW_TRUE@am__append_3 = @top_builddir@/src/inet/RawEndPoint.cpp
@@ -357,6 +359,9 @@
@CONFIG_HAVE_HEAP_TRUE@am__append_14 = \
@CONFIG_HAVE_HEAP_TRUE@ @top_builddir@/src/device-manager/WeaveDeviceManager.cpp \
+@CONFIG_HAVE_HEAP_TRUE@ @top_builddir@/src/device-manager/WeaveDataManagementClient.cpp \
+@CONFIG_HAVE_HEAP_TRUE@ @top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp \
+@CONFIG_HAVE_HEAP_TRUE@ @top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp \
@CONFIG_HAVE_HEAP_TRUE@ $(NULL)
@CONFIG_HAVE_HEAP_TRUE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_ENABLE_WOBLE_TEST_TRUE@am__append_15 = \
@@ -388,18 +393,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -478,6 +484,9 @@
@top_builddir@/src/inet/AsyncDNSResolverSockets.cpp \
@top_builddir@/src/inet/InetFaultInjection.cpp \
@top_builddir@/src/device-manager/WeaveDeviceManager.cpp \
+ @top_builddir@/src/device-manager/WeaveDataManagementClient.cpp \
+ @top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp \
+ @top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp \
@top_builddir@/src/device-manager/WoBleTest.cpp \
@top_builddir@/src/ble/BleLayer.cpp \
@top_builddir@/src/ble/BLEEndPoint.cpp \
@@ -673,7 +682,10 @@
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
$(am__objects_6) $(am__objects_7) $(am__objects_8) \
$(am__objects_9)
-@CONFIG_HAVE_HEAP_TRUE@am__objects_11 = @top_builddir@/src/device-manager/libWeave_a-WeaveDeviceManager.$(OBJEXT)
+@CONFIG_HAVE_HEAP_TRUE@am__objects_11 = @top_builddir@/src/device-manager/libWeave_a-WeaveDeviceManager.$(OBJEXT) \
+@CONFIG_HAVE_HEAP_TRUE@ @top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.$(OBJEXT) \
+@CONFIG_HAVE_HEAP_TRUE@ @top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.$(OBJEXT) \
+@CONFIG_HAVE_HEAP_TRUE@ @top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.$(OBJEXT)
@CONFIG_HAVE_HEAP_TRUE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_ENABLE_WOBLE_TEST_TRUE@am__objects_12 = @top_builddir@/src/device-manager/libWeave_a-WoBleTest.$(OBJEXT)
am__objects_13 = $(am__objects_11) $(am__objects_12)
@WEAVE_ENABLE_WOBLE_TEST_TRUE@am__objects_14 = @top_builddir@/src/device-manager/libWeave_a-WoBleTest.$(OBJEXT)
@@ -863,7 +875,200 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = \
+ @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BLEEndPoint.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleError.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleLayer.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleUUID.Po \
+ @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-WoBle.Po \
+ @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Po \
+ @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDeviceManager.Po \
+ @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Po \
+ @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Po \
+ @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-AsyncDNSResolverSockets.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-DNSResolver.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-EndPointBasis.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress-StringFuncts.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPEndPointBasis.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPPrefix.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetError.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetFaultInjection.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetInterface.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayer.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayerBasis.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetTimer.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetUtils.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-RawEndPoint.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TCPEndPoint.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TunEndPoint.Po \
+ @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-UDPEndPoint.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-ExchangeContext.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-HostPortList.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveBinding.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveCircularTLVBuffer.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnection.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnectionTunnel.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveError.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveExchangeMgr.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveFabricState.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveGlobals.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveKeyIds.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveMessageLayer.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-Malloc.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-SimpleAlloc.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveServerBase.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveStats.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVDebug.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVReader.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUpdater.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUtilities.Po \
+ @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVWriter.Po \
+ @top_builddir@/src/lib/profiles/bulk-data-transfer/$(DEPDIR)/libWeave_a-BulkDataTransfer.Po \
+ @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXMessages.Po \
+ @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXNode.Po \
+ @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXProtocol.Po \
+ @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXTransferState.Po \
+ @top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-RetainedPacketBuffer.Po \
+ @top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-WeaveMessage.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-Command.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLogging.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLoggingTypes.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventProcessor.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LogBDXUpload.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingConfiguration.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingManagement.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-MessageDef.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-NotificationEngine.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ResourceIdentifier.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionClient.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionEngine.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionHandler.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitData.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitPathStore.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateClient.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateEncoder.Po \
+ @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ViewClient.Po \
+ @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-Binding.Po \
+ @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ClientNotifier.Po \
+ @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMClient.Po \
+ @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMPublisher.Po \
+ @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProfileDatabase.Po \
+ @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProtocolEngine.Po \
+ @top_builddir@/src/lib/profiles/device-control/$(DEPDIR)/libWeave_a-DeviceControl.Po \
+ @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescription.Po \
+ @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionClient.Po \
+ @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionServer.Po \
+ @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po \
+ @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po \
+ @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po \
+ @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po \
+ @top_builddir@/src/lib/profiles/fabric-provisioning/$(DEPDIR)/libWeave_a-FabricProvisioning.Po \
+ @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatReceiver.Po \
+ @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatSender.Po \
+ @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkInfo.Po \
+ @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkProvisioning.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTrait.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTraitDataSink.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveAccessToken.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveApplicationKeys.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEEngine.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEMessages.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCert.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveDummyGroupKeyStore.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExport.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportClient.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportTest.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePASEEngine.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePasscodes.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePrivateKey.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvBundle.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvHash.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurity.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurityDebug.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSig.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveTAKEEngine.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveToX509.Po \
+ @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-X509ToWeave.Po \
+ @top_builddir@/src/lib/profiles/service-directory/$(DEPDIR)/libWeave_a-ServiceDirectory.Po \
+ @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioning.Po \
+ @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioningServer.Po \
+ @top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-SoftwareUpdateProfile.Po \
+ @top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-WeaveImageAnnounceServer.Po \
+ @top_builddir@/src/lib/profiles/status-report/$(DEPDIR)/libWeave_a-StatusReportProfile.Po \
+ @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTime.Po \
+ @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeClient.Po \
+ @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeCoordinator.Po \
+ @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeServer.Po \
+ @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeZone.Po \
+ @top_builddir@/src/lib/profiles/token-pairing/$(DEPDIR)/libWeave_a-TokenPairing.Po \
+ @top_builddir@/src/lib/profiles/vendor/nestlabs/dropcam-legacy-pairing/$(DEPDIR)/libWeave_a-DropcamLegacyPairing.Po \
+ @top_builddir@/src/lib/profiles/vendor/nestlabs/thermostat/$(DEPDIR)/libWeave_a-IfjStatusStr.Po \
+ @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelAgent.Po \
+ @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelCommon.Po \
+ @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelConnectionMgr.Po \
+ @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelControl.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Error.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1OID.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Reader.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Writer.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-Base64.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ErrorStr.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-FibonacciUtils.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-MathUtils.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NestCerts.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NonProductionMarker.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-PersistedCounter.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ProfileStringSupport.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-RandUtils.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerialNumberUtils.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerializationUtils.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-StatusReportStr.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-TimeUtils.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveCounter.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveFaultInjection.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveNames.Po \
+ @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-nlargparser.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-AESNI.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-OpenSSL.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-mbedTLS.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-CTRMode.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-DRBG.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-OpenSSL.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-uECC.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HKDF.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HMAC.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-MinCrypt.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-OpenSSL.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-mbedTLS.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto-OpenSSL.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-NestDRBG.Po \
+ @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-OpenSSL.Po \
+ @top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-DecodedIPPacket.Po \
+ @top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-WeaveLogging.Po \
+ @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-KryptonitePairingCodeUtils.Po \
+ @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-NevisPairingCodeUtils.Po \
+ @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-PairingCodeUtils.Po \
+ @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff.Po \
+ @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff10.Po \
+ @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff16.Po \
+ @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff32.Po \
+ @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff36.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemClock.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemError.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemFaultInjection.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemLayer.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemMutex.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemObject.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemPacketBuffer.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemStats.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemTimer.Po \
+ @top_builddir@/src/warm/$(DEPDIR)/libWeave_a-WarmCore.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -913,6 +1118,15 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/../ble/BleLayer.am \
+ $(srcdir)/../device-manager/DeviceManager.am \
+ $(srcdir)/../inet/InetLayer.am \
+ $(srcdir)/../system/SystemLayer.am $(srcdir)/../warm/Warm.am \
+ $(srcdir)/Makefile.in $(srcdir)/core/WeaveCore.am \
+ $(srcdir)/profiles/WeaveProfiles.am \
+ $(srcdir)/support/WeaveSupport.am \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -1002,6 +1216,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -1161,6 +1376,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1427,16 +1643,15 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/lib/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
-$(srcdir)/../system/SystemLayer.am $(srcdir)/../inet/InetLayer.am $(srcdir)/../ble/BleLayer.am $(srcdir)/core/WeaveCore.am $(srcdir)/support/WeaveSupport.am $(srcdir)/profiles/WeaveProfiles.am $(srcdir)/../warm/Warm.am $(srcdir)/../device-manager/DeviceManager.am:
+$(srcdir)/../system/SystemLayer.am $(srcdir)/../inet/InetLayer.am $(srcdir)/../ble/BleLayer.am $(srcdir)/core/WeaveCore.am $(srcdir)/support/WeaveSupport.am $(srcdir)/profiles/WeaveProfiles.am $(srcdir)/../warm/Warm.am $(srcdir)/../device-manager/DeviceManager.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1579,6 +1794,25 @@
@top_builddir@/src/device-manager/libWeave_a-WeaveDeviceManager.$(OBJEXT): \
@top_builddir@/src/device-manager/$(am__dirstamp) \
@top_builddir@/src/device-manager/$(DEPDIR)/$(am__dirstamp)
+@top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.$(OBJEXT): \
+ @top_builddir@/src/device-manager/$(am__dirstamp) \
+ @top_builddir@/src/device-manager/$(DEPDIR)/$(am__dirstamp)
+@top_builddir@/src/device-manager/schema/weave/trait/locale/$(am__dirstamp):
+ @$(MKDIR_P) @top_builddir@/src/device-manager/schema/weave/trait/locale
+ @: > @top_builddir@/src/device-manager/schema/weave/trait/locale/$(am__dirstamp)
+@top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)
+ @: > @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/$(am__dirstamp)
+@top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.$(OBJEXT): @top_builddir@/src/device-manager/schema/weave/trait/locale/$(am__dirstamp) \
+ @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/$(am__dirstamp)
+@top_builddir@/src/device-manager/schema/nest/test/trait/$(am__dirstamp):
+ @$(MKDIR_P) @top_builddir@/src/device-manager/schema/nest/test/trait
+ @: > @top_builddir@/src/device-manager/schema/nest/test/trait/$(am__dirstamp)
+@top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)
+ @: > @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/$(am__dirstamp)
+@top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.$(OBJEXT): @top_builddir@/src/device-manager/schema/nest/test/trait/$(am__dirstamp) \
+ @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/$(am__dirstamp)
@top_builddir@/src/device-manager/libWeave_a-WoBleTest.$(OBJEXT): \
@top_builddir@/src/device-manager/$(am__dirstamp) \
@top_builddir@/src/device-manager/$(DEPDIR)/$(am__dirstamp)
@@ -2205,6 +2439,8 @@
-rm -f *.$(OBJEXT)
-rm -f @top_builddir@/src/ble/*.$(OBJEXT)
-rm -f @top_builddir@/src/device-manager/*.$(OBJEXT)
+ -rm -f @top_builddir@/src/device-manager/schema/nest/test/trait/*.$(OBJEXT)
+ -rm -f @top_builddir@/src/device-manager/schema/weave/trait/locale/*.$(OBJEXT)
-rm -f @top_builddir@/src/inet/*.$(OBJEXT)
-rm -f @top_builddir@/src/lib/core/*.$(OBJEXT)
-rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/*.$(OBJEXT)
@@ -2240,195 +2476,204 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BLEEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleUUID.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-WoBle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDeviceManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-AsyncDNSResolverSockets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-DNSResolver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-EndPointBasis.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress-StringFuncts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPEndPointBasis.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPPrefix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetFaultInjection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetInterface.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayerBasis.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-RawEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TCPEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TunEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-UDPEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-ExchangeContext.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-HostPortList.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveBinding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveCircularTLVBuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnectionTunnel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveExchangeMgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveFabricState.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveGlobals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveKeyIds.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveMessageLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-Malloc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-SimpleAlloc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveServerBase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveStats.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVDebug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVReader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUpdater.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUtilities.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVWriter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/$(DEPDIR)/libWeave_a-BulkDataTransfer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXMessages.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXNode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXProtocol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXTransferState.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-RetainedPacketBuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-WeaveMessage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-Command.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLogging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLoggingTypes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventProcessor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LogBDXUpload.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingConfiguration.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingManagement.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-MessageDef.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-NotificationEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ResourceIdentifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionHandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitData.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitPathStore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateEncoder.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ViewClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-Binding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ClientNotifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMPublisher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProfileDatabase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProtocolEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-control/$(DEPDIR)/libWeave_a-DeviceControl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescription.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/fabric-provisioning/$(DEPDIR)/libWeave_a-FabricProvisioning.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatReceiver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatSender.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkInfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkProvisioning.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTraitDataSink.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveAccessToken.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveApplicationKeys.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEMessages.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveDummyGroupKeyStore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePASEEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePasscodes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePrivateKey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvBundle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvHash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurityDebug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSig.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveTAKEEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveToX509.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-X509ToWeave.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/service-directory/$(DEPDIR)/libWeave_a-ServiceDirectory.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioning.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioningServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-SoftwareUpdateProfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-WeaveImageAnnounceServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/status-report/$(DEPDIR)/libWeave_a-StatusReportProfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeCoordinator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeZone.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/token-pairing/$(DEPDIR)/libWeave_a-TokenPairing.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/vendor/nestlabs/dropcam-legacy-pairing/$(DEPDIR)/libWeave_a-DropcamLegacyPairing.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/vendor/nestlabs/thermostat/$(DEPDIR)/libWeave_a-IfjStatusStr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelAgent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelConnectionMgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelControl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Error.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1OID.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Reader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Writer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-Base64.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ErrorStr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-FibonacciUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-MathUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NestCerts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NonProductionMarker.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-PersistedCounter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ProfileStringSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-RandUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerialNumberUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerializationUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-StatusReportStr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-TimeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveCounter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveFaultInjection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveNames.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-nlargparser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-AESNI.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-OpenSSL.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-mbedTLS.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-CTRMode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-DRBG.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-OpenSSL.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-uECC.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HKDF.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HMAC.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-MinCrypt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-OpenSSL.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-mbedTLS.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto-OpenSSL.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-NestDRBG.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-OpenSSL.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-DecodedIPPacket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-WeaveLogging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-KryptonitePairingCodeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-NevisPairingCodeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-PairingCodeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff10.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff16.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff36.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemClock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemFaultInjection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemMutex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemObject.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemPacketBuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemStats.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/warm/$(DEPDIR)/libWeave_a-WarmCore.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BLEEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleUUID.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/ble/$(DEPDIR)/libWeave_a-WoBle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDeviceManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-AsyncDNSResolverSockets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-DNSResolver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-EndPointBasis.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress-StringFuncts.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPEndPointBasis.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPPrefix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetFaultInjection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetInterface.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayerBasis.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetTimer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-RawEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TCPEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TunEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/inet/$(DEPDIR)/libWeave_a-UDPEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-ExchangeContext.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-HostPortList.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveBinding.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveCircularTLVBuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnectionTunnel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveExchangeMgr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveFabricState.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveGlobals.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveKeyIds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveMessageLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-Malloc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-SimpleAlloc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveServerBase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveStats.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVDebug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVReader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUpdater.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUtilities.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVWriter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/$(DEPDIR)/libWeave_a-BulkDataTransfer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXMessages.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXNode.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXProtocol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXTransferState.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-RetainedPacketBuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-WeaveMessage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-Command.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLogging.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLoggingTypes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventProcessor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LogBDXUpload.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingConfiguration.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingManagement.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-MessageDef.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-NotificationEngine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ResourceIdentifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionEngine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionHandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitData.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitPathStore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateEncoder.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ViewClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-Binding.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ClientNotifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMPublisher.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProfileDatabase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProtocolEngine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-control/$(DEPDIR)/libWeave_a-DeviceControl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescription.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/fabric-provisioning/$(DEPDIR)/libWeave_a-FabricProvisioning.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatReceiver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatSender.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkInfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkProvisioning.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTraitDataSink.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveAccessToken.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveApplicationKeys.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEEngine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEMessages.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveDummyGroupKeyStore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportTest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePASEEngine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePasscodes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePrivateKey.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvBundle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvHash.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurity.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurityDebug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveTAKEEngine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveToX509.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-X509ToWeave.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/service-directory/$(DEPDIR)/libWeave_a-ServiceDirectory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioning.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioningServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-SoftwareUpdateProfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-WeaveImageAnnounceServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/status-report/$(DEPDIR)/libWeave_a-StatusReportProfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTime.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeCoordinator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeZone.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/token-pairing/$(DEPDIR)/libWeave_a-TokenPairing.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/vendor/nestlabs/dropcam-legacy-pairing/$(DEPDIR)/libWeave_a-DropcamLegacyPairing.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/vendor/nestlabs/thermostat/$(DEPDIR)/libWeave_a-IfjStatusStr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelAgent.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelConnectionMgr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelControl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Error.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1OID.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Reader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Writer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-Base64.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ErrorStr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-FibonacciUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-MathUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NestCerts.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NonProductionMarker.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-PersistedCounter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ProfileStringSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-RandUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerialNumberUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerializationUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-StatusReportStr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-TimeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveCounter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveFaultInjection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveNames.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-nlargparser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-AESNI.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-OpenSSL.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-mbedTLS.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-CTRMode.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-DRBG.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-OpenSSL.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-uECC.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HKDF.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HMAC.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-MinCrypt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-OpenSSL.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-mbedTLS.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto-OpenSSL.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-NestDRBG.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-OpenSSL.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-DecodedIPPacket.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-WeaveLogging.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-KryptonitePairingCodeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-NevisPairingCodeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-PairingCodeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff10.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff16.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff36.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemClock.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemFaultInjection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemMutex.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemObject.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemPacketBuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemStats.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemTimer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/warm/$(DEPDIR)/libWeave_a-WarmCore.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -2846,6 +3091,48 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o @top_builddir@/src/device-manager/libWeave_a-WeaveDeviceManager.obj `if test -f '@top_builddir@/src/device-manager/WeaveDeviceManager.cpp'; then $(CYGPATH_W) '@top_builddir@/src/device-manager/WeaveDeviceManager.cpp'; else $(CYGPATH_W) '$(srcdir)/@top_builddir@/src/device-manager/WeaveDeviceManager.cpp'; fi`
+@top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.o: @top_builddir@/src/device-manager/WeaveDataManagementClient.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT @top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.o -MD -MP -MF @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Tpo -c -o @top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.o `test -f '@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp' || echo '$(srcdir)/'`@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Tpo @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp' object='@top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o @top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.o `test -f '@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp' || echo '$(srcdir)/'`@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp
+
+@top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.obj: @top_builddir@/src/device-manager/WeaveDataManagementClient.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT @top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.obj -MD -MP -MF @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Tpo -c -o @top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.obj `if test -f '@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp'; then $(CYGPATH_W) '@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp'; else $(CYGPATH_W) '$(srcdir)/@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Tpo @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp' object='@top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o @top_builddir@/src/device-manager/libWeave_a-WeaveDataManagementClient.obj `if test -f '@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp'; then $(CYGPATH_W) '@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp'; else $(CYGPATH_W) '$(srcdir)/@top_builddir@/src/device-manager/WeaveDataManagementClient.cpp'; fi`
+
+@top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.o: @top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT @top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.o -MD -MP -MF @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Tpo -c -o @top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.o `test -f '@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp' || echo '$(srcdir)/'`@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Tpo @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp' object='@top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o @top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.o `test -f '@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp' || echo '$(srcdir)/'`@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp
+
+@top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.obj: @top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT @top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.obj -MD -MP -MF @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Tpo -c -o @top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.obj `if test -f '@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp'; then $(CYGPATH_W) '@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp'; else $(CYGPATH_W) '$(srcdir)/@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Tpo @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp' object='@top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o @top_builddir@/src/device-manager/schema/weave/trait/locale/libWeave_a-LocaleSettingsTrait.obj `if test -f '@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp'; then $(CYGPATH_W) '@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp'; else $(CYGPATH_W) '$(srcdir)/@top_builddir@/src/device-manager/schema/weave/trait/locale/LocaleSettingsTrait.cpp'; fi`
+
+@top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.o: @top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT @top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.o -MD -MP -MF @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Tpo -c -o @top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.o `test -f '@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp' || echo '$(srcdir)/'`@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Tpo @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp' object='@top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o @top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.o `test -f '@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp' || echo '$(srcdir)/'`@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp
+
+@top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.obj: @top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT @top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.obj -MD -MP -MF @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Tpo -c -o @top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.obj `if test -f '@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp'; then $(CYGPATH_W) '@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp'; else $(CYGPATH_W) '$(srcdir)/@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Tpo @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp' object='@top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o @top_builddir@/src/device-manager/schema/nest/test/trait/libWeave_a-TestCTrait.obj `if test -f '@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp'; then $(CYGPATH_W) '@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp'; else $(CYGPATH_W) '$(srcdir)/@top_builddir@/src/device-manager/schema/nest/test/trait/TestCTrait.cpp'; fi`
+
@top_builddir@/src/device-manager/libWeave_a-WoBleTest.o: @top_builddir@/src/device-manager/WoBleTest.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWeave_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT @top_builddir@/src/device-manager/libWeave_a-WoBleTest.o -MD -MP -MF @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Tpo -c -o @top_builddir@/src/device-manager/libWeave_a-WoBleTest.o `test -f '@top_builddir@/src/device-manager/WoBleTest.cpp' || echo '$(srcdir)/'`@top_builddir@/src/device-manager/WoBleTest.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Tpo @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Po
@@ -5158,7 +5445,10 @@
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)'; \
@@ -5225,6 +5515,10 @@
-rm -f @top_builddir@/src/ble/$(am__dirstamp)
-rm -f @top_builddir@/src/device-manager/$(DEPDIR)/$(am__dirstamp)
-rm -f @top_builddir@/src/device-manager/$(am__dirstamp)
+ -rm -f @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/$(am__dirstamp)
+ -rm -f @top_builddir@/src/device-manager/schema/nest/test/trait/$(am__dirstamp)
+ -rm -f @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/$(am__dirstamp)
+ -rm -f @top_builddir@/src/device-manager/schema/weave/trait/locale/$(am__dirstamp)
-rm -f @top_builddir@/src/inet/$(DEPDIR)/$(am__dirstamp)
-rm -f @top_builddir@/src/inet/$(am__dirstamp)
-rm -f @top_builddir@/src/lib/core/$(DEPDIR)/$(am__dirstamp)
@@ -5297,7 +5591,198 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf @top_builddir@/src/ble/$(DEPDIR) @top_builddir@/src/device-manager/$(DEPDIR) @top_builddir@/src/inet/$(DEPDIR) @top_builddir@/src/lib/core/$(DEPDIR) @top_builddir@/src/lib/profiles/bulk-data-transfer/$(DEPDIR) @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR) @top_builddir@/src/lib/profiles/common/$(DEPDIR) @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR) @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR) @top_builddir@/src/lib/profiles/device-control/$(DEPDIR) @top_builddir@/src/lib/profiles/device-description/$(DEPDIR) @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR) @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR) @top_builddir@/src/lib/profiles/fabric-provisioning/$(DEPDIR) @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR) @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR) @top_builddir@/src/lib/profiles/security/$(DEPDIR) @top_builddir@/src/lib/profiles/service-directory/$(DEPDIR) @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR) @top_builddir@/src/lib/profiles/software-update/$(DEPDIR) @top_builddir@/src/lib/profiles/status-report/$(DEPDIR) @top_builddir@/src/lib/profiles/time/$(DEPDIR) @top_builddir@/src/lib/profiles/token-pairing/$(DEPDIR) @top_builddir@/src/lib/profiles/vendor/nestlabs/dropcam-legacy-pairing/$(DEPDIR) @top_builddir@/src/lib/profiles/vendor/nestlabs/thermostat/$(DEPDIR) @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR) @top_builddir@/src/lib/support/$(DEPDIR) @top_builddir@/src/lib/support/crypto/$(DEPDIR) @top_builddir@/src/lib/support/logging/$(DEPDIR) @top_builddir@/src/lib/support/pairing-code/$(DEPDIR) @top_builddir@/src/lib/support/verhoeff/$(DEPDIR) @top_builddir@/src/system/$(DEPDIR) @top_builddir@/src/warm/$(DEPDIR)
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BLEEndPoint.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleError.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleLayer.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleUUID.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-WoBle.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDeviceManager.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Po
+ -rm -f @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Po
+ -rm -f @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-AsyncDNSResolverSockets.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-DNSResolver.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-EndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress-StringFuncts.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPEndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPPrefix.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetError.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetFaultInjection.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetInterface.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayerBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetTimer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetUtils.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-RawEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TCPEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TunEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-UDPEndPoint.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-ExchangeContext.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-HostPortList.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveBinding.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveCircularTLVBuffer.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnection.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnectionTunnel.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveError.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveExchangeMgr.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveFabricState.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveGlobals.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveKeyIds.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveMessageLayer.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-Malloc.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-SimpleAlloc.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveServerBase.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveStats.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVDebug.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVReader.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUpdater.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUtilities.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVWriter.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/$(DEPDIR)/libWeave_a-BulkDataTransfer.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXMessages.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXNode.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXProtocol.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXTransferState.Po
+ -rm -f @top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-RetainedPacketBuffer.Po
+ -rm -f @top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-WeaveMessage.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-Command.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLogging.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLoggingTypes.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventProcessor.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LogBDXUpload.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingConfiguration.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingManagement.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-MessageDef.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-NotificationEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ResourceIdentifier.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionHandler.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitData.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitPathStore.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateEncoder.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ViewClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-Binding.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ClientNotifier.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMPublisher.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProfileDatabase.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProtocolEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-control/$(DEPDIR)/libWeave_a-DeviceControl.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescription.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/fabric-provisioning/$(DEPDIR)/libWeave_a-FabricProvisioning.Po
+ -rm -f @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatReceiver.Po
+ -rm -f @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatSender.Po
+ -rm -f @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkInfo.Po
+ -rm -f @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkProvisioning.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTrait.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTraitDataSink.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveAccessToken.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveApplicationKeys.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEMessages.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCert.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveDummyGroupKeyStore.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExport.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportTest.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePASEEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePasscodes.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePrivateKey.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvBundle.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvHash.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurity.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurityDebug.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSig.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveTAKEEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveToX509.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-X509ToWeave.Po
+ -rm -f @top_builddir@/src/lib/profiles/service-directory/$(DEPDIR)/libWeave_a-ServiceDirectory.Po
+ -rm -f @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioning.Po
+ -rm -f @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioningServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-SoftwareUpdateProfile.Po
+ -rm -f @top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-WeaveImageAnnounceServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/status-report/$(DEPDIR)/libWeave_a-StatusReportProfile.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTime.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeCoordinator.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeZone.Po
+ -rm -f @top_builddir@/src/lib/profiles/token-pairing/$(DEPDIR)/libWeave_a-TokenPairing.Po
+ -rm -f @top_builddir@/src/lib/profiles/vendor/nestlabs/dropcam-legacy-pairing/$(DEPDIR)/libWeave_a-DropcamLegacyPairing.Po
+ -rm -f @top_builddir@/src/lib/profiles/vendor/nestlabs/thermostat/$(DEPDIR)/libWeave_a-IfjStatusStr.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelAgent.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelCommon.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelConnectionMgr.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelControl.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Error.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1OID.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Reader.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Writer.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-Base64.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ErrorStr.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-FibonacciUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-MathUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NestCerts.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NonProductionMarker.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-PersistedCounter.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ProfileStringSupport.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-RandUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerialNumberUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerializationUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-StatusReportStr.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-TimeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveCounter.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveFaultInjection.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveNames.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-nlargparser.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-AESNI.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-mbedTLS.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-CTRMode.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-DRBG.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-uECC.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HKDF.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HMAC.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-MinCrypt.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-mbedTLS.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-NestDRBG.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-DecodedIPPacket.Po
+ -rm -f @top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-WeaveLogging.Po
+ -rm -f @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-KryptonitePairingCodeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-NevisPairingCodeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-PairingCodeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff10.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff16.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff32.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff36.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemClock.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemError.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemFaultInjection.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemLayer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemMutex.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemObject.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemPacketBuffer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemStats.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemTimer.Po
+ -rm -f @top_builddir@/src/warm/$(DEPDIR)/libWeave_a-WarmCore.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -5343,7 +5828,198 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf @top_builddir@/src/ble/$(DEPDIR) @top_builddir@/src/device-manager/$(DEPDIR) @top_builddir@/src/inet/$(DEPDIR) @top_builddir@/src/lib/core/$(DEPDIR) @top_builddir@/src/lib/profiles/bulk-data-transfer/$(DEPDIR) @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR) @top_builddir@/src/lib/profiles/common/$(DEPDIR) @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR) @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR) @top_builddir@/src/lib/profiles/device-control/$(DEPDIR) @top_builddir@/src/lib/profiles/device-description/$(DEPDIR) @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR) @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR) @top_builddir@/src/lib/profiles/fabric-provisioning/$(DEPDIR) @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR) @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR) @top_builddir@/src/lib/profiles/security/$(DEPDIR) @top_builddir@/src/lib/profiles/service-directory/$(DEPDIR) @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR) @top_builddir@/src/lib/profiles/software-update/$(DEPDIR) @top_builddir@/src/lib/profiles/status-report/$(DEPDIR) @top_builddir@/src/lib/profiles/time/$(DEPDIR) @top_builddir@/src/lib/profiles/token-pairing/$(DEPDIR) @top_builddir@/src/lib/profiles/vendor/nestlabs/dropcam-legacy-pairing/$(DEPDIR) @top_builddir@/src/lib/profiles/vendor/nestlabs/thermostat/$(DEPDIR) @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR) @top_builddir@/src/lib/support/$(DEPDIR) @top_builddir@/src/lib/support/crypto/$(DEPDIR) @top_builddir@/src/lib/support/logging/$(DEPDIR) @top_builddir@/src/lib/support/pairing-code/$(DEPDIR) @top_builddir@/src/lib/support/verhoeff/$(DEPDIR) @top_builddir@/src/system/$(DEPDIR) @top_builddir@/src/warm/$(DEPDIR)
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BLEEndPoint.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleError.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleLayer.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-BleUUID.Po
+ -rm -f @top_builddir@/src/ble/$(DEPDIR)/libWeave_a-WoBle.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDataManagementClient.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WeaveDeviceManager.Po
+ -rm -f @top_builddir@/src/device-manager/$(DEPDIR)/libWeave_a-WoBleTest.Po
+ -rm -f @top_builddir@/src/device-manager/schema/nest/test/trait/$(DEPDIR)/libWeave_a-TestCTrait.Po
+ -rm -f @top_builddir@/src/device-manager/schema/weave/trait/locale/$(DEPDIR)/libWeave_a-LocaleSettingsTrait.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-AsyncDNSResolverSockets.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-DNSResolver.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-EndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress-StringFuncts.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPAddress.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPEndPointBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-IPPrefix.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetError.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetFaultInjection.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetInterface.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetLayerBasis.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetTimer.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-InetUtils.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-RawEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TCPEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-TunEndPoint.Po
+ -rm -f @top_builddir@/src/inet/$(DEPDIR)/libWeave_a-UDPEndPoint.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-ExchangeContext.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-HostPortList.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveBinding.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveCircularTLVBuffer.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnection.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveConnectionTunnel.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveError.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveExchangeMgr.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveFabricState.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveGlobals.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveKeyIds.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveMessageLayer.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-Malloc.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr-SimpleAlloc.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveSecurityMgr.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveServerBase.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveStats.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVDebug.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVReader.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUpdater.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVUtilities.Po
+ -rm -f @top_builddir@/src/lib/core/$(DEPDIR)/libWeave_a-WeaveTLVWriter.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/$(DEPDIR)/libWeave_a-BulkDataTransfer.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXMessages.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXNode.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXProtocol.Po
+ -rm -f @top_builddir@/src/lib/profiles/bulk-data-transfer/Development/$(DEPDIR)/libWeave_a-BDXTransferState.Po
+ -rm -f @top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-RetainedPacketBuffer.Po
+ -rm -f @top_builddir@/src/lib/profiles/common/$(DEPDIR)/libWeave_a-WeaveMessage.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-Command.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLogging.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventLoggingTypes.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-EventProcessor.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LogBDXUpload.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingConfiguration.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-LoggingManagement.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-MessageDef.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-NotificationEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ResourceIdentifier.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-SubscriptionHandler.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitData.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-TraitPathStore.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-UpdateEncoder.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Current/$(DEPDIR)/libWeave_a-ViewClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-Binding.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ClientNotifier.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-DMPublisher.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProfileDatabase.Po
+ -rm -f @top_builddir@/src/lib/profiles/data-management/Legacy/$(DEPDIR)/libWeave_a-ProtocolEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-control/$(DEPDIR)/libWeave_a-DeviceControl.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescription.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/device-description/$(DEPDIR)/libWeave_a-DeviceDescriptionServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Current/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/echo/Next/$(DEPDIR)/libWeave_a-WeaveEchoServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/fabric-provisioning/$(DEPDIR)/libWeave_a-FabricProvisioning.Po
+ -rm -f @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatReceiver.Po
+ -rm -f @top_builddir@/src/lib/profiles/heartbeat/$(DEPDIR)/libWeave_a-WeaveHeartbeatSender.Po
+ -rm -f @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkInfo.Po
+ -rm -f @top_builddir@/src/lib/profiles/network-provisioning/$(DEPDIR)/libWeave_a-NetworkProvisioning.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTrait.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-ApplicationKeysTraitDataSink.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveAccessToken.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveApplicationKeys.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCASEMessages.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveCert.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveDummyGroupKeyStore.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExport.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveKeyExportTest.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePASEEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePasscodes.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeavePrivateKey.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvBundle.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveProvHash.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurity.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSecurityDebug.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveSig.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveTAKEEngine.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-WeaveToX509.Po
+ -rm -f @top_builddir@/src/lib/profiles/security/$(DEPDIR)/libWeave_a-X509ToWeave.Po
+ -rm -f @top_builddir@/src/lib/profiles/service-directory/$(DEPDIR)/libWeave_a-ServiceDirectory.Po
+ -rm -f @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioning.Po
+ -rm -f @top_builddir@/src/lib/profiles/service-provisioning/$(DEPDIR)/libWeave_a-ServiceProvisioningServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-SoftwareUpdateProfile.Po
+ -rm -f @top_builddir@/src/lib/profiles/software-update/$(DEPDIR)/libWeave_a-WeaveImageAnnounceServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/status-report/$(DEPDIR)/libWeave_a-StatusReportProfile.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTime.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeClient.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeCoordinator.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeServer.Po
+ -rm -f @top_builddir@/src/lib/profiles/time/$(DEPDIR)/libWeave_a-WeaveTimeZone.Po
+ -rm -f @top_builddir@/src/lib/profiles/token-pairing/$(DEPDIR)/libWeave_a-TokenPairing.Po
+ -rm -f @top_builddir@/src/lib/profiles/vendor/nestlabs/dropcam-legacy-pairing/$(DEPDIR)/libWeave_a-DropcamLegacyPairing.Po
+ -rm -f @top_builddir@/src/lib/profiles/vendor/nestlabs/thermostat/$(DEPDIR)/libWeave_a-IfjStatusStr.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelAgent.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelCommon.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelConnectionMgr.Po
+ -rm -f @top_builddir@/src/lib/profiles/weave-tunneling/$(DEPDIR)/libWeave_a-WeaveTunnelControl.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Error.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1OID.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Reader.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ASN1Writer.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-Base64.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ErrorStr.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-FibonacciUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-MathUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NestCerts.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-NonProductionMarker.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-PersistedCounter.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-ProfileStringSupport.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-RandUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerialNumberUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-SerializationUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-StatusReportStr.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-TimeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveCounter.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveFaultInjection.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-WeaveNames.Po
+ -rm -f @top_builddir@/src/lib/support/$(DEPDIR)/libWeave_a-nlargparser.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-AESNI.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-AESBlockCipher-mbedTLS.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-CTRMode.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-DRBG.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve-uECC.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-EllipticCurve.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HKDF.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HMAC.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-MinCrypt.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-HashAlgos-mbedTLS.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveCrypto.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-NestDRBG.Po
+ -rm -f @top_builddir@/src/lib/support/crypto/$(DEPDIR)/libWeave_a-WeaveRNG-OpenSSL.Po
+ -rm -f @top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-DecodedIPPacket.Po
+ -rm -f @top_builddir@/src/lib/support/logging/$(DEPDIR)/libWeave_a-WeaveLogging.Po
+ -rm -f @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-KryptonitePairingCodeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-NevisPairingCodeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/pairing-code/$(DEPDIR)/libWeave_a-PairingCodeUtils.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff10.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff16.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff32.Po
+ -rm -f @top_builddir@/src/lib/support/verhoeff/$(DEPDIR)/libWeave_a-Verhoeff36.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemClock.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemError.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemFaultInjection.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemLayer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemMutex.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemObject.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemPacketBuffer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemStats.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libWeave_a-SystemTimer.Po
+ -rm -f @top_builddir@/src/warm/$(DEPDIR)/libWeave_a-WarmCore.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -5364,9 +6040,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -5378,6 +6054,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/lib/core/WeaveBinding.cpp b/src/lib/core/WeaveBinding.cpp
index 3cc4f76..ecd8153 100644
--- a/src/lib/core/WeaveBinding.cpp
+++ b/src/lib/core/WeaveBinding.cpp
@@ -1912,8 +1912,12 @@
// link-local address because we need to specify the interface when we are
// sending to a link local address. Otherwise, defer to the routing logic
// to choose the outgoing interface.
- TargetAddress_IP(apPktInfo->SrcAddress, apPktInfo->SrcPort,
- apPktInfo->SrcAddress.IsIPv6LinkLocal() ? apPktInfo->Interface : INET_NULL_INTERFACEID);
+
+ if (apConnection == NULL)
+ {
+ TargetAddress_IP(apPktInfo->SrcAddress, apPktInfo->SrcPort,
+ apPktInfo->SrcAddress.IsIPv6LinkLocal() ? apPktInfo->Interface : INET_NULL_INTERFACEID);
+ }
if (apConnection != NULL)
{
diff --git a/src/lib/core/WeaveDMConfig.h b/src/lib/core/WeaveDMConfig.h
index 100200c..69ea915 100644
--- a/src/lib/core/WeaveDMConfig.h
+++ b/src/lib/core/WeaveDMConfig.h
@@ -294,6 +294,18 @@
#endif // WDM_ENABLE_SUBSCRIPTIONLESS_NOTIFICATION
/**
+ * @def WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ *
+ * @brief
+ * Enable (1) or disable (0) sending/handling update response
+ * in Weave Data Management Next profile.
+ *
+ */
+#ifndef WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+#define WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT 1
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
+/**
* @def WDM_PUBLISHER_ENABLE_VIEW
*
* @brief
@@ -573,6 +585,29 @@
#endif /* WDM_MIN_UPDATE_SIZE */
/**
+ * @def WDM_MAX_UPDATE_RESPONSE_SIZE
+ *
+ * @brief
+ * Specify the maximum size (in bytes) of a WDM update response
+ * payload. Note that the WDM update payload is also limited
+ * by the size of `nl::Weave::System::PacketBuffer`
+ */
+#ifndef WDM_MAX_UPDATE_RESPONSE_SIZE
+#define WDM_MAX_UPDATE_RESPONSE_SIZE 2048
+#endif /* WDM_MAX_UPDATE_SIZE */
+
+/**
+ * @def WDM_MIN_UPDATE_RESPONSE_SIZE
+ *
+ * @brief
+ * Specify the minimum size (in bytes) of a WDM update response
+ * payload.
+ */
+#ifndef WDM_MIN_UPDATE_RESPONSE_SIZE
+#define WDM_MIN_UPDATE_RESPONSE_SIZE 1024
+#endif /* WDM_MIN_UPDATE_SIZE */
+
+/**
* @def TDM_DISABLE_STRICT_SCHEMA_COMPLIANCE
*
* @brief
diff --git a/src/lib/profiles/common/WeaveMessage.cpp b/src/lib/profiles/common/WeaveMessage.cpp
index 00ddb8a..117669a 100644
--- a/src/lib/profiles/common/WeaveMessage.cpp
+++ b/src/lib/profiles/common/WeaveMessage.cpp
@@ -851,6 +851,7 @@
* @brief Pack a ReferencedTLVData object using a TLVWriter.
*
* @param [in] i An iterator over the message being packed.
+ * @param [in] maxLen The maximum number of bytes that should be written to the output buffer.
*
* @return a WEAVE_ERROR - WEAVE_NO_ERROR if all goes well, otherwise
* an error reflecting an inability of the writer to write the
@@ -858,7 +859,7 @@
* return an error and so fails silently.
*/
-WEAVE_ERROR ReferencedTLVData::pack(MessageIterator &i)
+WEAVE_ERROR ReferencedTLVData::pack(MessageIterator &i, uint32_t maxLen)
{
WEAVE_ERROR err = WEAVE_NO_ERROR;
System::PacketBuffer *theBuffer = i.GetBuffer();
@@ -868,7 +869,7 @@
if (theWriteCallback != NULL)
{
theData = i.thePoint;
- writer.Init(theBuffer);
+ writer.Init(theBuffer, maxLen);
theWriteCallback(writer, theAppState);
theLength = theBuffer->DataLength() - oldDataLength;
i.thePoint += theLength;
diff --git a/src/lib/profiles/common/WeaveMessage.h b/src/lib/profiles/common/WeaveMessage.h
index ca7d493..7589970 100644
--- a/src/lib/profiles/common/WeaveMessage.h
+++ b/src/lib/profiles/common/WeaveMessage.h
@@ -289,7 +289,7 @@
return pack(i);
};
- WEAVE_ERROR pack(MessageIterator&i);
+ WEAVE_ERROR pack(MessageIterator&i, uint32_t maxLen = 0xFFFFFFFFUL);
/**
* Return the data length assuming that the object has been packed
diff --git a/src/lib/profiles/data-management/Current/DataManagement.h b/src/lib/profiles/data-management/Current/DataManagement.h
index df7f9c8..84d7992 100644
--- a/src/lib/profiles/data-management/Current/DataManagement.h
+++ b/src/lib/profiles/data-management/Current/DataManagement.h
@@ -65,6 +65,7 @@
#include <Weave/Profiles/data-management/SubscriptionHandler.h>
#include <Weave/Profiles/data-management/TraitData.h>
#include <Weave/Profiles/data-management/TraitCatalog.h>
+#include <Weave/Profiles/data-management/GenericTraitCatalogImp.h>
#include <Weave/Profiles/data-management/NotificationEngine.h>
#include <Weave/Profiles/data-management/SubscriptionClient.h>
#include <Weave/Profiles/data-management/ViewClient.h>
diff --git a/src/lib/profiles/data-management/Current/GenericTraitCatalogImp.h b/src/lib/profiles/data-management/Current/GenericTraitCatalogImp.h
new file mode 100644
index 0000000..9b2b23e
--- /dev/null
+++ b/src/lib/profiles/data-management/Current/GenericTraitCatalogImp.h
@@ -0,0 +1,565 @@
+/*
+ *
+ * Copyright (c) 2019 Google, LLC.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * Defines generic trait catalogs that are used to house trait data sources/sinks and can be used with the
+ * various WDM engines to correctly map to/from resources specified in a WDM path to actual trait
+ * data instances.
+ *
+ */
+
+#ifndef _WEAVE_DATA_MANAGEMENT_GENERIC_TRAIT_CATALOG_IMP_H
+#define _WEAVE_DATA_MANAGEMENT_GENERIC_TRAIT_CATALOG_IMP_H
+
+#include <map>
+#include <limits>
+#include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
+#include <Weave/Profiles/data-management/TraitCatalog.h>
+
+namespace nl {
+namespace Weave {
+namespace Profiles {
+namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNamespaceDesignation_Current) {
+/*
+ * @class GenericTraitCatalogImpl
+ *
+ * @brief A Weave provided implementation of the TraitCatalogBase interface for a collection of trait data instances
+ * that all refer to the same resource. It provides a map-backed storage for these instances.
+ */
+template <typename T>
+class GenericTraitCatalogImpl : public TraitCatalogBase<T>
+{
+public:
+ GenericTraitCatalogImpl(void);
+ virtual ~GenericTraitCatalogImpl(void);
+
+ WEAVE_ERROR Add(const ResourceIdentifier & aResourceId, const uint64_t & aInstanceId, PropertyPathHandle basePathHandle, T * traitInstance, TraitDataHandle & aHandle);
+ WEAVE_ERROR Remove(T * traitInstance);
+ WEAVE_ERROR Remove(TraitDataHandle aHandle);
+ WEAVE_ERROR PrepareSubscriptionPathList(TraitPath * pathList, uint16_t pathListSize, uint16_t & pathListLen, TraitDataHandle aHandle, bool aNeedSubscribeAll);
+ WEAVE_ERROR Clear(void);
+
+ virtual WEAVE_ERROR AddressToHandle(TLV::TLVReader & aReader, TraitDataHandle & aHandle,
+ SchemaVersionRange & aSchemaVersionRange) const;
+ virtual WEAVE_ERROR HandleToAddress(TraitDataHandle aHandle, TLV::TLVWriter & aWriter,
+ SchemaVersionRange & aSchemaVersionRange) const;
+ virtual WEAVE_ERROR Locate(TraitDataHandle aHandle, T ** aTraitInstance) const;
+ virtual WEAVE_ERROR Locate(T * aTraitInstance, TraitDataHandle & aHandle) const;
+
+ WEAVE_ERROR Locate (uint32_t aProfileId,
+ uint64_t aInstanceId,
+ ResourceIdentifier aResourceId,
+ TraitDataHandle &aHandle) const;
+
+ WEAVE_ERROR Locate (uint32_t aProfileId,
+ uint64_t aInstanceId,
+ ResourceIdentifier aResourceId,
+ T ** aTraitInstance) const;
+
+ virtual WEAVE_ERROR DispatchEvent(uint16_t aEvent, void * aContext) const;
+ virtual void Iterate(IteratorCallback aCallback, void * aContext);
+#if WEAVE_CONFIG_ENABLE_WDM_UPDATE
+ virtual WEAVE_ERROR GetInstanceId(TraitDataHandle aHandle, uint64_t &aInstanceId) const;
+ virtual WEAVE_ERROR GetResourceId(TraitDataHandle aHandle, ResourceIdentifier &aResourceId) const;
+#endif // WEAVE_CONFIG_ENABLE_WDM_UPDATE
+
+ /**
+ * Return the number of trait instances in the catalog.
+ */
+ uint32_t Count(void) const;
+
+private:
+ struct CatalogItem
+ {
+ uint32_t mProfileId;
+ uint64_t mInstanceId;
+ ResourceIdentifier mResourceId;
+ T *mItem;
+ PropertyPathHandle mBasePathHandle;
+ };
+ TraitDataHandle mNextHandle;
+
+ typedef std::map<TraitDataHandle, CatalogItem*> Handle2ItemMap_t;
+ Handle2ItemMap_t mItemStore;
+};
+
+typedef GenericTraitCatalogImpl<TraitDataSink> GenericTraitSinkCatalog;
+typedef GenericTraitCatalogImpl<TraitDataSource> GenericTraitSourceCatalog;
+
+template <typename T>
+GenericTraitCatalogImpl<T>::GenericTraitCatalogImpl(void)
+ : mNextHandle(0)
+{
+ // Nothing to do.
+}
+
+template <typename T>
+GenericTraitCatalogImpl<T>::~GenericTraitCatalogImpl(void)
+{
+ Clear();
+}
+
+template <typename T>
+WEAVE_ERROR GenericTraitCatalogImpl<T>::Add(const ResourceIdentifier & aResourceId, const uint64_t & aInstanceId,
+ PropertyPathHandle basePathHandle, T * traitInstance, TraitDataHandle & aHandle)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ CatalogItem *item = NULL;
+ TraitDataHandle handle;
+ typename Handle2ItemMap_t::iterator it;
+
+ // Make sure there is space
+ VerifyOrExit(mItemStore.size() < std::numeric_limits<TraitDataHandle>::max(),
+ err = WEAVE_ERROR_NO_MEMORY);
+
+ // Create the CatalogItem
+ item = new CatalogItem();
+ VerifyOrExit(item != NULL, err = WEAVE_ERROR_NO_MEMORY);
+
+ item->mProfileId = traitInstance->GetSchemaEngine()->GetProfileId();
+ item->mInstanceId = aInstanceId;
+ item->mResourceId = aResourceId;
+ item->mItem = traitInstance;
+ item->mBasePathHandle = basePathHandle;
+
+ // Stop if this path already exists
+ err = Locate(item->mProfileId, item->mInstanceId, item->mResourceId, handle);
+ VerifyOrExit(err != WEAVE_NO_ERROR, err = WEAVE_ERROR_DUPLICATE_KEY_ID);
+
+ do {
+ // Assign a new handle
+ aHandle = mNextHandle++;
+
+ // Make sure it's available as mNextHandle may have wrapped
+ it = mItemStore.find(aHandle);
+ } while (it != mItemStore.end());
+
+ // Store the item
+ mItemStore[aHandle] = item;
+ err = WEAVE_NO_ERROR;
+
+exit:
+ if (err != WEAVE_NO_ERROR && item != NULL)
+ {
+ delete item;
+ }
+
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR GenericTraitCatalogImpl<T>::Remove(T * traitInstance)
+{
+ WEAVE_ERROR err = WEAVE_ERROR_INVALID_ARGUMENT;
+ typename Handle2ItemMap_t::const_iterator it;
+ // Loop through the items and delete the items
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ CatalogItem *item = it->second;
+ if (item && item->mItem == traitInstance)
+ {
+ delete item;
+ err = WEAVE_NO_ERROR;
+ }
+ }
+
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR GenericTraitCatalogImpl<T>::Remove(TraitDataHandle aHandle)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ typename Handle2ItemMap_t::iterator it;
+ CatalogItem *item = NULL;
+
+ // Make sure the handle exists
+ it = mItemStore.find(aHandle);
+ VerifyOrExit(it != mItemStore.end(), err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ // Remove the item and delete it
+ item = it->second;
+ mItemStore.erase(it);
+ delete item;
+
+exit:
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::Clear(void)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ typename Handle2ItemMap_t::iterator it;
+ CatalogItem *item = NULL;
+ // Loop through the items and remove them all
+ it = mItemStore.begin();
+ while (it != mItemStore.end())
+ {
+ item = it->second;
+ delete item;
+ it ++;
+ }
+ mItemStore.clear();
+
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::AddressToHandle (TLV::TLVReader &aReader,
+ TraitDataHandle &aHandle,
+ SchemaVersionRange &aSchemaVersionRange) const
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ uint32_t profileId = 0;
+ uint64_t instanceId = 0;
+ ResourceIdentifier resourceId;
+ Path::Parser path;
+ TLV::TLVReader reader;
+
+ err = path.Init(aReader);
+ SuccessOrExit(err);
+
+ err = path.GetProfileID(&profileId, &aSchemaVersionRange);
+ SuccessOrExit(err);
+
+ err = path.GetInstanceID(&instanceId);
+ if ((WEAVE_NO_ERROR != err) && (WEAVE_END_OF_TLV != err))
+ {
+ ExitNow();
+ }
+
+ err = path.GetResourceID(&reader);
+ if (err == WEAVE_NO_ERROR)
+ {
+ err = resourceId.FromTLV(reader);
+ SuccessOrExit(err);
+ }
+ else if (err == WEAVE_END_OF_TLV)
+ {
+ resourceId = ResourceIdentifier(ResourceIdentifier::RESOURCE_TYPE_RESERVED,
+ ResourceIdentifier::SELF_NODE_ID);
+ }
+ else if (WEAVE_NO_ERROR != err)
+ {
+ ExitNow();
+ }
+
+ path.GetTags(&aReader);
+
+ VerifyOrExit(profileId != 0, err = WEAVE_ERROR_TLV_TAG_NOT_FOUND);
+
+ err = Locate(profileId, instanceId, resourceId, aHandle);
+ SuccessOrExit(err);
+exit:
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::HandleToAddress (TraitDataHandle aHandle,
+ TLV::TLVWriter &aWriter,
+ SchemaVersionRange &aSchemaVersionRange) const
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ TLV::TLVType type;
+ typename Handle2ItemMap_t::const_iterator it;
+ CatalogItem *item = NULL;
+
+ // Make sure the handle exists
+ it = mItemStore.find(aHandle);
+ VerifyOrExit(it != mItemStore.end(), err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ VerifyOrExit(aSchemaVersionRange.IsValid(), err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ item = it->second;
+
+ err = aWriter.StartContainer(TLV::ContextTag(Path::kCsTag_InstanceLocator),
+ TLV::kTLVType_Structure, type);
+ SuccessOrExit(err);
+
+ if (aSchemaVersionRange.mMinVersion != 1 || aSchemaVersionRange.mMaxVersion != 1) {
+ TLV::TLVType type2;
+
+ err = aWriter.StartContainer(TLV::ContextTag(Path::kCsTag_TraitProfileID), TLV::kTLVType_Array, type2);
+ SuccessOrExit(err);
+
+ err = aWriter.Put(TLV::AnonymousTag, item->mItem->GetSchemaEngine()->GetProfileId());
+ SuccessOrExit(err);
+
+ // Only encode the max version if it isn't 1.
+ if (aSchemaVersionRange.mMaxVersion != 1) {
+ err = aWriter.Put(TLV::AnonymousTag, aSchemaVersionRange.mMaxVersion);
+ SuccessOrExit(err);
+ }
+
+ // Only encode the min version if it isn't 1.
+ if (aSchemaVersionRange.mMinVersion != 1) {
+ err = aWriter.Put(TLV::AnonymousTag, aSchemaVersionRange.mMinVersion);
+ SuccessOrExit(err);
+ }
+
+ err = aWriter.EndContainer(type2);
+ SuccessOrExit(err);
+ }
+ else {
+ err = aWriter.Put(TLV::ContextTag(Path::kCsTag_TraitProfileID), item->mItem->GetSchemaEngine()->GetProfileId());
+ SuccessOrExit(err);
+ }
+
+ if (item->mInstanceId) {
+ err = aWriter.Put(TLV::ContextTag(Path::kCsTag_TraitInstanceID),
+ item->mInstanceId);
+ SuccessOrExit(err);
+ }
+
+ err = item->mResourceId.ToTLV(aWriter);
+ SuccessOrExit(err);
+
+ err = aWriter.EndContainer(type);
+ SuccessOrExit(err);
+
+ exit:
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::Locate (TraitDataHandle aHandle, T **aTraitInstance) const
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Make sure the handle exists
+ it = mItemStore.find(aHandle);
+ VerifyOrExit(it != mItemStore.end(), err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ // Return the trait instance
+ *aTraitInstance = it->second->mItem;
+
+exit:
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::Locate (T *aTraitInstance,
+ TraitDataHandle &aHandle) const
+{
+ WEAVE_ERROR err = WEAVE_ERROR_INVALID_ARGUMENT;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Iterate and find this trait instance
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ if (aTraitInstance == it->second->mItem)
+ {
+ aHandle = it->first;
+ err = WEAVE_NO_ERROR;
+ break;
+ }
+ }
+
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::Locate (uint32_t aProfileId,
+ uint64_t aInstanceId,
+ ResourceIdentifier aResourceId,
+ TraitDataHandle &aHandle) const
+{
+ WEAVE_ERROR err = WEAVE_ERROR_INVALID_PROFILE_ID;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Loop through the items and check if the path matches
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ CatalogItem *item = it->second;
+ if (item->mProfileId == aProfileId &&
+ item->mResourceId == aResourceId &&
+ item->mInstanceId == aInstanceId)
+ {
+ err = WEAVE_NO_ERROR;
+ aHandle = it->first;
+ }
+ }
+
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::Locate (uint32_t aProfileId,
+ uint64_t aInstanceId,
+ ResourceIdentifier aResourceId,
+ T **aTraitInstance) const
+{
+ WEAVE_ERROR err = WEAVE_ERROR_INVALID_PROFILE_ID;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Loop through the items and check if the path matches
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ CatalogItem *item = it->second;
+ if (item->mProfileId == aProfileId &&
+ item->mResourceId == aResourceId &&
+ item->mInstanceId == aInstanceId)
+ {
+ err = WEAVE_NO_ERROR;
+ *aTraitInstance = it->second->mItem;
+ }
+ }
+
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR
+GenericTraitCatalogImpl<T>::DispatchEvent (uint16_t aEvent, void *aContext) const
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Send the event to all the items
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ CatalogItem *item = it->second;
+ item->mItem->OnEvent(aEvent, aContext);
+ }
+
+ return err;
+}
+
+template <typename T>
+void
+GenericTraitCatalogImpl<T>::Iterate (IteratorCallback aCallback, void *aContext)
+{
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Send the event to all the items
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ aCallback(it->second->mItem, it->first, aContext);
+ }
+}
+
+#if WEAVE_CONFIG_ENABLE_WDM_UPDATE
+template <typename T>
+WEAVE_ERROR GenericTraitCatalogImpl<T>::GetInstanceId (TraitDataHandle aHandle, uint64_t &aInstanceId) const
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Make sure the handle exists
+ it = mItemStore.find(aHandle);
+ VerifyOrExit(it != mItemStore.end(), err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ // Return the trait mInstanceId
+ aInstanceId = it->second->mInstanceId;
+
+exit:
+ return err;
+}
+
+template <typename T>
+WEAVE_ERROR GenericTraitCatalogImpl<T>::GetResourceId (TraitDataHandle aHandle, ResourceIdentifier &aResourceId) const
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ // Make sure the handle exists
+ it = mItemStore.find(aHandle);
+ VerifyOrExit(it != mItemStore.end(), err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ // Return the trait mResourceId
+ aResourceId = it->second->mResourceId;
+
+exit:
+ return err;
+}
+#endif // WEAVE_CONFIG_ENABLE_WDM_UPDATE
+
+template <typename T>
+uint32_t GenericTraitCatalogImpl<T>::Count(void) const
+{
+ uint32_t count = 0;
+ typename Handle2ItemMap_t::const_iterator it;
+
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ CatalogItem *item = it->second;
+ if (item->mItem != NULL)
+ {
+ count++;
+ }
+ }
+
+ return count;
+}
+
+template <typename T>
+WEAVE_ERROR GenericTraitCatalogImpl<T>::PrepareSubscriptionPathList(TraitPath * pathList, uint16_t pathListSize, uint16_t & pathListLen, TraitDataHandle aHandle, bool aNeedSubscribeAll)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ typename Handle2ItemMap_t::const_iterator it;
+ pathListLen = 0;
+
+ for (it = mItemStore.begin(); it != mItemStore.end(); it++)
+ {
+ CatalogItem *item = it->second;
+ if (item->mItem != NULL)
+ {
+ VerifyOrExit(pathListLen < pathListSize, err = WEAVE_ERROR_BUFFER_TOO_SMALL);
+ if (aNeedSubscribeAll)
+ {
+ *pathList++ = TraitPath(it->first, item->mBasePathHandle);
+ pathListLen++;
+ }
+ else
+ {
+ if (it->first == aHandle)
+ {
+ pathList[0] = TraitPath(it->first, item->mBasePathHandle);
+ pathListLen = 1;
+ err = WEAVE_NO_ERROR;
+ break;
+ }
+ else
+ {
+ err = WEAVE_ERROR_INVALID_ARGUMENT;
+ }
+ }
+ }
+ }
+
+
+exit:
+ return err;
+}
+
+}; // namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNamespaceDesignation_Current)
+}; // namespace Profiles
+}; // namespace Weave
+}; // namespace nl
+
+#endif // _WEAVE_DATA_MANAGEMENT_GENERIC_TRAIT_CATALOG_IMP_H
diff --git a/src/lib/profiles/data-management/Current/MessageDef.h b/src/lib/profiles/data-management/Current/MessageDef.h
index a00873f..4fe3598 100644
--- a/src/lib/profiles/data-management/Current/MessageDef.h
+++ b/src/lib/profiles/data-management/Current/MessageDef.h
@@ -128,9 +128,9 @@
kStatus_InvalidSubscriptionID = 0x28,
kStatus_GeneralSchemaViolation = 0x29,
kStatus_UnpairedDeviceRejected = 0x2A,
- kStatus_IncompatibleDataSchemaVersion = 0x2B,
- kStatus_MultipleFailures = 0x2C,
- kStatus_UpdateOutOfSequence = 0x2D,
+ kStatus_MultipleFailures = 0x2B,
+ kStatus_UpdateOutOfSequence = 0x2C,
+ kStatus_IncompatibleDataSchemaVersion = 0x2D,
};
// TODO: The type is only used in a few places. We should use it everywhere.
diff --git a/src/lib/profiles/data-management/Current/SubscriptionClient.cpp b/src/lib/profiles/data-management/Current/SubscriptionClient.cpp
index 7809682..d069340 100644
--- a/src/lib/profiles/data-management/Current/SubscriptionClient.cpp
+++ b/src/lib/profiles/data-management/Current/SubscriptionClient.cpp
@@ -3222,11 +3222,19 @@
SetPendingSetState(kPendingSetReady);
}
- VerifyOrExit(mPendingSetState == kPendingSetReady,
- WeaveLogDetail(DataManagement, "%s: PendingSetState: %d; err = %s", __func__, mPendingSetState, nl::ErrorStr(err)));
+ if (mPendingSetState != kPendingSetReady)
+ {
+ WeaveLogDetail(DataManagement, "%s: PendingSetState: %d; err = %s", __func__, mPendingSetState, nl::ErrorStr(err));
+ err = WEAVE_ERROR_INCORRECT_STATE;
+ SuccessOrExit(err);
+ }
- VerifyOrExit(false == IsUpdateInFlight(),
- WeaveLogDetail(DataManagement, "%s: update already in flight", __func__));
+ if (true == IsUpdateInFlight())
+ {
+ WeaveLogDetail(DataManagement, "%s: update already in flight", __func__);
+ err = WEAVE_ERROR_INCORRECT_STATE;
+ SuccessOrExit(err);
+ }
if (aForce)
{
diff --git a/src/lib/profiles/data-management/Current/SubscriptionEngine.cpp b/src/lib/profiles/data-management/Current/SubscriptionEngine.cpp
index ff936fb..b2cd487 100644
--- a/src/lib/profiles/data-management/Current/SubscriptionEngine.cpp
+++ b/src/lib/profiles/data-management/Current/SubscriptionEngine.cpp
@@ -32,6 +32,7 @@
#include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
#include <Weave/Profiles/data-management/DataManagement.h>
#include <Weave/Profiles/data-management/NotificationEngine.h>
+#include <Weave/Profiles/status-report/StatusReportProfile.h>
#include <Weave/Profiles/time/WeaveTime.h>
#include <Weave/Support/crypto/WeaveCrypto.h>
#include <Weave/Support/WeaveFaultInjection.h>
@@ -357,6 +358,13 @@
func = OnSubscriptionlessNotification;
break;
#endif // WDM_ENABLE_SUBSCRIPTIONLESS_NOTIFICATION
+
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ case kMsgType_UpdateRequest:
+ func = OnUpdateRequest;
+ break;
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
default:
break;
}
@@ -1091,7 +1099,7 @@
ExitNow(err = WEAVE_ERROR_NO_MEMORY);
}
- err = binding->BeginConfiguration().ConfigureFromMessage(aMsgInfo, aPktInfo).PrepareBinding();
+ err = binding->BeginConfiguration().ConfigureFromMessage(aMsgInfo, aPktInfo, aEC->Con).PrepareBinding();
SuccessOrExit(err);
// If the peer requested an ACK, we need to ensure that the exchange context will automatically
@@ -1480,7 +1488,6 @@
ExitNow();
}
}
-
// Note we cannot just use pathReader at here because the TDM related functions
// generally assume they can move the reader at their will.
// Note that callee is supposed to cache whatever is useful in the TLV stream into its own memory
@@ -1519,7 +1526,558 @@
}
#endif // WDM_PUBLISHER_ENABLE_CUSTOM_COMMANDS
-#endif // #if WDM_ENABLE_SUBSCRIPTION_PUBLISHER
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+WEAVE_ERROR SubscriptionEngine::GetPreviousFirstSameTraitVersion(TLV::TLVReader & aDataListReader, uint32_t &aProfileId, uint64_t &aInstanceId, uint64_t &aPreviousFirstSameTraitVersion, uint32_t aNumDataElements)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ Weave::TLV::TLVReader DataListReaderCopy;
+ DataListReaderCopy.Init(aDataListReader);
+ uint32_t profileId = 0;
+ uint64_t instanceId = 0;
+ uint32_t numNeedSearchedElements = aNumDataElements - 1;
+
+ while (WEAVE_NO_ERROR == (err = DataListReaderCopy.Next()) && numNeedSearchedElements > 0)
+ {
+ nl::Weave::TLV::TLVReader pathReader;
+ {
+ DataElement::Parser element;
+
+ err = element.Init(DataListReaderCopy);
+ SuccessOrExit(err);
+
+ err = element.GetReaderOnPath(&pathReader);
+ SuccessOrExit(err);
+
+ err = GetProfileAndInstanceIds(pathReader, profileId, instanceId);
+ SuccessOrExit(err);
+ if (aProfileId == profileId && aInstanceId == instanceId)
+ {
+ element.GetVersion(&aPreviousFirstSameTraitVersion);
+ }
+ }
+
+ numNeedSearchedElements --;
+ }
+
+exit:
+ return err;
+}
+
+WEAVE_ERROR SubscriptionEngine::GetProfileAndInstanceIds(TLV::TLVReader & aPathReader, uint32_t & aProfileId, uint64_t & aInstanceId)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ Path::Parser path;
+ SchemaVersionRange versionRange;
+
+ err = path.Init(aPathReader);
+ SuccessOrExit(err);
+
+ err = path.GetProfileID(&aProfileId, &versionRange);
+ SuccessOrExit(err);
+
+ err = path.GetInstanceID(&aInstanceId);
+ if (WEAVE_END_OF_TLV == err)
+ {
+ err = WEAVE_NO_ERROR;
+ }
+ SuccessOrExit(err);
+
+exit:
+ return err;
+}
+
+WEAVE_ERROR SubscriptionEngine::AllocateRightSizedBuffer(PacketBuffer *& buf,
+ const uint32_t desiredSize,
+ const uint32_t minSize,
+ uint32_t & outMaxPayloadSize)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ uint32_t bufferAllocSize = 0;
+ uint32_t maxWeavePayloadSize;
+ uint32_t weaveTrailerSize = WEAVE_TRAILER_RESERVE_SIZE;
+ uint32_t weaveHeaderSize = WEAVE_SYSTEM_CONFIG_HEADER_RESERVE_SIZE;
+
+ bufferAllocSize = nl::Weave::min(desiredSize,
+ static_cast<uint32_t>(WEAVE_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX -
+ weaveHeaderSize -
+ weaveTrailerSize));
+
+ // Add the Weave Trailer size as NewWithAvailableSize() includes that in
+ // availableSize.
+ bufferAllocSize += weaveTrailerSize;
+
+ buf = PacketBuffer::NewWithAvailableSize(weaveHeaderSize, bufferAllocSize);
+ VerifyOrExit(buf != NULL, err = WEAVE_ERROR_NO_MEMORY);
+
+ maxWeavePayloadSize = WeaveMessageLayer::GetMaxWeavePayloadSize(buf, true, WEAVE_CONFIG_DEFAULT_UDP_MTU_SIZE);
+
+ outMaxPayloadSize = nl::Weave::min(maxWeavePayloadSize, bufferAllocSize);
+
+ if (outMaxPayloadSize < minSize)
+ {
+ err = WEAVE_ERROR_BUFFER_TOO_SMALL;
+
+ PacketBuffer::Free(buf);
+ buf = NULL;
+ }
+
+exit:
+ return err;
+}
+
+void SubscriptionEngine::StatusVersionListWriter(nl::Weave::TLV::TLVWriter &aWriter, void *apContext)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ nl::Weave::TLV::TLVWriter checkpoint = aWriter;
+ TraitDataSource * dataSource = NULL;
+ struct StatusDataHandleElement * elementTracker = NULL;
+ UpdateResponseWriterContext * context = NULL;
+ UpdateResponse::Builder updateResponseBuilder;
+
+ VerifyOrExit(NULL != apContext, err = WEAVE_ERROR_INCORRECT_STATE);
+ context = static_cast<UpdateResponseWriterContext*> (apContext);
+
+ err = updateResponseBuilder.Init(&aWriter);
+ SuccessOrExit(err);
+
+ elementTracker = static_cast<struct StatusDataHandleElement *> (context->mpFirstStatusDataHandleElement);
+ {
+ VersionList::Builder &lVLBuilder = updateResponseBuilder.CreateVersionListBuilder();
+ for (uint32_t i = 0; i < context->mNumDataElements; i++)
+ {
+ if ((elementTracker->mProfileId == nl::Weave::Profiles::kWeaveProfile_WDM) && (elementTracker->mStatusCode == kStatus_InvalidPath) || (elementTracker->mProfileId == nl::Weave::Profiles::kWeaveProfile_Common) && (elementTracker->mStatusCode == nl::Weave::Profiles::Common::kStatus_AccessDenied))
+ {
+ lVLBuilder.AddNull();
+ }
+ else if (context->mpCatalog->Locate(elementTracker->mTraitDataHandle, &dataSource) == WEAVE_NO_ERROR)
+ {
+ lVLBuilder.AddVersion(dataSource->GetVersion());
+ }
+ elementTracker ++;
+ }
+ lVLBuilder.EndOfVersionList();
+ SuccessOrExit(lVLBuilder.GetError());
+ }
+
+ elementTracker = static_cast<struct StatusDataHandleElement *> (context->mpFirstStatusDataHandleElement);
+ {
+ StatusList::Builder &lSLBuilder = updateResponseBuilder.CreateStatusListBuilder();
+ for (uint32_t j = 0; j < context->mNumDataElements; j++)
+ {
+ lSLBuilder.AddStatus(elementTracker->mProfileId , elementTracker->mStatusCode);
+ elementTracker ++;
+ }
+ lSLBuilder.EndOfStatusList();
+ SuccessOrExit(lSLBuilder.GetError());
+ }
+
+ updateResponseBuilder.EndOfResponse();
+ SuccessOrExit(updateResponseBuilder.GetError());
+ aWriter.Finalize();
+
+ WeaveLogDetail(DataManagement, "StatusVersionListWriter success");
+
+exit:
+ if (err != WEAVE_NO_ERROR)
+ {
+ aWriter = checkpoint;
+ }
+}
+
+void SubscriptionEngine::BuildStatusDataHandleElement(void * apStartAddr, TraitDataHandle aTraitDataHandle,uint32_t aProfileId, uint16_t aStatusCode, uint32_t aNumDataElement)
+{
+ StatusDataHandleElement * pStatusDataHandleElement = static_cast<StatusDataHandleElement *> (apStartAddr) + aNumDataElement - 1;
+ pStatusDataHandleElement->mProfileId = aProfileId;
+ pStatusDataHandleElement->mStatusCode = aStatusCode;
+ pStatusDataHandleElement->mTraitDataHandle = aTraitDataHandle;
+}
+
+WEAVE_ERROR SubscriptionEngine::ProcessDataListAndGenerateUpdateResponse(nl::Weave::ExchangeContext * aEC, nl::Weave::TLV::TLVReader & aReader,
+ const TraitCatalogBase<TraitDataSource> * apCatalog,
+ bool & aOutIsPartialChange,
+ TraitDataHandle & aOutTraitDataHandle,
+ IUpdateRequestDataElementAccessControlDelegate & acDelegate)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ bool isLocked = false;
+ bool isPartialChange = false;
+ Weave::TLV::TLVReader DataListReaderCopy;
+ TraitDataSource * dataSource = NULL;
+ TraitUpdatableDataSource *updatableSource = NULL;
+ StatusReport statusReport;
+ bool existSuccess= true;
+ bool existFailure = false;
+ uint32_t overalStatusProfile = nl::Weave::Profiles::kWeaveProfile_Common;
+ uint16_t overalStatusCode = nl::Weave::Profiles::Common::kStatus_Success;
+ uint32_t numDataElements = 0;
+
+ UpdateResponseWriterContext context;
+ uint32_t maxPayloadSize = 0;
+ PacketBuffer* pBuf = NULL;
+ ReferencedTLVData referenceTLVData;
+ void *pBufStartAddr = NULL;
+ void *movedStartAddr = NULL;
+ uint32_t totalStatusDataHandleListBytes = 0;
+
+ VerifyOrExit(apCatalog != NULL, err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ err = AllocateRightSizedBuffer(pBuf, WDM_MAX_UPDATE_RESPONSE_SIZE, WDM_MIN_UPDATE_RESPONSE_SIZE, maxPayloadSize);
+ SuccessOrExit(err);
+ pBufStartAddr = reinterpret_cast<void *>(pBuf->Start());
+
+ DataListReaderCopy.Init(aReader);
+
+ while (WEAVE_NO_ERROR == (err = aReader.Next()))
+ {
+ nl::Weave::TLV::TLVReader pathReader;
+ TraitPath traitPath;
+ TraitDataHandle handle;
+ PropertyPathHandle pathHandle;
+ SchemaVersionRange versionRange;
+ uint64_t previousFirstSameTraitRequiredVersion = 0;
+ numDataElements += 1;
+ uint32_t profileId = 0;
+ uint16_t statusCode = 0;
+
+ {
+ uint32_t currentProfildId = 0;
+ uint64_t currentInstanceID = 0;
+ DataElement::Parser element;
+ err = element.Init(aReader);
+ SuccessOrExit(err);
+ err = element.GetReaderOnPath(&pathReader);
+ SuccessOrExit(err);
+ err = GetProfileAndInstanceIds(pathReader, currentProfildId, currentInstanceID);
+ SuccessOrExit(err);
+ err = GetPreviousFirstSameTraitVersion(DataListReaderCopy, currentProfildId, currentInstanceID, previousFirstSameTraitRequiredVersion, numDataElements);
+ SuccessOrExit(err);
+
+ // Todo: Add Partial update request handling support
+ isPartialChange = false;
+ element.GetPartialChangeFlag(&isPartialChange);
+ VerifyOrExit(isPartialChange == false, aOutIsPartialChange = isPartialChange);
+ }
+
+ err = apCatalog->AddressToHandle(pathReader, handle, versionRange);
+ if (err == WEAVE_ERROR_INVALID_PROFILE_ID)
+ {
+ // AddressToHandle() can return an error if the source has been removed from the catalog. In that case,
+ // continue to next entry
+ WeaveLogDetail(DataManagement, "Ignoring path since it is not valid");
+ profileId = nl::Weave::Profiles::kWeaveProfile_WDM;
+ statusCode = kStatus_InvalidPath;
+ BuildStatusDataHandleElement(pBufStartAddr, handle, profileId, statusCode, numDataElements);
+ existFailure = true;
+ err = WEAVE_NO_ERROR;
+ continue;
+ }
+ SuccessOrExit(err);
+
+ if (apCatalog->Locate(handle, &dataSource) != WEAVE_NO_ERROR)
+ {
+ // Ideally, this code will not be reached as Locate() should find the entry in the catalog.
+ // Otherwise, the earlier AddressToHandle() call would have continued.
+ // However, keeping this check here for consistency and code safety
+ WeaveLogDetail(DataManagement, "Ignoring path since it is not valid");
+ profileId = nl::Weave::Profiles::kWeaveProfile_WDM;
+ statusCode = kStatus_InvalidPath;
+ BuildStatusDataHandleElement(reinterpret_cast<void *>(pBuf->Start()), handle, profileId, statusCode, numDataElements);
+ existFailure = true;
+ err = WEAVE_NO_ERROR;
+ continue;
+ }
+
+ err = dataSource->GetSchemaEngine()->MapPathToHandle(pathReader, pathHandle);
+
+#if TDM_DISABLE_STRICT_SCHEMA_COMPLIANCE
+ // if we're not in strict compliance mode, we can ignore data elements that refer to paths we can't map due to mismatching
+ // schema. The eventual call to StoreDataElement will correctly deal with the presence of a null property path handle that
+ // has been returned by the above call. It's necessary to call into StoreDataElement with this null handle to ensure
+ // the requisite OnEvent calls are made to the application despite the presence of an unknown tag. It's also necessary to
+ // ensure that we update the internal version tracked by the sink.
+ if (err == WEAVE_ERROR_TLV_TAG_NOT_FOUND)
+ {
+ WeaveLogDetail(DataManagement, "Ignoring un-mappable path!");
+ err = WEAVE_NO_ERROR;
+ }
+#endif
+ SuccessOrExit(err);
+
+ traitPath.mTraitDataHandle = handle;
+ traitPath.mPropertyPathHandle = pathHandle;
+
+ err = acDelegate.DataElementAccessCheck(traitPath, *apCatalog);
+ if (err == WEAVE_ERROR_ACCESS_DENIED)
+ {
+ WeaveLogDetail(DataManagement, "Ignoring path. change not accepted by data source.");
+ profileId = nl::Weave::Profiles::kWeaveProfile_Common;
+ statusCode = nl::Weave::Profiles::Common::kStatus_AccessDenied;
+ BuildStatusDataHandleElement(pBufStartAddr, handle, nl::Weave::Profiles::kWeaveProfile_Common, nl::Weave::Profiles::Common::kStatus_AccessDenied, numDataElements);
+ existFailure = true;
+ err = WEAVE_NO_ERROR;
+ continue;
+ }
+ SuccessOrExit(err);
+
+ updatableSource = static_cast<TraitUpdatableDataSource *>(dataSource);
+ pathReader = aReader;
+
+ updatableSource->Lock();
+ isLocked = true;
+ err = updatableSource->StoreDataElement(pathHandle, pathReader, 0, NULL, NULL, handle, previousFirstSameTraitRequiredVersion);
+ if (WEAVE_NO_ERROR == err)
+ {
+ existSuccess = true;
+ profileId = nl::Weave::Profiles::kWeaveProfile_Common;
+ statusCode = nl::Weave::Profiles::Common::kStatus_Success;
+ }
+ else
+ {
+ existFailure = true;
+ profileId = nl::Weave::Profiles::kWeaveProfile_Common;
+ statusCode = nl::Weave::Profiles::Common::kStatus_InternalError;
+ }
+
+ BuildStatusDataHandleElement(pBufStartAddr, handle, profileId, statusCode, numDataElements);
+
+ updatableSource->SetDirty(pathHandle);
+
+ updatableSource->Unlock(true);
+ isLocked = false;
+
+#if WDM_ENABLE_PROTOCOL_CHECKS
+ aOutTraitDataHandle = handle;
+#endif
+ }
+
+ // if we have exhausted this container
+ if (WEAVE_END_OF_TLV == err)
+ {
+ err = WEAVE_NO_ERROR;
+ apCatalog->DispatchEvent(TraitUpdatableDataSource::kEventUpdateRequestEnd, NULL);
+ }
+
+ totalStatusDataHandleListBytes = numDataElements * sizeof(StatusDataHandleElement);
+ WeaveLogDetail(DataManagement, "relocating the %d bytes statusDataHandleList to the end, %d", totalStatusDataHandleListBytes);
+ movedStartAddr = reinterpret_cast<void *>(pBuf->Start() + maxPayloadSize - totalStatusDataHandleListBytes);
+ memmove(movedStartAddr, pBufStartAddr, totalStatusDataHandleListBytes);
+ memset(pBufStartAddr, 0, totalStatusDataHandleListBytes);
+
+ context.mpFirstStatusDataHandleElement = movedStartAddr;
+ context.mpCatalog = apCatalog;
+ context.mNumDataElements = numDataElements;
+
+ err = referenceTLVData.init(StatusVersionListWriter, &context);
+ SuccessOrExit(err);
+
+ if (existFailure && existSuccess)
+ {
+ overalStatusProfile = nl::Weave::Profiles::kWeaveProfile_WDM;
+ overalStatusCode = kStatus_MultipleFailures;
+ }
+ else if (!existFailure)
+ {
+ overalStatusProfile = nl::Weave::Profiles::kWeaveProfile_Common;
+ overalStatusCode = nl::Weave::Profiles::Common::kStatus_Success;
+ }
+ else if (!existSuccess)
+ {
+ overalStatusProfile = nl::Weave::Profiles::kWeaveProfile_Common;
+ overalStatusCode = nl::Weave::Profiles::Common::kStatus_BadRequest;
+ }
+
+ err = statusReport.init(overalStatusProfile, overalStatusCode, &referenceTLVData);
+ SuccessOrExit(err);
+
+ err = statusReport.pack(pBuf, maxPayloadSize - totalStatusDataHandleListBytes);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "Send Update Response with profileId 0x%" PRIX32 " statusCode 0x%" PRIX16 " ", overalStatusProfile , overalStatusCode);
+ err = aEC->SendMessage(nl::Weave::Profiles::kWeaveProfile_Common, nl::Weave::Profiles::Common::kMsgType_StatusReport, pBuf, aEC->HasPeerRequestedAck() ? nl::Weave::ExchangeContext::kSendFlag_RequestAck
+ : 0);
+ SuccessOrExit(err);
+ pBuf = NULL;
+
+exit:
+ if (isLocked && updatableSource != NULL)
+ {
+ updatableSource->Unlock(true);
+ }
+
+ if (pBuf != NULL)
+ {
+ PacketBuffer::Free(pBuf);
+ }
+
+ return err;
+}
+
+void SubscriptionEngine::OnUpdateRequest(nl::Weave::ExchangeContext * aEC, const nl::Inet::IPPacketInfo * aPktInfo,
+ const nl::Weave::WeaveMessageInfo * aMsgInfo, uint32_t aProfileId, uint8_t aMsgType,
+ PacketBuffer * aPayload)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ UpdateRequest::Parser update;
+ nl::Weave::TLV::TLVReader reader;
+ bool isDataListPresent = false;
+ InEventParam inParam;
+ OutEventParam outParam;
+
+ SubscriptionEngine * const pEngine = reinterpret_cast<SubscriptionEngine *>(aEC->AppState);
+
+ // Send an event to the application indicating the receipt of a
+ // subscriptionless notification.
+
+ inParam.Clear();
+ outParam.Clear();
+
+ inParam.mIncomingUpdateRequest.processingError = err;
+ inParam.mIncomingUpdateRequest.mMsgInfo = aMsgInfo;
+ outParam.mIncomingUpdateRequest.mShouldContinueProcessing = true;
+
+ if (pEngine->mEventCallback)
+ {
+ pEngine->mEventCallback(pEngine->mAppState, kEvent_OnIncomingUpdateRequest, inParam, outParam);
+ }
+
+ pEngine->mPublisherCatalog->DispatchEvent(TraitUpdatableDataSource::kEventUpdateRequestBegin, NULL);
+
+ if (!outParam.mIncomingUpdateRequest.mShouldContinueProcessing)
+ {
+ WeaveLogDetail(DataManagement, "Update not allowed");
+ ExitNow();
+ }
+
+ reader.Init(aPayload);
+
+ err = reader.Next();
+ SuccessOrExit(err);
+
+ err = update.Init(reader);
+ SuccessOrExit(err);
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+ // simple schema checking
+ err = update.CheckSchemaValidity();
+ SuccessOrExit(err);
+#endif // WEAVE_CONFIG_DATA_MANAGEMENT_ENABLE_SCHEMA_CHECK
+
+ {
+ DataList::Parser dataList;
+
+ err = update.GetDataList(&dataList);
+ if (WEAVE_NO_ERROR == err)
+ {
+ isDataListPresent = true;
+ }
+ else if (WEAVE_END_OF_TLV == err)
+ {
+ isDataListPresent = false;
+ err = WEAVE_NO_ERROR;
+ }
+ SuccessOrExit(err);
+
+ // re-initialize the reader to point to individual date element (reuse to save stack depth).
+ dataList.GetReader(&reader);
+ }
+
+ if (isDataListPresent)
+ {
+ bool isPartialChange = false;
+ TraitDataHandle traitDataHandle;
+ UpdateRequestDataElementAccessControlDelegate acDelegate(aMsgInfo);
+ IUpdateRequestDataElementAccessControlDelegate & acDelegateRef = acDelegate;
+
+ err = ProcessDataListAndGenerateUpdateResponse(aEC,reader, pEngine->mPublisherCatalog,
+ isPartialChange, traitDataHandle, acDelegateRef);
+ SuccessOrExit(err);
+ if (isPartialChange)
+ {
+ // Todo: Add Partial update request handling support
+ ExitNow(err = WEAVE_ERROR_INCORRECT_STATE);
+ }
+ pEngine->GetNotificationEngine()->Run();
+ }
+
+exit:
+ if (NULL != aPayload)
+ {
+ PacketBuffer::Free(aPayload);
+ aPayload = NULL;
+ }
+
+ if (NULL != aEC)
+ {
+ aEC->Abort();
+ aEC = NULL;
+ }
+
+ if (pEngine->mEventCallback)
+ {
+ inParam.Clear();
+ outParam.Clear();
+
+ inParam.mIncomingUpdateRequest.processingError = err;
+ inParam.mIncomingUpdateRequest.mMsgInfo = aMsgInfo;
+ // Update completion event indication.
+ pEngine->mEventCallback(pEngine->mAppState, kEvent_UpdateRequestProcessingComplete, inParam, outParam);
+ }
+}
+
+WEAVE_ERROR SubscriptionEngine::UpdateRequestDataElementAccessControlDelegate::DataElementAccessCheck(const TraitPath & aTraitPath, const TraitCatalogBase<TraitDataSource> & aCatalog)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ TraitDataSource *dataSource;
+ InEventParam inParam;
+ OutEventParam outParam;
+ SubscriptionEngine * pEngine = SubscriptionEngine::GetInstance();
+
+ err = aCatalog.Locate(aTraitPath.mTraitDataHandle, &dataSource);
+ SuccessOrExit(err);
+
+ inParam.Clear();
+ outParam.Clear();
+
+ if (dataSource->IsUpdatableDataSource())
+ {
+ outParam.mDataElementAccessControlForUpdateRequest.mRejectUpdateRequest = false;
+ outParam.mDataElementAccessControlForUpdateRequest.mReason = WEAVE_NO_ERROR;
+ }
+ else
+ {
+ outParam.mDataElementAccessControlForUpdateRequest.mRejectUpdateRequest = true;
+ outParam.mDataElementAccessControlForUpdateRequest.mReason = WEAVE_ERROR_ACCESS_DENIED;
+ }
+
+ inParam.mDataElementAccessControlForUpdateRequest.mPath = &aTraitPath;
+ inParam.mDataElementAccessControlForUpdateRequest.mCatalog = &aCatalog;
+ inParam.mDataElementAccessControlForUpdateRequest.mMsgInfo = mMsgInfo;
+
+ if (NULL != pEngine->mEventCallback)
+ {
+ pEngine->mEventCallback(pEngine->mAppState, kEvent_UpdateRequestDataElementAccessControlCheck,
+ inParam, outParam);
+ }
+
+ // If application rejects it then deny access, else set reason to whatever
+ // reason is set by application.
+ if (outParam.mDataElementAccessControlForUpdateRequest.mRejectUpdateRequest == true)
+ {
+ err = WEAVE_ERROR_ACCESS_DENIED;
+ }
+ else
+ {
+ err = outParam.mDataElementAccessControlForUpdateRequest.mReason;
+ }
+
+exit:
+
+ return err;
+}
+
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
+#endif // WDM_ENABLE_SUBSCRIPTION_PUBLISHER
}; // namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNamespaceDesignation_Current)
}; // namespace Profiles
diff --git a/src/lib/profiles/data-management/Current/SubscriptionEngine.h b/src/lib/profiles/data-management/Current/SubscriptionEngine.h
index 51bd71e..548ef72 100644
--- a/src/lib/profiles/data-management/Current/SubscriptionEngine.h
+++ b/src/lib/profiles/data-management/Current/SubscriptionEngine.h
@@ -53,6 +53,14 @@
virtual WEAVE_ERROR Unlock(void) = 0;
};
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+class IUpdateRequestDataElementAccessControlDelegate
+{
+public:
+ virtual WEAVE_ERROR DataElementAccessCheck(const TraitPath & aTraitPath, const TraitCatalogBase<TraitDataSource> & aCatalog) = 0;
+};
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
/**
* @class SubscriptionEngine
*
@@ -89,6 +97,14 @@
kEvent_SubscriptionlessNotificationProcessingComplete =
3, ///< Called upon completion of processing of all trait data in the subscriptionless notify.
#endif // #if WDM_ENABLE_SUBSCRIPTIONLESS_NOTIFICATION
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ kEvent_OnIncomingUpdateRequest =
+ 4, ///< Called when an incoming update has arrived before updating the data element.
+ kEvent_UpdateRequestDataElementAccessControlCheck =
+ 5, ///< Called when an incoming update is being processed for access control of each data element.
+ kEvent_UpdateRequestProcessingComplete =
+ 6, ///< Called upon completion of processing of all trait data in the update.
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
};
/**
@@ -129,6 +145,23 @@
const nl::Weave::WeaveMessageInfo * mMsgInfo; ///< A pointer to the message information for the request
} mDataElementAccessControlForNotification;
#endif // WDM_ENABLE_SUBSCRIPTIONLESS_NOTIFICATION
+
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ struct
+ {
+ WEAVE_ERROR processingError; ///< The WEAVE_ERROR encountered in processing the
+ ///< Update Request.
+ const nl::Weave::WeaveMessageInfo * mMsgInfo; ///< A pointer to the message information for the request
+ } mIncomingUpdateRequest;
+
+ struct
+ {
+ const TraitCatalogBase<TraitDataSource> * mCatalog; ///< A pointer to the TraitCatalog for the data sources.
+ const TraitPath *mPath; ///< A pointer to the TraitPath being accessed by the
+ ///< update request.
+ const nl::Weave::WeaveMessageInfo * mMsgInfo; ///< A pointer to the message information for the request
+ } mDataElementAccessControlForUpdateRequest;
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
};
/**
@@ -167,6 +200,19 @@
WEAVE_ERROR mReason; ///< The reason for the rejection, if any.
} mDataElementAccessControlForNotification;
#endif // WDM_ENABLE_SUBSCRIPTIONLESS_NOTIFICATION
+
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ struct
+ {
+ bool mShouldContinueProcessing; ///< Set to true if update is allowed.
+ } mIncomingUpdateRequest;
+
+ struct
+ {
+ bool mRejectUpdateRequest; ///< Set to true if update is rejected.
+ WEAVE_ERROR mReason; ///< The reason for the rejection, if any.
+ } mDataElementAccessControlForUpdateRequest;
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
};
/**
@@ -359,6 +405,27 @@
PacketBuffer * aPayload);
#endif // WDM_ENABLE_SUBSCRIPTIONLESS_NOTIFICATION
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ class UpdateRequestDataElementAccessControlDelegate : public IUpdateRequestDataElementAccessControlDelegate
+ {
+ public:
+ UpdateRequestDataElementAccessControlDelegate(const WeaveMessageInfo * aMsgInfo)
+ {
+ mMsgInfo = aMsgInfo;
+ }
+
+ WEAVE_ERROR DataElementAccessCheck(const TraitPath & aTraitPath,
+ const TraitCatalogBase<TraitDataSource> & aCatalog);
+
+ private:
+ const WeaveMessageInfo * mMsgInfo;
+ };
+
+ static void OnUpdateRequest(nl::Weave::ExchangeContext * aEC, const nl::Inet::IPPacketInfo * aPktInfo,
+ const nl::Weave::WeaveMessageInfo * aMsgInfo, uint32_t aProfileId, uint8_t aMsgType,
+ PacketBuffer * aPayload);
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
#if WDM_ENABLE_SUBSCRIPTION_CLIENT
// Client-specific features
@@ -375,6 +442,38 @@
bool & aOutIsPartialChange,
TraitDataHandle & aOutTraitDataHandle,
IDataElementAccessControlDelegate & acDelegate);
+
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ struct StatusDataHandleElement
+ {
+ uint32_t mProfileId;
+ uint16_t mStatusCode;
+ TraitDataHandle mTraitDataHandle;
+ };
+
+ struct UpdateResponseWriterContext
+ {
+ void * mpFirstStatusDataHandleElement;
+ const TraitCatalogBase<TraitDataSource> * mpCatalog;
+ uint32_t mNumDataElements;
+ };
+
+ static WEAVE_ERROR GetPreviousFirstSameTraitVersion(TLV::TLVReader & aDataListReader, uint32_t &aProfileId, uint64_t &aInstanceId, uint64_t &aPreviousFirstSameTraitVersion, uint32_t aNumDataElements);
+ static WEAVE_ERROR GetProfileAndInstanceIds(TLV::TLVReader & aPathReader, uint32_t &aProfileId, uint64_t &aInstanceId);
+ static WEAVE_ERROR AllocateRightSizedBuffer(PacketBuffer *& buf,
+ const uint32_t desiredSize,
+ const uint32_t minSize,
+ uint32_t & outMaxPayloadSize);
+ static void StatusVersionListWriter(nl::Weave::TLV::TLVWriter &aWriter, void *apContext);
+ static void BuildStatusDataHandleElement(void * apStartAddr, TraitDataHandle aTraitDataHandle,uint32_t aProfileId, uint16_t aStatusCode, uint32_t aNumDataElement);
+
+ static WEAVE_ERROR ProcessDataListAndGenerateUpdateResponse(nl::Weave::ExchangeContext * aEC, nl::Weave::TLV::TLVReader & aReader,
+ const TraitCatalogBase<TraitDataSource> * apCatalog,
+ bool & aOutIsPartialChange,
+ TraitDataHandle & aOutTraitDataHandle,
+ IUpdateRequestDataElementAccessControlDelegate & acDelegate);
+
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
#if WEAVE_DETAIL_LOGGING
void LogSubscriptionFreed(void) const;
#endif // #if WEAVE_DETAIL_LOGGING
diff --git a/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp b/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp
index f0de69f..05f9f92 100644
--- a/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp
+++ b/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp
@@ -863,7 +863,7 @@
// Note we're sending back a message using an EC initiated by the client
err = mEC->SendMessage(nl::Weave::Profiles::kWeaveProfile_WDM, kMsgType_SubscribeResponse, msgBuf,
- nl::Weave::ExchangeContext::kSendFlag_RequestAck);
+ mEC->HasPeerRequestedAck() ? nl::Weave::ExchangeContext::kSendFlag_RequestAck : 0);
msgBuf = NULL;
SuccessOrExit(err);
diff --git a/src/lib/profiles/data-management/Current/TraitData.cpp b/src/lib/profiles/data-management/Current/TraitData.cpp
index 3550c77..9d8cb3d 100644
--- a/src/lib/profiles/data-management/Current/TraitData.cpp
+++ b/src/lib/profiles/data-management/Current/TraitData.cpp
@@ -88,6 +88,67 @@
return err;
}
+WEAVE_ERROR TraitSchemaEngine::MapPathToHandle(const char * aPathString, PropertyPathHandle & aHandle) const
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ PropertyPathHandle childProperty, curProperty;
+ nl::Weave::TLV::TLVType dummyContainerType = kTLVType_Path;
+ char *token = NULL;
+ char *pathStringCopy = (char *)malloc(strlen(aPathString) + 1);
+ VerifyOrExit(pathStringCopy != NULL, err = WEAVE_ERROR_NO_MEMORY);
+
+ strcpy(pathStringCopy, aPathString);
+ token = strtok(pathStringCopy, "/");
+
+ // initialize the out argument to NULL
+ aHandle = kNullPropertyPathHandle;
+
+ // Set our starting point for traversal to the root node.
+ curProperty = kRootPropertyPathHandle;
+
+ // Descend into our schema tree using the tags encountered to help navigate through the various branches.
+ while (token!= NULL)
+ {
+ // Todo: currently it does not support dictionary
+ const uint64_t tag = atoi(token) | kSpecialTagMarker;
+ // If it's a profile tag, we know we're dealing with a dictionary item - get the appropriate dictionary item. Otherwise,
+ // treat it like a regular child node.
+ if (IsProfileTag(tag))
+ {
+ VerifyOrExit(ProfileIdFromTag(tag) == kWeaveProfile_DictionaryKey, err = WEAVE_ERROR_INVALID_TLV_TAG);
+ childProperty = GetDictionaryItemHandle(curProperty, TagNumFromTag(tag));
+ }
+ else
+ {
+ childProperty = GetChildHandle(curProperty, TagNumFromTag(tag));
+ }
+
+ if (IsNullPropertyPathHandle(childProperty))
+ {
+ err = WEAVE_ERROR_TLV_TAG_NOT_FOUND;
+ break;
+ }
+
+ // Set the current node.
+ curProperty = childProperty;
+ token = strtok(NULL, "/");
+ }
+
+ if (err == WEAVE_NO_ERROR)
+ {
+ aHandle = curProperty;
+ }
+
+exit:
+ if (NULL != pathStringCopy)
+ {
+ free(pathStringCopy);
+ pathStringCopy = NULL;
+ }
+
+ return err;
+}
+
WEAVE_ERROR TraitSchemaEngine::MapPathToHandle(TLVReader & aPathReader, PropertyPathHandle & aHandle) const
{
WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -429,7 +490,7 @@
// The logic further below deals with the cases where this function was called on a path handle at the dictionary or higher.
if (IsInDictionary(curHandle, dictionaryItemHandle))
{
- aDelegate->OnDataSinkEvent(ISetDataDelegate::kDataSinkEvent_DictionaryItemModifyBegin, dictionaryItemHandle);
+ aDelegate->OnSetDataEvent(ISetDataDelegate::kSetDataEvent_DictionaryItemModifyBegin, dictionaryItemHandle);
dictionaryEventSignalled = true;
}
@@ -484,13 +545,13 @@
// We can surmise this is a replace if we're ascending to a node that is a dictionary, and that node
// is lower than the target node this function was directed at (we can't get to this point in code if the
// two handles (target and current) are equivalent to each other).
- aDelegate->OnDataSinkEvent(ISetDataDelegate::kDataSinkEvent_DictionaryReplaceEnd, curHandle);
+ aDelegate->OnSetDataEvent(ISetDataDelegate::kSetDataEvent_DictionaryReplaceEnd, curHandle);
} else if (IsDictionary(parentHandle)) {
// We can surmise this is a modify/add if we're ascending to a node whose parent is a dictionary, and that node
// is lower than the target node this function was directed at (we can't get to this point in code if the
// two handles (target and current) are equivalent to each other). Those cases are handled by the two 'if'
// statements at the top and bottom of this function.
- aDelegate->OnDataSinkEvent(ISetDataDelegate::kDataSinkEvent_DictionaryItemModifyEnd, curHandle);
+ aDelegate->OnSetDataEvent(ISetDataDelegate::kSetDataEvent_DictionaryItemModifyEnd, curHandle);
}
}
}
@@ -527,12 +588,12 @@
// If we're descending onto a node that is a dictionary, we know for certain that it is a replace operation
// since the target path handle for this function was higher in the tree than the node representing the
// dictionary itself.
- aDelegate->OnDataSinkEvent(ISetDataDelegate::kDataSinkEvent_DictionaryReplaceBegin, curHandle);
+ aDelegate->OnSetDataEvent(ISetDataDelegate::kSetDataEvent_DictionaryReplaceBegin, curHandle);
} else if (IsDictionary(parentHandle)) {
// Alternatively, if we're descending onto a node whose parent is a dictionary, we know that this node
// represents an element in the dictionary and as such, is an appropriate point in the traversal to notify the
// application of an upcoming dictionary item modification/insertion.
- aDelegate->OnDataSinkEvent(ISetDataDelegate::kDataSinkEvent_DictionaryItemModifyBegin,
+ aDelegate->OnSetDataEvent(ISetDataDelegate::kSetDataEvent_DictionaryItemModifyBegin,
curHandle);
}
}
@@ -548,7 +609,7 @@
if (dictionaryEventSignalled)
{
- aDelegate->OnDataSinkEvent(ISetDataDelegate::kDataSinkEvent_DictionaryItemModifyEnd, dictionaryItemHandle);
+ aDelegate->OnSetDataEvent(ISetDataDelegate::kSetDataEvent_DictionaryItemModifyEnd, dictionaryItemHandle);
}
exit:
@@ -1068,25 +1129,25 @@
return err;
}
-void TraitDataSink::OnDataSinkEvent(DataSinkEventType aEventType, PropertyPathHandle aHandle)
+void TraitDataSink::OnSetDataEvent(SetDataEventType aEventType, PropertyPathHandle aHandle)
{
EventType event;
switch (aEventType)
{
- case kDataSinkEvent_DictionaryReplaceBegin:
+ case kSetDataEvent_DictionaryReplaceBegin:
event = kEventDictionaryReplaceBegin;
break;
- case kDataSinkEvent_DictionaryReplaceEnd:
+ case kSetDataEvent_DictionaryReplaceEnd:
event = kEventDictionaryReplaceEnd;
break;
- case kDataSinkEvent_DictionaryItemModifyBegin:
+ case kSetDataEvent_DictionaryItemModifyBegin:
event = kEventDictionaryItemModifyBegin;
break;
- case kDataSinkEvent_DictionaryItemModifyEnd:
+ case kSetDataEvent_DictionaryItemModifyEnd:
event = kEventDictionaryItemModifyEnd;
break;
@@ -1269,6 +1330,19 @@
return SubscriptionEngine::GetInstance()->Unlock();
}
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+WEAVE_ERROR TraitDataSource::Unlock(bool aSkipVersionIncrement)
+{
+ if (mManagedVersion && mSetDirtyCalled && !aSkipVersionIncrement)
+ {
+ IncrementVersion();
+ }
+
+ VerifyOrDie(SubscriptionEngine::GetInstance());
+ return SubscriptionEngine::GetInstance()->Unlock();
+}
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
#if WEAVE_CONFIG_ENABLE_WDM_UPDATE
TraitUpdatableDataSink::TraitUpdatableDataSink(const TraitSchemaEngine * aEngine) :
TraitDataSink(aEngine),
@@ -1404,5 +1478,154 @@
exit:
return err;
}
-
#endif // WEAVE_CONFIG_ENABLE_WDM_UPDATE
+
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+TraitUpdatableDataSource::OnChangeRejection TraitUpdatableDataSource::sChangeRejectionCb = NULL;
+void * TraitUpdatableDataSource::sChangeRejectionContext = NULL;
+
+TraitUpdatableDataSource::TraitUpdatableDataSource(const TraitSchemaEngine * aEngine):TraitDataSource(aEngine)
+{
+}
+
+WEAVE_ERROR TraitUpdatableDataSource::StoreDataElement(PropertyPathHandle aHandle, TLVReader & aReader, uint8_t aFlags, OnChangeRejection aFunc, void * aContext, TraitDataHandle aDatahandle, uint64_t aPreviousFirstSameTraitRequiredVersion)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ DataElement::Parser parser;
+ DataVersion versionInDE = 0;
+ bool dataPresent = false, deletePresent = false;
+ bool isUnconditional = false;
+
+ err = parser.Init(aReader);
+ SuccessOrExit(err);
+
+ err = parser.GetVersion(&versionInDE);
+ VerifyOrExit(err == WEAVE_NO_ERROR || err == WEAVE_END_OF_TLV, WeaveLogDetail(DataManagement, "<TraitUpdatableDataSource::StoreDataElement> version parse error"));
+ if (err == WEAVE_END_OF_TLV)
+ {
+ isUnconditional = true;
+ err = WEAVE_NO_ERROR;
+ }
+
+ WeaveLogDetail(DataManagement, "<TraitUpdatableDataSource::StoreDataElement> [Trait %08x] version: 0x%" PRIx64 " vs DE version 0x%" PRIx64 " vs previousFirstSameTraitversion 0x%" PRIx64 " vs Unconditional: %s ",
+ mSchemaEngine->GetProfileId(), GetVersion(), versionInDE, aPreviousFirstSameTraitRequiredVersion, isUnconditional ? "true" : "false");
+
+ if (isUnconditional || (aPreviousFirstSameTraitRequiredVersion == 0 && IsVersionEqual(versionInDE)) || aPreviousFirstSameTraitRequiredVersion == versionInDE)
+ {
+ err = parser.CheckPresence(&dataPresent, &deletePresent);
+ SuccessOrExit(err);
+ // Signal to the app we're about to process a data element.
+ OnEvent(kEventDataElementBegin, NULL);
+
+ if (deletePresent)
+ {
+ err = parser.GetDeletedDictionaryKeys(&aReader);
+ SuccessOrExit(err);
+
+ while ((err = aReader.Next()) == WEAVE_NO_ERROR)
+ {
+ PropertyDictionaryKey key;
+ PropertyPathHandle handle;
+
+ err = aReader.Get(key);
+ SuccessOrExit(err);
+
+ // In the case of a delete, the path is usually directed to the dictionary itself. We
+ // need to get the handle to the child dictionary element handle first before we can
+ // pass it up to the application.
+ handle = mSchemaEngine->GetFirstChild(aHandle);
+ VerifyOrExit(handle != kNullPropertyPathHandle, err = WEAVE_ERROR_INVALID_ARGUMENT);
+
+ handle = CreatePropertyPathHandle(GetPropertySchemaHandle(handle), key);
+ OnEvent(kEventDictionaryItemDelete, &handle);
+ }
+
+ VerifyOrExit(err == WEAVE_NO_ERROR || err == WEAVE_END_OF_TLV, );
+ err = WEAVE_NO_ERROR;
+ }
+
+ if (aHandle != kNullPropertyPathHandle && dataPresent)
+ {
+ err = parser.GetData(&aReader);
+ SuccessOrExit(err);
+
+ err = mSchemaEngine->StoreData(aHandle, aReader, this, NULL);
+ SuccessOrExit(err);
+ }
+
+ OnEvent(kEventDataElementEnd, NULL);
+
+ if (isUnconditional || aPreviousFirstSameTraitRequiredVersion == 0)
+ {
+ IncrementVersion();
+ WeaveLogDetail(DataManagement, "<TraitUpdatableDataSource::StoreDataElement> [Trait %08x] bumped version: 0x%" PRIx64 " ",
+ mSchemaEngine->GetProfileId(), GetVersion());
+ }
+ }
+ else
+ {
+ WeaveLogDetail(DataManagement, "<TraitUpdatableDataSource::StoreDataElement> [Trait %08x] version: 0x%" PRIx64 " (no-change)",
+ mSchemaEngine->GetProfileId(), GetVersion());
+ }
+
+exit:
+ return err;
+}
+
+void TraitUpdatableDataSource::OnSetDataEvent(SetDataEventType aEventType, PropertyPathHandle aHandle)
+{
+ EventType event;
+
+ switch (aEventType)
+ {
+ case kSetDataEvent_DictionaryReplaceBegin:
+ event = kEventDictionaryReplaceBegin;
+ break;
+
+ case kSetDataEvent_DictionaryReplaceEnd:
+ event = kEventDictionaryReplaceEnd;
+ break;
+
+ case kSetDataEvent_DictionaryItemModifyBegin:
+ event = kEventDictionaryItemModifyBegin;
+ break;
+
+ case kSetDataEvent_DictionaryItemModifyEnd:
+ event = kEventDictionaryItemModifyEnd;
+ break;
+
+ default:
+ return;
+ };
+
+ OnEvent(event, &aHandle);
+}
+
+void TraitUpdatableDataSource::RejectChange(uint16_t aRejectionStatusCode)
+{
+ if (sChangeRejectionCb)
+ {
+ sChangeRejectionCb(aRejectionStatusCode, GetVersion(), sChangeRejectionContext);
+ }
+}
+
+WEAVE_ERROR TraitUpdatableDataSource::SetData(PropertyPathHandle aHandle, TLVReader & aReader, bool aIsNull)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ // if a trait has no nullable handles, aIsNull will always be false
+ // and serves no purpose. this is true for the default implementation.
+ IgnoreUnusedVariable(aIsNull);
+
+ if (mSchemaEngine->IsLeaf(aHandle))
+ {
+ err = SetLeafData(aHandle, aReader);
+ if (err != WEAVE_NO_ERROR)
+ {
+ WeaveLogDetail(DataManagement, "ahandle %u err: %d", aHandle, err);
+ }
+ }
+ return err;
+}
+
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
diff --git a/src/lib/profiles/data-management/Current/TraitData.h b/src/lib/profiles/data-management/Current/TraitData.h
index 7abf5d4..479d542 100644
--- a/src/lib/profiles/data-management/Current/TraitData.h
+++ b/src/lib/profiles/data-management/Current/TraitData.h
@@ -211,19 +211,19 @@
class ISetDataDelegate
{
public:
- enum DataSinkEventType
+ enum SetDataEventType
{
/* Start of replacement of an entire dictionary */
- kDataSinkEvent_DictionaryReplaceBegin,
+ kSetDataEvent_DictionaryReplaceBegin,
/* End of replacement of an entire dictionary */
- kDataSinkEvent_DictionaryReplaceEnd,
+ kSetDataEvent_DictionaryReplaceEnd,
/* Start of modification or addition of a dictionary item */
- kDataSinkEvent_DictionaryItemModifyBegin,
+ kSetDataEvent_DictionaryItemModifyBegin,
/* End of modification or addition of a dictionary item */
- kDataSinkEvent_DictionaryItemModifyEnd,
+ kSetDataEvent_DictionaryItemModifyEnd,
};
/**
@@ -260,7 +260,7 @@
* For dictionary item added/modififed events, these handles are property path handles as they contain the dictionary key as
* well.
*/
- virtual void OnDataSinkEvent(DataSinkEventType aType, PropertyPathHandle aHandle) = 0;
+ virtual void OnSetDataEvent(SetDataEventType aType, PropertyPathHandle aHandle) = 0;
};
class IGetDataDelegate
@@ -337,6 +337,17 @@
WEAVE_ERROR MapPathToHandle(nl::Weave::TLV::TLVReader & aPathReader, PropertyPathHandle & aHandle) const;
/**
+ * Given a string positioned at the root tag of a WDM path, the delimiter is /, read out the relevant tags and provide
+ * the equivalent path handle.
+ *
+ *
+ * @retval #WEAVE_NO_ERROR On success.
+ * @retval #WEAVE_ERROR_TLV_TAG_NOT_FOUND If a matching handle could not be found due to a
+ * malformed/incorrectly specified path.
+ */
+ WEAVE_ERROR MapPathToHandle(const char * aPathString, PropertyPathHandle & aHandle) const;
+
+ /**
* Convert the path handle to a TLV path.
*
* @retval #WEAVE_NO_ERROR On success.
@@ -536,7 +547,7 @@
* It takes in a pointer to a schema that it then uses to help decipher incoming TLV data from a publisher and invoke the
* relevant data setter calls to pass the data up to subclasses.
*/
-class TraitDataSink : private TraitSchemaEngine::ISetDataDelegate
+class TraitDataSink : protected TraitSchemaEngine::ISetDataDelegate
{
public:
@@ -736,7 +747,7 @@
// Current version of the data in this sink.
uint64_t mVersion;
uint64_t mLastNotifyVersion;
- void OnDataSinkEvent(DataSinkEventType aType, PropertyPathHandle aHandle) __OVERRIDE;
+ void OnSetDataEvent(SetDataEventType aType, PropertyPathHandle aHandle) __OVERRIDE;
static OnChangeRejection sChangeRejectionCb;
static void * sChangeRejectionContext;
bool mHasValidVersion;
@@ -834,6 +845,15 @@
void SetDirty(PropertyPathHandle aPropertyHandle);
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ WEAVE_ERROR Unlock(bool aSkipVersionIncrement);
+
+ virtual bool IsUpdatableDataSource(void) { return false; }
+
+ // Check if version is equal to the internal trait version
+ bool IsVersionEqual(DataVersion &aVersion) { return aVersion == GetVersion(); }
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
#if TDM_ENABLE_PUBLISHER_DICTIONARY_SUPPORT
void DeleteKey(PropertyPathHandle aPropertyHandle);
#endif
@@ -850,6 +870,10 @@
nl::Weave::PacketBuffer * aPayload,
nl::Weave::TLV::TLVReader & aArgumentReader);
+ enum EventType
+ {
+ kEvent_DataSourceMax
+ };
/*
* Invoked either by the base class or by an external agent (like the subscription engine) to signal the occurrence of an event
* (of type EventType). Sub-classes are expected to over-ride this if they desire to be made known of these events.
@@ -893,7 +917,6 @@
// Increment current version of the data in this source.
void IncrementVersion(void);
-
// Controls whether mVersion is incremented automatically or not.
bool mManagedVersion;
@@ -906,6 +929,138 @@
bool mSetDirtyCalled;
};
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+/*
+ * @class TraitUpdatableDataSource
+ *
+ * @brief Base abstract class that represents a particular instance of a trait on a specific resource (publisher).
+ * Application developers are expected to subclass this to make a concrete source that apply data received from client
+ *
+ */
+class TraitUpdatableDataSource : public TraitDataSource, protected TraitSchemaEngine::ISetDataDelegate
+{
+public:
+ TraitUpdatableDataSource(const TraitSchemaEngine * aEngine);
+
+ typedef WEAVE_ERROR (*OnChangeRejection)(uint16_t aRejectionStatusCode, uint64_t aVersion, void * aContext);
+
+ /**
+ * Convenience function for data sinks to handle unknown leaf handles with
+ * a system level tolerance for mismatched schema as defined by
+ * TDM_DISABLE_STRICT_SCHEMA_COMPILANCE.
+ */
+ WEAVE_ERROR HandleUnknownLeafHandle(void)
+ {
+#if TDM_DISABLE_STRICT_SCHEMA_COMPLIANCE
+ return WEAVE_NO_ERROR;
+#else
+ return WEAVE_ERROR_TLV_TAG_NOT_FOUND;
+#endif
+ }
+
+ enum EventType
+ {
+ kEventChangeFirst = kEvent_DataSourceMax,
+
+ /* Signals the beginning of a change record which in certain scenarios can span multiple data elements over multiple
+ * update requests (the latter only a possibility if the data being transmitted is unable to fit within a single packet)
+ */
+ kEventChangeBegin,
+
+ /* Start of a data element */
+ kEventDataElementBegin,
+
+ /* End of a data element */
+ kEventDataElementEnd,
+
+ /* End of a change record */
+ kEventChangeEnd,
+
+ /* Start of replacement of an entire dictionary */
+ kEventDictionaryReplaceBegin,
+
+ /* End of replacement of an entire dictionary */
+ kEventDictionaryReplaceEnd,
+
+ /* Start of modification or addition of a dictionary item */
+ kEventDictionaryItemModifyBegin,
+
+ /* End of modification or addition of a dictionary item */
+ kEventDictionaryItemModifyEnd,
+
+ /* Deletion of a dictionary item */
+ kEventDictionaryItemDelete,
+
+ /* Signals the start of the processing of a update request packet
+ */
+ kEventUpdateRequestBegin,
+
+ /* Signals the end of the processing of a update request packet
+ */
+ kEventUpdateRequestEnd,
+
+ /* Signals the termination of a subscription either due to an error, or the subscription was cancelled */
+ kEventSubscriptionTerminated,
+
+ kEvent_UpdatableDataSourceMax
+ };
+
+ union InEventParam
+ {
+ struct
+ {
+ PropertyPathHandle mTargetHandle;
+ } mDictionaryReplaceBegin;
+
+ struct
+ {
+ PropertyPathHandle mTargetHandle;
+ } mDictionaryReplaceEnd;
+
+ struct
+ {
+ PropertyPathHandle mTargetHandle;
+ } mDictionaryItemModifyBegin;
+
+ struct
+ {
+ PropertyPathHandle mTargetHandle;
+ } mDictionaryItemModifyEnd;
+
+ struct
+ {
+ PropertyPathHandle mTargetHandle;
+ } mDictionaryItemDelete;
+ };
+
+ WEAVE_ERROR StoreDataElement(PropertyPathHandle aHandle, TLV::TLVReader & aReader, uint8_t aFlags, OnChangeRejection aFunc, void * aContext, TraitDataHandle aDatahandle, uint64_t aPreviousFirstSameTraitVersion);
+ virtual bool IsUpdatableDataSource(void) __OVERRIDE { return true; }
+
+protected: // ISetDataDelegate
+ virtual WEAVE_ERROR SetLeafData(PropertyPathHandle aLeafHandle, nl::Weave::TLV::TLVReader & aReader) __OVERRIDE = 0;
+
+ /*
+ * Defaults to calling SetLeafData if aHandle is a leaf. DataSinks
+ * can optionally implement this if they need to support nullable,
+ * ephemeral, or optional properties.
+ *
+ * TODO: make this the defacto API, moving all the logic from
+ * SetLeafData into this function.
+ */
+ virtual WEAVE_ERROR SetData(PropertyPathHandle aHandle, nl::Weave::TLV::TLVReader & aReader, bool aIsNull) __OVERRIDE;
+
+ /* Subclass can invoke this if they desire to reject a particular data change */
+ void RejectChange(uint16_t aRejectionStatusCode);
+
+private:
+ void OnSetDataEvent(SetDataEventType aType, PropertyPathHandle aHandle) __OVERRIDE;
+
+private:
+ static OnChangeRejection sChangeRejectionCb;
+ static void * sChangeRejectionContext;
+};
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
}; // namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNamespaceDesignation_Current)
}; // namespace Profiles
}; // namespace Weave
diff --git a/src/lib/profiles/data-management/GenericTraitCatalogImp.h b/src/lib/profiles/data-management/GenericTraitCatalogImp.h
new file mode 100644
index 0000000..99e9423
--- /dev/null
+++ b/src/lib/profiles/data-management/GenericTraitCatalogImp.h
@@ -0,0 +1,29 @@
+/*
+ *
+ * Copyright (c) 2019 Google, LLC.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef _WEAVE_DATA_MANAGEMENT_GENERIC_TRAIT_CATALOG_IMP_CURRENT_H
+#define _WEAVE_DATA_MANAGEMENT_GENERIC_TRAIT_CATALOG_IMP_CURRENT_H
+
+#include <Weave/Profiles/data-management/WdmManagedNamespace.h>
+
+#if WEAVE_CONFIG_DATA_MANAGEMENT_NAMESPACE == kWeaveManagedNamespace_Current
+#include <Weave/Profiles/data-management/Current/GenericTraitCatalogImp.h>
+#else
+#error "WEAVE_CONFIG_DATA_MANAGEMENT_NAMESPACE defined, but not as namespace kWeaveManagedNamespace_Current"
+#endif // WEAVE_CONFIG_DATA_MANAGEMENT_NAMESPACE == kWeaveManagedNamespace_Current
+
+#endif // _WEAVE_DATA_MANAGEMENT_GENERIC_TRAIT_CATALOG_IMP_CURRENT_H
diff --git a/src/lib/profiles/status-report/StatusReportProfile.cpp b/src/lib/profiles/status-report/StatusReportProfile.cpp
index 085de6c..bcf805c 100644
--- a/src/lib/profiles/status-report/StatusReportProfile.cpp
+++ b/src/lib/profiles/status-report/StatusReportProfile.cpp
@@ -81,7 +81,7 @@
return WEAVE_NO_ERROR;
}
-WEAVE_ERROR StatusReport::pack(PacketBuffer *aBuffer)
+WEAVE_ERROR StatusReport::pack(PacketBuffer *aBuffer, uint32_t maxLen)
{
WEAVE_ERROR err = WEAVE_NO_ERROR;
MessageIterator i(aBuffer);
@@ -129,7 +129,7 @@
else
{
- err = mAdditionalInfo.pack(i);
+ err = mAdditionalInfo.pack(i, maxLen - 6);
}
exit:
diff --git a/src/lib/profiles/status-report/StatusReportProfile.h b/src/lib/profiles/status-report/StatusReportProfile.h
index e3cc58f..4f5affb 100644
--- a/src/lib/profiles/status-report/StatusReportProfile.h
+++ b/src/lib/profiles/status-report/StatusReportProfile.h
@@ -73,7 +73,7 @@
WEAVE_ERROR init(WEAVE_ERROR aError);
- WEAVE_ERROR pack(PacketBuffer *aBuffer);
+ WEAVE_ERROR pack(PacketBuffer *aBuffer, uint32_t maxLen = 0xFFFFFFFFUL);
uint16_t packedLength(void);
static WEAVE_ERROR parse(PacketBuffer *aBuffer, StatusReport &aDestination);
diff --git a/src/lib/support/Makefile.in b/src/lib/support/Makefile.in
index c8383b6..1a9b00d 100644
--- a/src/lib/support/Makefile.in
+++ b/src/lib/support/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
# sub-group of the Weave SDK library.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -103,8 +113,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/lib/support
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -123,18 +131,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -160,6 +169,8 @@
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -249,6 +260,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -408,6 +420,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -450,14 +463,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/support/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/lib/support/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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,7 +493,10 @@
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)'; \
@@ -628,6 +643,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/lib/support/verhoeff/Makefile.in b/src/lib/support/verhoeff/Makefile.in
index 14be126..2db2abe 100644
--- a/src/lib/support/verhoeff/Makefile.in
+++ b/src/lib/support/verhoeff/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -104,9 +114,6 @@
target_triplet = @target@
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_WITH_VERHOEFF_TRUE@noinst_PROGRAMS = VerhoeffTest$(EXEEXT)
subdir = src/lib/support/verhoeff
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -125,18 +132,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -166,7 +174,8 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/VerhoeffTest-VerhoeffTest.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -212,6 +221,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -301,6 +313,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -460,6 +473,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -507,14 +521,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/support/verhoeff/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/lib/support/verhoeff/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -545,7 +558,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VerhoeffTest-VerhoeffTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VerhoeffTest-VerhoeffTest.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -643,7 +662,10 @@
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)'; \
@@ -713,7 +735,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/VerhoeffTest-VerhoeffTest.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -759,7 +781,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/VerhoeffTest-VerhoeffTest.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -780,9 +802,9 @@
.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 \
@@ -794,6 +816,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/lwip/Makefile.in b/src/lwip/Makefile.in
index a9f63ea..9f2c8d8 100644
--- a/src/lwip/Makefile.in
+++ b/src/lwip/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -41,7 +41,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -106,9 +116,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/lwip
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -127,18 +134,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -296,7 +304,54 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_lib.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_msg.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-err.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netbuf.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netdb.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netifapi.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-sockets.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-tcpip.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-def.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-dns.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-inet_chksum.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-init.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-ip.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-mem.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-memp.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-netif.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-pbuf.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-raw.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-stats.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-sys.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_in.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_out.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-timeouts.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-udp.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-autoip.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-dhcp.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-etharp.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-icmp.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-igmp.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_addr.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_frag.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-dhcp6.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ethip6.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-icmp6.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-inet6.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_addr.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_frag.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_route_table.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-mld6.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-nd6.Po \
+ @top_builddir@/third_party/lwip/repo/lwip/src/netif/$(DEPDIR)/liblwip_a-ethernet.Po \
+ freertos/$(DEPDIR)/liblwip_a-sys_arch.Po \
+ standalone/$(DEPDIR)/liblwip_a-TapInterface.Po \
+ standalone/$(DEPDIR)/liblwip_a-sys_arch.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -346,6 +401,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -435,6 +493,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -594,6 +653,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -711,14 +771,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lwip/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/lwip/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -916,53 +975,59 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_lib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_msg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-err.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netbuf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netdb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netifapi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-sockets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-tcpip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-def.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-dns.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-inet_chksum.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-ip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-mem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-memp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-netif.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-pbuf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-raw.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-stats.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-sys.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_in.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_out.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-timeouts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-udp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-autoip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-dhcp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-etharp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-icmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-igmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_addr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_frag.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-dhcp6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ethip6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-icmp6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-inet6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_addr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_frag.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_route_table.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-mld6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-nd6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/netif/$(DEPDIR)/liblwip_a-ethernet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@freertos/$(DEPDIR)/liblwip_a-sys_arch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@standalone/$(DEPDIR)/liblwip_a-TapInterface.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@standalone/$(DEPDIR)/liblwip_a-sys_arch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_lib.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_msg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-err.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netbuf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netdb.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netifapi.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-sockets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-tcpip.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-def.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-dns.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-inet_chksum.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-init.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-ip.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-mem.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-memp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-netif.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-pbuf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-raw.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-stats.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-sys.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_in.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_out.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-timeouts.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-udp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-autoip.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-dhcp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-etharp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-icmp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-igmp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_addr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_frag.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-dhcp6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ethip6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-icmp6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-inet6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_addr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_frag.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_route_table.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-mld6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-nd6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/third_party/lwip/repo/lwip/src/netif/$(DEPDIR)/liblwip_a-ethernet.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@freertos/$(DEPDIR)/liblwip_a-sys_arch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@standalone/$(DEPDIR)/liblwip_a-TapInterface.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@standalone/$(DEPDIR)/liblwip_a-sys_arch.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$$||'`;\
@@ -1704,7 +1769,10 @@
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)'; \
@@ -1791,7 +1859,53 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/netif/$(DEPDIR) freertos/$(DEPDIR) standalone/$(DEPDIR)
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_lib.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_msg.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-err.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netbuf.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netdb.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netifapi.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-sockets.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-tcpip.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-def.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-dns.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-inet_chksum.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-init.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-ip.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-mem.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-memp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-netif.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-pbuf.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-raw.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-stats.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-sys.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_in.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_out.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-timeouts.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-udp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-autoip.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-dhcp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-etharp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-icmp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-igmp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_addr.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_frag.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-dhcp6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ethip6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-icmp6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-inet6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_addr.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_frag.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_route_table.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-mld6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-nd6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/netif/$(DEPDIR)/liblwip_a-ethernet.Po
+ -rm -f freertos/$(DEPDIR)/liblwip_a-sys_arch.Po
+ -rm -f standalone/$(DEPDIR)/liblwip_a-TapInterface.Po
+ -rm -f standalone/$(DEPDIR)/liblwip_a-sys_arch.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1837,7 +1951,53 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR) @top_builddir@/third_party/lwip/repo/lwip/src/netif/$(DEPDIR) freertos/$(DEPDIR) standalone/$(DEPDIR)
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_lib.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-api_msg.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-err.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netbuf.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netdb.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-netifapi.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-sockets.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/api/$(DEPDIR)/liblwip_a-tcpip.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-def.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-dns.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-inet_chksum.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-init.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-ip.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-mem.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-memp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-netif.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-pbuf.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-raw.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-stats.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-sys.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_in.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-tcp_out.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-timeouts.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/$(DEPDIR)/liblwip_a-udp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-autoip.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-dhcp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-etharp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-icmp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-igmp.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_addr.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv4/$(DEPDIR)/liblwip_a-ip4_frag.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-dhcp6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ethip6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-icmp6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-inet6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_addr.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_frag.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-ip6_route_table.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-mld6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/core/ipv6/$(DEPDIR)/liblwip_a-nd6.Po
+ -rm -f @top_builddir@/third_party/lwip/repo/lwip/src/netif/$(DEPDIR)/liblwip_a-ethernet.Po
+ -rm -f freertos/$(DEPDIR)/liblwip_a-sys_arch.Po
+ -rm -f standalone/$(DEPDIR)/liblwip_a-TapInterface.Po
+ -rm -f standalone/$(DEPDIR)/liblwip_a-sys_arch.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1858,9 +2018,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -1872,6 +2032,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/platform/ble/bluez/Makefile.in b/src/platform/ble/bluez/Makefile.in
index f118313..dada065 100644
--- a/src/platform/ble/bluez/Makefile.in
+++ b/src/platform/ble/bluez/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -40,7 +40,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -105,10 +115,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/platform/ble/bluez
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -127,18 +133,20 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -201,7 +209,12 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = \
+ ./$(DEPDIR)/libWoBluez_a-BluezBleApplicationDelegate.Po \
+ ./$(DEPDIR)/libWoBluez_a-BluezBlePlatformDelegate.Po \
+ ./$(DEPDIR)/libWoBluez_a-BluezHelperCode.Po \
+ ./$(DEPDIR)/libWoBluez_a-WoBluez.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -252,6 +265,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -341,6 +357,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -500,6 +517,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -553,14 +571,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/platform/ble/bluez/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/platform/ble/bluez/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -614,10 +631,16 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-BluezBleApplicationDelegate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-BluezBlePlatformDelegate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-BluezHelperCode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-WoBluez.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-BluezBleApplicationDelegate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-BluezBlePlatformDelegate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-BluezHelperCode.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWoBluez_a-WoBluez.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -757,7 +780,10 @@
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)'; \
@@ -830,7 +856,10 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libWoBluez_a-BluezBleApplicationDelegate.Po
+ -rm -f ./$(DEPDIR)/libWoBluez_a-BluezBlePlatformDelegate.Po
+ -rm -f ./$(DEPDIR)/libWoBluez_a-BluezHelperCode.Po
+ -rm -f ./$(DEPDIR)/libWoBluez_a-WoBluez.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -876,7 +905,10 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libWoBluez_a-BluezBleApplicationDelegate.Po
+ -rm -f ./$(DEPDIR)/libWoBluez_a-BluezBlePlatformDelegate.Po
+ -rm -f ./$(DEPDIR)/libWoBluez_a-BluezHelperCode.Po
+ -rm -f ./$(DEPDIR)/libWoBluez_a-WoBluez.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -897,9 +929,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -911,6 +943,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/ra-daemon/Makefile.in b/src/ra-daemon/Makefile.in
index 5ee61f1..b4d45dd 100644
--- a/src/ra-daemon/Makefile.in
+++ b/src/ra-daemon/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -37,7 +37,17 @@
# Router Advertisement (RA) daemon library.
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,9 +112,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/ra-daemon
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -123,18 +130,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -193,7 +201,8 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libRADaemon_a-RADaemon.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -243,6 +252,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -332,6 +344,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -491,6 +504,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -535,14 +549,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ra-daemon/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/ra-daemon/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -596,7 +609,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libRADaemon_a-RADaemon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libRADaemon_a-RADaemon.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -694,7 +713,10 @@
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)'; \
@@ -767,7 +789,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libRADaemon_a-RADaemon.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -813,7 +835,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libRADaemon_a-RADaemon.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -834,9 +856,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -848,6 +870,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/system/Makefile.in b/src/system/Makefile.in
index baf1379..4d63452 100644
--- a/src/system/Makefile.in
+++ b/src/system/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -59,7 +59,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -123,10 +133,6 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-DIST_COMMON = $(srcdir)/SystemLayer.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
@WEAVE_WITH_NLFAULTINJECTION_TRUE@am__append_1 = @top_builddir@/src/system/SystemFaultInjection.cpp
subdir = src/system
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -147,18 +153,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -238,7 +245,16 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemClock.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemError.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemFaultInjection.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemLayer.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemMutex.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemObject.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemPacketBuffer.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemStats.Po \
+ @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemTimer.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -288,6 +304,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/SystemLayer.am \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -377,6 +396,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -536,6 +556,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -587,16 +608,15 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/system/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/system/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
-$(srcdir)/SystemLayer.am:
+$(srcdir)/SystemLayer.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -683,15 +703,21 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemClock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemFaultInjection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemMutex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemObject.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemPacketBuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemStats.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemTimer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemClock.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemError.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemFaultInjection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemMutex.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemObject.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemPacketBuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemStats.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemTimer.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -901,7 +927,10 @@
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)'; \
@@ -976,7 +1005,15 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf @top_builddir@/src/system/$(DEPDIR)
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemClock.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemError.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemFaultInjection.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemLayer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemMutex.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemObject.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemPacketBuffer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemStats.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemTimer.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1022,7 +1059,15 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf @top_builddir@/src/system/$(DEPDIR)
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemClock.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemError.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemFaultInjection.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemLayer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemMutex.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemObject.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemPacketBuffer.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemStats.Po
+ -rm -f @top_builddir@/src/system/$(DEPDIR)/libSystemLayer_a-SystemTimer.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1043,9 +1088,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -1057,6 +1102,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/test-apps/Makefile.am b/src/test-apps/Makefile.am
index 1cb1f7a..5686269 100644
--- a/src/test-apps/Makefile.am
+++ b/src/test-apps/Makefile.am
@@ -1036,6 +1036,8 @@
happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py \
happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py \
happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py \
+ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py \
+ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py \
$(NULL)
endif # WEAVE_RUN_HAPPY_WDM
diff --git a/src/test-apps/Makefile.in b/src/test-apps/Makefile.in
index 41fbe59..7fb5a8e 100644
--- a/src/test-apps/Makefile.in
+++ b/src/test-apps/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -41,7 +41,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -535,6 +545,8 @@
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py \
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py \
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py \
+@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py \
+@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py \
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ $(NULL)
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_BDX_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__append_33 = \
@@ -608,11 +620,6 @@
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_WITH_CURL_TRUE@am__append_46 = $(CURL_LIBS)
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_WITH_CURL_TRUE@am__append_47 = $(CURL_LIBS)
subdir = src/test-apps
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(am__noinst_HEADERS_DIST) \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/test-driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -631,84 +638,25 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo " AR " $@;
-am__v_AR_1 =
-libMockBleApplicationDelegate_a_AR = $(AR) $(ARFLAGS)
-libMockBleApplicationDelegate_a_LIBADD =
-am__libMockBleApplicationDelegate_a_SOURCES_DIST = \
- MockBleApplicationDelegate.cpp
-@CONFIG_BLE_PLATFORM_BLUEZ_FALSE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@am_libMockBleApplicationDelegate_a_OBJECTS = MockBleApplicationDelegate.$(OBJEXT)
-libMockBleApplicationDelegate_a_OBJECTS = \
- $(am_libMockBleApplicationDelegate_a_OBJECTS)
-libMockBlePlatformDelegate_a_AR = $(AR) $(ARFLAGS)
-libMockBlePlatformDelegate_a_LIBADD =
-am__libMockBlePlatformDelegate_a_SOURCES_DIST = \
- MockBlePlatformDelegate.cpp
-@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@am_libMockBlePlatformDelegate_a_OBJECTS = MockBlePlatformDelegate.$(OBJEXT)
-libMockBlePlatformDelegate_a_OBJECTS = \
- $(am_libMockBlePlatformDelegate_a_OBJECTS)
-libWeaveCryptoTests_a_AR = $(AR) $(ARFLAGS)
-libWeaveCryptoTests_a_LIBADD =
-am__libWeaveCryptoTests_a_SOURCES_DIST = \
- crypto-tests/WeaveCryptoAESTests.cpp \
- crypto-tests/WeaveCryptoHKDFTests.cpp \
- crypto-tests/WeaveCryptoHMACTests.cpp \
- crypto-tests/WeaveCryptoSHATests.cpp
-am__dirstamp = $(am__leading_dot)dirstamp
-@WEAVE_BUILD_TESTS_TRUE@am_libWeaveCryptoTests_a_OBJECTS = crypto-tests/WeaveCryptoAESTests.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ crypto-tests/WeaveCryptoHKDFTests.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ crypto-tests/WeaveCryptoHMACTests.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ crypto-tests/WeaveCryptoSHATests.$(OBJEXT)
-libWeaveCryptoTests_a_OBJECTS = $(am_libWeaveCryptoTests_a_OBJECTS)
-libWeaveTestCommon_a_AR = $(AR) $(ARFLAGS)
-libWeaveTestCommon_a_LIBADD =
-am__libWeaveTestCommon_a_SOURCES_DIST = CASEOptions.cpp \
- KeyExportOptions.cpp TAKEOptions.cpp DeviceDescOptions.cpp \
- Certs.cpp TestGroupKeyStore.cpp ToolCommon.cpp \
- ToolCommonOptions.cpp TapAddrAutoconf.cpp PASEEngineTest.cpp \
- MockPlatformClocks.cpp TestPersistedStorageImplementation.cpp
-@WEAVE_BUILD_TESTS_TRUE@am_libWeaveTestCommon_a_OBJECTS = \
-@WEAVE_BUILD_TESTS_TRUE@ CASEOptions.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ KeyExportOptions.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ TAKEOptions.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ DeviceDescOptions.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ Certs.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ TestGroupKeyStore.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ ToolCommon.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ ToolCommonOptions.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ TapAddrAutoconf.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ PASEEngineTest.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ MockPlatformClocks.$(OBJEXT) \
-@WEAVE_BUILD_TESTS_TRUE@ TestPersistedStorageImplementation.$(OBJEXT)
-libWeaveTestCommon_a_OBJECTS = $(am_libWeaveTestCommon_a_OBJECTS)
-libWeaveTestGroupKeyStore_a_AR = $(AR) $(ARFLAGS)
-libWeaveTestGroupKeyStore_a_LIBADD =
-am__libWeaveTestGroupKeyStore_a_SOURCES_DIST = TestGroupKeyStore.cpp
-@WEAVE_BUILD_TESTS_TRUE@am_libWeaveTestGroupKeyStore_a_OBJECTS = \
-@WEAVE_BUILD_TESTS_TRUE@ TestGroupKeyStore.$(OBJEXT)
-libWeaveTestGroupKeyStore_a_OBJECTS = \
- $(am_libWeaveTestGroupKeyStore_a_OBJECTS)
@HAVE_CXX11_TRUE@@WEAVE_BUILD_TESTS_TRUE@am__EXEEXT_1 = \
@HAVE_CXX11_TRUE@@WEAVE_BUILD_TESTS_TRUE@ TestTDM$(EXEEXT)
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_BUILD_WARM_TRUE@am__EXEEXT_2 = TestWarm$(EXEEXT)
@@ -798,6 +746,67 @@
@WEAVE_BUILD_TESTS_TRUE@ weave-swu-server$(EXEEXT) \
@WEAVE_BUILD_TESTS_TRUE@ $(am__EXEEXT_9)
PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
+libMockBleApplicationDelegate_a_AR = $(AR) $(ARFLAGS)
+libMockBleApplicationDelegate_a_LIBADD =
+am__libMockBleApplicationDelegate_a_SOURCES_DIST = \
+ MockBleApplicationDelegate.cpp
+@CONFIG_BLE_PLATFORM_BLUEZ_FALSE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@am_libMockBleApplicationDelegate_a_OBJECTS = MockBleApplicationDelegate.$(OBJEXT)
+libMockBleApplicationDelegate_a_OBJECTS = \
+ $(am_libMockBleApplicationDelegate_a_OBJECTS)
+libMockBlePlatformDelegate_a_AR = $(AR) $(ARFLAGS)
+libMockBlePlatformDelegate_a_LIBADD =
+am__libMockBlePlatformDelegate_a_SOURCES_DIST = \
+ MockBlePlatformDelegate.cpp
+@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@am_libMockBlePlatformDelegate_a_OBJECTS = MockBlePlatformDelegate.$(OBJEXT)
+libMockBlePlatformDelegate_a_OBJECTS = \
+ $(am_libMockBlePlatformDelegate_a_OBJECTS)
+libWeaveCryptoTests_a_AR = $(AR) $(ARFLAGS)
+libWeaveCryptoTests_a_LIBADD =
+am__libWeaveCryptoTests_a_SOURCES_DIST = \
+ crypto-tests/WeaveCryptoAESTests.cpp \
+ crypto-tests/WeaveCryptoHKDFTests.cpp \
+ crypto-tests/WeaveCryptoHMACTests.cpp \
+ crypto-tests/WeaveCryptoSHATests.cpp
+am__dirstamp = $(am__leading_dot)dirstamp
+@WEAVE_BUILD_TESTS_TRUE@am_libWeaveCryptoTests_a_OBJECTS = crypto-tests/WeaveCryptoAESTests.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ crypto-tests/WeaveCryptoHKDFTests.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ crypto-tests/WeaveCryptoHMACTests.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ crypto-tests/WeaveCryptoSHATests.$(OBJEXT)
+libWeaveCryptoTests_a_OBJECTS = $(am_libWeaveCryptoTests_a_OBJECTS)
+libWeaveTestCommon_a_AR = $(AR) $(ARFLAGS)
+libWeaveTestCommon_a_LIBADD =
+am__libWeaveTestCommon_a_SOURCES_DIST = CASEOptions.cpp \
+ KeyExportOptions.cpp TAKEOptions.cpp DeviceDescOptions.cpp \
+ Certs.cpp TestGroupKeyStore.cpp ToolCommon.cpp \
+ ToolCommonOptions.cpp TapAddrAutoconf.cpp PASEEngineTest.cpp \
+ MockPlatformClocks.cpp TestPersistedStorageImplementation.cpp
+@WEAVE_BUILD_TESTS_TRUE@am_libWeaveTestCommon_a_OBJECTS = \
+@WEAVE_BUILD_TESTS_TRUE@ CASEOptions.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ KeyExportOptions.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ TAKEOptions.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ DeviceDescOptions.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ Certs.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ TestGroupKeyStore.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ ToolCommon.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ ToolCommonOptions.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ TapAddrAutoconf.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ PASEEngineTest.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ MockPlatformClocks.$(OBJEXT) \
+@WEAVE_BUILD_TESTS_TRUE@ TestPersistedStorageImplementation.$(OBJEXT)
+libWeaveTestCommon_a_OBJECTS = $(am_libWeaveTestCommon_a_OBJECTS)
+libWeaveTestGroupKeyStore_a_AR = $(AR) $(ARFLAGS)
+libWeaveTestGroupKeyStore_a_LIBADD =
+am__libWeaveTestGroupKeyStore_a_SOURCES_DIST = TestGroupKeyStore.cpp
+@WEAVE_BUILD_TESTS_TRUE@am_libWeaveTestGroupKeyStore_a_OBJECTS = \
+@WEAVE_BUILD_TESTS_TRUE@ TestGroupKeyStore.$(OBJEXT)
+libWeaveTestGroupKeyStore_a_OBJECTS = \
+ $(am_libWeaveTestGroupKeyStore_a_OBJECTS)
am__GenerateEventLog_SOURCES_DIST = GenerateEventLog.cpp \
MockEvents.cpp \
schema/weave/trait/telemetry/NetworkWiFiTelemetryTrait.cpp \
@@ -1777,7 +1786,187 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/CASEOptions.Po ./$(DEPDIR)/Certs.Po \
+ ./$(DEPDIR)/DeviceDescOptions.Po \
+ ./$(DEPDIR)/GenerateEventLog-GenerateEventLog.Po \
+ ./$(DEPDIR)/GenerateEventLog-MockEvents.Po \
+ ./$(DEPDIR)/KeyExportOptions.Po \
+ ./$(DEPDIR)/MockBleApplicationDelegate.Po \
+ ./$(DEPDIR)/MockBlePlatformDelegate.Po \
+ ./$(DEPDIR)/MockIAServer.Po ./$(DEPDIR)/MockPlatformClocks.Po \
+ ./$(DEPDIR)/MockSDServer.Po ./$(DEPDIR)/MockSWUServer.Po \
+ ./$(DEPDIR)/PASEEngineTest.Po ./$(DEPDIR)/TAKEOptions.Po \
+ ./$(DEPDIR)/TapAddrAutoconf.Po ./$(DEPDIR)/TestASN1.Po \
+ ./$(DEPDIR)/TestAppKeys.Po ./$(DEPDIR)/TestArgParser.Po \
+ ./$(DEPDIR)/TestBinding.Po ./$(DEPDIR)/TestCASE.Po \
+ ./$(DEPDIR)/TestCodeUtils.Po \
+ ./$(DEPDIR)/TestCrypto-TestCrypto.Po ./$(DEPDIR)/TestDRBG.Po \
+ ./$(DEPDIR)/TestDataManagement.Po \
+ ./$(DEPDIR)/TestDeviceDescriptor.Po ./$(DEPDIR)/TestECDH.Po \
+ ./$(DEPDIR)/TestECDSA.Po ./$(DEPDIR)/TestECMath.Po \
+ ./$(DEPDIR)/TestECMathParams.Po ./$(DEPDIR)/TestErrorStr.Po \
+ ./$(DEPDIR)/TestEventLogging-MockExternalEvents.Po \
+ ./$(DEPDIR)/TestEventLogging-TestEventLogging.Po \
+ ./$(DEPDIR)/TestFabricStateDelegate.Po \
+ ./$(DEPDIR)/TestGroupKeyStore.Po \
+ ./$(DEPDIR)/TestInetAddress.Po ./$(DEPDIR)/TestInetBuffer.Po \
+ ./$(DEPDIR)/TestInetEndPoint.Po ./$(DEPDIR)/TestInetLayer.Po \
+ ./$(DEPDIR)/TestInetLayerCommon.Po \
+ ./$(DEPDIR)/TestInetLayerDNS.Po \
+ ./$(DEPDIR)/TestInetLayerMulticast.Po \
+ ./$(DEPDIR)/TestInetTimer.Po ./$(DEPDIR)/TestKeyExport.Po \
+ ./$(DEPDIR)/TestKeyIds.Po ./$(DEPDIR)/TestMsgEnc.Po \
+ ./$(DEPDIR)/TestNetworkInfo.Po ./$(DEPDIR)/TestPASE.Po \
+ ./$(DEPDIR)/TestPacketBuffer.Po \
+ ./$(DEPDIR)/TestPairingCodeUtils.Po \
+ ./$(DEPDIR)/TestPasscodeEnc.Po \
+ ./$(DEPDIR)/TestPathStore-TestPathStore.Po \
+ ./$(DEPDIR)/TestPathStore-TestPersistedStorageImplementation.Po \
+ ./$(DEPDIR)/TestPersistedCounter.Po \
+ ./$(DEPDIR)/TestPersistedStorage.Po \
+ ./$(DEPDIR)/TestPersistedStorageImplementation.Po \
+ ./$(DEPDIR)/TestProfile.Po \
+ ./$(DEPDIR)/TestProfileStringSupport.Po \
+ ./$(DEPDIR)/TestProvHash.Po \
+ ./$(DEPDIR)/TestRADaemon-TestRADaemon.Po \
+ ./$(DEPDIR)/TestResourceIdentifier.Po \
+ ./$(DEPDIR)/TestRetainedPacketBuffer.Po \
+ ./$(DEPDIR)/TestSerialNumUtils.Po \
+ ./$(DEPDIR)/TestSoftwareUpdate.Po \
+ ./$(DEPDIR)/TestStatusReportStr.Po \
+ ./$(DEPDIR)/TestSystemObject-TestSystemObject.Po \
+ ./$(DEPDIR)/TestSystemTimer.Po ./$(DEPDIR)/TestTAKE.Po \
+ ./$(DEPDIR)/TestTDM-MockMismatchedSchemaSinkAndSource.Po \
+ ./$(DEPDIR)/TestTDM-MockTestBTrait.Po \
+ ./$(DEPDIR)/TestTDM-TestPersistedStorageImplementation.Po \
+ ./$(DEPDIR)/TestTDM-TestTDM.Po ./$(DEPDIR)/TestTLV.Po \
+ ./$(DEPDIR)/TestThermostatStatus.Po \
+ ./$(DEPDIR)/TestTimeUtils.Po ./$(DEPDIR)/TestTimeZone.Po \
+ ./$(DEPDIR)/TestWDM-TestWdm.Po ./$(DEPDIR)/TestWRMP.Po \
+ ./$(DEPDIR)/TestWarm.Po ./$(DEPDIR)/TestWdmNext-MockEvents.Po \
+ ./$(DEPDIR)/TestWdmNext-MockLoggingManager.Po \
+ ./$(DEPDIR)/TestWdmNext-MockSinkTraits.Po \
+ ./$(DEPDIR)/TestWdmNext-MockSourceTraits.Po \
+ ./$(DEPDIR)/TestWdmNext-MockWdmNodeOptions.Po \
+ ./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionInitiator.Po \
+ ./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionResponder.Po \
+ ./$(DEPDIR)/TestWdmNext-MockWdmTestVerifier.Po \
+ ./$(DEPDIR)/TestWdmNext-MockWdmViewClient.Po \
+ ./$(DEPDIR)/TestWdmNext-MockWdmViewServer.Po \
+ ./$(DEPDIR)/TestWdmNext-TestWdmNext.Po \
+ ./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationReceiver.Po \
+ ./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationSender.Po \
+ ./$(DEPDIR)/TestWdmNext-WdmNextPerfUtility.Po \
+ ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockEvents.Po \
+ ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockLoggingManager.Po \
+ ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockSourceTraits.Po \
+ ./$(DEPDIR)/TestWdmOneWayCommandReceiver-TestWdmOneWayCommandReceiver.Po \
+ ./$(DEPDIR)/TestWdmOneWayCommandSender-TestWdmOneWayCommandSender.Po \
+ ./$(DEPDIR)/TestWdmUpdateEncoder-MockSinkTraits.Po \
+ ./$(DEPDIR)/TestWdmUpdateEncoder-MockWdmNodeOptions.Po \
+ ./$(DEPDIR)/TestWdmUpdateEncoder-TestPersistedStorageImplementation.Po \
+ ./$(DEPDIR)/TestWdmUpdateEncoder-TestWdmUpdateEncoder.Po \
+ ./$(DEPDIR)/TestWdmUpdateResponse-TestPersistedStorageImplementation.Po \
+ ./$(DEPDIR)/TestWdmUpdateResponse-TestWdmUpdateResponse.Po \
+ ./$(DEPDIR)/TestWeaveCert.Po ./$(DEPDIR)/TestWeaveCertData.Po \
+ ./$(DEPDIR)/TestWeaveEncoding.Po \
+ ./$(DEPDIR)/TestWeaveFabricState.Po \
+ ./$(DEPDIR)/TestWeaveMessageLayer.Po \
+ ./$(DEPDIR)/TestWeaveProvBundle.Po \
+ ./$(DEPDIR)/TestWeaveSignature.Po \
+ ./$(DEPDIR)/TestWeaveTunnelBR.Po \
+ ./$(DEPDIR)/TestWeaveTunnelServer.Po ./$(DEPDIR)/TestWoble.Po \
+ ./$(DEPDIR)/ToolCommon.Po ./$(DEPDIR)/ToolCommonOptions.Po \
+ ./$(DEPDIR)/infratest.Po ./$(DEPDIR)/mock-weave-bg.Po \
+ ./$(DEPDIR)/mock_device-MockDCLPServer.Po \
+ ./$(DEPDIR)/mock_device-MockDCServer.Po \
+ ./$(DEPDIR)/mock_device-MockDDServer.Po \
+ ./$(DEPDIR)/mock_device-MockDMPublisher.Po \
+ ./$(DEPDIR)/mock_device-MockEvents.Po \
+ ./$(DEPDIR)/mock_device-MockFPServer.Po \
+ ./$(DEPDIR)/mock_device-MockLoggingManager.Po \
+ ./$(DEPDIR)/mock_device-MockNPServer.Po \
+ ./$(DEPDIR)/mock_device-MockOpActions.Po \
+ ./$(DEPDIR)/mock_device-MockPairingServer.Po \
+ ./$(DEPDIR)/mock_device-MockSPServer.Po \
+ ./$(DEPDIR)/mock_device-MockSinkTraits.Po \
+ ./$(DEPDIR)/mock_device-MockSourceTraits.Po \
+ ./$(DEPDIR)/mock_device-MockTimeSyncClient.Po \
+ ./$(DEPDIR)/mock_device-MockTimeSyncCoordinator.Po \
+ ./$(DEPDIR)/mock_device-MockTimeSyncServer.Po \
+ ./$(DEPDIR)/mock_device-MockTimeSyncUtil.Po \
+ ./$(DEPDIR)/mock_device-MockTokenPairingServer.Po \
+ ./$(DEPDIR)/mock_device-MockWdmNodeOptions.Po \
+ ./$(DEPDIR)/mock_device-MockWdmSubscriptionInitiator.Po \
+ ./$(DEPDIR)/mock_device-MockWdmSubscriptionResponder.Po \
+ ./$(DEPDIR)/mock_device-MockWdmTestVerifier.Po \
+ ./$(DEPDIR)/mock_device-MockWdmViewClient.Po \
+ ./$(DEPDIR)/mock_device-MockWdmViewServer.Po \
+ ./$(DEPDIR)/mock_device-TestProfile.Po \
+ ./$(DEPDIR)/mock_device-mock-device.Po \
+ ./$(DEPDIR)/nlweavebdxserver.Po \
+ ./$(DEPDIR)/nlweaveswuclient.Po ./$(DEPDIR)/wdmtest.Po \
+ ./$(DEPDIR)/weave-bdx-client-development.Po \
+ ./$(DEPDIR)/weave-bdx-client-v0.Po \
+ ./$(DEPDIR)/weave-bdx-common-development.Po \
+ ./$(DEPDIR)/weave-bdx-server-development.Po \
+ ./$(DEPDIR)/weave-bdx-server-v0.Po \
+ ./$(DEPDIR)/weave-connection-tunnel.Po \
+ ./$(DEPDIR)/weave-dd-client.Po \
+ ./$(DEPDIR)/weave-device-descriptor.Po \
+ ./$(DEPDIR)/weave-heartbeat.Po ./$(DEPDIR)/weave-key-export.Po \
+ ./$(DEPDIR)/weave-ping.Po ./$(DEPDIR)/weave-service-dir.Po \
+ ./$(DEPDIR)/weave-swu-client.Po \
+ ./$(DEPDIR)/weave-swu-server.Po \
+ crypto-tests/$(DEPDIR)/WeaveCryptoAESTests.Po \
+ crypto-tests/$(DEPDIR)/WeaveCryptoHKDFTests.Po \
+ crypto-tests/$(DEPDIR)/WeaveCryptoHMACTests.Po \
+ crypto-tests/$(DEPDIR)/WeaveCryptoSHATests.Po \
+ schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestETrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestETrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestHTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestTDM-TestBTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestTDM-TestHTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestTDM-TestMismatchedCTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestATrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestBTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestETrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestATrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestBTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestETrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestATrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestBTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestETrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/mock_device-TestATrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/mock_device-TestBTrait.Po \
+ schema/nest/test/trait/$(DEPDIR)/mock_device-TestCommon.Po \
+ schema/nest/test/trait/$(DEPDIR)/mock_device-TestETrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleCapabilitiesTrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleSettingsTrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleCapabilitiesTrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleSettingsTrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleCapabilitiesTrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleSettingsTrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleCapabilitiesTrait.Po \
+ schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleSettingsTrait.Po \
+ schema/weave/trait/security/$(DEPDIR)/TestWdmNext-BoltLockSettingsTrait.Po \
+ schema/weave/trait/security/$(DEPDIR)/TestWdmOneWayCommandReceiver-BoltLockSettingsTrait.Po \
+ schema/weave/trait/security/$(DEPDIR)/TestWdmUpdateEncoder-BoltLockSettingsTrait.Po \
+ schema/weave/trait/security/$(DEPDIR)/mock_device-BoltLockSettingsTrait.Po \
+ schema/weave/trait/telemetry/$(DEPDIR)/GenerateEventLog-NetworkWiFiTelemetryTrait.Po \
+ schema/weave/trait/telemetry/$(DEPDIR)/TestWdmNext-NetworkWiFiTelemetryTrait.Po \
+ schema/weave/trait/telemetry/$(DEPDIR)/TestWdmOneWayCommandReceiver-NetworkWiFiTelemetryTrait.Po \
+ schema/weave/trait/telemetry/$(DEPDIR)/TestWdmUpdateEncoder-NetworkWiFiTelemetryTrait.Po \
+ schema/weave/trait/telemetry/$(DEPDIR)/mock_device-NetworkWiFiTelemetryTrait.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -1991,7 +2180,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- check recheck distdir
+ check recheck 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
@@ -2438,7 +2627,9 @@
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_subless_notify_01.py \
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py \
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py \
-@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py
+@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py \
+@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py \
+@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_WDM_TRUE@ happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_BDX_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__EXEEXT_28 = happy/tests/standalone/bdx/test_weave_bdx_01.py \
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_BDX_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@ happy/tests/standalone/bdx/test_weave_bdx_02.py \
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_BDX_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@ happy/tests/standalone/bdx/test_weave_bdx_03.py \
@@ -2548,6 +2739,10 @@
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/test-driver
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -2662,6 +2857,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -2821,6 +3017,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -3534,14 +3731,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/test-apps/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/test-apps/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -3553,52 +3749,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libMockBleApplicationDelegate.a: $(libMockBleApplicationDelegate_a_OBJECTS) $(libMockBleApplicationDelegate_a_DEPENDENCIES) $(EXTRA_libMockBleApplicationDelegate_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libMockBleApplicationDelegate.a
- $(AM_V_AR)$(libMockBleApplicationDelegate_a_AR) libMockBleApplicationDelegate.a $(libMockBleApplicationDelegate_a_OBJECTS) $(libMockBleApplicationDelegate_a_LIBADD)
- $(AM_V_at)$(RANLIB) libMockBleApplicationDelegate.a
-
-libMockBlePlatformDelegate.a: $(libMockBlePlatformDelegate_a_OBJECTS) $(libMockBlePlatformDelegate_a_DEPENDENCIES) $(EXTRA_libMockBlePlatformDelegate_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libMockBlePlatformDelegate.a
- $(AM_V_AR)$(libMockBlePlatformDelegate_a_AR) libMockBlePlatformDelegate.a $(libMockBlePlatformDelegate_a_OBJECTS) $(libMockBlePlatformDelegate_a_LIBADD)
- $(AM_V_at)$(RANLIB) libMockBlePlatformDelegate.a
-crypto-tests/$(am__dirstamp):
- @$(MKDIR_P) crypto-tests
- @: > crypto-tests/$(am__dirstamp)
-crypto-tests/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) crypto-tests/$(DEPDIR)
- @: > crypto-tests/$(DEPDIR)/$(am__dirstamp)
-crypto-tests/WeaveCryptoAESTests.$(OBJEXT): \
- crypto-tests/$(am__dirstamp) \
- crypto-tests/$(DEPDIR)/$(am__dirstamp)
-crypto-tests/WeaveCryptoHKDFTests.$(OBJEXT): \
- crypto-tests/$(am__dirstamp) \
- crypto-tests/$(DEPDIR)/$(am__dirstamp)
-crypto-tests/WeaveCryptoHMACTests.$(OBJEXT): \
- crypto-tests/$(am__dirstamp) \
- crypto-tests/$(DEPDIR)/$(am__dirstamp)
-crypto-tests/WeaveCryptoSHATests.$(OBJEXT): \
- crypto-tests/$(am__dirstamp) \
- crypto-tests/$(DEPDIR)/$(am__dirstamp)
-
-libWeaveCryptoTests.a: $(libWeaveCryptoTests_a_OBJECTS) $(libWeaveCryptoTests_a_DEPENDENCIES) $(EXTRA_libWeaveCryptoTests_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libWeaveCryptoTests.a
- $(AM_V_AR)$(libWeaveCryptoTests_a_AR) libWeaveCryptoTests.a $(libWeaveCryptoTests_a_OBJECTS) $(libWeaveCryptoTests_a_LIBADD)
- $(AM_V_at)$(RANLIB) libWeaveCryptoTests.a
-
-libWeaveTestCommon.a: $(libWeaveTestCommon_a_OBJECTS) $(libWeaveTestCommon_a_DEPENDENCIES) $(EXTRA_libWeaveTestCommon_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libWeaveTestCommon.a
- $(AM_V_AR)$(libWeaveTestCommon_a_AR) libWeaveTestCommon.a $(libWeaveTestCommon_a_OBJECTS) $(libWeaveTestCommon_a_LIBADD)
- $(AM_V_at)$(RANLIB) libWeaveTestCommon.a
-
-libWeaveTestGroupKeyStore.a: $(libWeaveTestGroupKeyStore_a_OBJECTS) $(libWeaveTestGroupKeyStore_a_DEPENDENCIES) $(EXTRA_libWeaveTestGroupKeyStore_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libWeaveTestGroupKeyStore.a
- $(AM_V_AR)$(libWeaveTestGroupKeyStore_a_AR) libWeaveTestGroupKeyStore.a $(libWeaveTestGroupKeyStore_a_OBJECTS) $(libWeaveTestGroupKeyStore_a_LIBADD)
- $(AM_V_at)$(RANLIB) libWeaveTestGroupKeyStore.a
-
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
@@ -3665,6 +3815,52 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+
+clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libMockBleApplicationDelegate.a: $(libMockBleApplicationDelegate_a_OBJECTS) $(libMockBleApplicationDelegate_a_DEPENDENCIES) $(EXTRA_libMockBleApplicationDelegate_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libMockBleApplicationDelegate.a
+ $(AM_V_AR)$(libMockBleApplicationDelegate_a_AR) libMockBleApplicationDelegate.a $(libMockBleApplicationDelegate_a_OBJECTS) $(libMockBleApplicationDelegate_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libMockBleApplicationDelegate.a
+
+libMockBlePlatformDelegate.a: $(libMockBlePlatformDelegate_a_OBJECTS) $(libMockBlePlatformDelegate_a_DEPENDENCIES) $(EXTRA_libMockBlePlatformDelegate_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libMockBlePlatformDelegate.a
+ $(AM_V_AR)$(libMockBlePlatformDelegate_a_AR) libMockBlePlatformDelegate.a $(libMockBlePlatformDelegate_a_OBJECTS) $(libMockBlePlatformDelegate_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libMockBlePlatformDelegate.a
+crypto-tests/$(am__dirstamp):
+ @$(MKDIR_P) crypto-tests
+ @: > crypto-tests/$(am__dirstamp)
+crypto-tests/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) crypto-tests/$(DEPDIR)
+ @: > crypto-tests/$(DEPDIR)/$(am__dirstamp)
+crypto-tests/WeaveCryptoAESTests.$(OBJEXT): \
+ crypto-tests/$(am__dirstamp) \
+ crypto-tests/$(DEPDIR)/$(am__dirstamp)
+crypto-tests/WeaveCryptoHKDFTests.$(OBJEXT): \
+ crypto-tests/$(am__dirstamp) \
+ crypto-tests/$(DEPDIR)/$(am__dirstamp)
+crypto-tests/WeaveCryptoHMACTests.$(OBJEXT): \
+ crypto-tests/$(am__dirstamp) \
+ crypto-tests/$(DEPDIR)/$(am__dirstamp)
+crypto-tests/WeaveCryptoSHATests.$(OBJEXT): \
+ crypto-tests/$(am__dirstamp) \
+ crypto-tests/$(DEPDIR)/$(am__dirstamp)
+
+libWeaveCryptoTests.a: $(libWeaveCryptoTests_a_OBJECTS) $(libWeaveCryptoTests_a_DEPENDENCIES) $(EXTRA_libWeaveCryptoTests_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libWeaveCryptoTests.a
+ $(AM_V_AR)$(libWeaveCryptoTests_a_AR) libWeaveCryptoTests.a $(libWeaveCryptoTests_a_OBJECTS) $(libWeaveCryptoTests_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libWeaveCryptoTests.a
+
+libWeaveTestCommon.a: $(libWeaveTestCommon_a_OBJECTS) $(libWeaveTestCommon_a_DEPENDENCIES) $(EXTRA_libWeaveTestCommon_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libWeaveTestCommon.a
+ $(AM_V_AR)$(libWeaveTestCommon_a_AR) libWeaveTestCommon.a $(libWeaveTestCommon_a_OBJECTS) $(libWeaveTestCommon_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libWeaveTestCommon.a
+
+libWeaveTestGroupKeyStore.a: $(libWeaveTestGroupKeyStore_a_OBJECTS) $(libWeaveTestGroupKeyStore_a_DEPENDENCIES) $(EXTRA_libWeaveTestGroupKeyStore_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libWeaveTestGroupKeyStore.a
+ $(AM_V_AR)$(libWeaveTestGroupKeyStore_a_AR) libWeaveTestGroupKeyStore.a $(libWeaveTestGroupKeyStore_a_OBJECTS) $(libWeaveTestGroupKeyStore_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libWeaveTestGroupKeyStore.a
schema/weave/trait/telemetry/$(am__dirstamp):
@$(MKDIR_P) schema/weave/trait/telemetry
@: > schema/weave/trait/telemetry/$(am__dirstamp)
@@ -4173,214 +4369,220 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CASEOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Certs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DeviceDescOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GenerateEventLog-GenerateEventLog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GenerateEventLog-MockEvents.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KeyExportOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockBleApplicationDelegate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockBlePlatformDelegate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockIAServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockPlatformClocks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockSDServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockSWUServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PASEEngineTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TAKEOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TapAddrAutoconf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestASN1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestAppKeys.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestArgParser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestBinding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCASE.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCodeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCrypto-TestCrypto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDRBG.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDataManagement.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDeviceDescriptor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECDH.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECDSA.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECMath.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECMathParams.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestErrorStr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestEventLogging-MockExternalEvents.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestEventLogging-TestEventLogging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestFabricStateDelegate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestGroupKeyStore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetAddress.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetBuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetEndPoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayerCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayerDNS.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayerMulticast.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestKeyExport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestKeyIds.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestMsgEnc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestNetworkInfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPASE.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPacketBuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPairingCodeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPasscodeEnc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPathStore-TestPathStore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPathStore-TestPersistedStorageImplementation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPersistedCounter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPersistedStorage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPersistedStorageImplementation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestProfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestProfileStringSupport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestProvHash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestRADaemon-TestRADaemon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestResourceIdentifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestRetainedPacketBuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSerialNumUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSoftwareUpdate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestStatusReportStr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSystemObject-TestSystemObject.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSystemTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTAKE.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-MockMismatchedSchemaSinkAndSource.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-MockTestBTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-TestPersistedStorageImplementation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-TestTDM.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTLV.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestThermostatStatus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTimeUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTimeZone.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWDM-TestWdm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWRMP.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWarm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockEvents.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockLoggingManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockSinkTraits.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockSourceTraits.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmNodeOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionInitiator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionResponder.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmTestVerifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmViewClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmViewServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-TestWdmNext.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationReceiver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationSender.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-WdmNextPerfUtility.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockEvents.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockLoggingManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockSourceTraits.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-TestWdmOneWayCommandReceiver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandSender-TestWdmOneWayCommandSender.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-MockSinkTraits.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-MockWdmNodeOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-TestPersistedStorageImplementation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-TestWdmUpdateEncoder.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateResponse-TestPersistedStorageImplementation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateResponse-TestWdmUpdateResponse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveCertData.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveEncoding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveFabricState.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveMessageLayer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveProvBundle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveSignature.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveTunnelBR.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveTunnelServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWoble.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ToolCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ToolCommonOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infratest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock-weave-bg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDCLPServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDCServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDDServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDMPublisher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockEvents.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockFPServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockLoggingManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockNPServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockOpActions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockPairingServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockSPServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockSinkTraits.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockSourceTraits.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncCoordinator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncUtil.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTokenPairingServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmNodeOptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmSubscriptionInitiator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmSubscriptionResponder.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmTestVerifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmViewClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmViewServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-TestProfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-mock-device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlweavebdxserver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlweaveswuclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wdmtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-client-development.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-client-v0.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-common-development.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-server-development.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-server-v0.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-connection-tunnel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-dd-client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-device-descriptor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-heartbeat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-key-export.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-ping.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-service-dir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-swu-client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-swu-server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoAESTests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoHKDFTests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoHMACTests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoSHATests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestETrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestETrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestHTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestBTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestHTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestMismatchedCTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestATrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestBTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestETrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestATrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestBTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestETrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestATrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestBTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestETrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestATrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestBTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestCommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestETrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleCapabilitiesTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleCapabilitiesTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleCapabilitiesTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleCapabilitiesTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/TestWdmNext-BoltLockSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/TestWdmOneWayCommandReceiver-BoltLockSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/TestWdmUpdateEncoder-BoltLockSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/mock_device-BoltLockSettingsTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/GenerateEventLog-NetworkWiFiTelemetryTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/TestWdmNext-NetworkWiFiTelemetryTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/TestWdmOneWayCommandReceiver-NetworkWiFiTelemetryTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/TestWdmUpdateEncoder-NetworkWiFiTelemetryTrait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/mock_device-NetworkWiFiTelemetryTrait.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CASEOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Certs.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DeviceDescOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GenerateEventLog-GenerateEventLog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GenerateEventLog-MockEvents.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KeyExportOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockBleApplicationDelegate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockBlePlatformDelegate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockIAServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockPlatformClocks.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockSDServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockSWUServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PASEEngineTest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TAKEOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TapAddrAutoconf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestASN1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestAppKeys.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestArgParser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestBinding.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCASE.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCodeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCrypto-TestCrypto.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDRBG.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDataManagement.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDeviceDescriptor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECDH.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECDSA.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECMath.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestECMathParams.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestErrorStr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestEventLogging-MockExternalEvents.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestEventLogging-TestEventLogging.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestFabricStateDelegate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestGroupKeyStore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetAddress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetBuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetEndPoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayerCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayerDNS.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetLayerMulticast.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestInetTimer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestKeyExport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestKeyIds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestMsgEnc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestNetworkInfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPASE.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPacketBuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPairingCodeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPasscodeEnc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPathStore-TestPathStore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPathStore-TestPersistedStorageImplementation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPersistedCounter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPersistedStorage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPersistedStorageImplementation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestProfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestProfileStringSupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestProvHash.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestRADaemon-TestRADaemon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestResourceIdentifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestRetainedPacketBuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSerialNumUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSoftwareUpdate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestStatusReportStr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSystemObject-TestSystemObject.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSystemTimer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTAKE.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-MockMismatchedSchemaSinkAndSource.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-MockTestBTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-TestPersistedStorageImplementation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTDM-TestTDM.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTLV.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestThermostatStatus.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTimeUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTimeZone.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWDM-TestWdm.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWRMP.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWarm.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockEvents.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockLoggingManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockSinkTraits.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockSourceTraits.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmNodeOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionInitiator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionResponder.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmTestVerifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmViewClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-MockWdmViewServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-TestWdmNext.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationReceiver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationSender.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmNext-WdmNextPerfUtility.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockEvents.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockLoggingManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockSourceTraits.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandReceiver-TestWdmOneWayCommandReceiver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmOneWayCommandSender-TestWdmOneWayCommandSender.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-MockSinkTraits.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-MockWdmNodeOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-TestPersistedStorageImplementation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateEncoder-TestWdmUpdateEncoder.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateResponse-TestPersistedStorageImplementation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWdmUpdateResponse-TestWdmUpdateResponse.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveCertData.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveEncoding.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveFabricState.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveMessageLayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveProvBundle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveSignature.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveTunnelBR.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWeaveTunnelServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestWoble.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ToolCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ToolCommonOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infratest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock-weave-bg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDCLPServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDCServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDDServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockDMPublisher.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockEvents.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockFPServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockLoggingManager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockNPServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockOpActions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockPairingServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockSPServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockSinkTraits.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockSourceTraits.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncCoordinator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTimeSyncUtil.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockTokenPairingServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmNodeOptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmSubscriptionInitiator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmSubscriptionResponder.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmTestVerifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmViewClient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-MockWdmViewServer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-TestProfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock_device-mock-device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlweavebdxserver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlweaveswuclient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wdmtest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-client-development.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-client-v0.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-common-development.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-server-development.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-bdx-server-v0.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-connection-tunnel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-dd-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-device-descriptor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-heartbeat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-key-export.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-ping.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-service-dir.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-swu-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-swu-server.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoAESTests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoHKDFTests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoHMACTests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@crypto-tests/$(DEPDIR)/WeaveCryptoSHATests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestETrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestETrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestHTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestBTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestHTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestTDM-TestMismatchedCTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestATrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestBTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestETrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestATrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestBTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestETrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestATrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestBTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestETrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestATrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestBTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestCommon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/nest/test/trait/$(DEPDIR)/mock_device-TestETrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleCapabilitiesTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleCapabilitiesTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleCapabilitiesTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleCapabilitiesTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/TestWdmNext-BoltLockSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/TestWdmOneWayCommandReceiver-BoltLockSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/TestWdmUpdateEncoder-BoltLockSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/security/$(DEPDIR)/mock_device-BoltLockSettingsTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/GenerateEventLog-NetworkWiFiTelemetryTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/TestWdmNext-NetworkWiFiTelemetryTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/TestWdmOneWayCommandReceiver-NetworkWiFiTelemetryTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/TestWdmUpdateEncoder-NetworkWiFiTelemetryTrait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@schema/weave/trait/telemetry/$(DEPDIR)/mock_device-NetworkWiFiTelemetryTrait.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -6067,7 +6269,7 @@
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -6157,7 +6359,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(check_SCRIPTS)
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -8292,6 +8494,20 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py.log: happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py
+ @p='happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py'; \
+ b='happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py.log: happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py
+ @p='happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py'; \
+ b='happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
happy/tests/standalone/bdx/test_weave_bdx_01.py.log: happy/tests/standalone/bdx/test_weave_bdx_01.py
@p='happy/tests/standalone/bdx/test_weave_bdx_01.py'; \
b='happy/tests/standalone/bdx/test_weave_bdx_01.py'; \
@@ -8517,7 +8733,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+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)'; \
@@ -8576,7 +8795,7 @@
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(libexecdir)"; do \
@@ -8627,10 +8846,10 @@
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@WEAVE_BUILD_TESTS_FALSE@uninstall-local:
-@WEAVE_BUILD_TESTS_FALSE@install-exec-local:
@WEAVE_BUILD_COVERAGE_FALSE@clean-local:
@WEAVE_BUILD_COVERAGE_REPORTS_FALSE@clean-local:
@WEAVE_BUILD_TESTS_FALSE@clean-local:
+@WEAVE_BUILD_TESTS_FALSE@install-exec-local:
clean: clean-recursive
clean-am: clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \
@@ -8638,7 +8857,214 @@
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-recursive
- -rm -rf ./$(DEPDIR) crypto-tests/$(DEPDIR) schema/nest/test/trait/$(DEPDIR) schema/weave/trait/locale/$(DEPDIR) schema/weave/trait/security/$(DEPDIR) schema/weave/trait/telemetry/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/CASEOptions.Po
+ -rm -f ./$(DEPDIR)/Certs.Po
+ -rm -f ./$(DEPDIR)/DeviceDescOptions.Po
+ -rm -f ./$(DEPDIR)/GenerateEventLog-GenerateEventLog.Po
+ -rm -f ./$(DEPDIR)/GenerateEventLog-MockEvents.Po
+ -rm -f ./$(DEPDIR)/KeyExportOptions.Po
+ -rm -f ./$(DEPDIR)/MockBleApplicationDelegate.Po
+ -rm -f ./$(DEPDIR)/MockBlePlatformDelegate.Po
+ -rm -f ./$(DEPDIR)/MockIAServer.Po
+ -rm -f ./$(DEPDIR)/MockPlatformClocks.Po
+ -rm -f ./$(DEPDIR)/MockSDServer.Po
+ -rm -f ./$(DEPDIR)/MockSWUServer.Po
+ -rm -f ./$(DEPDIR)/PASEEngineTest.Po
+ -rm -f ./$(DEPDIR)/TAKEOptions.Po
+ -rm -f ./$(DEPDIR)/TapAddrAutoconf.Po
+ -rm -f ./$(DEPDIR)/TestASN1.Po
+ -rm -f ./$(DEPDIR)/TestAppKeys.Po
+ -rm -f ./$(DEPDIR)/TestArgParser.Po
+ -rm -f ./$(DEPDIR)/TestBinding.Po
+ -rm -f ./$(DEPDIR)/TestCASE.Po
+ -rm -f ./$(DEPDIR)/TestCodeUtils.Po
+ -rm -f ./$(DEPDIR)/TestCrypto-TestCrypto.Po
+ -rm -f ./$(DEPDIR)/TestDRBG.Po
+ -rm -f ./$(DEPDIR)/TestDataManagement.Po
+ -rm -f ./$(DEPDIR)/TestDeviceDescriptor.Po
+ -rm -f ./$(DEPDIR)/TestECDH.Po
+ -rm -f ./$(DEPDIR)/TestECDSA.Po
+ -rm -f ./$(DEPDIR)/TestECMath.Po
+ -rm -f ./$(DEPDIR)/TestECMathParams.Po
+ -rm -f ./$(DEPDIR)/TestErrorStr.Po
+ -rm -f ./$(DEPDIR)/TestEventLogging-MockExternalEvents.Po
+ -rm -f ./$(DEPDIR)/TestEventLogging-TestEventLogging.Po
+ -rm -f ./$(DEPDIR)/TestFabricStateDelegate.Po
+ -rm -f ./$(DEPDIR)/TestGroupKeyStore.Po
+ -rm -f ./$(DEPDIR)/TestInetAddress.Po
+ -rm -f ./$(DEPDIR)/TestInetBuffer.Po
+ -rm -f ./$(DEPDIR)/TestInetEndPoint.Po
+ -rm -f ./$(DEPDIR)/TestInetLayer.Po
+ -rm -f ./$(DEPDIR)/TestInetLayerCommon.Po
+ -rm -f ./$(DEPDIR)/TestInetLayerDNS.Po
+ -rm -f ./$(DEPDIR)/TestInetLayerMulticast.Po
+ -rm -f ./$(DEPDIR)/TestInetTimer.Po
+ -rm -f ./$(DEPDIR)/TestKeyExport.Po
+ -rm -f ./$(DEPDIR)/TestKeyIds.Po
+ -rm -f ./$(DEPDIR)/TestMsgEnc.Po
+ -rm -f ./$(DEPDIR)/TestNetworkInfo.Po
+ -rm -f ./$(DEPDIR)/TestPASE.Po
+ -rm -f ./$(DEPDIR)/TestPacketBuffer.Po
+ -rm -f ./$(DEPDIR)/TestPairingCodeUtils.Po
+ -rm -f ./$(DEPDIR)/TestPasscodeEnc.Po
+ -rm -f ./$(DEPDIR)/TestPathStore-TestPathStore.Po
+ -rm -f ./$(DEPDIR)/TestPathStore-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestPersistedCounter.Po
+ -rm -f ./$(DEPDIR)/TestPersistedStorage.Po
+ -rm -f ./$(DEPDIR)/TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestProfile.Po
+ -rm -f ./$(DEPDIR)/TestProfileStringSupport.Po
+ -rm -f ./$(DEPDIR)/TestProvHash.Po
+ -rm -f ./$(DEPDIR)/TestRADaemon-TestRADaemon.Po
+ -rm -f ./$(DEPDIR)/TestResourceIdentifier.Po
+ -rm -f ./$(DEPDIR)/TestRetainedPacketBuffer.Po
+ -rm -f ./$(DEPDIR)/TestSerialNumUtils.Po
+ -rm -f ./$(DEPDIR)/TestSoftwareUpdate.Po
+ -rm -f ./$(DEPDIR)/TestStatusReportStr.Po
+ -rm -f ./$(DEPDIR)/TestSystemObject-TestSystemObject.Po
+ -rm -f ./$(DEPDIR)/TestSystemTimer.Po
+ -rm -f ./$(DEPDIR)/TestTAKE.Po
+ -rm -f ./$(DEPDIR)/TestTDM-MockMismatchedSchemaSinkAndSource.Po
+ -rm -f ./$(DEPDIR)/TestTDM-MockTestBTrait.Po
+ -rm -f ./$(DEPDIR)/TestTDM-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestTDM-TestTDM.Po
+ -rm -f ./$(DEPDIR)/TestTLV.Po
+ -rm -f ./$(DEPDIR)/TestThermostatStatus.Po
+ -rm -f ./$(DEPDIR)/TestTimeUtils.Po
+ -rm -f ./$(DEPDIR)/TestTimeZone.Po
+ -rm -f ./$(DEPDIR)/TestWDM-TestWdm.Po
+ -rm -f ./$(DEPDIR)/TestWRMP.Po
+ -rm -f ./$(DEPDIR)/TestWarm.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockEvents.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockLoggingManager.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockSinkTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockSourceTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmNodeOptions.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionInitiator.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionResponder.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmTestVerifier.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmViewClient.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmViewServer.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-TestWdmNext.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationReceiver.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationSender.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-WdmNextPerfUtility.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockEvents.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockLoggingManager.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockSourceTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-TestWdmOneWayCommandReceiver.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandSender-TestWdmOneWayCommandSender.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-MockSinkTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-MockWdmNodeOptions.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-TestWdmUpdateEncoder.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateResponse-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateResponse-TestWdmUpdateResponse.Po
+ -rm -f ./$(DEPDIR)/TestWeaveCert.Po
+ -rm -f ./$(DEPDIR)/TestWeaveCertData.Po
+ -rm -f ./$(DEPDIR)/TestWeaveEncoding.Po
+ -rm -f ./$(DEPDIR)/TestWeaveFabricState.Po
+ -rm -f ./$(DEPDIR)/TestWeaveMessageLayer.Po
+ -rm -f ./$(DEPDIR)/TestWeaveProvBundle.Po
+ -rm -f ./$(DEPDIR)/TestWeaveSignature.Po
+ -rm -f ./$(DEPDIR)/TestWeaveTunnelBR.Po
+ -rm -f ./$(DEPDIR)/TestWeaveTunnelServer.Po
+ -rm -f ./$(DEPDIR)/TestWoble.Po
+ -rm -f ./$(DEPDIR)/ToolCommon.Po
+ -rm -f ./$(DEPDIR)/ToolCommonOptions.Po
+ -rm -f ./$(DEPDIR)/infratest.Po
+ -rm -f ./$(DEPDIR)/mock-weave-bg.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDCLPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDCServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDDServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDMPublisher.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockEvents.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockFPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockLoggingManager.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockNPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockOpActions.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockPairingServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockSPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockSinkTraits.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockSourceTraits.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncClient.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncCoordinator.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncUtil.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTokenPairingServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmNodeOptions.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmSubscriptionInitiator.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmSubscriptionResponder.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmTestVerifier.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmViewClient.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmViewServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-TestProfile.Po
+ -rm -f ./$(DEPDIR)/mock_device-mock-device.Po
+ -rm -f ./$(DEPDIR)/nlweavebdxserver.Po
+ -rm -f ./$(DEPDIR)/nlweaveswuclient.Po
+ -rm -f ./$(DEPDIR)/wdmtest.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-client-development.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-client-v0.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-common-development.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-server-development.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-server-v0.Po
+ -rm -f ./$(DEPDIR)/weave-connection-tunnel.Po
+ -rm -f ./$(DEPDIR)/weave-dd-client.Po
+ -rm -f ./$(DEPDIR)/weave-device-descriptor.Po
+ -rm -f ./$(DEPDIR)/weave-heartbeat.Po
+ -rm -f ./$(DEPDIR)/weave-key-export.Po
+ -rm -f ./$(DEPDIR)/weave-ping.Po
+ -rm -f ./$(DEPDIR)/weave-service-dir.Po
+ -rm -f ./$(DEPDIR)/weave-swu-client.Po
+ -rm -f ./$(DEPDIR)/weave-swu-server.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoAESTests.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoHKDFTests.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoHMACTests.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoSHATests.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestHTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestHTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestMismatchedCTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestETrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/TestWdmNext-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/TestWdmOneWayCommandReceiver-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/TestWdmUpdateEncoder-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/mock_device-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/GenerateEventLog-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/TestWdmNext-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/TestWdmOneWayCommandReceiver-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/TestWdmUpdateEncoder-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/mock_device-NetworkWiFiTelemetryTrait.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -8684,7 +9110,214 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
- -rm -rf ./$(DEPDIR) crypto-tests/$(DEPDIR) schema/nest/test/trait/$(DEPDIR) schema/weave/trait/locale/$(DEPDIR) schema/weave/trait/security/$(DEPDIR) schema/weave/trait/telemetry/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/CASEOptions.Po
+ -rm -f ./$(DEPDIR)/Certs.Po
+ -rm -f ./$(DEPDIR)/DeviceDescOptions.Po
+ -rm -f ./$(DEPDIR)/GenerateEventLog-GenerateEventLog.Po
+ -rm -f ./$(DEPDIR)/GenerateEventLog-MockEvents.Po
+ -rm -f ./$(DEPDIR)/KeyExportOptions.Po
+ -rm -f ./$(DEPDIR)/MockBleApplicationDelegate.Po
+ -rm -f ./$(DEPDIR)/MockBlePlatformDelegate.Po
+ -rm -f ./$(DEPDIR)/MockIAServer.Po
+ -rm -f ./$(DEPDIR)/MockPlatformClocks.Po
+ -rm -f ./$(DEPDIR)/MockSDServer.Po
+ -rm -f ./$(DEPDIR)/MockSWUServer.Po
+ -rm -f ./$(DEPDIR)/PASEEngineTest.Po
+ -rm -f ./$(DEPDIR)/TAKEOptions.Po
+ -rm -f ./$(DEPDIR)/TapAddrAutoconf.Po
+ -rm -f ./$(DEPDIR)/TestASN1.Po
+ -rm -f ./$(DEPDIR)/TestAppKeys.Po
+ -rm -f ./$(DEPDIR)/TestArgParser.Po
+ -rm -f ./$(DEPDIR)/TestBinding.Po
+ -rm -f ./$(DEPDIR)/TestCASE.Po
+ -rm -f ./$(DEPDIR)/TestCodeUtils.Po
+ -rm -f ./$(DEPDIR)/TestCrypto-TestCrypto.Po
+ -rm -f ./$(DEPDIR)/TestDRBG.Po
+ -rm -f ./$(DEPDIR)/TestDataManagement.Po
+ -rm -f ./$(DEPDIR)/TestDeviceDescriptor.Po
+ -rm -f ./$(DEPDIR)/TestECDH.Po
+ -rm -f ./$(DEPDIR)/TestECDSA.Po
+ -rm -f ./$(DEPDIR)/TestECMath.Po
+ -rm -f ./$(DEPDIR)/TestECMathParams.Po
+ -rm -f ./$(DEPDIR)/TestErrorStr.Po
+ -rm -f ./$(DEPDIR)/TestEventLogging-MockExternalEvents.Po
+ -rm -f ./$(DEPDIR)/TestEventLogging-TestEventLogging.Po
+ -rm -f ./$(DEPDIR)/TestFabricStateDelegate.Po
+ -rm -f ./$(DEPDIR)/TestGroupKeyStore.Po
+ -rm -f ./$(DEPDIR)/TestInetAddress.Po
+ -rm -f ./$(DEPDIR)/TestInetBuffer.Po
+ -rm -f ./$(DEPDIR)/TestInetEndPoint.Po
+ -rm -f ./$(DEPDIR)/TestInetLayer.Po
+ -rm -f ./$(DEPDIR)/TestInetLayerCommon.Po
+ -rm -f ./$(DEPDIR)/TestInetLayerDNS.Po
+ -rm -f ./$(DEPDIR)/TestInetLayerMulticast.Po
+ -rm -f ./$(DEPDIR)/TestInetTimer.Po
+ -rm -f ./$(DEPDIR)/TestKeyExport.Po
+ -rm -f ./$(DEPDIR)/TestKeyIds.Po
+ -rm -f ./$(DEPDIR)/TestMsgEnc.Po
+ -rm -f ./$(DEPDIR)/TestNetworkInfo.Po
+ -rm -f ./$(DEPDIR)/TestPASE.Po
+ -rm -f ./$(DEPDIR)/TestPacketBuffer.Po
+ -rm -f ./$(DEPDIR)/TestPairingCodeUtils.Po
+ -rm -f ./$(DEPDIR)/TestPasscodeEnc.Po
+ -rm -f ./$(DEPDIR)/TestPathStore-TestPathStore.Po
+ -rm -f ./$(DEPDIR)/TestPathStore-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestPersistedCounter.Po
+ -rm -f ./$(DEPDIR)/TestPersistedStorage.Po
+ -rm -f ./$(DEPDIR)/TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestProfile.Po
+ -rm -f ./$(DEPDIR)/TestProfileStringSupport.Po
+ -rm -f ./$(DEPDIR)/TestProvHash.Po
+ -rm -f ./$(DEPDIR)/TestRADaemon-TestRADaemon.Po
+ -rm -f ./$(DEPDIR)/TestResourceIdentifier.Po
+ -rm -f ./$(DEPDIR)/TestRetainedPacketBuffer.Po
+ -rm -f ./$(DEPDIR)/TestSerialNumUtils.Po
+ -rm -f ./$(DEPDIR)/TestSoftwareUpdate.Po
+ -rm -f ./$(DEPDIR)/TestStatusReportStr.Po
+ -rm -f ./$(DEPDIR)/TestSystemObject-TestSystemObject.Po
+ -rm -f ./$(DEPDIR)/TestSystemTimer.Po
+ -rm -f ./$(DEPDIR)/TestTAKE.Po
+ -rm -f ./$(DEPDIR)/TestTDM-MockMismatchedSchemaSinkAndSource.Po
+ -rm -f ./$(DEPDIR)/TestTDM-MockTestBTrait.Po
+ -rm -f ./$(DEPDIR)/TestTDM-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestTDM-TestTDM.Po
+ -rm -f ./$(DEPDIR)/TestTLV.Po
+ -rm -f ./$(DEPDIR)/TestThermostatStatus.Po
+ -rm -f ./$(DEPDIR)/TestTimeUtils.Po
+ -rm -f ./$(DEPDIR)/TestTimeZone.Po
+ -rm -f ./$(DEPDIR)/TestWDM-TestWdm.Po
+ -rm -f ./$(DEPDIR)/TestWRMP.Po
+ -rm -f ./$(DEPDIR)/TestWarm.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockEvents.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockLoggingManager.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockSinkTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockSourceTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmNodeOptions.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionInitiator.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmSubscriptionResponder.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmTestVerifier.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmViewClient.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-MockWdmViewServer.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-TestWdmNext.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationReceiver.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-TestWdmSubscriptionlessNotificationSender.Po
+ -rm -f ./$(DEPDIR)/TestWdmNext-WdmNextPerfUtility.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockEvents.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockLoggingManager.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-MockSourceTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandReceiver-TestWdmOneWayCommandReceiver.Po
+ -rm -f ./$(DEPDIR)/TestWdmOneWayCommandSender-TestWdmOneWayCommandSender.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-MockSinkTraits.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-MockWdmNodeOptions.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateEncoder-TestWdmUpdateEncoder.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateResponse-TestPersistedStorageImplementation.Po
+ -rm -f ./$(DEPDIR)/TestWdmUpdateResponse-TestWdmUpdateResponse.Po
+ -rm -f ./$(DEPDIR)/TestWeaveCert.Po
+ -rm -f ./$(DEPDIR)/TestWeaveCertData.Po
+ -rm -f ./$(DEPDIR)/TestWeaveEncoding.Po
+ -rm -f ./$(DEPDIR)/TestWeaveFabricState.Po
+ -rm -f ./$(DEPDIR)/TestWeaveMessageLayer.Po
+ -rm -f ./$(DEPDIR)/TestWeaveProvBundle.Po
+ -rm -f ./$(DEPDIR)/TestWeaveSignature.Po
+ -rm -f ./$(DEPDIR)/TestWeaveTunnelBR.Po
+ -rm -f ./$(DEPDIR)/TestWeaveTunnelServer.Po
+ -rm -f ./$(DEPDIR)/TestWoble.Po
+ -rm -f ./$(DEPDIR)/ToolCommon.Po
+ -rm -f ./$(DEPDIR)/ToolCommonOptions.Po
+ -rm -f ./$(DEPDIR)/infratest.Po
+ -rm -f ./$(DEPDIR)/mock-weave-bg.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDCLPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDCServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDDServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockDMPublisher.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockEvents.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockFPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockLoggingManager.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockNPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockOpActions.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockPairingServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockSPServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockSinkTraits.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockSourceTraits.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncClient.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncCoordinator.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTimeSyncUtil.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockTokenPairingServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmNodeOptions.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmSubscriptionInitiator.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmSubscriptionResponder.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmTestVerifier.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmViewClient.Po
+ -rm -f ./$(DEPDIR)/mock_device-MockWdmViewServer.Po
+ -rm -f ./$(DEPDIR)/mock_device-TestProfile.Po
+ -rm -f ./$(DEPDIR)/mock_device-mock-device.Po
+ -rm -f ./$(DEPDIR)/nlweavebdxserver.Po
+ -rm -f ./$(DEPDIR)/nlweaveswuclient.Po
+ -rm -f ./$(DEPDIR)/wdmtest.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-client-development.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-client-v0.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-common-development.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-server-development.Po
+ -rm -f ./$(DEPDIR)/weave-bdx-server-v0.Po
+ -rm -f ./$(DEPDIR)/weave-connection-tunnel.Po
+ -rm -f ./$(DEPDIR)/weave-dd-client.Po
+ -rm -f ./$(DEPDIR)/weave-device-descriptor.Po
+ -rm -f ./$(DEPDIR)/weave-heartbeat.Po
+ -rm -f ./$(DEPDIR)/weave-key-export.Po
+ -rm -f ./$(DEPDIR)/weave-ping.Po
+ -rm -f ./$(DEPDIR)/weave-service-dir.Po
+ -rm -f ./$(DEPDIR)/weave-swu-client.Po
+ -rm -f ./$(DEPDIR)/weave-swu-server.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoAESTests.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoHKDFTests.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoHMACTests.Po
+ -rm -f crypto-tests/$(DEPDIR)/WeaveCryptoSHATests.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/GenerateEventLog-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestEventLogging-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestPathStore-TestHTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestHTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestTDM-TestMismatchedCTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmNext-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmOneWayCommandReceiver-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/TestWdmUpdateEncoder-TestETrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestATrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestBTrait.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestCommon.Po
+ -rm -f schema/nest/test/trait/$(DEPDIR)/mock_device-TestETrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmNext-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmOneWayCommandReceiver-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/TestWdmUpdateEncoder-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleCapabilitiesTrait.Po
+ -rm -f schema/weave/trait/locale/$(DEPDIR)/mock_device-LocaleSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/TestWdmNext-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/TestWdmOneWayCommandReceiver-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/TestWdmUpdateEncoder-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/security/$(DEPDIR)/mock_device-BoltLockSettingsTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/GenerateEventLog-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/TestWdmNext-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/TestWdmOneWayCommandReceiver-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/TestWdmUpdateEncoder-NetworkWiFiTelemetryTrait.Po
+ -rm -f schema/weave/trait/telemetry/$(DEPDIR)/mock_device-NetworkWiFiTelemetryTrait.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -8705,16 +9338,16 @@
.MAKE: $(am__recursive_targets) check-am install-am install-strip
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
- check-TESTS check-am clean clean-checkPROGRAMS clean-generic \
- clean-libexecPROGRAMS clean-libtool clean-local \
- clean-noinstLIBRARIES clean-noinstPROGRAMS cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-exec-local install-html \
- install-html-am install-info install-info-am \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--depfiles check check-TESTS check-am clean \
+ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-libtool clean-local clean-noinstLIBRARIES \
+ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-exec-local \
+ install-html install-html-am install-info install-info-am \
install-libexecPROGRAMS install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
@@ -8723,6 +9356,8 @@
recheck tags tags-am uninstall uninstall-am \
uninstall-libexecPROGRAMS uninstall-local
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/test-apps/MockSourceTraits.cpp b/src/test-apps/MockSourceTraits.cpp
index 3a59d9b..cf60d5a 100644
--- a/src/test-apps/MockSourceTraits.cpp
+++ b/src/test-apps/MockSourceTraits.cpp
@@ -72,11 +72,16 @@
return strlen(src);
}
-LocaleSettingsTraitDataSource::LocaleSettingsTraitDataSource()
- : TraitDataSource(&LocaleSettingsTrait::TraitSchema)
+LocaleSettingsTraitDataSource::LocaleSettingsTraitDataSource():
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ TraitUpdatableDataSource(&LocaleSettingsTrait::TraitSchema)
+#else
+ TraitDataSource(&LocaleSettingsTrait::TraitSchema)
+#endif
{
SetVersion(300);
memset(mLocale, 0, sizeof(mLocale));
+ MOCK_strlcpy(mLocale, "en-US", sizeof(mLocale));
}
void LocaleSettingsTraitDataSource::Mutate()
@@ -94,6 +99,37 @@
Unlock();
}
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+WEAVE_ERROR
+LocaleSettingsTraitDataSource::SetLeafData(PropertyPathHandle aLeafHandle, TLVReader &aReader)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ switch (aLeafHandle) {
+ case LocaleSettingsTrait::kPropertyHandle_active_locale:
+ char next_locale[24];
+ err = aReader.GetString(next_locale, MAX_LOCALE_SIZE);
+ SuccessOrExit(err);
+ if (strncmp(next_locale, mLocale, MAX_LOCALE_SIZE) != 0)
+ {
+ WeaveLogDetail(DataManagement, "<< active_locale is changed from \"%s\" to \"%s\"", mLocale, next_locale);
+ memcpy(mLocale, next_locale, MAX_LOCALE_SIZE);
+ }
+
+ WeaveLogDetail(DataManagement, "<< active_locale = \"%s\"", mLocale);
+ break;
+
+ default:
+ WeaveLogDetail(DataManagement, "<< UNKNOWN!");
+ err = WEAVE_ERROR_TLV_TAG_NOT_FOUND;
+ }
+
+exit:
+ return err;
+}
+
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
WEAVE_ERROR
LocaleSettingsTraitDataSource::GetLeafData(PropertyPathHandle aLeafHandle, uint64_t aTagToWrite, TLVWriter &aWriter)
{
@@ -245,9 +281,13 @@
return err;
}
-TestATraitDataSource::TestATraitDataSource()
- : TraitDataSource(&TestATrait::TraitSchema),
- mActiveCommand(NULL)
+TestATraitDataSource::TestATraitDataSource():
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ TraitUpdatableDataSource(&TestATrait::TraitSchema),
+#else
+ TraitDataSource(&TestATrait::TraitSchema),
+#endif
+ mActiveCommand(NULL)
{
uint8_t *tmp;
SetVersion(100);
@@ -748,6 +788,251 @@
}
}
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+WEAVE_ERROR
+TestATraitDataSource::SetLeafData(PropertyPathHandle aLeafHandle, TLVReader &aReader)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ switch (GetPropertySchemaHandle(aLeafHandle)) {
+ case TestATrait::kPropertyHandle_TaA:
+ err = aReader.Get(taa);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_a = %u", taa);
+ break;
+
+ case TestATrait::kPropertyHandle_TaB:
+ err = aReader.Get(tab);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_b = %u", tab);
+ break;
+
+ case TestATrait::kPropertyHandle_TaC:
+ uint32_t next_tac;
+ err = aReader.Get(next_tac);
+ SuccessOrExit(err);
+ if (next_tac != tac)
+ {
+ WeaveLogDetail(DataManagement, "<< ta_c is changed from %u to %u", tac, next_tac);
+ tac = next_tac;
+ }
+
+ WeaveLogDetail(DataManagement, "<< ta_c = %u", tac);
+ break;
+
+ case TestATrait::kPropertyHandle_TaD_SaA:
+ uint32_t next_tad_saa;
+ err = aReader.Get(next_tad_saa);
+ SuccessOrExit(err);
+ if (next_tad_saa != tad.saA)
+ {
+ WeaveLogDetail(DataManagement, "<< ta_d.sa_a is changed from %u to %u", tad.saA, next_tad_saa);
+ tad.saA = next_tad_saa;
+ }
+
+ WeaveLogDetail(DataManagement, "<< ta_d.sa_a = %u", tad.saA);
+ break;
+
+ case TestATrait::kPropertyHandle_TaD_SaB:
+ bool next_tad_sab;
+ err = aReader.Get(next_tad_sab);
+ SuccessOrExit(err);
+ if (next_tad_sab != tad.saB)
+ {
+ WeaveLogDetail(DataManagement, "<< ta_d.sa_b is changed from %u to %u", tad.saB, next_tad_sab);
+ tad.saB = next_tad_sab;
+ }
+
+ WeaveLogDetail(DataManagement, "<< ta_d.sa_b = %u", tad.saB);
+ break;
+
+ case TestATrait::kPropertyHandle_TaE:
+ {
+ TLVType outerType;
+ uint32_t i = 0;
+
+ err = aReader.EnterContainer(outerType);
+ SuccessOrExit(err);
+
+ while (((err = aReader.Next()) == WEAVE_NO_ERROR) && (i < (sizeof(tae) / sizeof(tae[0])))) {
+ uint32_t next_tae;
+ err = aReader.Get(next_tae);
+ SuccessOrExit(err);
+ if (tae[i] != next_tae)
+ {
+ WeaveLogDetail(DataManagement, "<< ta_e[%u] is changed from %u to %u", i, tae[i], next_tae);
+ tae[i] = next_tae;
+ }
+
+ WeaveLogDetail(DataManagement, "<< ta_e[%u] = %u", i, tae[i]);
+ i++;
+ }
+
+ err = aReader.ExitContainer(outerType);
+ break;
+ }
+
+ case TestATrait::kPropertyHandle_TaG:
+ {
+ if (aReader.GetType() == kTLVType_UTF8String)
+ {
+ err = aReader.GetString(tag_string, sizeof(tag_string));
+ SuccessOrExit(err);
+
+ tag_use_ref = false;
+
+ WeaveLogDetail(DataManagement, "<< ta_g string = %s", tag_string);
+ }
+ else
+ {
+ err = aReader.Get(tag_ref);
+ SuccessOrExit(err);
+
+ tag_use_ref = true;
+
+ WeaveLogDetail(DataManagement, "<< ta_g ref = %u", tag_ref);
+ }
+ }
+ break;
+
+ case TestATrait::kPropertyHandle_TaK:
+ err = aReader.GetBytes(&tak[0], sizeof(tak));
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_k %d bytes", sizeof(tak));
+ break;
+
+ case TestATrait::kPropertyHandle_TaL:
+ err = aReader.Get(tal);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_l = %x", tal);
+ break;
+
+ case TestATrait::kPropertyHandle_TaM:
+ err = aReader.Get(tam_resourceid);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_m = %" PRIx64 , tam_resourceid);
+ break;
+
+ case TestATrait::kPropertyHandle_TaN:
+ err = aReader.GetBytes(&tan[0], sizeof(tan));
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_n %d bytes", sizeof(tan));
+ DumpMemory(&tan[0], sizeof(tan), "WEAVE:DMG: << ta_n ", 16);
+ break;
+
+ case TestATrait::kPropertyHandle_TaO:
+ err = aReader.Get(tao);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_o = %d", tao);
+ break;
+
+ case TestATrait::kPropertyHandle_TaP:
+ int64_t next_tap;
+ err = aReader.Get(next_tap);
+ SuccessOrExit(err);
+
+ if (next_tap != tap)
+ {
+ WeaveLogDetail(DataManagement, "<< ta_p is changed from %d to %d", tap, next_tap);
+ tap = next_tap;
+ }
+ WeaveLogDetail(DataManagement, "<< ta_p = %d", tap);
+ break;
+
+ case TestATrait::kPropertyHandle_TaQ:
+ err = aReader.Get(taq);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_q %" PRId64 , taq);
+ break;
+
+ case TestATrait::kPropertyHandle_TaR:
+ err = aReader.Get(tar);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_r %u", tar);
+ break;
+
+ case TestATrait::kPropertyHandle_TaS:
+ err = aReader.Get(tas);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_s %u", tas);
+ break;
+
+ case TestATrait::kPropertyHandle_TaT:
+ err = aReader.Get(tat);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_t %u", tat);
+ break;
+
+ case TestATrait::kPropertyHandle_TaU:
+ err = aReader.Get(tau);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_u %d", tau);
+ break;
+
+ case TestATrait::kPropertyHandle_TaV:
+ err = aReader.Get(tav);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_v %u", tav);
+ break;
+
+ case TestATrait::kPropertyHandle_TaW:
+ err = aReader.GetString(&taw[0], sizeof(taw));
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_w %s", taw);
+ break;
+
+ case TestATrait::kPropertyHandle_TaX:
+ err = aReader.Get(tax);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< ta_x %d", tax);
+ break;
+
+ case TestATrait::kPropertyHandle_TaI_Value:
+ err = aReader.Get(tai_stageditem);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< tai[%u] = %u", GetPropertyDictionaryKey(aLeafHandle), tai_stageditem);
+ break;
+
+ case TestATrait::kPropertyHandle_TaJ_Value_SaA:
+ err = aReader.Get(taj_stageditem.saA);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< taj[%u].sa_a = %u", GetPropertyDictionaryKey(aLeafHandle), taj_stageditem.saA);
+ break;
+
+ case TestATrait::kPropertyHandle_TaJ_Value_SaB:
+ err = aReader.Get(taj_stageditem.saB);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< taj[%u].sa_b = %u", GetPropertyDictionaryKey(aLeafHandle), taj_stageditem.saB);
+ break;
+
+ default:
+ WeaveLogDetail(DataManagement, "<< UNKNOWN!");
+ }
+
+ exit:
+ return err;
+}
+
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
WEAVE_ERROR TestATraitDataSource::GetData(PropertyPathHandle aHandle,
uint64_t aTagToWrite,
TLVWriter &aWriter,
@@ -1992,3 +2277,147 @@
return err;
}
+
+TestCTraitDataSource::TestCTraitDataSource():
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ TraitUpdatableDataSource(&TestCTrait::TraitSchema)
+#else
+ TraitDataSource(&TestCTrait::TraitSchema)
+#endif
+{
+ SetVersion(300);
+ taa = true;
+ tab = TestCTrait::ENUM_C_VALUE_1;
+ tac.scA= 3;
+ tac.scB = true;
+ tad = 4;
+}
+
+void TestCTraitDataSource::Mutate()
+{
+ Lock();
+
+ if ((GetVersion() % 2) == 0) {
+ SetDirty(TestCTrait::kPropertyHandle_TcA);
+ taa = !taa;
+ }
+ else
+ {
+ SetDirty(TestCTrait::kPropertyHandle_TcC_ScA);
+ SetDirty(TestCTrait::kPropertyHandle_TcC_ScB);
+ tac.scA ++;
+ tac.scB = !tac.scB;
+ }
+
+ Unlock();
+}
+
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+void TestCTraitDataSource::TLVPrettyPrinter(const char *aFormat, ...)
+{
+ va_list args;
+
+ va_start(args, aFormat);
+
+ vprintf(aFormat, args);
+
+ va_end(args);
+}
+
+WEAVE_ERROR
+TestCTraitDataSource::SetLeafData(PropertyPathHandle aLeafHandle, TLVReader &aReader)
+{
+
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+ switch (aLeafHandle) {
+ case TestCTrait::kPropertyHandle_TcA:
+ err = aReader.Get(taa);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< taa = %s", taa ? "true" : "false");
+ break;
+ case TestCTrait::kPropertyHandle_TcB:
+ err = aReader.Get(tab);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< tab %d", tab);
+ break;
+ case TestCTrait::kPropertyHandle_TcC_ScA:
+ err = aReader.Get(tac.scA);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< tac.scA %u", tac.scA);
+ break;
+ case TestCTrait::kPropertyHandle_TcC_ScB:
+ err = aReader.Get(tac.scB);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< tac.scB = %s", tac.scB ? "true" : "false");
+ break;
+ case TestCTrait::kPropertyHandle_TcD:
+ err = aReader.Get(tad);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, "<< tad %u", tad);
+ break;
+
+ default:
+ WeaveLogDetail(DataManagement, "<< UNKNOWN!");
+ err = WEAVE_ERROR_TLV_TAG_NOT_FOUND;
+ }
+
+exit:
+ return err;
+}
+
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
+WEAVE_ERROR
+TestCTraitDataSource::GetLeafData(PropertyPathHandle aLeafHandle, uint64_t aTagToWrite, TLVWriter &aWriter)
+{
+ WEAVE_ERROR err = WEAVE_NO_ERROR;
+
+ switch (aLeafHandle) {
+ case TestCTrait::kPropertyHandle_TcA:
+ err = aWriter.PutBoolean(aTagToWrite, taa);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, ">> taa = %s", taa ? "true" : "false");
+ break;
+ case TestCTrait::kPropertyHandle_TcB:
+ err = aWriter.Put(aTagToWrite, tab);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, ">> tab = %d", tab);
+ break;
+
+ case TestCTrait::kPropertyHandle_TcC_ScA:
+ err = aWriter.Put(aTagToWrite, tac.scA);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, ">> tac.scA = %u", tac.scA);
+ break;
+
+ case TestCTrait::kPropertyHandle_TcC_ScB:
+ err = aWriter.PutBoolean(aTagToWrite, taa);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, ">> tac.scB = %s", tac.scB ? "true" : "false");
+ break;
+ case TestCTrait::kPropertyHandle_TcD:
+ err = aWriter.Put(aTagToWrite, tad);
+ SuccessOrExit(err);
+
+ WeaveLogDetail(DataManagement, ">> tad = %u", tad);
+ break;
+
+ default:
+ WeaveLogDetail(DataManagement, ">> UNKNOWN!");
+ ExitNow(err = WEAVE_ERROR_TLV_TAG_NOT_FOUND);
+ }
+
+exit:
+ WeaveLogFunctError(err);
+
+ return err;
+}
diff --git a/src/test-apps/MockSourceTraits.h b/src/test-apps/MockSourceTraits.h
index d1c7af4..6553f72 100644
--- a/src/test-apps/MockSourceTraits.h
+++ b/src/test-apps/MockSourceTraits.h
@@ -34,17 +34,29 @@
#include <weave/trait/locale/LocaleCapabilitiesTrait.h>
#include <nest/test/trait/TestATrait.h>
#include <nest/test/trait/TestBTrait.h>
+#include <nest/test/trait/TestCTrait.h>
+#include <nest/test/trait/TestDTrait.h>
#include <nest/test/trait/TestCommon.h>
#include "TestGroupKeyStore.h"
#include <map>
-class LocaleSettingsTraitDataSource : public nl::Weave::Profiles::DataManagement::TraitDataSource
+#define MAX_LOCALE_SIZE sizeof(char) * 24
+
+class LocaleSettingsTraitDataSource :
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ public nl::Weave::Profiles::DataManagement::TraitUpdatableDataSource
+#else
+ public nl::Weave::Profiles::DataManagement::TraitDataSource
+#endif
{
public:
LocaleSettingsTraitDataSource();
void Mutate();
private:
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ WEAVE_ERROR SetLeafData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aLeafHandle, nl::Weave::TLV::TLVReader &aReader) __OVERRIDE;
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
WEAVE_ERROR GetLeafData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aLeafHandle, uint64_t aTagToWrite, nl::Weave::TLV::TLVWriter &aWriter) __OVERRIDE;
char mLocale[24];
@@ -80,7 +92,12 @@
uint32_t mAutoRelockDuration;
};
-class TestATraitDataSource : public nl::Weave::Profiles::DataManagement::TraitDataSource
+class TestATraitDataSource :
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ public nl::Weave::Profiles::DataManagement::TraitUpdatableDataSource
+#else
+ public nl::Weave::Profiles::DataManagement::TraitDataSource
+#endif
{
public:
TestATraitDataSource();
@@ -89,6 +106,10 @@
uint32_t mTraitTestSet;
private:
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ WEAVE_ERROR SetLeafData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aLeafHandle, nl::Weave::TLV::TLVReader &aReader) __OVERRIDE;
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
void SetNullifiedPath(nl::Weave::Profiles::DataManagement::PropertyPathHandle aHandle, bool isNull);
WEAVE_ERROR GetData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aHandle, uint64_t aTagToWrite, nl::Weave::TLV::TLVWriter &aWriter, bool &aIsNull, bool &aIsPresent) __OVERRIDE;
@@ -126,11 +147,12 @@
uint32_t tae[10];
// weave.common.StringRef is implemented as a union
- const char *tag_string = "stringreftest";
+ char *tag_string = "stringreftest";
uint16_t tag_ref;
bool tag_use_ref;
-
+ uint32_t tai_stageditem;
std::map<uint16_t, uint32_t> tai_map;
+ Schema::Nest::Test::Trait::TestATrait::StructA taj_stageditem;
std::map<uint16_t, Schema::Nest::Test::Trait::TestATrait::StructA> taj_map;
// byte array
@@ -155,7 +177,7 @@
uint32_t tat;
int32_t tau;
bool tav;
- const char *taw = "boxedstring";
+ char *taw = "boxedstring";
// boxed float
int16_t tax;
@@ -241,4 +263,27 @@
nl::Weave::Profiles::Security::AppKeys::WeaveGroupKey GroupMasterKeys[WEAVE_CONFIG_MAX_APPLICATION_GROUPS];
};
+class TestCTraitDataSource :
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ public nl::Weave::Profiles::DataManagement::TraitUpdatableDataSource
+#else
+ public nl::Weave::Profiles::DataManagement::TraitDataSource
+#endif
+{
+public:
+ TestCTraitDataSource();
+ void Mutate();
+ static void TLVPrettyPrinter(const char *aFormat, ...);
+private:
+#if WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+ WEAVE_ERROR SetLeafData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aLeafHandle, nl::Weave::TLV::TLVReader &aReader) __OVERRIDE;
+#endif // WDM_ENABLE_PUBLISHER_UPDATE_SERVER_SUPPORT
+
+ WEAVE_ERROR GetLeafData(nl::Weave::Profiles::DataManagement::PropertyPathHandle aLeafHandle, uint64_t aTagToWrite, nl::Weave::TLV::TLVWriter &aWriter) __OVERRIDE;
+ bool taa;
+ int32_t tab;
+ Schema::Nest::Test::Trait::TestCTrait::StructC tac;
+ uint32_t tad;
+};
+
#endif // MOCK_TRAIT_SOURCES_H_
diff --git a/src/test-apps/MockWdmSubscriptionInitiator.cpp b/src/test-apps/MockWdmSubscriptionInitiator.cpp
index 667341c..c7300b7 100644
--- a/src/test-apps/MockWdmSubscriptionInitiator.cpp
+++ b/src/test-apps/MockWdmSubscriptionInitiator.cpp
@@ -1129,7 +1129,7 @@
break;
#if WEAVE_CONFIG_ENABLE_WDM_UPDATE
case SubscriptionClient::kEvent_OnUpdateComplete:
- if ((aInParam.mUpdateComplete.mReason == WEAVE_NO_ERROR) && (nl::Weave::Profiles::Common::kStatus_Success == aInParam.mUpdateComplete.mStatusCode))
+ if ((aInParam.mUpdateComplete.mReason == WEAVE_NO_ERROR) && (nl::Weave::Profiles::kWeaveProfile_Common == aInParam.mUpdateComplete.mStatusProfileId) && (nl::Weave::Profiles::Common::kStatus_Success == aInParam.mUpdateComplete.mStatusCode))
{
WeaveLogDetail(DataManagement, "Update: path result: success");
}
@@ -1143,8 +1143,6 @@
if (initiator->mUpdateDiscardOnError)
{
- TraitDataSink *sink = NULL;
- initiator->mSinkCatalog.Locate(aInParam.mUpdateComplete.mTraitDataHandle, &sink);
initiator->mSubscriptionClient->DiscardUpdates();
}
}
diff --git a/src/test-apps/MockWdmSubscriptionResponder.cpp b/src/test-apps/MockWdmSubscriptionResponder.cpp
index fc8b5a2..8a0fa26 100644
--- a/src/test-apps/MockWdmSubscriptionResponder.cpp
+++ b/src/test-apps/MockWdmSubscriptionResponder.cpp
@@ -152,7 +152,7 @@
// publisher side
uint32_t mTimeBetweenLivenessCheckSec;
SingleResourceSourceTraitCatalog mSourceCatalog;
- SingleResourceSourceTraitCatalog::CatalogItem mSourceCatalogStore[6];
+ SingleResourceSourceTraitCatalog::CatalogItem mSourceCatalogStore[10];
// source traits
LocaleSettingsTraitDataSource mLocaleSettingsDataSource;
@@ -162,6 +162,7 @@
TestBLargeTraitDataSource mTestBLargeDataSource;
BoltLockSettingTraitDataSource mBoltLockSettingDataSource;
ApplicationKeysTraitDataSource mApplicationKeysTraitDataSource;
+ TestCTraitDataSource mTestCDataSource;
static void EngineEventCallback (void * const aAppState, SubscriptionEngine::EventID aEvent,
const SubscriptionEngine::InEventParam & aInParam, SubscriptionEngine::OutEventParam & aOutParam);
@@ -193,6 +194,7 @@
kLocaleSettingsTraitSourceIndex,
kBoltLockSettingTraitSourceIndex,
kApplicationKeysTraitSourceIndex,
+ kTestCTraitSourceIndex,
kNumTraitHandles,
};
@@ -293,15 +295,6 @@
const nl::Weave::WeaveMessageInfo *aMsgInfo, uint32_t aProfileId,
uint8_t aMsgType, PacketBuffer *aPayload);
static void HandleCustomCommandTimeout(nl::Weave::System::Layer* aSystemLayer, void *aAppState, ::nl::Weave::System::Error aErr);
- static void IncomingUpdateRequest(nl::Weave::ExchangeContext *ec, const nl::Weave::IPPacketInfo *pktInfo,
- const nl::Weave::WeaveMessageInfo *msgInfo, uint32_t profileId,
- uint8_t msgType, PacketBuffer *payload);
- static void IncomingPartialUpdateRequest(nl::Weave::ExchangeContext *ec, const nl::Weave::IPPacketInfo *pktInfo,
- const nl::Weave::WeaveMessageInfo *msgInfo, uint32_t profileId,
- uint8_t msgType, PacketBuffer *payload);
- static void IncomingUpdateRequestHandler(nl::Weave::ExchangeContext *ec, const nl::Weave::IPPacketInfo *pktInfo,
- const nl::Weave::WeaveMessageInfo *msgInfo, uint32_t profileId,
- uint8_t msgType, PacketBuffer *payload);
};
static MockWdmSubscriptionResponderImpl gWdmSubscriptionResponder;
@@ -404,7 +397,7 @@
mSourceCatalog.Add(0, &mLocaleSettingsDataSource, mTraitHandleSet[kLocaleSettingsTraitSourceIndex]);
mSourceCatalog.Add(0, &mBoltLockSettingDataSource, mTraitHandleSet[kBoltLockSettingTraitSourceIndex]);
mSourceCatalog.Add(0, &mApplicationKeysTraitDataSource, mTraitHandleSet[kApplicationKeysTraitSourceIndex]);
-
+ mSourceCatalog.Add(0, &mTestCDataSource, mTraitHandleSet[kTestCTraitSourceIndex]);
switch (mTestCaseId)
{
case kTestCase_IntegrationTrait:
@@ -478,16 +471,6 @@
mSinkAddressList[kTestBDataSinkIndex] = &mTestBDataSink;
mSinkAddressList[kLocaleCapabilitiesTraitSinkIndex] = &mLocaleCapabilitiesDataSink;
- err = mExchangeMgr->RegisterUnsolicitedMessageHandler(nl::Weave::Profiles::kWeaveProfile_WDM,
- kMsgType_UpdateRequest,
- IncomingUpdateRequest,
- this);
- SuccessOrExit(err);
- err = mExchangeMgr->RegisterUnsolicitedMessageHandler(nl::Weave::Profiles::kWeaveProfile_WDM,
- kMsgType_PartialUpdateRequest,
- IncomingPartialUpdateRequest,
- this);
- SuccessOrExit(err);
Command_End();
exit:
@@ -1076,160 +1059,6 @@
pResponder->Command_End(true);
}
-void MockWdmSubscriptionResponderImpl::IncomingUpdateRequestHandler(nl::Weave::ExchangeContext *ec, const nl::Weave::IPPacketInfo *pktInfo,
- const nl::Weave::WeaveMessageInfo *msgInfo, uint32_t profileId,
- uint8_t msgType, PacketBuffer *payload)
-{
- switch (msgType)
- {
- case kMsgType_UpdateRequest:
- IncomingUpdateRequest(ec, pktInfo, msgInfo, profileId, msgType, payload);
- break;
-
- case kMsgType_PartialUpdateRequest:
- IncomingPartialUpdateRequest(ec, pktInfo, msgInfo, profileId, msgType, payload);
- break;
-
- default:
- WeaveLogError(DataManagement, "Unexpected message with type 0x" PRIu8 "");
- PacketBuffer::Free(payload);
- ec->Close();
- break;
- }
-}
-
-void MockWdmSubscriptionResponderImpl::IncomingUpdateRequest(nl::Weave::ExchangeContext *ec, const nl::Weave::IPPacketInfo *pktInfo,
- const nl::Weave::WeaveMessageInfo *msgInfo, uint32_t profileId,
- uint8_t msgType, PacketBuffer *payload)
-{
- WEAVE_ERROR err = WEAVE_NO_ERROR;
- nl::Weave::TLV::TLVReader reader;
- nl::Weave::TLV::TLVWriter writer;
- UpdateRequest::Parser parser;
- UpdateResponse::Builder updateResponseBuilder;
- StatusReport statusReport;
- uint8_t updateResponseBuf[512];
- ReferencedTLVData referenceTLVData;
- PacketBuffer * mBuf = PacketBuffer::NewWithAvailableSize(1024);
- MockWdmSubscriptionResponderImpl * pResponder = reinterpret_cast<MockWdmSubscriptionResponderImpl *>(ec->AppState);
-
- VerifyOrExit(NULL != pResponder, err = WEAVE_ERROR_INCORRECT_STATE);
-
- WeaveLogDetail(DataManagement, "Incoming Update Request, dumping it");
-
- reader.Init(payload);
- reader.Next();
- DebugPrettyPrint(reader);
-
- WeaveLogDetail(DataManagement, "constructing notification if subscription exists and status report");
-
- if (pResponder->mUpdateTiming != MockWdmNodeOptions::kTiming_NoSub)
- {
- pResponder->mLocaleSettingsDataSource.Mutate();
- SubscriptionEngine::GetInstance()->GetNotificationEngine()->Run();
- }
-
- writer.Init(updateResponseBuf, sizeof(updateResponseBuf));
- err = updateResponseBuilder.Init(&writer);
- SuccessOrExit(err);
-
- {
- VersionList::Builder &lVLBuilder = updateResponseBuilder.CreateVersionListBuilder();
- lVLBuilder.AddVersion(pResponder->mLocaleSettingsDataSource.GetVersion());
- lVLBuilder.EndOfVersionList();
- SuccessOrExit(lVLBuilder.GetError());
- }
-
- {
- StatusList::Builder &lSLBuilder = updateResponseBuilder.CreateStatusListBuilder();
- lSLBuilder.AddStatus(nl::Weave::Profiles::kWeaveProfile_Common, nl::Weave::Profiles::Common::kStatus_Success);
- lSLBuilder.EndOfStatusList();
- SuccessOrExit(lSLBuilder.GetError());
- }
-
- updateResponseBuilder.EndOfResponse();
- SuccessOrExit(updateResponseBuilder.GetError());
-
- referenceTLVData.init(sizeof(updateResponseBuf), sizeof(updateResponseBuf), updateResponseBuf);
-
- statusReport.init(nl::Weave::Profiles::kWeaveProfile_Common, nl::Weave::Profiles::Common::kStatus_Success, &referenceTLVData);
- err = statusReport.pack(mBuf);
- SuccessOrExit(err);
-
- err = ec->SendMessage(nl::Weave::Profiles::kWeaveProfile_Common, nl::Weave::Profiles::Common::kMsgType_StatusReport, mBuf, nl::Weave::ExchangeContext::kSendFlag_RequestAck);
- mBuf = NULL;
- SuccessOrExit(err);
-
-exit:
- WeaveLogFunctError(err);
-
- if (NULL != payload)
- {
- PacketBuffer::Free(payload);
- payload = NULL;
- }
-
- if (NULL != mBuf)
- {
- PacketBuffer::Free(mBuf);
- mBuf = NULL;
- }
-
- if (NULL != ec)
- {
- ec->Close();
- }
-}
-
-void MockWdmSubscriptionResponderImpl::IncomingPartialUpdateRequest(nl::Weave::ExchangeContext *ec, const nl::Weave::IPPacketInfo *pktInfo,
- const nl::Weave::WeaveMessageInfo *msgInfo, uint32_t profileId,
- uint8_t msgType, PacketBuffer *payload)
-{
- WEAVE_ERROR err = WEAVE_NO_ERROR;
- nl::Weave::TLV::TLVReader reader;
- UpdateRequest::Parser parser;
- WeaveLogDetail(DataManagement, "Incoming PartialUpdate Request");
-
- // Set the handler on the EC, as we'll get more requests on this exchange.
- ec->OnMessageReceived = IncomingUpdateRequestHandler;
-
- reader.Init(payload);
- reader.Next();
- parser.Init(reader);
- parser.CheckSchemaValidity();
-
- reader.Init(payload);
- DebugPrettyPrint(reader);
-
- PacketBuffer * msgBuf = PacketBuffer::NewWithAvailableSize(0);
- VerifyOrExit(NULL != msgBuf, err = WEAVE_ERROR_NO_MEMORY);
-
- err = ec->SendMessage(nl::Weave::Profiles::kWeaveProfile_WDM,
- nl::Weave::Profiles::DataManagement::kMsgType_UpdateContinue,
- msgBuf,
- nl::Weave::ExchangeContext::kSendFlag_RequestAck);
- msgBuf = NULL;
- SuccessOrExit(err);
-
-exit:
- WeaveLogFunctError(err);
-
- if (NULL != payload)
- {
- PacketBuffer::Free(payload);
- payload = NULL;
- }
-
- if (NULL != msgBuf)
- {
- PacketBuffer::Free(msgBuf);
- msgBuf = NULL;
- }
-
- // Don't close the EC; more requests fill follow.
- // TODO: we should close the EC on a timeout.
-}
-
void MockWdmSubscriptionResponderImpl::OnMessageReceivedForCustomCommand (nl::Weave::ExchangeContext *aEC, const nl::Inet::IPPacketInfo *aPktInfo,
const nl::Weave::WeaveMessageInfo *aMsgInfo, uint32_t aProfileId,
uint8_t aMsgType, PacketBuffer *aPayload)
diff --git a/src/test-apps/fuzz/Makefile.in b/src/test-apps/fuzz/Makefile.in
index f644658..9ff4367 100644
--- a/src/test-apps/fuzz/Makefile.in
+++ b/src/test-apps/fuzz/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -40,7 +40,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -120,10 +130,6 @@
@WEAVE_BUILD_TESTS_TRUE@ FuzzPASEKeyConfirm$(EXEEXT) \
@WEAVE_BUILD_TESTS_TRUE@ FuzzCertificateConversion$(EXEEXT)
subdir = src/test-apps/fuzz
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -142,23 +148,26 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_@AM_V@)
@@ -171,7 +180,6 @@
@WEAVE_BUILD_TESTS_TRUE@am_libFuzzUtil_a_OBJECTS = \
@WEAVE_BUILD_TESTS_TRUE@ FuzzUtils.$(OBJEXT)
libFuzzUtil_a_OBJECTS = $(am_libFuzzUtil_a_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
am__FuzzCertificateConversion_SOURCES_DIST = \
FuzzCertificateConversion.cpp
@WEAVE_BUILD_TESTS_TRUE@am_FuzzCertificateConversion_OBJECTS = \
@@ -275,7 +283,13 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/FuzzCertificateConversion.Po \
+ ./$(DEPDIR)/FuzzPASEInitiatorStep1.Po \
+ ./$(DEPDIR)/FuzzPASEInitiatorStep2.Po \
+ ./$(DEPDIR)/FuzzPASEKeyConfirm.Po \
+ ./$(DEPDIR)/FuzzPASEResponderStep1.Po \
+ ./$(DEPDIR)/FuzzPASEResponderStep2.Po ./$(DEPDIR)/FuzzUtils.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -334,6 +348,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -423,6 +440,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -582,6 +600,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -727,14 +746,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/test-apps/fuzz/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/test-apps/fuzz/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -746,14 +764,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libFuzzUtil.a: $(libFuzzUtil_a_OBJECTS) $(libFuzzUtil_a_DEPENDENCIES) $(EXTRA_libFuzzUtil_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libFuzzUtil.a
- $(AM_V_AR)$(libFuzzUtil_a_AR) libFuzzUtil.a $(libFuzzUtil_a_OBJECTS) $(libFuzzUtil_a_LIBADD)
- $(AM_V_at)$(RANLIB) libFuzzUtil.a
-
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
@@ -772,6 +782,14 @@
echo " rm -f" $$list; \
rm -f $$list
+clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libFuzzUtil.a: $(libFuzzUtil_a_OBJECTS) $(libFuzzUtil_a_DEPENDENCIES) $(EXTRA_libFuzzUtil_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libFuzzUtil.a
+ $(AM_V_AR)$(libFuzzUtil_a_AR) libFuzzUtil.a $(libFuzzUtil_a_OBJECTS) $(libFuzzUtil_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libFuzzUtil.a
+
FuzzCertificateConversion$(EXEEXT): $(FuzzCertificateConversion_OBJECTS) $(FuzzCertificateConversion_DEPENDENCIES) $(EXTRA_FuzzCertificateConversion_DEPENDENCIES)
@rm -f FuzzCertificateConversion$(EXEEXT)
$(AM_V_CXXLD)$(FuzzCertificateConversion_LINK) $(FuzzCertificateConversion_OBJECTS) $(FuzzCertificateConversion_LDADD) $(LIBS)
@@ -802,13 +820,19 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzCertificateConversion.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEInitiatorStep1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEInitiatorStep2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEKeyConfirm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEResponderStep1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEResponderStep2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzUtils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzCertificateConversion.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEInitiatorStep1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEInitiatorStep2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEKeyConfirm.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEResponderStep1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzPASEResponderStep2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzUtils.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -892,7 +916,10 @@
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)'; \
@@ -925,7 +952,7 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
@@ -957,15 +984,21 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@WEAVE_BUILD_TESTS_FALSE@install-exec-local:
@WEAVE_BUILD_TESTS_FALSE@uninstall-local:
+@WEAVE_BUILD_TESTS_FALSE@install-exec-local:
clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
clean-noinstLIBRARIES clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/FuzzCertificateConversion.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEInitiatorStep1.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEInitiatorStep2.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEKeyConfirm.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEResponderStep1.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEResponderStep2.Po
+ -rm -f ./$(DEPDIR)/FuzzUtils.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1011,7 +1044,13 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/FuzzCertificateConversion.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEInitiatorStep1.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEInitiatorStep2.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEKeyConfirm.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEResponderStep1.Po
+ -rm -f ./$(DEPDIR)/FuzzPASEResponderStep2.Po
+ -rm -f ./$(DEPDIR)/FuzzUtils.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1032,7 +1071,7 @@
.MAKE: check-am 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-checkPROGRAMS clean-generic clean-libtool \
clean-noinstLIBRARIES clean-noinstPROGRAMS cscopelist-am ctags \
ctags-am distclean distclean-compile distclean-generic \
@@ -1048,6 +1087,8 @@
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-local
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/test-apps/happy/lib/WeaveDeviceManager.py b/src/test-apps/happy/lib/WeaveDeviceManager.py
index d383c09..6efbad1 100644
--- a/src/test-apps/happy/lib/WeaveDeviceManager.py
+++ b/src/test-apps/happy/lib/WeaveDeviceManager.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
#
-# Copyright (c) 2017 Nest Labs, Inc.
+# Copyright (c) 2017-2018 Nest Labs, Inc.
+# Copyright (c) 2019 Google, LLC.
# All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,10 +42,20 @@
sys.path.append(weaveDeviceMgrPath)
try:
+ from openweave import WeaveStack
+except Exception as ex:
+ print ("Failed to import WeaveStack: %s" % (str(ex)))
+
+try:
from openweave import WeaveDeviceMgr
except Exception as ex:
print ("Failed to import WeaveDeviceMgr: %s" % (str(ex)))
+try:
+ from openweave import WeaveDataManagementClient
+except Exception as ex:
+ print ("Failed to import WeaveDataManagementClient: %s" % (str(ex)))
+
# Dummy Access Token
#
# The following fabric access token contains the dummy account certificate and
@@ -102,6 +113,255 @@
print "Invalid network id"
return None
+class MockWeaveDataManagementClientImp():
+ def __init_(self):
+ self.wdmClient = None
+
+ def createWDMClient(self):
+ try:
+ self.wdmClient = WeaveDataManagementClient.WDMClient()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ def closeWdmClient(self):
+ try:
+ if self.wdmClient:
+ del self.wdmClient
+ self.wdmClient = None
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "close wdm client complete"
+
+ def newDataSink(self, profileid, instanceid, path):
+ """
+ new-data-sink <profileid, instanceid, path>
+ """
+ if self.wdmClient == None:
+ print "wdmclient not initialized"
+ return
+
+ try:
+ traitInstance = self.wdmClient.newDataSink(0, None, 0, profileid, instanceid, path)
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "new data sink complete"
+ return traitInstance
+
+ def flushUpdate(self):
+ if self.wdmClient == None:
+ print "wdmclient not initialized"
+ return
+
+ try:
+ self.wdmClient.flushUpdate()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "flush update complete"
+
+ def refreshData(self):
+ if self.wdmClient == None:
+ print "wdmclient not initialized"
+ return
+
+ try:
+ self.wdmClient.refreshData()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "refresh trait data complete"
+
+ def refreshIndividualData(self, traitInstance):
+ if self.wdmClient == None or traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ try:
+ traitInstance.refreshData()
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "refresh individual trait data complete"
+
+ def closeIndividualTrait(self, traitInstance):
+ if self.wdmClient == None or traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ try:
+ traitInstance.close()
+ traitInstance = None
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "close current trait"
+
+ def setData(self, traitInstance, path, value):
+ if self.wdmClient == None or traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ isConditional = False
+
+ try:
+ val = ast.literal_eval(args[1])
+ except:
+ val = value
+
+ try:
+ traitInstance.setData(path, val, isConditional)
+ print "set string data in trait complete"
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ def getData(self, traitInstance, path):
+ if self.wdmClient == None or traitInstance == None:
+ print "wdmclient or traitInstance not initialized"
+ return
+
+ try:
+ val = traitInstance.getData(path)
+ print val
+ except WeaveStack.WeaveStackException, ex:
+ print str(ex)
+ return
+
+ print "get data in trait complete"
+
+def testWDMClientCreateClose(testObject):
+ testObject.createWDMClient()
+ testObject.closeWdmClient()
+ print "testWDMClientCreationClose completes"
+
+def testWDMClientDataSinkCreateClose(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkCreateClose completes"
+
+def testWDMClientDataSinkSetFlushData(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.setData(LocaleSettingTrait, "/1", "en-US")
+ testObject.setData(TestCTrait, "/1", False)
+ testObject.setData(TestCTrait, "/2", 15)
+ testObject.setData(TestCTrait, "/3/1", 16)
+ testObject.setData(TestCTrait, "/3/2", False)
+ testObject.setData(TestCTrait, "/4", 17)
+ testObject.flushUpdate()
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkSetFlushData completes"
+
+def testWDMClientDataSinkRefreshData(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.refreshData()
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkRefreshData completes"
+
+def testWDMClientDataSinkRefreshIndividualData(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.refreshIndividualData(LocaleSettingTrait)
+ testObject.refreshIndividualData(TestCTrait)
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkRefreshIndividualData completes"
+
+def testWDMClientDataSinkRefreshGetData(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.refreshData()
+ testObject.getData(LocaleSettingTrait, "/1")
+ testObject.getData(TestCTrait, "/1")
+ testObject.getData(TestCTrait, "/2")
+ testObject.getData(TestCTrait, "/3/1")
+ testObject.getData(TestCTrait, "/3/2")
+ testObject.getData(TestCTrait, "/4")
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkRefreshGetData completes"
+
+def testWDMClientDataSinkCloseIndividualData(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.refreshIndividualData(LocaleSettingTrait)
+ testObject.closeIndividualTrait(LocaleSettingTrait)
+ testObject.refreshIndividualData(TestCTrait)
+ testObject.closeIndividualTrait(TestCTrait)
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkCloseIndividualData completes"
+
+def testWDMClientDataSinkSetFlushRefreshGetData(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.setData(LocaleSettingTrait, "/1", "en-US")
+ testObject.setData(TestCTrait, "/1", False)
+ testObject.setData(TestCTrait, "/2", 15)
+ testObject.setData(TestCTrait, "/3/1", 16)
+ testObject.setData(TestCTrait, "/3/2", False)
+ testObject.setData(TestCTrait, "/4", 17)
+ testObject.flushUpdate()
+ testObject.refreshData()
+ testObject.getData(LocaleSettingTrait, "/1")
+ testObject.getData(TestCTrait, "/1")
+ testObject.getData(TestCTrait, "/2")
+ testObject.getData(TestCTrait, "/3/1")
+ testObject.getData(TestCTrait, "/3/2")
+ testObject.getData(TestCTrait, "/4")
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkSetFlushRefreshGetData completes"
+
+def testWDMClientDataSinkSetRefreshFlushGetData(testObject):
+ testObject.createWDMClient()
+ LocaleSettingTrait = testObject.newDataSink(20, 0, "/")
+ TestCTrait = testObject.newDataSink(593165827, 0, "/")
+ testObject.setData(LocaleSettingTrait, "/1", "en-US")
+ testObject.setData(TestCTrait, "/1", False)
+ testObject.setData(TestCTrait, "/2", 15)
+ testObject.setData(TestCTrait, "/3/1", 16)
+ testObject.setData(TestCTrait, "/3/2", False)
+ testObject.setData(TestCTrait, "/4", 17)
+ testObject.refreshData()
+ testObject.flushUpdate()
+ testObject.getData(LocaleSettingTrait, "/1")
+ testObject.getData(TestCTrait, "/1")
+ testObject.getData(TestCTrait, "/2")
+ testObject.getData(TestCTrait, "/3/1")
+ testObject.getData(TestCTrait, "/3/2")
+ testObject.getData(TestCTrait, "/4")
+ testObject.closeWdmClient()
+ print "testWDMClientDataSinkSetRefreshFlushGetData completes"
+
+def RunWDMClientTest():
+ print "Run WDMClient Test"
+ testObject = MockWeaveDataManagementClientImp()
+ testWDMClientCreateClose(testObject)
+ testWDMClientDataSinkCreateClose(testObject)
+ testWDMClientDataSinkSetFlushData(testObject)
+ testWDMClientDataSinkRefreshData(testObject)
+ testWDMClientDataSinkRefreshIndividualData(testObject)
+ testWDMClientDataSinkRefreshGetData(testObject)
+ testWDMClientDataSinkCloseIndividualData(testObject)
+ testWDMClientDataSinkSetFlushRefreshGetData(testObject)
+ testWDMClientDataSinkSetRefreshFlushGetData(testObject)
+ print "Run WDMClient Complete"
+
class ExtendedOption (Option):
TYPES = Option.TYPES + ("base64", "hexint", )
TYPE_CHECKER = copy(Option.TYPE_CHECKER)
@@ -166,25 +426,27 @@
try:
bleManager.ble_adapter_select(identifier=options.bleSrcAddr)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
try:
line = ' ' + str(options.bleDstAddr)
bleManager.scan_connect(line)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
devMgr.ConnectBle(bleConnection=FAKE_CONN_OBJ_VALUE,
pairingCode=options.pairingCode,
accessToken=options.accessToken)
+
+ RunWDMClientTest()
try:
devMgr.Close()
devMgr.CloseEndpoints()
bleManager.disconnect()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -197,7 +459,7 @@
pairingCode=options.pairingCode,
accessToken=options.accessToken)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -207,7 +469,7 @@
print '#################################register-real-NestService#################################'
try:
devMgr.RegisterServicePairAccount(0x18B4300200000010, options.account_id, base64.b64decode(options.service_config), options.pairing_token, options.init_data)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -219,7 +481,7 @@
print '#################################unregister-real-NestService#################################'
try:
devMgr.UnregisterService(0x18B4300200000010)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -231,7 +493,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
print "Shutdown complete"
@@ -243,7 +505,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -252,7 +514,7 @@
try:
devMgr.ConnectDevice(deviceId=nodeId, deviceAddr=addr)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -263,7 +525,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -271,7 +533,7 @@
print '#################################set-rendezvous-linklocal#################################'
try:
devMgr.SetRendezvousLinkLocal(0)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -280,7 +542,7 @@
print '#################################set-rendezvous-address#################################'
try:
devMgr.SetRendezvousAddress(addr)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -292,7 +554,7 @@
try:
devMgr.SetConnectTimeout(timeoutMS)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -308,7 +570,7 @@
targetVendorId=WeaveDeviceMgr.TargetVendorId_Any,
targetProductId=WeaveDeviceMgr.TargetProductId_Any,
targetDeviceId=WeaveDeviceMgr.TargetDeviceId_Any)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -320,7 +582,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -334,7 +596,7 @@
targetVendorId=WeaveDeviceMgr.TargetVendorId_Any,
targetProductId=WeaveDeviceMgr.TargetProductId_Any,
targetDeviceId=WeaveDeviceMgr.TargetDeviceId_Any)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -346,7 +608,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -355,7 +617,7 @@
try:
devMgr.RendezvousDevice(
pairingCode=options.pairingCode)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -367,7 +629,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -375,7 +637,7 @@
print '#################################rendezvous4#################################'
try:
devMgr.RendezvousDevice()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -387,7 +649,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -396,7 +658,7 @@
try:
devMgr.ConnectDevice(deviceId=nodeId, deviceAddr=addr, pairingCode=options.pairingCode)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -404,7 +666,7 @@
print '#################################set-rendezvous-mode#################################'
try:
devMgr.SetRendezvousMode(10)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -416,7 +678,7 @@
try:
devMgr.ArmFailSafe(1, failSafeToken)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -424,7 +686,7 @@
try:
devMgr.ArmFailSafe(2, failSafeToken)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -432,7 +694,7 @@
try:
devMgr.ArmFailSafe(3, failSafeToken)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -442,7 +704,7 @@
print '#################################disarm-fail-safe#################################'
try:
devMgr.DisarmFailSafe()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -455,7 +717,7 @@
try:
devMgr.ResetConfig(resetFlags)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -467,7 +729,7 @@
try:
devMgr.SetAutoReconnect(autoReconnect)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -487,18 +749,20 @@
try:
devMgr.SetLogFilter(category)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
print "Done."
+ RunWDMClientTest()
+
print ''
print '#################################scan-network#################################'
try:
networkType = WeaveDeviceMgr.ParseNetworkType("wifi")
scanResult = devMgr.ScanNetworks(networkType)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
print "ScanNetworks complete, %d network(s) found" % (len(scanResult))
i = 1
@@ -509,7 +773,7 @@
try:
networkType = WeaveDeviceMgr.ParseNetworkType("thread")
scanResult = devMgr.ScanNetworks(networkType)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
print "ScanNetworks complete, %d network(s) found" % (len(scanResult))
i = 1
@@ -529,7 +793,7 @@
try:
addResult = devMgr.AddNetwork(networkInfo)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -552,7 +816,7 @@
try:
devMgr.UpdateNetwork(networkInfo)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -563,7 +827,7 @@
try:
devMgr.DisableNetwork(lastNetworkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
print "Disable network complete"
@@ -573,7 +837,7 @@
try:
devMgr.EnableNetwork(lastNetworkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -584,7 +848,7 @@
try:
devMgr.TestNetworkConnectivity(lastNetworkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -597,7 +861,7 @@
# Send a GetNetworks without asking for credentials
flags = 0
getResult = devMgr.GetNetworks(flags)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -617,7 +881,7 @@
kGetNetwork_IncludeCredentials = 1
flags = kGetNetwork_IncludeCredentials
getResult = devMgr.GetNetworks(flags)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print "expected Device Error: [ Common(00000000):20 ] Access denied"
print "caught " + str(ex)
if ex.profileId != 0 or ex.statusCode != 20:
@@ -628,7 +892,7 @@
try:
devMgr.RemoveNetwork(lastNetworkId)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -639,7 +903,7 @@
try:
devMgr.CreateFabric()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print 'Already member of fabric'
print "Create fabric complete"
@@ -649,7 +913,7 @@
try:
fabricConfig = devMgr.GetFabricConfig()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -661,7 +925,7 @@
try:
devMgr.LeaveFabric()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -672,7 +936,7 @@
try:
devMgr.JoinExistingFabric(fabricConfig)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -683,7 +947,7 @@
try:
deviceDesc = devMgr.IdentifyDevice()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -695,7 +959,7 @@
try:
devMgr.GetLastNetworkProvisioningResult()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -704,7 +968,7 @@
try:
devMgr.Ping()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
print "Ping complete"
@@ -713,7 +977,7 @@
print '#################################register-service#################################'
try:
devMgr.RegisterServicePairAccount(0x18B4300100000001, '21245530', base64.b64decode(DUMMY_SERVICE_CONFIG), DUMMY_PAIRING_TOKEN, DUMMY_INIT_DATA)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print ex
exit()
@@ -723,7 +987,7 @@
print '#################################update-service#################################'
try:
devMgr.UpdateService(0x18B4300100000001, base64.b64decode(DUMMY_SERVICE_CONFIG))
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -734,7 +998,7 @@
try:
devMgr.UnregisterService(0x18B4300100000001)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -745,7 +1009,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
print ''
@@ -753,7 +1017,7 @@
try:
devMgr.ReconnectDevice()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -763,7 +1027,7 @@
timeout = 1000
try:
devMgr.EnableConnectionMonitor(interval, timeout)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -773,7 +1037,7 @@
print '#################################disable-connection-monitor#################################'
try:
devMgr.DisableConnectionMonitor()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -783,7 +1047,7 @@
print '#################################start-system-test#################################'
try:
devMgr.StartSystemTest(WeaveDeviceMgr.SystemTest_ProductList["thermostat"], 1)
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -792,7 +1056,7 @@
print '#################################stop-system-test#################################'
try:
devMgr.StopSystemTest()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -802,7 +1066,7 @@
print '#################################pair-token#################################'
try:
tokenPairingBundle = devMgr.PairToken('Test')
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -813,7 +1077,7 @@
print '#################################unpair-token#################################'
try:
devMgr.UnpairToken()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -826,7 +1090,7 @@
try:
devMgr.Close()
devMgr.CloseEndpoints()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
@@ -834,7 +1098,7 @@
print '#################################shutdown#################################'
try:
devMgr.__del__()
- except WeaveDeviceMgr.DeviceManagerException, ex:
+ except WeaveStack.WeaveStackException, ex:
print str(ex)
exit()
print "Shutdown complete"
diff --git a/src/test-apps/happy/test-templates/WeaveBle.py b/src/test-apps/happy/test-templates/WeaveBle.py
index 8e7f14d..5baa56e 100755
--- a/src/test-apps/happy/test-templates/WeaveBle.py
+++ b/src/test-apps/happy/test-templates/WeaveBle.py
@@ -172,7 +172,7 @@
return
cmd += " --enable-bluez-peripheral --peripheral-name N0001 --peripheral-address " + self.interfaces[0]["bd_address"]
- cmd += " --print-fault-counters"
+ cmd += " --print-fault-counters --wdm-resp-mutual-sub --test-case 10 --total-count 0 --wdm-update-timing NoSub "
self.start_weave_process(node_id=self.server_node_id, cmd=cmd, tag=self.server_process_tag, rootMode=True)
def resetBluez(self):
diff --git a/src/test-apps/happy/test-templates/WeavePairing.py b/src/test-apps/happy/test-templates/WeavePairing.py
index b91410d..17284cd 100644
--- a/src/test-apps/happy/test-templates/WeavePairing.py
+++ b/src/test-apps/happy/test-templates/WeavePairing.py
@@ -322,6 +322,8 @@
return
cmd += " --node-addr " + device_info['device_ip'] + " --pairing-code TEST"
+ cmd += " --wdm-resp-mutual-sub --test-case 10 --total-count 0 --wdm-update-timing NoSub "
+
if self.server is not None:
cmd += " --pairing-server " + self.server_ip \
+ " --wrm-pairing" \
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py
index f6d6d05..064af2b 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py
@@ -57,12 +57,13 @@
wdm_next_args['client_clear_state_between_iterations'] = False
wdm_next_args['server_clear_state_between_iterations'] = False
- wdm_next_args['client_update_mutation'] = "OneLeaf"
+ wdm_next_args['client_update_mutation'] = "SameLevelLeaves"
wdm_next_args['client_update_conditionality'] = "Conditional"
- wdm_next_args['client_update_num_mutations'] = 1
+ wdm_next_args['client_update_num_mutations'] = 2
+ wdm_next_args['client_update_num_traits'] = 2
wdm_next_args['client_update_timing'] = "AfterSub"
- wdm_next_args['client_log_check'] = [('Update: path result: success', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'])]
+ wdm_next_args['client_log_check'] = [('UpdateComplete event: 1', wdm_next_args['test_client_iterations'] * wdm_next_args['client_update_num_mutations'])]
wdm_next_args['server_log_check'] = []
wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
wdm_next_args['test_case_name'] = ['Update 01: Client creates mutual subscription, sends conditional update request to publisher, and receives notification and status report']
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py
index 7c231cd..b5e2e33 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py
@@ -57,12 +57,13 @@
wdm_next_args['client_clear_state_between_iterations'] = False
wdm_next_args['server_clear_state_between_iterations'] = False
- wdm_next_args['client_update_mutation'] = "OneLeaf"
+ wdm_next_args['client_update_mutation'] = "SameLevelLeaves"
wdm_next_args['client_update_conditionality'] = "Unconditional"
- wdm_next_args['client_update_num_mutations'] = 1
+ wdm_next_args['client_update_num_mutations'] = 2
+ wdm_next_args['client_update_num_traits'] = 2
wdm_next_args['client_update_timing'] = "AfterSub"
- wdm_next_args['client_log_check'] = [('Update: path result: success', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'])]
+ wdm_next_args['client_log_check'] = [('UpdateComplete event: 1', wdm_next_args['test_client_iterations'] * wdm_next_args['client_update_num_mutations'])]
wdm_next_args['server_log_check'] = []
wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
wdm_next_args['test_case_name'] = ['Update 02: Client creates mutual subscription, sends unconditional update request to publisher, and receives notification and status report']
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py
index 3ae7e53..bd9da7b 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py
@@ -56,12 +56,13 @@
wdm_next_args['client_clear_state_between_iterations'] = False
wdm_next_args['server_clear_state_between_iterations'] = False
- wdm_next_args['client_update_mutation'] = "OneLeaf"
+ wdm_next_args['client_update_mutation'] = "SameLevelLeaves"
wdm_next_args['client_update_conditionality'] = "Unconditional"
- wdm_next_args['client_update_num_mutations'] = 1
+ wdm_next_args['client_update_num_mutations'] = 2
+ wdm_next_args['client_update_num_traits'] = 2
wdm_next_args['client_update_timing'] = "NoSub"
- wdm_next_args['client_log_check'] = [('Update: path result: success', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'])]
+ wdm_next_args['client_log_check'] = [('UpdateComplete event: 1', wdm_next_args['test_client_iterations'] * wdm_next_args['client_update_num_mutations'])]
wdm_next_args['server_log_check'] = []
wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
wdm_next_args['test_case_name'] = ['Update 03: Client sends standalone unconditional update request to publisher, and receives status report']
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py
new file mode 100755
index 0000000..b7f14c0
--- /dev/null
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_04.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+
+#
+# Copyright (c) 2019 Google, LLC.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# @file
+# Calls Weave WDM Update between nodes.
+# Update 04: Client sends standalone unconditional update request to publisher during subscription, and receives
+# status report and notification.
+
+import unittest
+import set_test_path
+from weave_wdm_next_test_base import weave_wdm_next_test_base
+import WeaveUtilities
+
+
+class test_weave_wdm_next_update_04(weave_wdm_next_test_base):
+
+ def test_weave_wdm_next_mutual_subscribe_04(self):
+ wdm_next_args = {}
+ wdm_next_args['wdm_option'] = "mutual_subscribe"
+
+ wdm_next_args['total_client_count'] = 1
+ wdm_next_args['final_client_status'] = 0
+ wdm_next_args['timer_client_period'] = 10000
+ wdm_next_args['test_client_iterations'] = 1
+ wdm_next_args['test_client_delay'] = 2000
+ wdm_next_args['enable_client_flip'] = 1
+ wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTrait
+
+ wdm_next_args['enable_retry'] = True
+
+ wdm_next_args['total_server_count'] = 0
+ wdm_next_args['final_server_status'] = 4
+ wdm_next_args['timer_server_period'] = 0
+ wdm_next_args['enable_server_flip'] = 0
+ wdm_next_args['test_server_case'] = 10
+
+ wdm_next_args['client_clear_state_between_iterations'] = False
+ wdm_next_args['server_clear_state_between_iterations'] = False
+
+ wdm_next_args['client_update_mutation'] = "SameLevelLeaves"
+ wdm_next_args['client_update_conditionality'] = "Unconditional"
+ wdm_next_args['client_update_num_mutations'] = 2
+ wdm_next_args['client_update_num_traits'] = 2
+ wdm_next_args['client_update_timing'] = "DuringSub"
+
+ wdm_next_args['client_log_check'] = [('UpdateComplete event: 1', wdm_next_args['test_client_iterations'] * wdm_next_args['client_update_num_mutations'])]
+ wdm_next_args['server_log_check'] = []
+ wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
+ wdm_next_args['test_case_name'] = ['Update 04: Client sends standalone unconditional update request to publisher during subscription, and receives status report and notification']
+ print 'test file: ' + self.__class__.__name__
+ print "weave-wdm-next update test 04"
+ super(test_weave_wdm_next_update_04, self).weave_wdm_next_test_base(wdm_next_args)
+
+
+if __name__ == "__main__":
+ WeaveUtilities.run_unittest()
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py
new file mode 100755
index 0000000..60a8e49
--- /dev/null
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_05.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+
+
+#
+# Copyright (c) 2019 Google, LLC.
+# Copyright (c) 2016-2018 Nest Labs, Inc.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# @file
+# Calls Weave WDM Update between nodes.
+# Update 05: Client sends standalone unconditional update request to publisher, and receives status report
+#
+
+import unittest
+import set_test_path
+from weave_wdm_next_test_base import weave_wdm_next_test_base
+import WeaveUtilities
+
+
+class test_weave_wdm_next_update_05(weave_wdm_next_test_base):
+
+ def test_weave_wdm_next_mutual_subscribe_05(self):
+ wdm_next_args = {}
+ wdm_next_args['wdm_option'] = "mutual_subscribe"
+
+ wdm_next_args['total_client_count'] = 1
+ wdm_next_args['final_client_status'] = 0
+ wdm_next_args['timer_client_period'] = 10000
+ wdm_next_args['test_client_iterations'] = 1
+ wdm_next_args['test_client_delay'] = 2000
+ wdm_next_args['enable_client_flip'] = 1
+ wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTrait
+
+ wdm_next_args['enable_retry'] = True
+
+ wdm_next_args['total_server_count'] = 0
+ wdm_next_args['final_server_status'] = 4
+ wdm_next_args['timer_server_period'] = 0
+ wdm_next_args['enable_server_flip'] = 0
+ wdm_next_args['test_server_case'] = 10
+
+ wdm_next_args['client_clear_state_between_iterations'] = False
+ wdm_next_args['server_clear_state_between_iterations'] = False
+
+ wdm_next_args['client_update_mutation'] = "SameLevelLeaves"
+ wdm_next_args['client_update_conditionality'] = "Mixed"
+ wdm_next_args['client_update_num_mutations'] = 2
+ wdm_next_args['client_update_num_traits'] = 2
+ wdm_next_args['client_update_timing'] = "AfterSub"
+
+ wdm_next_args['client_log_check'] = [('UpdateComplete event: 1', wdm_next_args['test_client_iterations'] * wdm_next_args['client_update_num_mutations'])]
+ wdm_next_args['server_log_check'] = []
+ wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
+ wdm_next_args['test_case_name'] = ['Update 05: Client sends standalone unconditional update request to publisher, and receives status report']
+ print 'test file: ' + self.__class__.__name__
+ print "weave-wdm-next update test 05"
+ super(test_weave_wdm_next_update_05, self).weave_wdm_next_test_base(wdm_next_args)
+
+
+if __name__ == "__main__":
+ WeaveUtilities.run_unittest()
diff --git a/src/test-apps/mock-device.cpp b/src/test-apps/mock-device.cpp
index 7c8b981..5c9ec1c 100644
--- a/src/test-apps/mock-device.cpp
+++ b/src/test-apps/mock-device.cpp
@@ -104,6 +104,7 @@
static void InitiateConnection(System::Layer* aSystemLayer, void* aAppState, System::Error aError);
static void HandleConnectionComplete(WeaveConnection *con, WEAVE_ERROR conErr);
static void HandleWdmCompleteTest();
+static void HandleError();
#if CONFIG_BLE_PLATFORM_BLUEZ
bool EnableWeaveBluezPeripheral = false;
@@ -766,6 +767,111 @@
#endif // CONFIG_BLE_PLATFORM_BLUEZ
+ InitializeEventLogging(&ExchangeMgr);
+
+ switch (gMockWdmNodeOptions.mWdmRoleInTest)
+ {
+ case 0:
+ break;
+ case kToolOpt_WdmInitMutualSubscription:
+ case kToolOpt_WdmSubscriptionClient:
+
+ if (gMockWdmNodeOptions.mWdmPublisherNodeId != kAnyNodeId)
+ {
+ err = MockWdmSubscriptionInitiator::GetInstance()->Init(&ExchangeMgr,
+ gGroupKeyEncOptions.GetEncKeyId(),
+ gWeaveSecurityMode.SecurityMode,
+ gMockWdmNodeOptions);
+ FAIL_ERROR(err, "MockWdmSubscriptionInitiator.Init failed");
+ MockWdmSubscriptionInitiator::GetInstance()->onCompleteTest = HandleWdmCompleteTest;
+ MockWdmSubscriptionInitiator::GetInstance()->onError = HandleError;
+
+ }
+ else
+ {
+ err = WEAVE_ERROR_INVALID_ARGUMENT;
+ FAIL_ERROR(err, "MockWdmSubscriptionInitiator requires node ID to some publisher");
+ }
+
+ break;
+ case kToolOpt_WdmRespMutualSubscription:
+ case kToolOpt_WdmSubscriptionPublisher:
+ if (gMockWdmNodeOptions.mEnableRetry)
+ {
+ err = WEAVE_ERROR_INVALID_ARGUMENT;
+ FAIL_ERROR(err, "MockWdmSubcriptionResponder is incompatible with --enable-retry");
+ }
+
+ err = MockWdmSubscriptionResponder::GetInstance()->Init(&ExchangeMgr,
+ gMockWdmNodeOptions
+ );
+ FAIL_ERROR(err, "MockWdmSubscriptionResponder.Init failed");
+ MockWdmSubscriptionResponder::GetInstance()->onCompleteTest = HandleWdmCompleteTest;
+ MockWdmSubscriptionResponder::GetInstance()->onError = HandleError;
+ if (gTestWdmNextOptions.mClearDataSinkState)
+ {
+ MockWdmSubscriptionResponder::GetInstance()->ClearDataSinkState();
+ }
+ break;
+ default:
+ err = WEAVE_ERROR_INVALID_ARGUMENT;
+ FAIL_ERROR(err, "WdmRoleInTest is invalid");
+ };
+
+ for (uint32_t iteration = 1; iteration <= gTestWdmNextOptions.mTestIterations; iteration++) {
+
+ switch (gMockWdmNodeOptions.mWdmRoleInTest) {
+ case 0:
+ break;
+ case kToolOpt_WdmInitMutualSubscription:
+ case kToolOpt_WdmSubscriptionClient:
+ if (gTestWdmNextOptions.mClearDataSinkState) {
+ MockWdmSubscriptionInitiator::GetInstance()->ClearDataSinkState();
+ }
+ err = MockWdmSubscriptionInitiator::GetInstance()->StartTesting(gMockWdmNodeOptions.mWdmPublisherNodeId,
+ gMockWdmNodeOptions.mWdmUseSubnetId);
+ if (err != WEAVE_NO_ERROR) {
+ printf("\nMockWdmSubscriptionInitiator.StartTesting failed: %s\n", ErrorStr(err));
+ Done = true;
+ }
+ //FAIL_ERROR(err, "MockWdmSubscriptionInitiator.StartTesting failed");
+ break;
+ default:
+ printf("TestWdmNext server is ready\n");
+ };
+
+ switch (gMockWdmNodeOptions.mEventGeneratorType) {
+ case MockWdmNodeOptions::kGenerator_None:
+ gEventGenerator = NULL;
+ break;
+ case MockWdmNodeOptions::kGenerator_TestDebug:
+ gEventGenerator = GetTestDebugGenerator();
+ break;
+ case MockWdmNodeOptions::kGenerator_TestLiveness:
+ gEventGenerator = GetTestLivenessGenerator();
+ break;
+ case MockWdmNodeOptions::kGenerator_TestSecurity:
+ gEventGenerator = GetTestSecurityGenerator();
+ break;
+ case MockWdmNodeOptions::kGenerator_TestTelemetry:
+ gEventGenerator = GetTestTelemetryGenerator();
+ break;
+ case MockWdmNodeOptions::kGenerator_TestTrait:
+ gEventGenerator = GetTestTraitGenerator();
+ break;
+ case MockWdmNodeOptions::kGenerator_NumItems:
+ default:
+ gEventGenerator = NULL;
+ break;
+ }
+
+ if (gEventGenerator != NULL) {
+ printf("Starting Event Generator\n");
+ MockEventGenerator::GetInstance()->Init(&ExchangeMgr, gEventGenerator,
+ gMockWdmNodeOptions.mTimeBetweenEvents, true);
+ }
+
+ }
while (!Done)
{
struct timeval sleepTime;
@@ -1069,3 +1175,8 @@
Done = true;
}
}
+
+static void HandleError()
+{
+ Done = true;
+}
diff --git a/src/test-apps/wrapper-tests/jni/Makefile.in b/src/test-apps/wrapper-tests/jni/Makefile.in
index b3b4cf4..80e2b20 100644
--- a/src/test-apps/wrapper-tests/jni/Makefile.in
+++ b/src/test-apps/wrapper-tests/jni/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -37,7 +37,17 @@
# Java Device Manager library.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,8 +112,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/test-apps/wrapper-tests/jni
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -122,18 +130,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -159,6 +168,8 @@
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -248,6 +259,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -407,6 +419,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -459,14 +472,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/test-apps/wrapper-tests/jni/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/test-apps/wrapper-tests/jni/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -490,7 +502,10 @@
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)'; \
@@ -555,9 +570,9 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+@WEAVE_WITH_JAVA_FALSE@uninstall-local:
@WEAVE_WITH_JAVA_FALSE@mostlyclean-local:
@WEAVE_WITH_JAVA_FALSE@install-data-local:
-@WEAVE_WITH_JAVA_FALSE@uninstall-local:
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
@@ -640,6 +655,8 @@
mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am uninstall-local
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/tools/misc/Makefile.in b/src/tools/misc/Makefile.in
index c41f619..8542fe6 100644
--- a/src/tools/misc/Makefile.in
+++ b/src/tools/misc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -37,7 +37,17 @@
# support tools.
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,8 +112,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/tools/misc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -122,18 +130,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -188,6 +197,8 @@
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -277,6 +288,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -436,6 +448,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -481,14 +494,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tools/misc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/tools/misc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -582,7 +594,10 @@
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)'; \
@@ -731,6 +746,8 @@
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-binSCRIPTS uninstall-libexecSCRIPTS
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/tools/weave/Makefile.in b/src/tools/weave/Makefile.in
index 601fa41..6380a72 100644
--- a/src/tools/weave/Makefile.in
+++ b/src/tools/weave/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -104,10 +114,6 @@
target_triplet = @target@
@WEAVE_BUILD_TOOLS_TRUE@libexec_PROGRAMS = weave$(EXEEXT)
subdir = src/tools/weave
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(am__noinst_HEADERS_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -126,23 +132,27 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(libexecdir)"
+PROGRAMS = $(libexec_PROGRAMS)
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_@AM_V@)
@@ -158,8 +168,6 @@
@WEAVE_BUILD_TOOLS_TRUE@ libWeaveTool_a-GeneralUtils.$(OBJEXT) \
@WEAVE_BUILD_TOOLS_TRUE@ libWeaveTool_a-KeyUtils.$(OBJEXT)
libWeaveTool_a_OBJECTS = $(am_libWeaveTool_a_OBJECTS)
-am__installdirs = "$(DESTDIR)$(libexecdir)"
-PROGRAMS = $(libexec_PROGRAMS)
am__weave_SOURCES_DIST = Cmd_ConvertCert.cpp \
Cmd_ConvertProvisioningData.cpp Cmd_ConvertKey.cpp \
Cmd_GenCACert.cpp Cmd_GenCodeSigningCert.cpp \
@@ -210,7 +218,27 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libWeaveTool_a-CertUtils.Po \
+ ./$(DEPDIR)/libWeaveTool_a-GeneralUtils.Po \
+ ./$(DEPDIR)/libWeaveTool_a-KeyUtils.Po \
+ ./$(DEPDIR)/weave-Cmd_ConvertCert.Po \
+ ./$(DEPDIR)/weave-Cmd_ConvertKey.Po \
+ ./$(DEPDIR)/weave-Cmd_ConvertProvisioningData.Po \
+ ./$(DEPDIR)/weave-Cmd_GenCACert.Po \
+ ./$(DEPDIR)/weave-Cmd_GenCodeSigningCert.Po \
+ ./$(DEPDIR)/weave-Cmd_GenDeviceCert.Po \
+ ./$(DEPDIR)/weave-Cmd_GenGeneralCert.Po \
+ ./$(DEPDIR)/weave-Cmd_GenProvisioningData.Po \
+ ./$(DEPDIR)/weave-Cmd_GenServiceEndpointCert.Po \
+ ./$(DEPDIR)/weave-Cmd_MakeAccessToken.Po \
+ ./$(DEPDIR)/weave-Cmd_MakeServiceConfig.Po \
+ ./$(DEPDIR)/weave-Cmd_PrintCert.Po \
+ ./$(DEPDIR)/weave-Cmd_PrintSig.Po \
+ ./$(DEPDIR)/weave-Cmd_PrintTLV.Po \
+ ./$(DEPDIR)/weave-Cmd_ResignCert.Po \
+ ./$(DEPDIR)/weave-Cmd_ValidateCert.Po \
+ ./$(DEPDIR)/weave-weave-tool.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -259,6 +287,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -348,6 +379,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -507,6 +539,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -614,14 +647,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tools/weave/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/tools/weave/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -632,14 +664,6 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libWeaveTool.a: $(libWeaveTool_a_OBJECTS) $(libWeaveTool_a_DEPENDENCIES) $(EXTRA_libWeaveTool_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libWeaveTool.a
- $(AM_V_AR)$(libWeaveTool_a_AR) libWeaveTool.a $(libWeaveTool_a_OBJECTS) $(libWeaveTool_a_LIBADD)
- $(AM_V_at)$(RANLIB) libWeaveTool.a
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
@@ -690,6 +714,14 @@
echo " rm -f" $$list; \
rm -f $$list
+clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libWeaveTool.a: $(libWeaveTool_a_OBJECTS) $(libWeaveTool_a_DEPENDENCIES) $(EXTRA_libWeaveTool_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libWeaveTool.a
+ $(AM_V_AR)$(libWeaveTool_a_AR) libWeaveTool.a $(libWeaveTool_a_OBJECTS) $(libWeaveTool_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libWeaveTool.a
+
weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
@rm -f weave$(EXEEXT)
$(AM_V_CXXLD)$(weave_LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
@@ -700,26 +732,32 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveTool_a-CertUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveTool_a-GeneralUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveTool_a-KeyUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ConvertCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ConvertKey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ConvertProvisioningData.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenCACert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenCodeSigningCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenDeviceCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenGeneralCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenProvisioningData.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenServiceEndpointCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_MakeAccessToken.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_MakeServiceConfig.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_PrintCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_PrintSig.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_PrintTLV.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ResignCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ValidateCert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-weave-tool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveTool_a-CertUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveTool_a-GeneralUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libWeaveTool_a-KeyUtils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ConvertCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ConvertKey.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ConvertProvisioningData.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenCACert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenCodeSigningCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenDeviceCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenGeneralCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenProvisioningData.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_GenServiceEndpointCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_MakeAccessToken.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_MakeServiceConfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_PrintCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_PrintSig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_PrintTLV.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ResignCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-Cmd_ValidateCert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave-weave-tool.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1083,7 +1121,10 @@
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)'; \
@@ -1115,7 +1156,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libexecdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -1150,15 +1191,34 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@WEAVE_BUILD_TOOLS_FALSE@install-exec-local:
@WEAVE_BUILD_TOOLS_FALSE@uninstall-local:
+@WEAVE_BUILD_TOOLS_FALSE@install-exec-local:
clean: clean-am
clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libWeaveTool_a-CertUtils.Po
+ -rm -f ./$(DEPDIR)/libWeaveTool_a-GeneralUtils.Po
+ -rm -f ./$(DEPDIR)/libWeaveTool_a-KeyUtils.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ConvertCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ConvertKey.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ConvertProvisioningData.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenCACert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenCodeSigningCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenDeviceCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenGeneralCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenProvisioningData.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenServiceEndpointCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_MakeAccessToken.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_MakeServiceConfig.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_PrintCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_PrintSig.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_PrintTLV.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ResignCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ValidateCert.Po
+ -rm -f ./$(DEPDIR)/weave-weave-tool.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1204,7 +1264,26 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libWeaveTool_a-CertUtils.Po
+ -rm -f ./$(DEPDIR)/libWeaveTool_a-GeneralUtils.Po
+ -rm -f ./$(DEPDIR)/libWeaveTool_a-KeyUtils.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ConvertCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ConvertKey.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ConvertProvisioningData.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenCACert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenCodeSigningCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenDeviceCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenGeneralCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenProvisioningData.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_GenServiceEndpointCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_MakeAccessToken.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_MakeServiceConfig.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_PrintCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_PrintSig.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_PrintTLV.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ResignCert.Po
+ -rm -f ./$(DEPDIR)/weave-Cmd_ValidateCert.Po
+ -rm -f ./$(DEPDIR)/weave-weave-tool.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1225,14 +1304,14 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libexecPROGRAMS clean-libtool clean-noinstLIBRARIES \
- 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-exec-local install-html \
- install-html-am install-info install-info-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libexecPROGRAMS clean-libtool \
+ clean-noinstLIBRARIES 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-exec-local \
+ install-html install-html-am install-info install-info-am \
install-libexecPROGRAMS install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
@@ -1241,6 +1320,8 @@
tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS \
uninstall-local
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/warm/Makefile.in b/src/warm/Makefile.in
index 88c81bd..2a782d3 100644
--- a/src/warm/Makefile.in
+++ b/src/warm/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -64,7 +64,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -128,10 +138,6 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-DIST_COMMON = $(srcdir)/Warm.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
subdir = src/warm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
@@ -151,18 +157,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -223,7 +230,9 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = \
+ @top_builddir@/src/warm/$(DEPDIR)/libWarm_a-WarmCore.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -273,6 +282,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Warm.am \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -362,6 +374,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -521,6 +534,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -563,16 +577,15 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/warm/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/warm/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
-$(srcdir)/Warm.am:
+$(srcdir)/Warm.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -635,7 +648,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/warm/$(DEPDIR)/libWarm_a-WarmCore.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@top_builddir@/src/warm/$(DEPDIR)/libWarm_a-WarmCore.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -733,7 +752,10 @@
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)'; \
@@ -808,7 +830,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf @top_builddir@/src/warm/$(DEPDIR)
+ -rm -f @top_builddir@/src/warm/$(DEPDIR)/libWarm_a-WarmCore.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -854,7 +876,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf @top_builddir@/src/warm/$(DEPDIR)
+ -rm -f @top_builddir@/src/warm/$(DEPDIR)/libWarm_a-WarmCore.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -875,9 +897,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -889,6 +911,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/post.am
diff --git a/src/wrappers/jni/Makefile.in b/src/wrappers/jni/Makefile.in
index 6a32039..4a4bfb6 100644
--- a/src/wrappers/jni/Makefile.in
+++ b/src/wrappers/jni/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -37,7 +37,17 @@
# source code.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,8 +112,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/wrappers/jni
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -122,18 +130,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -173,7 +182,7 @@
$(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
@@ -193,6 +202,8 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -307,6 +318,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -466,6 +478,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -506,14 +519,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/wrappers/jni/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/wrappers/jni/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -630,7 +642,10 @@
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)'; \
@@ -801,6 +816,8 @@
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/wrappers/jni/jni-utils/Makefile.in b/src/wrappers/jni/jni-utils/Makefile.in
index 7613a88..61d9db6 100644
--- a/src/wrappers/jni/jni-utils/Makefile.in
+++ b/src/wrappers/jni/jni-utils/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -39,7 +39,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -104,10 +114,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = src/wrappers/jni/jni-utils
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
- $(am__noinst_HEADERS_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -126,18 +132,20 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -198,7 +206,8 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libJNIUtils_a-JNIUtils.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -250,6 +259,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -339,6 +351,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -498,6 +511,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -546,14 +560,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/wrappers/jni/jni-utils/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/wrappers/jni/jni-utils/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -607,7 +620,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libJNIUtils_a-JNIUtils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libJNIUtils_a-JNIUtils.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -705,7 +724,10 @@
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)'; \
@@ -778,7 +800,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libJNIUtils_a-JNIUtils.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -824,7 +846,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libJNIUtils_a-JNIUtils.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -845,9 +867,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -859,6 +881,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/src/wrappers/jni/security-support/Makefile.in b/src/wrappers/jni/security-support/Makefile.in
index 9817157..7ad2bf1 100644
--- a/src/wrappers/jni/security-support/Makefile.in
+++ b/src/wrappers/jni/security-support/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -38,7 +38,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -107,9 +117,6 @@
@WEAVE_LOGGING_STYLE_ANDROID_TRUE@@WEAVE_WITH_ANDROID_TRUE@@WEAVE_WITH_JAVA_TRUE@ $(NULL)
subdir = src/wrappers/jni/security-support
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -128,18 +135,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -216,7 +224,13 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = native/$(DEPDIR)/libWeaveSecuritySupport_la-PairingCodeSupport.Plo \
+ native/$(DEPDIR)/libWeaveSecuritySupport_la-PasscodeEncryptionSupport.Plo \
+ native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveCertificateSupport.Plo \
+ native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportClientNative.Plo \
+ native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportSupportNative.Plo \
+ native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveSecuritySupport.Plo
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -262,6 +276,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -351,6 +368,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -510,6 +528,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -596,14 +615,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/wrappers/jni/security-support/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/wrappers/jni/security-support/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -679,12 +697,18 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-PairingCodeSupport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-PasscodeEncryptionSupport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveCertificateSupport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportClientNative.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportSupportNative.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveSecuritySupport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-PairingCodeSupport.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-PasscodeEncryptionSupport.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveCertificateSupport.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportClientNative.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportSupportNative.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveSecuritySupport.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -811,7 +835,10 @@
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)'; \
@@ -881,16 +908,21 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+@WEAVE_WITH_JAVA_FALSE@uninstall-local:
@WEAVE_WITH_JAVA_FALSE@install-data-local:
@WEAVE_WITH_JAVA_FALSE@mostlyclean-local:
-@WEAVE_WITH_JAVA_FALSE@uninstall-local:
clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
- -rm -rf native/$(DEPDIR)
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-PairingCodeSupport.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-PasscodeEncryptionSupport.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveCertificateSupport.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportClientNative.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportSupportNative.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveSecuritySupport.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -936,7 +968,12 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf native/$(DEPDIR)
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-PairingCodeSupport.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-PasscodeEncryptionSupport.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveCertificateSupport.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportClientNative.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveKeyExportSupportNative.Plo
+ -rm -f native/$(DEPDIR)/libWeaveSecuritySupport_la-WeaveSecuritySupport.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -957,21 +994,23 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local 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-data-local install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-libLTLIBRARIES \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
- tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
- uninstall-local
+.PHONY: CTAGS GTAGS TAGS all all-am all-local 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-data-local install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-libLTLIBRARIES install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-libLTLIBRARIES uninstall-local
+
+.PRECIOUS: Makefile
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/third_party/Makefile.in b/third_party/Makefile.in
index 4fcf946..1e177d2 100644
--- a/third_party/Makefile.in
+++ b/third_party/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -37,7 +37,17 @@
# third-party software directory.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,8 +112,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = third_party
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -122,18 +130,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -173,7 +182,7 @@
$(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
@@ -193,6 +202,8 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -307,6 +318,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -466,6 +478,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -529,14 +542,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third_party/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign third_party/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -653,7 +665,10 @@
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)'; \
@@ -824,6 +839,8 @@
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/third_party/android/platform-system/core-mincrypt/Makefile.in b/third_party/android/platform-system/core-mincrypt/Makefile.in
index f34bf27..370c7e9 100644
--- a/third_party/android/platform-system/core-mincrypt/Makefile.in
+++ b/third_party/android/platform-system/core-mincrypt/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -40,7 +40,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -105,9 +115,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = third_party/android/platform-system/core-mincrypt
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -126,18 +133,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -180,8 +188,8 @@
libmincrypt_a_AR = $(AR) $(ARFLAGS)
libmincrypt_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
-am_libmincrypt_a_OBJECTS = libmincrypt/libmincrypt_a-sha.$(OBJEXT) \
- libmincrypt/libmincrypt_a-sha256.$(OBJEXT)
+am_libmincrypt_a_OBJECTS = libmincrypt/a-sha.$(OBJEXT) \
+ libmincrypt/a-sha256.$(OBJEXT)
libmincrypt_a_OBJECTS = $(am_libmincrypt_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -198,7 +206,9 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = libmincrypt/$(DEPDIR)/a-sha.Po \
+ libmincrypt/$(DEPDIR)/a-sha256.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -248,6 +258,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -337,6 +350,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -496,6 +510,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -551,14 +566,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third_party/android/platform-system/core-mincrypt/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign third_party/android/platform-system/core-mincrypt/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -606,10 +620,9 @@
libmincrypt/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) libmincrypt/$(DEPDIR)
@: > libmincrypt/$(DEPDIR)/$(am__dirstamp)
-libmincrypt/libmincrypt_a-sha.$(OBJEXT): libmincrypt/$(am__dirstamp) \
+libmincrypt/a-sha.$(OBJEXT): libmincrypt/$(am__dirstamp) \
libmincrypt/$(DEPDIR)/$(am__dirstamp)
-libmincrypt/libmincrypt_a-sha256.$(OBJEXT): \
- libmincrypt/$(am__dirstamp) \
+libmincrypt/a-sha256.$(OBJEXT): libmincrypt/$(am__dirstamp) \
libmincrypt/$(DEPDIR)/$(am__dirstamp)
libmincrypt.a: $(libmincrypt_a_OBJECTS) $(libmincrypt_a_DEPENDENCIES) $(EXTRA_libmincrypt_a_DEPENDENCIES)
@@ -624,8 +637,14 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@libmincrypt/$(DEPDIR)/libmincrypt_a-sha.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libmincrypt/$(DEPDIR)/libmincrypt_a-sha256.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libmincrypt/$(DEPDIR)/a-sha.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libmincrypt/$(DEPDIR)/a-sha256.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$$||'`;\
@@ -651,33 +670,33 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-libmincrypt/libmincrypt_a-sha.o: libmincrypt/sha.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/libmincrypt_a-sha.o -MD -MP -MF libmincrypt/$(DEPDIR)/libmincrypt_a-sha.Tpo -c -o libmincrypt/libmincrypt_a-sha.o `test -f 'libmincrypt/sha.c' || echo '$(srcdir)/'`libmincrypt/sha.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/libmincrypt_a-sha.Tpo libmincrypt/$(DEPDIR)/libmincrypt_a-sha.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha.c' object='libmincrypt/libmincrypt_a-sha.o' libtool=no @AMDEPBACKSLASH@
+libmincrypt/a-sha.o: libmincrypt/sha.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/a-sha.o -MD -MP -MF libmincrypt/$(DEPDIR)/a-sha.Tpo -c -o libmincrypt/a-sha.o `test -f 'libmincrypt/sha.c' || echo '$(srcdir)/'`libmincrypt/sha.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/a-sha.Tpo libmincrypt/$(DEPDIR)/a-sha.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha.c' object='libmincrypt/a-sha.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/libmincrypt_a-sha.o `test -f 'libmincrypt/sha.c' || echo '$(srcdir)/'`libmincrypt/sha.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/a-sha.o `test -f 'libmincrypt/sha.c' || echo '$(srcdir)/'`libmincrypt/sha.c
-libmincrypt/libmincrypt_a-sha.obj: libmincrypt/sha.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/libmincrypt_a-sha.obj -MD -MP -MF libmincrypt/$(DEPDIR)/libmincrypt_a-sha.Tpo -c -o libmincrypt/libmincrypt_a-sha.obj `if test -f 'libmincrypt/sha.c'; then $(CYGPATH_W) 'libmincrypt/sha.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/libmincrypt_a-sha.Tpo libmincrypt/$(DEPDIR)/libmincrypt_a-sha.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha.c' object='libmincrypt/libmincrypt_a-sha.obj' libtool=no @AMDEPBACKSLASH@
+libmincrypt/a-sha.obj: libmincrypt/sha.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/a-sha.obj -MD -MP -MF libmincrypt/$(DEPDIR)/a-sha.Tpo -c -o libmincrypt/a-sha.obj `if test -f 'libmincrypt/sha.c'; then $(CYGPATH_W) 'libmincrypt/sha.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/a-sha.Tpo libmincrypt/$(DEPDIR)/a-sha.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha.c' object='libmincrypt/a-sha.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/libmincrypt_a-sha.obj `if test -f 'libmincrypt/sha.c'; then $(CYGPATH_W) 'libmincrypt/sha.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/a-sha.obj `if test -f 'libmincrypt/sha.c'; then $(CYGPATH_W) 'libmincrypt/sha.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha.c'; fi`
-libmincrypt/libmincrypt_a-sha256.o: libmincrypt/sha256.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/libmincrypt_a-sha256.o -MD -MP -MF libmincrypt/$(DEPDIR)/libmincrypt_a-sha256.Tpo -c -o libmincrypt/libmincrypt_a-sha256.o `test -f 'libmincrypt/sha256.c' || echo '$(srcdir)/'`libmincrypt/sha256.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/libmincrypt_a-sha256.Tpo libmincrypt/$(DEPDIR)/libmincrypt_a-sha256.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha256.c' object='libmincrypt/libmincrypt_a-sha256.o' libtool=no @AMDEPBACKSLASH@
+libmincrypt/a-sha256.o: libmincrypt/sha256.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/a-sha256.o -MD -MP -MF libmincrypt/$(DEPDIR)/a-sha256.Tpo -c -o libmincrypt/a-sha256.o `test -f 'libmincrypt/sha256.c' || echo '$(srcdir)/'`libmincrypt/sha256.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/a-sha256.Tpo libmincrypt/$(DEPDIR)/a-sha256.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha256.c' object='libmincrypt/a-sha256.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/libmincrypt_a-sha256.o `test -f 'libmincrypt/sha256.c' || echo '$(srcdir)/'`libmincrypt/sha256.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/a-sha256.o `test -f 'libmincrypt/sha256.c' || echo '$(srcdir)/'`libmincrypt/sha256.c
-libmincrypt/libmincrypt_a-sha256.obj: libmincrypt/sha256.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/libmincrypt_a-sha256.obj -MD -MP -MF libmincrypt/$(DEPDIR)/libmincrypt_a-sha256.Tpo -c -o libmincrypt/libmincrypt_a-sha256.obj `if test -f 'libmincrypt/sha256.c'; then $(CYGPATH_W) 'libmincrypt/sha256.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha256.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/libmincrypt_a-sha256.Tpo libmincrypt/$(DEPDIR)/libmincrypt_a-sha256.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha256.c' object='libmincrypt/libmincrypt_a-sha256.obj' libtool=no @AMDEPBACKSLASH@
+libmincrypt/a-sha256.obj: libmincrypt/sha256.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmincrypt/a-sha256.obj -MD -MP -MF libmincrypt/$(DEPDIR)/a-sha256.Tpo -c -o libmincrypt/a-sha256.obj `if test -f 'libmincrypt/sha256.c'; then $(CYGPATH_W) 'libmincrypt/sha256.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha256.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmincrypt/$(DEPDIR)/a-sha256.Tpo libmincrypt/$(DEPDIR)/a-sha256.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmincrypt/sha256.c' object='libmincrypt/a-sha256.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/libmincrypt_a-sha256.obj `if test -f 'libmincrypt/sha256.c'; then $(CYGPATH_W) 'libmincrypt/sha256.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha256.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmincrypt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmincrypt/a-sha256.obj `if test -f 'libmincrypt/sha256.c'; then $(CYGPATH_W) 'libmincrypt/sha256.c'; else $(CYGPATH_W) '$(srcdir)/libmincrypt/sha256.c'; fi`
mostlyclean-libtool:
-rm -f *.lo
@@ -737,7 +756,10 @@
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)'; \
@@ -812,7 +834,8 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf libmincrypt/$(DEPDIR)
+ -rm -f libmincrypt/$(DEPDIR)/a-sha.Po
+ -rm -f libmincrypt/$(DEPDIR)/a-sha256.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -858,7 +881,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf libmincrypt/$(DEPDIR)
+ -rm -f libmincrypt/$(DEPDIR)/a-sha.Po
+ -rm -f libmincrypt/$(DEPDIR)/a-sha256.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -879,9 +903,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -893,6 +917,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/third_party/lwip/Makefile.in b/third_party/lwip/Makefile.in
index 4ddc6c5..ee54699 100644
--- a/third_party/lwip/Makefile.in
+++ b/third_party/lwip/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -39,7 +39,17 @@
# the library.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -104,8 +114,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = third_party/lwip
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -124,18 +132,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -161,6 +170,8 @@
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -250,6 +261,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -409,6 +421,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -450,14 +463,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third_party/lwip/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign third_party/lwip/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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,7 +493,10 @@
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)'; \
@@ -625,6 +640,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/third_party/micro-ecc/Makefile.in b/third_party/micro-ecc/Makefile.in
index 0af314c..99ce3a9 100644
--- a/third_party/micro-ecc/Makefile.in
+++ b/third_party/micro-ecc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -37,7 +37,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,9 +112,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = third_party/micro-ecc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -123,18 +130,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -194,7 +202,8 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = micro-ecc/$(DEPDIR)/libuECC_a-uECC.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -244,6 +253,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -333,6 +345,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -492,6 +505,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -550,14 +564,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third_party/micro-ecc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign third_party/micro-ecc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -620,7 +633,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@micro-ecc/$(DEPDIR)/libuECC_a-uECC.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@micro-ecc/$(DEPDIR)/libuECC_a-uECC.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$$||'`;\
@@ -718,7 +737,10 @@
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)'; \
@@ -793,7 +815,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf micro-ecc/$(DEPDIR)
+ -rm -f micro-ecc/$(DEPDIR)/libuECC_a-uECC.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -839,7 +861,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf micro-ecc/$(DEPDIR)
+ -rm -f micro-ecc/$(DEPDIR)/libuECC_a-uECC.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -860,9 +882,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -874,6 +896,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/post.am
diff --git a/third_party/nlbuild-autotools/repo/third_party/autoconf/compile b/third_party/nlbuild-autotools/repo/third_party/autoconf/compile
index b1f4749..99e5052 100755
--- a/third_party/nlbuild-autotools/repo/third_party/autoconf/compile
+++ b/third_party/nlbuild-autotools/repo/third_party/autoconf/compile
@@ -1,10 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -79,6 +78,53 @@
esac
}
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
@@ -109,43 +155,34 @@
;;
esac
;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
- -l*)
- lib=${1#-l}
- found=no
- save_IFS=$IFS
- IFS=';'
- for dir in $lib_path $LIB
- do
- IFS=$save_IFS
- if $shared && test -f "$dir/$lib.dll.lib"; then
- found=yes
- set x "$@" "$dir/$lib.dll.lib"
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- set x "$@" "$dir/$lib.lib"
- break
- fi
- done
- IFS=$save_IFS
-
- test "$found" != yes && set x "$@" "$lib.lib"
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
shift
;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
-L*)
- func_file_conv "${1#-L}"
- if test -z "$lib_path"; then
- lib_path=$file
- else
- lib_path="$lib_path;$file"
- fi
- linker_opts="$linker_opts -LIBPATH:$file"
+ func_cl_dashL "${1#-L}"
;;
-static)
shared=false
@@ -218,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -302,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp b/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
index 4ebd5b3..65cbf70 100755
--- a/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
+++ b/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh b/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh
index 63ae69d..c12c197 100644
--- a/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh
+++ b/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -23,166 +26,670 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --no-warn don't display warning messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
-# automake: $automake_version
-# autoconf: $autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
+VERSION="2.4.6 Debian-2.4.6-9"
+package_revision=2.4.6
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+ export $_G_var
+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp $nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+ func_path_progs_result=$func_check_prog_result
+ ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo 'GREP' >> conftest.nl
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
# is ksh but when the shell is invoked as "sh" and the current value of
# the _XPG environment variable is not equal to 1 (one), the special
# positional parameter $0, within a function call, is the name of the
# function.
-progpath="$0"
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+ progdir=`cd "$progdir" && pwd`
+ progpath=$progdir/$progname
+ ;;
+ *)
+ _G_IFS=$IFS
+ IFS=${PATH_SEPARATOR-:}
+ for progdir in $PATH; do
+ IFS=$_G_IFS
+ test -x "$progdir/$progname" && break
+ done
+ IFS=$_G_IFS
+ test -n "$progdir" || progdir=`pwd`
+ progpath=$progdir/$progname
+ ;;
+esac
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
-exit_status=$EXIT_SUCCESS
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" $lt_nl"
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
-# func_dirname file append nondir_replacement
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='[0m'
+ tc_bold='[1m'; tc_standout='[7m'
+ tc_red='[31m'; tc_green='[32m'
+ tc_blue='[34m'; tc_cyan='[36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
+
+ require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+ # We should try to minimise forks, especially on Windows where they are
+ # unreasonably slow, so skip the feature probes when bash or zsh are
+ # being used:
+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+ : ${_G_HAVE_ARITH_OP="yes"}
+ : ${_G_HAVE_XSI_OPS="yes"}
+ # The += operator was introduced in bash 3.1
+ case $BASH_VERSION in
+ [12].* | 3.0 | 3.0*) ;;
+ *)
+ : ${_G_HAVE_PLUSEQ_OP="yes"}
+ ;;
+ esac
+ fi
+
+ # _G_HAVE_PLUSEQ_OP
+ # Can be empty, in which case the shell is probed, "yes" if += is
+ # useable or anything else if it does not work.
+ test -z "$_G_HAVE_PLUSEQ_OP" \
+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+ && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '\(.\)'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
# Compute the dirname of FILE. If nonempty, add APPEND to the result,
# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
+eval 'func_dirname ()
{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
+ $debug_cmd
+
+ '"$_d"'
+}'
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
# call:
# dirname: Compute the dirname of FILE. If nonempty,
# add APPEND to the result, otherwise set result
@@ -190,263 +697,327 @@
# value returned in "$func_dirname_result"
# basename: Compute filename of FILE.
# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ $debug_cmd
+
+ func_error "$*"
+ exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+ $debug_cmd
+
+ $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+ $debug_cmd
+
+ _G_directory_path=$1
+ _G_dir_list=
+
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
+ esac
+
+ # While some portion of DIR does not yet exist...
+ while test ! -d "$_G_directory_path"; do
+ # ...make a list in topmost first order. Use a colon delimited
+ # list incase some portion of path contains whitespace.
+ _G_dir_list=$_G_directory_path:$_G_dir_list
+
+ # If the last portion added has no slash in it, the list is done
+ case $_G_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+ done
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+ IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
+ # try to create one of the directories concurrently. Don't
+ # stop in that case!
+ $MKDIR "$_G_dir" 2>/dev/null || :
+ done
+ IFS=$func_mkdir_p_IFS
+
+ # Bail out if we (or some other process) failed to create a directory.
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+}
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible. If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
+ $debug_cmd
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+ if test : = "$opt_dry_run"; then
+ # Return a directory name, but don't create it in dry-run mode
+ _G_tmpdir=$_G_template-$$
+ else
+
+ # If mktemp works, use that first and foremost
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+ if test ! -d "$_G_tmpdir"; then
+ # Failing that, at least try and use $RANDOM to avoid a race
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+ func_mktempdir_umask=`umask`
+ umask 0077
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
+ fi
+
+ # If we're not in dry-run mode, bomb out on failure
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+ fi
+
+ $ECHO "$_G_tmpdir"
+}
+
# func_normal_abspath PATH
+# ------------------------
# Remove doubled-up and trailing slashes, "." path components,
# and cancel out any ".." path components in PATH after making
# it an absolute path.
-# value returned in "$func_normal_abspath_result"
func_normal_abspath ()
{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
+ $debug_cmd
+
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/\([^/]*\).*$|\1|'
+ _G_pathcdr='s|^/[^/]*||'
+ _G_removedotparts=':dotsl
+ s|/\./|/|g
+ t dotsl
+ s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
"")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
;;
*)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
;;
esac
- done
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
-
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test / = "$func_normal_abspath_tpath"; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result"; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
}
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-# Make sure we have an absolute path for reexecution:
-case $progpath in
- [\\/]*|[A-Za-z]:\\*) ;;
- *[\\/]*)
- progdir=$func_dirname_result
- progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
- ;;
- *)
- save_IFS="$IFS"
- IFS=${PATH_SEPARATOR-:}
- for progdir in $PATH; do
- IFS="$save_IFS"
- test -x "$progdir/$progname" && break
- done
- IFS="$save_IFS"
- test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
+ $debug_cmd
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
+ $opt_quiet || func_echo ${1+"$@"}
# A bug in bash halts the script if the last line of a function
# fails when set -e is in force, so we need another command to
@@ -454,450 +1025,1186 @@
:
}
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+ $debug_cmd
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
- # bash bug again:
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ fi
+
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
:
}
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information." ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
- $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
- my_directory_path="$1"
- my_dir_list=
-
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
- esac
-
- # While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
- # ...make a list in topmost first order. Use a colon delimited
- # list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
-
- # If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
-
- # ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
- done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
- # try to create one of the directories concurrently. Don't
- # stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
- done
- IFS="$save_mkdir_p_IFS"
-
- # Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
- fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
-
- if test "$opt_dry_run" = ":"; then
- # Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
- else
-
- # If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
- if test ! -d "$my_tmpdir"; then
- # Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
-
- save_mktempdir_umask=`umask`
- umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
- fi
-
- # If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
- fi
-
- $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
func_quote_for_eval ()
{
- case $1 in
- *[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
- ;;
- *)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
- esac
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
}
-# func_quote_for_expand arg
+# func_quote_for_expand ARG
+# -------------------------
# Aesthetically quote ARG to be evaled later; same as above,
# but do not quote variable references.
func_quote_for_expand ()
{
+ $debug_cmd
+
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
- -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
*)
- my_arg="$1" ;;
+ _G_arg=$1 ;;
esac
- case $my_arg in
+ case $_G_arg in
# Double-quote args containing shell metacharacters to delay
# word splitting and command substitution for a subsequent eval.
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- my_arg="\"$my_arg\""
+ _G_arg=\"$_G_arg\"
;;
esac
- func_quote_for_expand_result="$my_arg"
+ func_quote_for_expand_result=$_G_arg
}
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
# is given, then evaluate it.
func_show_eval ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
+
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
fi
- fi
+ }
}
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
# is given, then evaluate it. Use the saved locale for evaluation.
func_show_eval_locale ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
eval "func_echo $func_quote_for_expand_result"
}
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
- $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
+ $opt_dry_run || {
+ eval "$_G_user_locale
+ $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
fi
- fi
+ }
}
+
# func_tr_sh
+# ----------
# Turn $1 into a string suitable for a shell variable name.
# Result is stored in $func_tr_sh_result. All characters
# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
# if $1 begins with a digit, a '_' is prepended as well.
func_tr_sh ()
{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
+ $debug_cmd
+
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
}
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
- s/^# *$//
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
- p
- }' < "$progpath"
- exit $?
+ $opt_verbose && func_echo "$*"
+
+ :
}
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2015-10-07.11; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY [all]
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ _G_rc_run_hooks=false
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ if eval $_G_hook '"$@"'; then
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ _G_rc_run_hooks=:
+ fi
+ done
+
+ $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, you may remove/edit
+# any options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. In this case you also must return $EXIT_SUCCESS to let the
+# hook's caller know that it should pay attention to
+# '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that
+# arguments are left untouched by the hook and therefore caller will ignore the
+# result variable.
+#
+# Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+# # No change in '$@' (ignored completely by this hook). There is
+# # no need to do the equivalent (but slower) action:
+# # func_quote_for_eval ${1+"$@"}
+# # my_options_prep_result=$func_quote_for_eval_result
+# false
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# args_changed=false
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=:
+# args_changed=:
+# ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# args_changed=:
+# ;;
+# *) # Make sure the first unrecognised option "$_G_opt"
+# # is added back to "$@", we could need that later
+# # if $args_changed is true.
+# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+# esac
+# done
+#
+# if $args_changed; then
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# fi
+#
+# $args_changed
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# false
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll also need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options_finish [ARG]...
+# ----------------------------
+# Finishing the option parse loop (call 'func_options' hooks ATM).
+func_options_finish ()
+{
+ $debug_cmd
+
+ _G_func_options_finish_exit=false
+ if func_run_hooks func_options ${1+"$@"}; then
+ func_options_finish_result=$func_run_hooks_result
+ _G_func_options_finish_exit=:
+ fi
+
+ $_G_func_options_finish_exit
+}
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+ $debug_cmd
+
+ _G_rc_options=false
+
+ for my_func in options_prep parse_options validate_options options_finish
+ do
+ if eval func_$my_func '${1+"$@"}'; then
+ eval _G_res_var='$'"func_${my_func}_result"
+ eval set dummy "$_G_res_var" ; shift
+ _G_rc_options=:
+ fi
+ done
+
+ # Save modified positional parameters for caller. As a top-level
+ # options-parser function we always need to set the 'func_options_result'
+ # variable (regardless the $_G_rc_options value).
+ if $_G_rc_options; then
+ func_options_result=$_G_res_var
+ else
+ func_quote_for_eval ${1+"$@"}
+ func_options_result=$func_quote_for_eval_result
+ fi
+
+ $_G_rc_options
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propagate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
+func_hookable func_options_prep
+func_options_prep ()
+{
+ $debug_cmd
+
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
+
+ _G_rc_options_prep=false
+ if func_run_hooks func_options_prep ${1+"$@"}; then
+ _G_rc_options_prep=:
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
+ fi
+
+ $_G_rc_options_prep
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+ $debug_cmd
+
+ func_parse_options_result=
+
+ _G_rc_parse_options=false
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ if func_run_hooks func_parse_options ${1+"$@"}; then
+ eval set dummy "$func_run_hooks_result"; shift
+ _G_rc_parse_options=:
+ fi
+
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
+
+ _G_match_parse_options=:
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+ ;;
+
+ --warnings|--warning|-W)
+ if test $# = 0 && func_missing_arg $_G_opt; then
+ _G_rc_parse_options=:
+ break
+ fi
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+ # Separate optargs to long options (plugins may need this):
+ --*=*) func_split_equals "$_G_opt"
+ set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) _G_rc_parse_options=: ; break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift
+ _G_match_parse_options=false
+ break
+ ;;
+ esac
+
+ $_G_match_parse_options && _G_rc_parse_options=:
+ done
+
+
+ if $_G_rc_parse_options; then
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
+ fi
+
+ $_G_rc_parse_options
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+ $debug_cmd
+
+ _G_rc_validate_options=false
+
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+ if func_run_hooks func_validate_options ${1+"$@"}; then
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
+ _G_rc_validate_options=:
+ fi
+
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ $_G_rc_validate_options
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+ $debug_cmd
+
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
- s/^# //
- s/^# *$//
- s*\$progname*'$progname'*
- s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
- s*\$LTCC*'"$LTCC"'*
- s*\$LTCFLAGS*'"$LTCFLAGS"'*
- s*\$LD*'"$LD"'*
- s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
}
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
# Echo program name prefixed message to standard error and set global
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
+ $debug_cmd
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
exit_cmd=exit
}
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+ }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
# Set func_split_short_opt_name and func_split_short_opt_arg shell
# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ $debug_cmd
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+ func_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
+ $debug_cmd
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+ h
+ /^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
+
+ exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
-# func_arith arithmetic-term...
-func_arith ()
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
+
+ $warning_func ${1+"$@"}
+}
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+ -n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --mode=MODE use operation mode MODE
+ --no-warnings equivalent to '-Wnone'
+ --preserve-dup-deps don't remove duplicate dependency libraries
+ --quiet, --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ -v, --verbose print more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+ -h, --help, --help-all print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+ host-triplet: $host
+ shell: $SHELL
+ compiler: $LTCC
+ compiler flags: $LTCFLAGS
+ linker: $LD (gnu? $with_gnu_ld)
+ version: $progname $scriptversion Debian-2.4.6-9
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
+
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+ }
+fi
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
}
# func_config
+# -----------
# Display the configuration for all the tags in this script.
func_config ()
{
@@ -915,17 +2222,19 @@
exit $?
}
+
# func_features
+# -------------
# Display the features supported by this script.
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -934,314 +2243,369 @@
exit $?
}
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
# Verify that TAGNAME is valid, and either flag an error and exit, or
# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
# variable here.
func_enable_tag ()
{
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
*)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
}
+
# func_check_version_match
+# ------------------------
# Ensure that we are using m4 macros, and libtool script from the same
# release of libtool.
func_check_version_match ()
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from an older release.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- else
- cat >&2 <<_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
$progname: but the definition of this LT_INIT comes from revision $macro_revision.
$progname: You should recreate aclocal.m4 with macros from revision $package_revision
$progname: of $PACKAGE $VERSION and run autoconf again.
_LT_EOF
- fi
+ fi
- exit $EXIT_MISMATCH
- fi
+ exit $EXIT_MISMATCH
+ fi
}
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- $opt_debug
- ;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
- shift
- ;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
+ $debug_mode
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
- shift
- ;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-warning|--no-warn)
- opt_warning=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
- opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
- ;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
- ;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
- shift
- ;;
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
+ nonopt=
+ preserve_args=
- # Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- shift
- ;;
+ _G_rc_lt_options_prep=:
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
-
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
-
- # Validate options:
-
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
-
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
-
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
;;
*)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ _G_rc_lt_options_prep=false
;;
- esac
+ esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
-
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+ if $_G_rc_lt_options_prep; then
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
-
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
-
-
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ $_G_rc_lt_options_prep
}
+func_add_hook func_options_prep libtool_options_prep
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+ $debug_cmd
+
+ _G_rc_lt_parse_options=false
+
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_match_lt_parse_options=:
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ case $1 in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"} ; shift
+ _G_match_lt_parse_options=false
+ break
+ ;;
+ esac
+ $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
+ done
+
+ if $_G_rc_lt_parse_options; then
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+ fi
+
+ $_G_rc_lt_parse_options
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
+ fi
+
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+ case $host in
+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
+
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+ func_error "unrecognized option '-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help=$help
+ help="Try '$progname --help --mode=$opt_mode' for more information."
+ }
+
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
## ----------- ##
## Main. ##
## ----------- ##
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function is only a basic sanity check; it will hardly flush out
# determined imposters.
func_lalib_p ()
{
test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function implements the same check as func_lalib_p without
# resorting to external programs. To this end, it redirects stdin and
# closes it afterwards, without saving the original file descriptor.
# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
func_lalib_unsafe_p ()
{
lalib_p=no
@@ -1249,13 +2613,13 @@
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -1264,7 +2628,8 @@
# determined imposters.
func_ltwrapper_script_p ()
{
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_ltwrapper_executable_p file
@@ -1289,7 +2654,7 @@
{
func_dirname_and_basename "$1" "" "."
func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -1308,11 +2673,13 @@
# FAIL_CMD may read-access the current command in variable CMD!
func_execute_cmds ()
{
- $opt_debug
+ $debug_cmd
+
save_ifs=$IFS; IFS='~'
for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
eval cmd=\"$cmd\"
+ IFS=$save_ifs
func_show_eval "$cmd" "${2-:}"
done
IFS=$save_ifs
@@ -1324,10 +2691,11 @@
# Note that it is not necessary on cygwin/mingw to append a dot to
# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
# behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
func_source ()
{
- $opt_debug
+ $debug_cmd
+
case $1 in
*/* | *\\*) . "$1" ;;
*) . "./$1" ;;
@@ -1354,10 +2722,10 @@
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -1374,7 +2742,8 @@
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1393,7 +2762,7 @@
for z in $available_tags; do
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
# Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -1418,7 +2787,7 @@
# line option must be used.
if test -z "$tagname"; then
func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_fatal_error "specify a tag with '--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -1434,15 +2803,15 @@
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -1450,7 +2819,7 @@
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -1462,7 +2831,7 @@
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -1482,8 +2851,9 @@
# be empty on error (or when ARG is empty)
func_convert_core_file_wine_to_w32 ()
{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
+ $debug_cmd
+
+ func_convert_core_file_wine_to_w32_result=$1
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2861,9 @@
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
+ $SED -e "$sed_naive_backslashify"`
else
func_convert_core_file_wine_to_w32_result=
fi
@@ -1514,18 +2884,19 @@
# are convertible, then the result may be empty.
func_convert_core_path_wine_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
if test -n "$1"; then
oldIFS=$IFS
IFS=:
for func_convert_core_path_wine_to_w32_f in $1; do
IFS=$oldIFS
func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -n "$func_convert_core_file_wine_to_w32_result"; then
if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
fi
@@ -1554,7 +2925,8 @@
# environment variable; do not put it in $PATH.
func_cygpath ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
if test "$?" -ne 0; then
@@ -1563,7 +2935,7 @@
fi
else
func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
@@ -1574,10 +2946,11 @@
# result in func_convert_core_msys_to_w32_result.
func_convert_core_msys_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# awkward: cmd appends spaces to result
func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
}
#end: func_convert_core_msys_to_w32
@@ -1588,13 +2961,14 @@
# func_to_host_file_result to ARG1).
func_convert_file_check ()
{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -1606,10 +2980,11 @@
# func_to_host_file_result to a simplistic fallback value (see below).
func_convert_path_check ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$4" && test -n "$3"; then
func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ func_error " '$3'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This is a deliberately simplistic "conversion" and
# should not be "improved". See libtool.info.
@@ -1618,7 +2993,7 @@
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -1630,9 +3005,10 @@
# and appending REPL if ORIG matches BACKPAT.
func_convert_path_front_back_pathsep ()
{
- $opt_debug
+ $debug_cmd
+
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -1646,7 +3022,7 @@
##################################################
# $build to $host FILE NAME CONVERSION FUNCTIONS #
##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# Result will be available in $func_to_host_file_result.
@@ -1657,7 +3033,8 @@
# in func_to_host_file_result.
func_to_host_file ()
{
- $opt_debug
+ $debug_cmd
+
$to_host_file_cmd "$1"
}
# end func_to_host_file
@@ -1669,7 +3046,8 @@
# in (the comma separated) LAZY, no conversion takes place.
func_to_tool_file ()
{
- $opt_debug
+ $debug_cmd
+
case ,$2, in
*,"$to_tool_file_cmd",*)
func_to_tool_file_result=$1
@@ -1687,7 +3065,7 @@
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -1698,11 +3076,12 @@
# func_to_host_file_result.
func_convert_file_msys_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1714,8 +3093,9 @@
# func_to_host_file_result.
func_convert_file_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# because $build is cygwin, we call "the" cygpath in $PATH; no need to use
# LT_CYGPATH in this case.
@@ -1731,11 +3111,12 @@
# and a working winepath. Returns result in func_to_host_file_result.
func_convert_file_nix_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1747,12 +3128,13 @@
# Returns result in func_to_host_file_result.
func_convert_file_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1765,13 +3147,14 @@
# in func_to_host_file_result.
func_convert_file_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
func_convert_core_file_wine_to_w32 "$1"
func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1781,7 +3164,7 @@
#############################################
# $build to $host PATH CONVERSION FUNCTIONS #
#############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# The result will be available in $func_to_host_path_result.
@@ -1805,10 +3188,11 @@
to_host_path_cmd=
func_init_to_host_path_cmd ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$to_host_path_cmd"; then
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1818,7 +3202,8 @@
# in func_to_host_path_result.
func_to_host_path ()
{
- $opt_debug
+ $debug_cmd
+
func_init_to_host_path_cmd
$to_host_path_cmd "$1"
}
@@ -1829,7 +3214,7 @@
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1840,8 +3225,9 @@
# func_to_host_path_result.
func_convert_path_msys_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from ARG. MSYS
# behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3235,7 @@
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3249,9 @@
# func_to_host_file_result.
func_convert_path_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1883,14 +3270,15 @@
# a working winepath. Returns result in func_to_host_file_result.
func_convert_path_nix_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3292,16 @@
# Returns result in func_to_host_file_result.
func_convert_path_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3316,9 @@
# func_to_host_file_result.
func_convert_path_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3327,7 @@
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3336,31 @@
# end func_convert_path_nix_to_cygwin
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^[ ]*//' \
+ -e '/^\(;.*\)*$/d' \
+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
# func_mode_compile arg...
func_mode_compile ()
{
- $opt_debug
+ $debug_cmd
+
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1965,12 +3373,12 @@
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1980,7 +3388,7 @@
case $arg in
-o)
test -n "$libobj" && \
- func_fatal_error "you cannot specify \`-o' more than once"
+ func_fatal_error "you cannot specify '-o' more than once"
arg_mode=target
continue
;;
@@ -2009,12 +3417,12 @@
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -2027,8 +3435,8 @@
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -2043,13 +3451,13 @@
func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
;;
*)
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -2069,7 +3477,7 @@
case $libobj in
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
;;
esac
@@ -2078,8 +3486,8 @@
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -2105,17 +3513,17 @@
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3535,16 @@
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# Calculate the filename of the output object if compiler does
# not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -2145,12 +3553,12 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -2158,7 +3566,7 @@
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2180,11 +3588,11 @@
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -2201,7 +3609,7 @@
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2212,7 +3620,7 @@
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2228,20 +3636,20 @@
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -2250,7 +3658,7 @@
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2261,7 +3669,7 @@
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2281,7 +3689,7 @@
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -2291,7 +3699,7 @@
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -2311,7 +3719,7 @@
Remove files from the build directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3738,16 @@
-no-suppress do not suppress compiler output for multiple passes
-prefer-pic try to build PIC objects only
-prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -shared do not build a '.o' file suitable for static linking
+ -static only build a '.o' file suitable for static linking
-Wc,FLAG pass FLAG directly to the compiler
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
from the given SOURCEFILE.
The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
;;
execute)
@@ -2352,7 +3760,7 @@
-dlopen FILE add the directory containing FILE to the library path
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
flags.
If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3779,7 @@
Each LIBDIR is a directory that contains libtool libraries.
The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
;;
install)
@@ -2381,7 +3789,7 @@
Install executables or libraries.
INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2407,7 +3815,7 @@
-avoid-version do not add a version suffix if possible
-bindir BINDIR specify path to binaries directory (for systems where
libraries must be found in the PATH setting at runtime)
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -2421,7 +3829,8 @@
-no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -2441,20 +3850,20 @@
-Xlinker FLAG pass linker-specific FLAG directly to the linker
-XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
treated as uninstalled libtool libraries, other files are standard or library
object files.
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
required, except when creating a convenience library.
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -2465,7 +3874,7 @@
Remove libraries from an installation directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3882,17 @@
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
;;
esac
echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
}
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -2491,7 +3900,7 @@
for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3908,7 @@
func_mode_help
done
} |
- sed '1d
+ $SED '1d
/^When reporting/,/^Report/{
H
d
@@ -2516,16 +3925,17 @@
# func_mode_execute arg...
func_mode_execute ()
{
- $opt_debug
+ $debug_cmd
+
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
for file in $opt_dlopen; do
test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
+ || func_fatal_help "'$file' is not a file"
dir=
case $file in
@@ -2535,7 +3945,7 @@
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$lib' is not a valid libtool archive"
+ || func_fatal_help "'$lib' is not a valid libtool archive"
# Read the libtool library.
dlname=
@@ -2546,18 +3956,18 @@
if test -z "$dlname"; then
# Warn if it was a shared library.
test -n "$library_names" && \
- func_warning "\`$file' was not linked with \`-export-dynamic'"
+ func_warning "'$file' was not linked with '-export-dynamic'"
continue
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
fi
fi
;;
@@ -2565,18 +3975,18 @@
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
esac
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3998,7 @@
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -2601,12 +4011,12 @@
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -2614,7 +4024,15 @@
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -2631,25 +4049,18 @@
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
- $opt_debug
+ $debug_cmd
+
libs=
libdirs=
admincmds=
@@ -2663,11 +4074,11 @@
if func_lalib_unsafe_p "$opt"; then
func_append libs " $opt"
else
- func_warning "\`$opt' is not a valid libtool archive"
+ func_warning "'$opt' is not a valid libtool archive"
fi
else
- func_fatal_error "invalid argument \`$opt'"
+ func_fatal_error "invalid argument '$opt'"
fi
done
@@ -2682,12 +4093,12 @@
# Remove sysroot references
if $opt_dry_run; then
for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ echo "removing references to $lt_sysroot and '=' prefixes from $lib"
done
else
tmpdir=`func_mktempdir`
for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2712,7 +4123,7 @@
fi
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
echo "----------------------------------------------------------------------"
@@ -2723,27 +4134,27 @@
echo
echo "If you ever happen to want to link against installed libraries"
echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "specify the full pathname of the library, or use the '-LLIBDIR'"
echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " - add LIBDIR to the '$shlibpath_var' environment variable"
echo " during execution"
fi
if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " - add LIBDIR to the '$runpath_var' environment variable"
echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
+ $ECHO " - use the '$flag' linker flag"
fi
if test -n "$admincmds"; then
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
fi
echo
@@ -2762,18 +4173,20 @@
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
func_mode_install ()
{
- $opt_debug
+ $debug_cmd
+
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4213,7 @@
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2813,7 +4226,7 @@
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2831,7 +4244,7 @@
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2856,7 +4269,7 @@
func_fatal_help "you must specify an install program"
test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
@@ -2878,19 +4291,19 @@
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
test "$#" -gt 1 && \
- func_fatal_help "\`$dest' is not a directory"
+ func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4312,7 @@
case $file in
*.lo) ;;
*)
- func_fatal_help "\`$destdir' must be an absolute directory name"
+ func_fatal_help "'$destdir' must be an absolute directory name"
;;
esac
done
@@ -2908,7 +4321,7 @@
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2928,7 +4341,7 @@
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$file' is not a valid libtool archive"
+ || func_fatal_help "'$file' is not a valid libtool archive"
library_names=
old_library=
@@ -2950,7 +4363,7 @@
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2964,7 +4377,7 @@
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4386,36 @@
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
- func_warning "relinking \`$file'"
+ func_warning "relinking '$file'"
func_show_eval "$relink_command" \
- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
fi
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ test -n "$relink_command" && srcname=${realname}T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
+ ;;
+ esac
+ ;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
;;
esac
;;
@@ -3006,7 +4426,7 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
+ # Try 'ln -sf' first, because the 'ln' binary might depend on
# the symlink we replace! Solaris /bin/ln does not understand -f,
# so we also need to try rm && ln -s.
for linkname
@@ -3017,14 +4437,14 @@
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -3036,11 +4456,11 @@
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -3050,11 +4470,11 @@
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
- func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ func_fatal_help "cannot copy a libtool object to '$destfile'"
;;
esac
@@ -3063,7 +4483,7 @@
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -3075,23 +4495,23 @@
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -3119,19 +4539,19 @@
# Check the variables that should have been set.
test -z "$generated_by_libtool_version" && \
- func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+ func_fatal_error "invalid libtool wrapper script '$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
- func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ func_warning "'$lib' has not been installed in '$libdir'"
+ finalize=false
fi
done
@@ -3139,29 +4559,29 @@
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- $opt_silent || {
+ $opt_quiet || {
func_quote_for_expand "$relink_command"
eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
- func_error "error: relink \`$file' with the above command before installing it"
+ func_error "error: relink '$file' with the above command before installing it"
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
- func_warning "cannot relink \`$file'"
+ func_warning "cannot relink '$file'"
fi
}
else
@@ -3198,10 +4618,10 @@
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -3216,18 +4636,18 @@
done
test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4655,17 @@
# a dlpreopen symbol table.
func_generate_dlsyms ()
{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened files"
fi
@@ -3255,7 +4676,7 @@
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -3263,34 +4684,36 @@
func_verbose "creating $output_objdir/$my_dlsyms"
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
#endif
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
# define LT_DLSYM_CONST const
#endif
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
- func_verbose "generating symbol list for \`$output'"
+ if test yes = "$dlself"; then
+ func_verbose "generating symbol list for '$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -3298,7 +4721,7 @@
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
$opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
@@ -3318,10 +4741,10 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4754,7 @@
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -3345,22 +4768,22 @@
fi
for dlprefile in $dlprefiles; do
- func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_verbose "extracting global C symbols from '$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ name=$func_basename_result
case $host in
*cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
+ dlprefile_dlbasename=
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
+ if test -n "$dlprefile_dlname"; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4791,7 @@
fi
fi
$opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
+ if test -n "$dlprefile_dlbasename"; then
eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
else
func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4847,11 @@
echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
+ func_show_eval '$RM "${nlist}I"'
+ if test -n "$global_symbol_to_import"; then
+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+ fi
+
echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
@@ -3432,11 +4860,30 @@
void *address;
} lt_dlsymlist;
extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+ echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+ fi
+ echo >> "$output_objdir/$my_dlsyms" "\
LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) <_syminit},"
+ fi
case $need_lib_prefix in
no)
@@ -3478,9 +4925,7 @@
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -3497,10 +4942,10 @@
func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
# Clean up the generated files.
- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4963,7 @@
esac
;;
*)
- func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ func_fatal_error "unknown suffix for '$my_dlsyms'"
;;
esac
else
@@ -3532,6 +4977,32 @@
fi
}
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -3541,8 +5012,9 @@
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +5024,29 @@
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- $SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+ if func_cygming_ms_implib_p "$1" ||
+ func_cygming_gnu_implib_p "$1"
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
}'`
+ ;;
+ esac
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -3593,7 +5078,8 @@
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib ()
{
- $opt_debug
+ $debug_cmd
+
sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
}
@@ -3610,7 +5096,8 @@
# specified import library.
func_cygming_dll_for_implib_fallback_core ()
{
- $opt_debug
+ $debug_cmd
+
match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
$OBJDUMP -s --section "$1" "$2" 2>/dev/null |
$SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5133,8 @@
/./p' |
# we now have a list, one entry per line, of the stringified
# contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
# a '.' (that is, objdump's representation of an unprintable
# character.) This should work for all archives with less than
# 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5145,6 @@
$SED -e '/^\./d;/^.\./d;q'
}
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
# func_cygming_dll_for_implib_fallback ARG
# Platform-specific function to extract the
# name of the DLL associated with the specified
@@ -3695,16 +5158,17 @@
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib_fallback ()
{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ if func_cygming_gnu_implib_p "$1"; then
# binutils import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
+ elif func_cygming_ms_implib_p "$1"; then
# ms-generated import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
else
# unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
fi
}
@@ -3712,10 +5176,11 @@
# func_extract_an_archive dir oldlib
func_extract_an_archive ()
{
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
lockfile=$f_ex_an_ar_oldlib.lock
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5189,7 @@
fi
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5203,23 @@
# func_extract_archives gentop oldlib ...
func_extract_archives ()
{
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3765,7 +5231,7 @@
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3778,22 +5244,23 @@
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ for darwin_arch in $darwin_arches; do
+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+ cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+ func_extract_an_archive "`pwd`" "$darwin_base_archive"
cd "$darwin_curdir"
- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3815,7 +5282,7 @@
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3830,7 +5297,7 @@
#
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3841,7 +5308,7 @@
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3898,9 +5365,9 @@
# Very basic option parsing. These options are (a) specific to
# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -3933,7 +5400,7 @@
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
fi
}
@@ -3944,7 +5411,7 @@
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3958,7 +5425,7 @@
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5435,7 @@
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5510,13 @@
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -4066,7 +5533,7 @@
if test -n \"\$relink_command\"; then
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
- $ECHO \"\$relink_command_output\" >&2
+ \$ECHO \"\$relink_command_output\" >&2
$RM \"\$progdir/\$file\"
exit 1
fi
@@ -4101,7 +5568,7 @@
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5588,7 @@
fi
else
# The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
\$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
@@ -4140,7 +5607,7 @@
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -4175,47 +5642,45 @@
#include <fcntl.h>
#include <sys/stat.h>
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
# ifdef __STRICT_ANSI__
int _putenv (const char *);
# endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
char *realpath (const char *, char *);
int putenv (char *);
int setenv (const char *, const char *, int);
# endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
#endif
/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# define HAVE_SETENV
# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
#endif
-#if defined(PATH_MAX)
+#if defined PATH_MAX
# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
# define LT_PATHMAX MAXPATHLEN
#else
# define LT_PATHMAX 1024
@@ -4234,8 +5699,8 @@
# define PATH_SEPARATOR ':'
#endif
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
# define HAVE_DOS_BASED_FILE_SYSTEM
# define FOPEN_WB "wb"
# ifndef DIR_SEPARATOR_2
@@ -4268,10 +5733,10 @@
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
static int lt_debug = 1;
#else
static int lt_debug = 0;
@@ -4300,11 +5765,16 @@
EOF
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5798,7 @@
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -4357,12 +5827,12 @@
char *actual_cwrapper_name;
char *target_name;
char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
/* very simple arg parsing; don't want to rely on getopt
* also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5841,10 @@
newargc=0;
for (i = 1; i < argc; i++)
{
- if (strcmp (argv[i], dumpscript_opt) == 0)
+ if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5855,12 @@
lt_dump_script (stdout);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
+ if (STREQ (argv[i], debug_opt))
{
lt_debug = 1;
continue;
}
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ if (STREQ (argv[i], ltwrapper_option_prefix))
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
@@ -4413,7 +5883,7 @@
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5994,7 @@
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz);
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
@@ -4569,7 +6039,7 @@
{
const char *base;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
/* Skip over the disk name in MSDOS pathnames. */
if (isalpha ((unsigned char) name[0]) && name[1] == ':')
name += 2;
@@ -4628,7 +6098,7 @@
const char *p_next;
/* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
- int tmp_len;
+ size_t tmp_len;
char *concat_name;
lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6108,7 @@
return NULL;
/* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
@@ -4656,7 +6126,7 @@
return concat_name;
XFREE (concat_name);
}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
}
#endif
@@ -4679,7 +6149,7 @@
for (q = p; *q; q++)
if (IS_PATH_SEPARATOR (*q))
break;
- p_len = q - p;
+ p_len = (size_t) (q - p);
p_next = (*q == '\0' ? q : q + 1);
if (p_len == 0)
{
@@ -4798,7 +6268,7 @@
if (patlen <= len)
{
str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
*str = '\0';
}
return str;
@@ -4863,7 +6333,7 @@
char *str = xstrdup (value);
setenv (name, str, 1);
#else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
char *str = XMALLOC (char, len);
sprintf (str, "%s=%s", name, value);
if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6350,8 @@
char *new_value;
if (orig_value && *orig_value)
{
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
new_value = XMALLOC (char, add_len + orig_value_len + 1);
if (to_end)
{
@@ -4912,10 +6382,10 @@
{
char *new_value = lt_extend_str (getenv (name), value, 0);
/* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
{
- new_value[len-1] = '\0';
+ new_value[--len] = '\0';
}
lt_setenv (name, new_value);
XFREE (new_value);
@@ -5082,27 +6552,47 @@
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
{
- $opt_debug
+ $debug_cmd
+
case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
*import*) : ;;
*) false ;;
esac
}
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
- $opt_debug
+ $debug_cmd
+
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6636,11 @@
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -5161,7 +6652,7 @@
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -5169,15 +6660,15 @@
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
@@ -5210,7 +6701,7 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6718,21 @@
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -5249,9 +6740,9 @@
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -5261,7 +6752,7 @@
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -5272,14 +6763,14 @@
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
- || func_fatal_error "symbol file \`$arg' does not exist"
+ || func_fatal_error "symbol file '$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -5297,7 +6788,13 @@
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
+ prev=
+ continue
+ ;;
+ mllvm)
+ # Clang does not use LLVM to link, so we can simply discard any
+ # '-mllvm $arg' options when doing the link step.
prev=
continue
;;
@@ -5321,21 +6818,21 @@
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5346,7 +6843,7 @@
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5354,23 +6851,23 @@
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5378,7 +6875,7 @@
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6883,29 @@
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
done
else
- func_fatal_error "link input file \`$arg' does not exist"
+ func_fatal_error "link input file '$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -5415,7 +6917,7 @@
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -5430,7 +6932,7 @@
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -5470,7 +6972,7 @@
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -5484,7 +6986,7 @@
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ func_fatal_error "'-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -5516,7 +7018,7 @@
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -5550,9 +7052,9 @@
func_stripname "-L" '' "$arg"
if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
+ func_fatal_error "require no space between '-L' and '$1'"
else
- func_fatal_error "need path for \`-L' option"
+ func_fatal_error "need path for '-L' option"
fi
fi
func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +7065,8 @@
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
- func_fatal_error "cannot determine absolute directory name of \`$dir'"
- dir="$absdir"
+ func_fatal_error "cannot determine absolute directory name of '$dir'"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -5599,7 +7101,7 @@
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -5607,11 +7109,11 @@
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7122,16 @@
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5639,6 +7141,11 @@
continue
;;
+ -mllvm)
+ prev=mllvm
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -5668,7 +7175,7 @@
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5682,8 +7189,8 @@
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
- func_warning "assuming \`-no-fast-install' instead"
+ func_warning "'-no-install' is ignored for $host"
+ func_warning "assuming '-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -5701,6 +7208,11 @@
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -5788,14 +7300,14 @@
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $func_quote_for_eval_result"
func_append compiler_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5804,15 +7316,15 @@
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $wl$func_quote_for_eval_result"
func_append compiler_flags " $wl$func_quote_for_eval_result"
func_append linker_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5835,7 +7347,7 @@
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7359,50 @@
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
# -F/path path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # -fstack-protector* stack protector flags for GCC
# @file GCC response files
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -specs=* GCC specs files
+ # -stdlib=* select c++ std lib with clang
+ # -fsanitize=* Clang/GCC memory and address sanitizer
+ # -fuse-ld=* Linker select flags for GCC
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+ -specs=*|-fsanitize=*|-fuse-ld=*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5886,21 +7423,21 @@
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5911,7 +7448,7 @@
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5919,23 +7456,23 @@
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5943,7 +7480,7 @@
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7488,7 @@
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
;;
@@ -5967,11 +7504,11 @@
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5986,7 +7523,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5998,9 +7535,9 @@
done # argument parsing loop
test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6009,20 +7546,23 @@
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -6045,7 +7585,7 @@
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6053,7 +7593,7 @@
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7625,7 @@
case $file in
*.la) ;;
*)
- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -6093,7 +7633,7 @@
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -6105,29 +7645,32 @@
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -6148,26 +7691,26 @@
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6177,13 +7720,13 @@
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- func_warning "\`-l' is ignored for archives/objects"
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
+ func_warning "'-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6191,31 +7734,22 @@
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -6223,19 +7757,19 @@
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
+ if test "X$ll" = "X$old_library"; then # only static version available
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -6244,15 +7778,25 @@
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6265,18 +7809,18 @@
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6287,13 +7831,13 @@
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
- func_warning "\`-L' is ignored for archives/objects"
+ func_warning "'-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -6311,7 +7855,7 @@
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -6322,21 +7866,26 @@
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
echo "*** I have the capability to make that library automatically link in when"
@@ -6344,18 +7893,13 @@
echo "*** shared version of the library, which you do not appear to have"
echo "*** because the file extensions .$libext of this argument makes me believe"
echo "*** that it is just a static archive that I should not use here."
- else
- echo
- $ECHO "*** Warning: Linking the shared library $output against the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6366,10 +7910,10 @@
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -6382,22 +7926,20 @@
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
- || func_fatal_error "\`$lib' is not a valid libtool archive"
+ || func_fatal_error "'$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -6427,36 +7969,36 @@
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
+ elif test prog != "$linkmode" && test lib != "$linkmode"; then
+ func_fatal_error "'$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -6464,26 +8006,26 @@
# Get the name of the library we link against.
linklib=
if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -z "$libdir" \
+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ then
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
@@ -6497,40 +8039,40 @@
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "cannot determine absolute directory name of '$ladir'"
func_warning "passing it literally to the linker, although it might fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ func_warning "library '$lib' was moved."
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -6539,11 +8081,11 @@
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -6587,9 +8129,9 @@
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -6599,14 +8141,14 @@
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -6618,14 +8160,14 @@
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6635,15 +8177,15 @@
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -6672,9 +8214,9 @@
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -6683,19 +8225,19 @@
link_static=no # Whether the deplib will be linked statically
use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes; then
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -6705,24 +8247,24 @@
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
$ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
$ECHO "*** $linklib is not portable!"
fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6750,43 +8292,43 @@
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- func_verbose "extracting exported symbol list from \`$soname'"
+ func_verbose "extracting exported symbol list from '$soname'"
func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- func_verbose "generating import library for \`$soname'"
+ func_verbose "generating import library for '$soname'"
func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -6794,58 +8336,58 @@
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+ *-*-sysv4*uw2*) add_dir=-L$dir ;;
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
- # if the lib is a (non-dlopened) module then we can not
+ # if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [^:]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
+ if test -z "$old_library"; then
echo
echo "*** And there doesn't seem to be a static archive available"
echo "*** The link will probably fail, sorry"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6854,10 +8396,10 @@
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6865,7 +8407,7 @@
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6875,15 +8417,15 @@
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6892,33 +8434,33 @@
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir=-L$libdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6927,10 +8469,10 @@
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6938,43 +8480,43 @@
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** Warning: This system cannot link to static lib archive $lib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have."
- if test "$module" = yes; then
+ if test yes = "$module"; then
echo "*** But as you try to build a module library, libtool will still create "
echo "*** a static module, that should work as long as the dlopening application"
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6987,11 +8529,11 @@
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -7005,12 +8547,12 @@
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -7020,7 +8562,7 @@
func_resolve_sysroot "$func_stripname_result";;
*) func_resolve_sysroot "$deplib" ;;
esac
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7029,12 +8571,12 @@
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -7042,12 +8584,12 @@
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- func_warning "cannot determine absolute directory name of \`$dir'"
- absdir="$dir"
+ func_warning "cannot determine absolute directory name of '$dir'"
+ absdir=$dir
fi
;;
esac
@@ -7055,35 +8597,35 @@
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names"; then
+ for tmp in $deplibrary_names; do
depdepl=$tmp
done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -f "$absdir/$objdir/$depdepl"; then
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ func_warning "'$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -7095,23 +8637,23 @@
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -7121,12 +8663,12 @@
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -7184,62 +8726,93 @@
eval $var=\"$tmp_libs\"
done # for var
fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
# Last step: remove runtime libs from dependency_libs
# (they stay in deplibs)
tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
- if test -n "$i" ; then
+ if test -n "$i"; then
func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for archives"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ func_warning "'-l' and '-L' are ignored for archives" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for archives"
+ func_warning "'-rpath' is ignored for archives"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for archives"
+ func_warning "'-R' is ignored for archives"
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for archives"
+ func_warning "'-version-info/-version-number' is ignored for archives"
test -n "$release" && \
- func_warning "\`-release' is ignored for archives"
+ func_warning "'-release' is ignored for archives"
test -n "$export_symbols$export_symbols_regex" && \
- func_warning "\`-export-symbols' is ignored for archives"
+ func_warning "'-export-symbols' is ignored for archives"
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
case $outputname in
lib*)
func_stripname 'lib' '.la' "$outputname"
@@ -7248,10 +8821,10 @@
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test no = "$module" \
+ && func_fatal_help "libtool library '$output' must begin with 'lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -7265,8 +8838,8 @@
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ if test pass_all != "$deplibs_check_method"; then
+ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
else
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7275,21 +8848,21 @@
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "'-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
- test "$#" -gt 1 && \
- func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+ && func_warning "ignoring multiple '-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
+ # Some compilers have problems with a '.al' extension so
# convenience libraries should have the same extension an
# archive normally would.
oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7298,20 +8871,20 @@
fi
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ func_warning "'-version-info/-version-number' is ignored for convenience libraries"
test -n "$release" && \
- func_warning "\`-release' is ignored for convenience libraries"
+ func_warning "'-release' is ignored for convenience libraries"
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
- func_fatal_help "too many parameters to \`-version-info'"
+ func_fatal_help "too many parameters to '-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -7319,42 +8892,45 @@
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ freebsd-aout|qnx|sunos)
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
+ ;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -7362,30 +8938,30 @@
case $current in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "CURRENT \`$current' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "CURRENT '$current' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $revision in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "REVISION \`$revision' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "REVISION '$revision' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $age in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "AGE \`$age' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- func_error "AGE \`$age' is greater than the current interface number \`$current'"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' is greater than the current interface number '$current'"
+ func_fatal_error "'$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -7400,26 +8976,36 @@
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -7430,69 +9016,74 @@
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
- # Before this point, $major must not contain `.'.
+ # Before this point, $major must not contain '.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
+ ;;
+
+ sco)
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
# Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
+ # extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
- func_fatal_configuration "unknown library version type \`$version_type'"
+ func_fatal_configuration "unknown library version type '$version_type'"
;;
esac
@@ -7506,42 +9097,45 @@
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- func_warning "undefined symbols not allowed in $host shared libraries"
- build_libtool_libs=no
- build_old_libs=yes
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
+ if test yes = "$build_old_libs"; then
+ func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+ build_libtool_libs=no
+ else
+ func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+ fi
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7550,8 +9144,8 @@
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
then
continue
@@ -7567,11 +9161,11 @@
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -7592,13 +9186,13 @@
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -7608,7 +9202,7 @@
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -7617,7 +9211,7 @@
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7641,7 +9235,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -7657,9 +9251,9 @@
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -7688,20 +9282,20 @@
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7731,20 +9325,20 @@
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7781,24 +9375,24 @@
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
if test -n "$file_magic_glob"; then
libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
else
libnameglob=$libname
fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7816,25 +9410,25 @@
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7842,7 +9436,7 @@
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7865,30 +9459,30 @@
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
+ potlib=$potent_lib # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7896,7 +9490,7 @@
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7912,18 +9506,18 @@
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ for i in $predeps $postdeps; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7947,8 +9541,8 @@
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7957,12 +9551,12 @@
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7973,14 +9567,14 @@
echo "*** automatically added whenever a program is linked with this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
echo "*** it was explicitly requested with -no-undefined,"
echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -8026,7 +9620,7 @@
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -8034,25 +9628,25 @@
dlname=
# Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- # Remove ${wl} instances when linking with ld.
+ if test yes = "$build_libtool_libs"; then
+ # Remove $wl instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
- if test "$hardcode_into_libs" = yes; then
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
func_replace_sysroot "$libdir"
libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8077,7 +9671,7 @@
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8091,8 +9685,8 @@
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,19 +9696,19 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -8128,7 +9722,7 @@
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -8137,31 +9731,31 @@
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ func_dll_def_p "$export_symbols" || {
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
- fi
+ }
fi
;;
esac
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
# Take the normal branch if the nm_file_list_spec branch
# doesn't work or if tool conversion is not needed.
case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8175,7 +9769,7 @@
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -8186,7 +9780,7 @@
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ output=$output_objdir/$output_la.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
func_append delfiles " $output"
@@ -8209,8 +9803,8 @@
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -8218,16 +9812,16 @@
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8246,11 +9840,11 @@
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -8261,7 +9855,7 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8270,18 +9864,18 @@
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -8299,7 +9893,7 @@
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8332,8 +9926,8 @@
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -8345,14 +9939,14 @@
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -8367,7 +9961,7 @@
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -8379,13 +9973,13 @@
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -8395,10 +9989,10 @@
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -8410,9 +10004,9 @@
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\$concat_cmds$reload_cmds\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -8420,9 +10014,9 @@
output=
fi
- if ${skipped_export-false}; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ ${skipped_export-false} && {
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -8431,16 +10025,16 @@
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8448,7 +10042,7 @@
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8457,7 +10051,7 @@
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8465,18 +10059,18 @@
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8485,7 +10079,7 @@
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -8499,7 +10093,7 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -8521,7 +10115,7 @@
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8529,11 +10123,12 @@
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$sp$nl
eval cmd=\"$cmd\"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8541,7 +10136,7 @@
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8550,10 +10145,10 @@
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8573,39 +10168,39 @@
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for objects"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ func_warning "'-l' and '-L' are ignored for objects" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for objects"
+ func_warning "'-rpath' is ignored for objects"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for objects"
+ func_warning "'-R' is ignored for objects"
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for objects"
+ func_warning "'-version-info' is ignored for objects"
test -n "$release" && \
- func_warning "\`-release' is ignored for objects"
+ func_warning "'-release' is ignored for objects"
case $output in
*.lo)
test -n "$objs$old_deplibs" && \
- func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+ func_fatal_error "cannot build library object '$output' from non-libtool objects"
libobj=$output
func_lo2o "$libobj"
@@ -8613,7 +10208,7 @@
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -8626,17 +10221,19 @@
# the extraction.
reload_conv_objs=
gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD[\ \$]*) wl= ;;
+ esac
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8645,12 +10242,12 @@
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -8662,7 +10259,7 @@
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -8672,12 +10269,12 @@
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -8694,16 +10291,14 @@
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for programs"
+ func_warning "'-version-info' is ignored for programs"
test -n "$release" && \
- func_warning "\`-release' is ignored for programs"
+ func_warning "'-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+ $preload \
+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8717,11 +10312,11 @@
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8757,7 +10352,7 @@
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8781,7 +10376,7 @@
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8804,7 +10399,7 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8821,10 +10416,10 @@
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8832,7 +10427,7 @@
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8857,45 +10452,43 @@
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
# Transform all the library objects into standard objects.
compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8908,12 +10501,12 @@
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8943,9 +10536,9 @@
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
@@ -8962,27 +10555,28 @@
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "'$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9039,8 +10633,8 @@
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ cwrappersource=$output_path/$objdir/lt-$output_name.c
+ cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -9061,7 +10655,7 @@
trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
- if test "x$build" = "x$host" ; then
+ if test "x$build" = "x$host"; then
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9084,25 +10678,27 @@
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -9110,13 +10706,13 @@
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -9137,7 +10733,7 @@
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -9146,7 +10742,7 @@
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -9215,18 +10811,18 @@
else
# the above command should be used before it gets too long
oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
+ if test "$obj" = "$last_oldobj"; then
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9243,7 +10839,7 @@
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -9258,31 +10854,31 @@
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ name=$func_basename_result
func_resolve_sysroot "$deplib"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
@@ -9298,23 +10894,23 @@
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -9324,34 +10920,34 @@
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -9367,10 +10963,9 @@
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
+ tdlname=$func_relative_path_result/$dlname
else
# Otherwise fall back on heuristic.
tdlname=../bin/$dlname
@@ -9379,7 +10974,7 @@
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -9393,7 +10988,7 @@
# The name of the static archive.
old_library='$old_library'
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
inherited_linker_flags='$new_inherited_linker_flags'
# Libraries that this one depends upon.
@@ -9419,7 +11014,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -9434,27 +11029,29 @@
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
func_mode_uninstall ()
{
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -9467,18 +11064,18 @@
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -9493,11 +11090,11 @@
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -9511,7 +11108,7 @@
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -9522,12 +11119,12 @@
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -9543,21 +11140,19 @@
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -9584,12 +11179,12 @@
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
- if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ if test "X$noexename" != "X$name"; then
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -9598,7 +11193,7 @@
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9608,16 +11203,17 @@
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
@@ -9628,7 +11224,7 @@
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
@@ -9651,5 +11247,3 @@
# mode:shell-script
# sh-indentation:2
# End:
-# vi:sw=2
-
diff --git a/third_party/nlbuild-autotools/repo/third_party/autoconf/missing b/third_party/nlbuild-autotools/repo/third_party/autoconf/missing
index db98974..625aeb1 100755
--- a/third_party/nlbuild-autotools/repo/third_party/autoconf/missing
+++ b/third_party/nlbuild-autotools/repo/third_party/autoconf/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/third_party/openssl-jpake/Makefile.in b/third_party/openssl-jpake/Makefile.in
index f3c9e7e..e03d6b6 100644
--- a/third_party/openssl-jpake/Makefile.in
+++ b/third_party/openssl-jpake/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -37,7 +37,17 @@
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,9 +112,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = third_party/openssl-jpake
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -123,18 +130,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -201,7 +209,11 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake.Po \
+ openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake_err.Po \
+ openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake.Po \
+ openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake_err.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -251,6 +263,9 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -340,6 +355,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -499,6 +515,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -554,14 +571,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third_party/openssl-jpake/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign third_party/openssl-jpake/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -641,10 +657,16 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake_err.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake_err.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake_err.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake_err.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$$||'`;\
@@ -784,7 +806,10 @@
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)'; \
@@ -861,7 +886,10 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf openssl/crypto/ecjpake/$(DEPDIR) openssl/crypto/jpake/$(DEPDIR)
+ -rm -f openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake.Po
+ -rm -f openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake_err.Po
+ -rm -f openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake.Po
+ -rm -f openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake_err.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -907,7 +935,10 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf openssl/crypto/ecjpake/$(DEPDIR) openssl/crypto/jpake/$(DEPDIR)
+ -rm -f openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake.Po
+ -rm -f openssl/crypto/ecjpake/$(DEPDIR)/libopenssl_jpake_a-ecjpake_err.Po
+ -rm -f openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake.Po
+ -rm -f openssl/crypto/jpake/$(DEPDIR)/libopenssl_jpake_a-jpake_err.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -928,9 +959,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES 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-libLIBRARIES 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 \
@@ -942,6 +973,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
diff --git a/third_party/openssl/Makefile.in b/third_party/openssl/Makefile.in
index 75f0c10..85271c0 100644
--- a/third_party/openssl/Makefile.in
+++ b/third_party/openssl/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,
@@ -39,7 +39,17 @@
# the OpenSSL build system.
#
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -104,8 +114,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = third_party/openssl
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
@@ -124,18 +132,19 @@
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
- $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
+ $(top_srcdir)/build/autoconf/m4/libtool.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltoptions.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltsugar.m4 \
+ $(top_srcdir)/build/autoconf/m4/ltversion.m4 \
+ $(top_srcdir)/build/autoconf/m4/lt~obsolete.m4 \
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) \
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -161,6 +170,8 @@
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -250,6 +261,7 @@
LNDIR = @LNDIR@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LWIP_CPPFLAGS = @LWIP_CPPFLAGS@
LWIP_LDFLAGS = @LWIP_LDFLAGS@
LWIP_LIBS = @LWIP_LIBS@
@@ -409,6 +421,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -476,14 +489,13 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third_party/openssl/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign third_party/openssl/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ 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)
@@ -507,7 +519,10 @@
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)'; \
@@ -572,8 +587,8 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@WEAVE_WITH_OPENSSL_INTERNAL_FALSE@install-data-local:
@WEAVE_WITH_OPENSSL_INTERNAL_FALSE@clean-local:
+@WEAVE_WITH_OPENSSL_INTERNAL_FALSE@install-data-local:
@WEAVE_WITH_OPENSSL_INTERNAL_FALSE@distclean-local:
clean: clean-am
@@ -656,6 +671,8 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
