diff --git a/.travis.yml b/.travis.yml index c860cc8fa8..d212f059b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ # # Description: -# This file is the Travis CI hosted, distributed continuous +# This file is the Travis CI hosted, distributed continuous # integration configuration file for the OpenWeave Core library. # @@ -64,6 +64,12 @@ matrix: compiler: clang - name: "ESP32 (openweave-esp32-demo)" env: BUILD_TARGET="esp32" + - name: "nRF52840 Lock Example (Linux)" + env: BUILD_TARGET="nrf52840-lock-example" + os: linux + - name: "nRF52840 Lock Example (OS X)" + env: BUILD_TARGET="nrf52840-lock-example" + os: osx - name: "Linux with Defaults against GCC Functional and Unit Tests" env: BUILD_TARGET="linux-auto-gcc-check" CC="gcc" os: linux @@ -104,4 +110,4 @@ deploy: tags: true env: global: - secure: PJdNS8L51Y+Op8xc2C9U13Y6eQUAszDEKigB0jn9LsXB8BZwJsu3mjmtLTQBU99nqAhsCKiN85kxry6APi/xjcDJ3/iRP8IpP8KJ/VV68CChdu1X/2iatSS/EOAT4ZBoo3sUCmP98w4k5G6HiVCpnNprhZOg8xsD9bflVkX9Au67hcwfHfKWyX1c/kbYYyegSWd+7GgkNZRGAws1yuwL1MwGppDqKQJ1bOciALaA1LMzzl1wvrle6t+CWvLH51YoIgndFsTJaphGqXp/hveCIsXEGKY5ZN8RkfuSvs9JupsfoXjA9Nxg2WfLC5c4MeyJV9yvzF9zZNglra9+PTlHFMxnuSvyIKRiHb9rwXMwgtb8Tqwhe0Cikj77gHdRUfZjUNBS34nNRqACSFjSFDM9N862z17BqfMZu0A0znquM24vfm+JV1i7OZ8USdbbmBqtL5qJgimQv2/Y/j3H/o6IrqOLEhuzOXQynclf6xi6AdXlcJ1QmTTicU5JbETJuzkvOYsnUs7TBV0FaPf+j98LEHTXZUPlDtQz4sIu757SiYUuR6Jm357yOwyv+x/PMk250g2op0TtMksjR3HQahnz8HJPYLenOxogYqarqY6E4TNm2P+bRDCPgxQ+dTSvlrcH8qhl+PHImn38q38ghm98WUvqdwxAApI3cZdy4Ja/3WA= \ No newline at end of file + secure: PJdNS8L51Y+Op8xc2C9U13Y6eQUAszDEKigB0jn9LsXB8BZwJsu3mjmtLTQBU99nqAhsCKiN85kxry6APi/xjcDJ3/iRP8IpP8KJ/VV68CChdu1X/2iatSS/EOAT4ZBoo3sUCmP98w4k5G6HiVCpnNprhZOg8xsD9bflVkX9Au67hcwfHfKWyX1c/kbYYyegSWd+7GgkNZRGAws1yuwL1MwGppDqKQJ1bOciALaA1LMzzl1wvrle6t+CWvLH51YoIgndFsTJaphGqXp/hveCIsXEGKY5ZN8RkfuSvs9JupsfoXjA9Nxg2WfLC5c4MeyJV9yvzF9zZNglra9+PTlHFMxnuSvyIKRiHb9rwXMwgtb8Tqwhe0Cikj77gHdRUfZjUNBS34nNRqACSFjSFDM9N862z17BqfMZu0A0znquM24vfm+JV1i7OZ8USdbbmBqtL5qJgimQv2/Y/j3H/o6IrqOLEhuzOXQynclf6xi6AdXlcJ1QmTTicU5JbETJuzkvOYsnUs7TBV0FaPf+j98LEHTXZUPlDtQz4sIu757SiYUuR6Jm357yOwyv+x/PMk250g2op0TtMksjR3HQahnz8HJPYLenOxogYqarqY6E4TNm2P+bRDCPgxQ+dTSvlrcH8qhl+PHImn38q38ghm98WUvqdwxAApI3cZdy4Ja/3WA= diff --git a/.travis/before_install.sh b/.travis/before_install.sh index f41c79783e..fb2d69312d 100755 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -18,16 +18,10 @@ # # Description: -# This file is the script for Travis CI hosted, distributed continuous +# This file is the script for Travis CI hosted, distributed continuous # integration 'before_install' trigger of the 'install' step. # -NORDIC_SDK_FOR_THREAD_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5-SDK-for-Thread/nRF5-SDK-for-Thread-and-Zigbee/nRF5SDKforThreadandZigbee20029775ac.zip - -NORDIC_COMMAND_LINE_TOOLS_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF5-command-line-tools/sw/nRF-Command-Line-Tools_9_8_1_Linux-x86_64.tar - -ARM_GCC_TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 - TMPDIR=${TMPDIR-/tmp} die() @@ -74,40 +68,14 @@ installdeps() ;; - nrf5-sdk) - # Install Nordic nRF52840 SDK for Thread and Zigbee - wget -O ${TMPDIR}/nordic_sdk_for_thread.zip -nv ${NORDIC_SDK_FOR_THREAD_URL} || exit 1 - unzip -d ${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee -q ${TMPDIR}/nordic_sdk_for_thread.zip || exit 1 - rm ${TMPDIR}/nordic_sdk_for_thread.zip - - ;; - - nrf5-tools) - # Install Nordic nRF5x Command Line Tools - wget -O ${TMPDIR}/nordic_command_line_tools.tar -nv ${NORDIC_COMMAND_LINE_TOOLS_URL} || exit 1 - mkdir ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools - tar -C ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools -xf ${TMPDIR}/nordic_command_line_tools.tar || exit 1 - rm ${TMPDIR}/nordic_command_line_tools.tar - - ;; - - arm-gcc) - # Install ARM GCC Toolchain - wget -O ${TMPDIR}/arm_gcc_toolchain.tar.bz2 -nv ${ARM_GCC_TOOLCHAIN_URL} || exit 1 - mkdir ${TRAVIS_BUILD_DIR}/arm - tar -jxf ${TMPDIR}/arm_gcc_toolchain.tar.bz2 --directory ${TRAVIS_BUILD_DIR}/arm || exit 1 - rm ${TMPDIR}/arm_gcc_toolchain.tar.bz2 - - ;; - osx-autotools) HOMEBREW_NO_AUTO_UPDATE=1 brew install automake libtool ;; - + osx-openssl) HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl ;; - + esac } @@ -135,8 +103,8 @@ case "${BUILD_TARGET}" in ;; - nrf52840) - .travis/prepare_nrf52840.sh + nrf52840-lock-example) + .travis/prepare_nrf52840_lock_example.sh ;; diff --git a/.travis/build_nrf52840.sh b/.travis/build_nrf52840_lock_example.sh similarity index 71% rename from .travis/build_nrf52840.sh rename to .travis/build_nrf52840_lock_example.sh index 228a21c9b9..513065f196 100755 --- a/.travis/build_nrf52840.sh +++ b/.travis/build_nrf52840_lock_example.sh @@ -21,21 +21,15 @@ # Travis CI build script for nRF52840 integration builds. # -# Export NRF5_SDK_ROOT variable pointing to the nRF5x SDK for Thread and Zigbee. -export NRF5_SDK_ROOT=${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee - -# Export NRF5_TOOLS_ROOT variable pointing to the nRF5x command line tools. -export NRF5_TOOLS_ROOT=${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools - -# Export GNU_INSTALL_ROOT variable pointing to the ARM GCC tool chain. -export GNU_INSTALL_ROOT=${TRAVIS_BUILD_DIR}/arm/gcc-arm-none-eabi-7-2018-q2-update/bin/ - # Export GNU_VERSION variable. export GNU_VERSION=7.3.1 # Add Nordic nRF jprog tool to the path. export PATH=${PATH}:${NRF5_TOOLS_ROOT}/nrfjprog +# Source env variables generated from the prepare script. +source ${TRAVIS_BUILD_DIR}/nrf_setup_vars.sh + # Set OPENWEAVE_ROOT to the Travis build directory. This will result in the example app being # built using the target OpenWeave commit. export OPENWEAVE_ROOT=${TRAVIS_BUILD_DIR} diff --git a/.travis/prepare_nrf52840.sh b/.travis/prepare_nrf52840_lock_example.sh similarity index 64% rename from .travis/prepare_nrf52840.sh rename to .travis/prepare_nrf52840_lock_example.sh index 4f639d0f4d..e01c4938ae 100755 --- a/.travis/prepare_nrf52840.sh +++ b/.travis/prepare_nrf52840_lock_example.sh @@ -23,36 +23,8 @@ TMPDIR=${TMPDIR-/tmp} -# Set tools download links -# -NORDIC_SDK_FOR_THREAD_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5-SDK-for-Thread/nRF5-SDK-for-Thread-and-Zigbee/nRF5SDKforThreadandZigbeev300d310e71.zip -NORDIC_COMMAND_LINE_TOOLS_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF5-command-line-tools/sw/nRF-Command-Line-Tools_9_8_1_Linux-x86_64.tar -ARM_GCC_TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 - -# -------------------------------------------------------------------------------- - set -x -# Install Nordic nRF52840 SDK for Thread and Zigbee -# -wget -O ${TMPDIR}/nordic_sdk_for_thread.zip -nv ${NORDIC_SDK_FOR_THREAD_URL} || exit 1 -unzip -d ${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee -q ${TMPDIR}/nordic_sdk_for_thread.zip || exit 1 -rm ${TMPDIR}/nordic_sdk_for_thread.zip - -# Install Nordic nRF5x Command Line Tools -# -wget -O ${TMPDIR}/nordic_command_line_tools.tar -nv ${NORDIC_COMMAND_LINE_TOOLS_URL} || exit 1 -mkdir ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools -tar -C ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools -xf ${TMPDIR}/nordic_command_line_tools.tar || exit 1 -rm ${TMPDIR}/nordic_command_line_tools.tar - -# Install ARM GCC Toolchain -# -wget -O ${TMPDIR}/arm_gcc_toolchain.tar.bz2 -nv ${ARM_GCC_TOOLCHAIN_URL} || exit 1 -mkdir ${TRAVIS_BUILD_DIR}/arm -tar -jxf ${TMPDIR}/arm_gcc_toolchain.tar.bz2 --directory ${TRAVIS_BUILD_DIR}/arm || exit 1 -rm ${TMPDIR}/arm_gcc_toolchain.tar.bz2 - # Clone the openweave-nrf52840-lock-example application. This code will be used to # test the ability to build OpenWeave for the nRF52840. # @@ -71,6 +43,14 @@ if git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --verify fi EXAMPLE_APP_BRANCH=`git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --abbrev-ref HEAD` +# Call the prepare script in the lock example repo to install related +# dependencies. This will also generate a file ${TRAVIS_BUILD_DIR}/nrf_setup_vars.sh +${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example/.travis/prepare.sh + +# Source nrf_setup_vars.sh since it contains the URLs and paths to the tools +# that were generated. +source ${TRAVIS_BUILD_DIR}/nrf_setup_vars.sh + # Initialize and update all submodules within the example app EXCEPT the # OpenWeave submodule. # @@ -87,7 +67,7 @@ echo 'nRF52840 Build Preparation Complete' echo '' echo "openweave-core branch: ${TRAVIS_BRANCH}" echo "openweave-nrf52840-lock-example branch: ${EXAMPLE_APP_BRANCH}" -echo "Nordic SDK for Thread and Zigbee: ${NORDIC_SDK_FOR_THREAD_URL}" +echo "Nordic SDK for Thread and Zigbee: ${NORDIC_SDK_URL}" echo "Nordic nRF5x Command Line Tools: ${NORDIC_COMMAND_LINE_TOOLS_URL}" echo "ARM GCC Toolchain: ${ARM_GCC_TOOLCHAIN_URL}" echo 'Commit Hashes' diff --git a/.travis/script.sh b/.travis/script.sh index beec7862e1..69cd321134 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -18,7 +18,7 @@ # # Description: -# This file is the script for Travis CI hosted, distributed continuous +# This file is the script for Travis CI hosted, distributed continuous # integration 'script' step. # @@ -97,8 +97,8 @@ case "${BUILD_TARGET}" in .travis/build_esp32.sh ;; - nrf52840) - .travis/build_nrf52840.sh + nrf52840-lock-example) + .travis/build_nrf52840_lock_example.sh ;; linux-auto-*-distcheck) @@ -112,6 +112,6 @@ case "${BUILD_TARGET}" in *) die "Unknown build target \"${BUILD_TARGET}\"." ;; - + esac diff --git a/Makefile.am b/Makefile.am index e400a8df4b..c4d5115621 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,59 +28,59 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am .NOTPARALLEL: -AM_MAKEFLAGS = --no-print-directory +AM_MAKEFLAGS = --no-print-directory -SUBDIRS = \ - third_party \ - src \ - doc \ +SUBDIRS = \ + third_party \ + src \ + doc \ $(NULL) -PRETTY_SUBDIRS = \ - $(filter-out third_party,$(SUBDIRS)) \ +PRETTY_SUBDIRS = \ + $(filter-out third_party,$(SUBDIRS)) \ $(NULL) -EXTRA_DIST = \ - BUILDING-ESP32.md \ - BUILDING.md \ - CONTRIBUTING.md \ - Makefile-Android \ - Makefile-bootstrap \ - Makefile-iOS \ - Makefile-Standalone \ - README.md \ - .default-version \ - .travis.yml \ - .travis/before_install.sh \ - .travis/build_esp32.sh \ - .travis/build_nrf52840.sh \ - .travis/prepare_esp32.sh \ - .travis/prepare_nrf52840.sh \ - .travis/script.sh \ - bootstrap \ - bootstrap-configure \ - repos.conf \ - $(srcdir)/build/autoconf \ - $(srcdir)/build/config \ - $(srcdir)/build/cstyle/cstyle.options \ - $(srcdir)/build/esp32 \ - $(srcdir)/build/jenkins \ - $(srcdir)/build/make \ - $(srcdir)/build/scripts \ - $(srcdir)/certs \ +EXTRA_DIST = \ + BUILDING-ESP32.md \ + BUILDING.md \ + CONTRIBUTING.md \ + Makefile-Android \ + Makefile-bootstrap \ + Makefile-iOS \ + Makefile-Standalone \ + README.md \ + .default-version \ + .travis.yml \ + .travis/before_install.sh \ + .travis/build_esp32.sh \ + .travis/build_nrf52840_lock_example.sh \ + .travis/prepare_esp32.sh \ + .travis/prepare_nrf52840_lock_example.sh \ + .travis/script.sh \ + bootstrap \ + bootstrap-configure \ + repos.conf \ + $(srcdir)/build/autoconf \ + $(srcdir)/build/config \ + $(srcdir)/build/cstyle/cstyle.options \ + $(srcdir)/build/esp32 \ + $(srcdir)/build/jenkins \ + $(srcdir)/build/make \ + $(srcdir)/build/scripts \ + $(srcdir)/certs \ $(NULL) -BUILT_SOURCES = \ - .local-version \ +BUILT_SOURCES = \ + .local-version \ $(NULL) -dist_doc_DATA = \ - CHANGELOG \ - LICENSE \ +dist_doc_DATA = \ + CHANGELOG \ + LICENSE \ $(NULL) -DISTCLEANFILES = \ - .local-version \ +DISTCLEANFILES = \ + .local-version \ $(NULL) # There are no source files to lint or prettify in this subdirectory. diff --git a/Makefile.in b/Makefile.in index dab851923a..365c8c4cc9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -549,56 +549,56 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = \ - third_party \ - src \ - doc \ + third_party \ + src \ + doc \ $(NULL) PRETTY_SUBDIRS = \ - $(filter-out third_party,$(SUBDIRS)) \ + $(filter-out third_party,$(SUBDIRS)) \ $(NULL) EXTRA_DIST = \ - BUILDING-ESP32.md \ - BUILDING.md \ - CONTRIBUTING.md \ - Makefile-Android \ - Makefile-bootstrap \ - Makefile-iOS \ - Makefile-Standalone \ - README.md \ - .default-version \ - .travis.yml \ - .travis/before_install.sh \ - .travis/build_esp32.sh \ - .travis/build_nrf52840.sh \ - .travis/prepare_esp32.sh \ - .travis/prepare_nrf52840.sh \ - .travis/script.sh \ - bootstrap \ - bootstrap-configure \ - repos.conf \ - $(srcdir)/build/autoconf \ - $(srcdir)/build/config \ - $(srcdir)/build/cstyle/cstyle.options \ - $(srcdir)/build/esp32 \ - $(srcdir)/build/jenkins \ - $(srcdir)/build/make \ - $(srcdir)/build/scripts \ - $(srcdir)/certs \ + BUILDING-ESP32.md \ + BUILDING.md \ + CONTRIBUTING.md \ + Makefile-Android \ + Makefile-bootstrap \ + Makefile-iOS \ + Makefile-Standalone \ + README.md \ + .default-version \ + .travis.yml \ + .travis/before_install.sh \ + .travis/build_esp32.sh \ + .travis/build_nrf52840_lock_example.sh \ + .travis/prepare_esp32.sh \ + .travis/prepare_nrf52840_lock_example.sh \ + .travis/script.sh \ + bootstrap \ + bootstrap-configure \ + repos.conf \ + $(srcdir)/build/autoconf \ + $(srcdir)/build/config \ + $(srcdir)/build/cstyle/cstyle.options \ + $(srcdir)/build/esp32 \ + $(srcdir)/build/jenkins \ + $(srcdir)/build/make \ + $(srcdir)/build/scripts \ + $(srcdir)/certs \ $(NULL) BUILT_SOURCES = \ - .local-version \ + .local-version \ $(NULL) dist_doc_DATA = \ - CHANGELOG \ - LICENSE \ + CHANGELOG \ + LICENSE \ $(NULL) DISTCLEANFILES = \ - .local-version \ + .local-version \ $(NULL) diff --git a/src/adaptations/device-layer/Makefile.in b/src/adaptations/device-layer/Makefile.in index f7e26389bd..38ede4eae6 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.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -39,17 +39,7 @@ VPATH = @srcdir@ -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__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -150,6 +140,10 @@ target_triplet = @target@ @CONFIG_DEVICE_LAYER_TRUE@@WEAVE_DEVICE_LAYER_TARGET_NRF5_TRUE@ $(NULL) subdir = src/adaptations/device-layer +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 \ @@ -180,8 +174,6 @@ am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/ $(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 @@ -378,9 +370,6 @@ am__define_uniq_tagged_files = \ 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@ @@ -629,7 +618,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -763,6 +751,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/adaptations/device-layer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/adaptations/device-layer/Makefile +.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -2016,8 +2005,6 @@ uninstall-am: uninstall-libLIBRARIES 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/include/Makefile.in b/src/include/Makefile.in index 67140f5d9e..bce6a29c01 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.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -42,17 +42,7 @@ # VPATH = @srcdir@ -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__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -133,38 +123,10 @@ target_triplet = @target@ @WEAVE_BUILD_LEGACY_WDM_TRUE@$(NULL) subdir = src/include -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 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage_reporting.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_debug.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_docs.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_optimization.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_tests.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_werror.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_filtered_canonical.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_prog_lndir.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_werror.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_with_package.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_compare_version.m4 \ - $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx.m4 \ - $(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/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 $(dist_ble_ble_HEADERS) \ - $(dist_ble_device_manager_HEADERS) \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/BuildConfig.h.in \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \ + $(dist_ble_ble_HEADERS) $(dist_ble_device_manager_HEADERS) \ $(dist_device_manager_HEADERS) $(dist_inet_HEADERS) \ $(dist_micro_ecc_HEADERS) $(dist_mincrypt_HEADERS) \ $(dist_platform_ble_bluez_HEADERS) $(dist_system_HEADERS) \ @@ -216,7 +178,37 @@ DIST_COMMON = $(srcdir)/Makefile.am $(dist_ble_ble_HEADERS) \ $(weave_profiles_status_report_HEADERS) \ $(weave_profiles_time_HEADERS) \ $(weave_profiles_token_pairing_HEADERS) \ - $(weave_profiles_weave_tunneling_HEADERS) $(am__DIST_COMMON) + $(weave_profiles_weave_tunneling_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 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage_reporting.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_debug.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_docs.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_optimization.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_tests.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_werror.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_filtered_canonical.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_prog_lndir.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_werror.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_with_package.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_compare_version.m4 \ + $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx.m4 \ + $(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/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) mkinstalldirs = $(SHELL) \ $(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs CONFIG_HEADER = BuildConfig.h @@ -413,8 +405,6 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__DIST_COMMON = $(srcdir)/BuildConfig.h.in $(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@ @@ -663,7 +653,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1659,6 +1648,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/include/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/include/Makefile +.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -3413,8 +3403,6 @@ uninstall-am: uninstall-dist_ble_bleHEADERS \ uninstall-weave_profiles_token_pairingHEADERS \ uninstall-weave_profiles_weave_tunnelingHEADERS -.PRECIOUS: Makefile - include $(abs_top_nlbuild_autotools_dir)/automake/pre.am