Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit e512e37

Browse files
suryanshupsuryanshup
committed
-- Cleanup a couple of Makefile.in
-- Source nrf_setup_vars.sh when building lock example app targets to bring in the env vars that were generated during the prepare script.
1 parent 23456bc commit e512e37

File tree

4 files changed

+56
-74
lines changed

4 files changed

+56
-74
lines changed

‎.travis/build_nrf52840_lock_example.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ export GNU_VERSION=7.3.1
2727
# Add Nordic nRF jprog tool to the path.
2828
export PATH=${PATH}:${NRF5_TOOLS_ROOT}/nrfjprog
2929

30+
# Source env variables generated from the prepare script.
31+
source ${TRAVIS_BUILD_DIR}/nrf_setup_vars.sh
32+
3033
# Set OPENWEAVE_ROOT to the Travis build directory. This will result in the example app being
3134
# built using the target OpenWeave commit.
3235
export OPENWEAVE_ROOT=${TRAVIS_BUILD_DIR}

‎.travis/prepare_nrf52840_lock_example.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@ fi
4444
EXAMPLE_APP_BRANCH=`git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --abbrev-ref HEAD`
4545

4646
# Call the prepare script in the lock example repo to install related
47-
# dependencies.
48-
source ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example/.travis/prepare.sh
47+
# dependencies. This will also generate a file ${TRAVIS_BUILD_DIR}/nrf_setup_vars.sh
48+
${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example/.travis/prepare.sh
49+
50+
# Source nrf_setup_vars.sh since it contains the URLs and paths to the tools
51+
# that were generated.
52+
source ${TRAVIS_BUILD_DIR}/nrf_setup_vars.sh
4953

5054
# Initialize and update all submodules within the example app EXCEPT the
5155
# OpenWeave submodule.

‎src/adaptations/device-layer/Makefile.in‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.14.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -39,17 +39,7 @@
3939

4040

4141
VPATH = @srcdir@
42-
am__is_gnu_make = { \
43-
if test -z '$(MAKELEVEL)'; then \
44-
false; \
45-
elif test -n '$(MAKE_HOST)'; then \
46-
true; \
47-
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
48-
true; \
49-
else \
50-
false; \
51-
fi; \
52-
}
42+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
5343
am__make_running_with_option = \
5444
case $${target_option-} in \
5545
?) ;; \
@@ -150,6 +140,10 @@ target_triplet = @target@
150140
@CONFIG_DEVICE_LAYER_TRUE@@WEAVE_DEVICE_LAYER_TARGET_NRF5_TRUE@ $(NULL)
151141

152142
subdir = src/adaptations/device-layer
143+
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
144+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
145+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
146+
$(noinst_HEADERS)
153147
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
154148
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
155149
$(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/
180174
$(top_srcdir)/configure.ac
181175
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
182176
$(ACLOCAL_M4)
183-
DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
184-
$(am__DIST_COMMON)
185177
mkinstalldirs = $(SHELL) \
186178
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
187179
CONFIG_HEADER = $(top_builddir)/src/include/BuildConfig.h
@@ -378,9 +370,6 @@ am__define_uniq_tagged_files = \
378370
done | $(am__uniquify_input)`
379371
ETAGS = etags
380372
CTAGS = ctags
381-
am__DIST_COMMON = $(srcdir)/Makefile.in \
382-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/depcomp \
383-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
384373
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
385374
ACLOCAL = @ACLOCAL@
386375
AMTAR = @AMTAR@
@@ -629,7 +618,6 @@ program_transform_name = @program_transform_name@
629618
psdir = @psdir@
630619
pyexecdir = @pyexecdir@
631620
pythondir = @pythondir@
632-
runstatedir = @runstatedir@
633621
sbindir = @sbindir@
634622
sharedstatedir = @sharedstatedir@
635623
srcdir = @srcdir@
@@ -763,6 +751,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
763751
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/adaptations/device-layer/Makefile'; \
764752
$(am__cd) $(top_srcdir) && \
765753
$(AUTOMAKE) --foreign src/adaptations/device-layer/Makefile
754+
.PRECIOUS: Makefile
766755
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
767756
@case '$?' in \
768757
*config.status*) \
@@ -2016,8 +2005,6 @@ uninstall-am: uninstall-libLIBRARIES
20162005
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
20172006
tags tags-am uninstall uninstall-am uninstall-libLIBRARIES
20182007

2019-
.PRECIOUS: Makefile
2020-
20212008

20222009
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
20232010

‎src/include/Makefile.in‎

Lines changed: 39 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.14.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -42,17 +42,7 @@
4242
#
4343

4444
VPATH = @srcdir@
45-
am__is_gnu_make = { \
46-
if test -z '$(MAKELEVEL)'; then \
47-
false; \
48-
elif test -n '$(MAKE_HOST)'; then \
49-
true; \
50-
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
51-
true; \
52-
else \
53-
false; \
54-
fi; \
55-
}
45+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
5646
am__make_running_with_option = \
5747
case $${target_option-} in \
5848
?) ;; \
@@ -133,38 +123,10 @@ target_triplet = @target@
133123
@WEAVE_BUILD_LEGACY_WDM_TRUE@$(NULL)
134124

135125
subdir = src/include
136-
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
137-
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
138-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
139-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage_reporting.m4 \
140-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_debug.m4 \
141-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_docs.m4 \
142-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_optimization.m4 \
143-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_tests.m4 \
144-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_werror.m4 \
145-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_filtered_canonical.m4 \
146-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_prog_lndir.m4 \
147-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_werror.m4 \
148-
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_with_package.m4 \
149-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_compare_version.m4 \
150-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx.m4 \
151-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
152-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
153-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
154-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
155-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
156-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
157-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
158-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
159-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
160-
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
161-
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
162-
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
163-
$(top_srcdir)/configure.ac
164-
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
165-
$(ACLOCAL_M4)
166-
DIST_COMMON = $(srcdir)/Makefile.am $(dist_ble_ble_HEADERS) \
167-
$(dist_ble_device_manager_HEADERS) \
126+
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
127+
$(srcdir)/BuildConfig.h.in \
128+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs \
129+
$(dist_ble_ble_HEADERS) $(dist_ble_device_manager_HEADERS) \
168130
$(dist_device_manager_HEADERS) $(dist_inet_HEADERS) \
169131
$(dist_micro_ecc_HEADERS) $(dist_mincrypt_HEADERS) \
170132
$(dist_platform_ble_bluez_HEADERS) $(dist_system_HEADERS) \
@@ -216,7 +178,37 @@ DIST_COMMON = $(srcdir)/Makefile.am $(dist_ble_ble_HEADERS) \
216178
$(weave_profiles_status_report_HEADERS) \
217179
$(weave_profiles_time_HEADERS) \
218180
$(weave_profiles_token_pairing_HEADERS) \
219-
$(weave_profiles_weave_tunneling_HEADERS) $(am__DIST_COMMON)
181+
$(weave_profiles_weave_tunneling_HEADERS)
182+
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
183+
am__aclocal_m4_deps = $(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/ax_check_compiler.m4 \
184+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4 \
185+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage_reporting.m4 \
186+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_debug.m4 \
187+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_docs.m4 \
188+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_optimization.m4 \
189+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_tests.m4 \
190+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_werror.m4 \
191+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_filtered_canonical.m4 \
192+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_prog_lndir.m4 \
193+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_werror.m4 \
194+
$(top_srcdir)/third_party/nlbuild-autotools/repo/autoconf/m4/nl_with_package.m4 \
195+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_compare_version.m4 \
196+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx.m4 \
197+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_cxx_compile_stdcxx_11.m4 \
198+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_jni_include_dir.m4 \
199+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ax_pthread.m4 \
200+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/libtool.m4 \
201+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltoptions.m4 \
202+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltsugar.m4 \
203+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/ltversion.m4 \
204+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/lt~obsolete.m4 \
205+
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/m4/pkg.m4 \
206+
$(top_srcdir)/build/autoconf/m4/nl_check_project_config_includes.m4 \
207+
$(top_srcdir)/build/autoconf/m4/nl_enable_long_tests.m4 \
208+
$(top_srcdir)/build/autoconf/m4/nl_with_lwip.m4 \
209+
$(top_srcdir)/configure.ac
210+
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
211+
$(ACLOCAL_M4)
220212
mkinstalldirs = $(SHELL) \
221213
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
222214
CONFIG_HEADER = BuildConfig.h
@@ -413,8 +405,6 @@ am__define_uniq_tagged_files = \
413405
done | $(am__uniquify_input)`
414406
ETAGS = etags
415407
CTAGS = ctags
416-
am__DIST_COMMON = $(srcdir)/BuildConfig.h.in $(srcdir)/Makefile.in \
417-
$(top_srcdir)/third_party/nlbuild-autotools/repo/third_party/autoconf/mkinstalldirs
418408
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
419409
ACLOCAL = @ACLOCAL@
420410
AMTAR = @AMTAR@
@@ -663,7 +653,6 @@ program_transform_name = @program_transform_name@
663653
psdir = @psdir@
664654
pyexecdir = @pyexecdir@
665655
pythondir = @pythondir@
666-
runstatedir = @runstatedir@
667656
sbindir = @sbindir@
668657
sharedstatedir = @sharedstatedir@
669658
srcdir = @srcdir@
@@ -1659,6 +1648,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
16591648
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/include/Makefile'; \
16601649
$(am__cd) $(top_srcdir) && \
16611650
$(AUTOMAKE) --foreign src/include/Makefile
1651+
.PRECIOUS: Makefile
16621652
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16631653
@case '$?' in \
16641654
*config.status*) \
@@ -3413,8 +3403,6 @@ uninstall-am: uninstall-dist_ble_bleHEADERS \
34133403
uninstall-weave_profiles_token_pairingHEADERS \
34143404
uninstall-weave_profiles_weave_tunnelingHEADERS
34153405

3416-
.PRECIOUS: Makefile
3417-
34183406

34193407
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
34203408

0 commit comments

Comments
 (0)