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

Commit 2142449

Browse files
robszewczykrobszewczyk
authored
Merge pull request #446 from robszewczyk/cleanup/bootstrap-in-sample-makefiles
Add automatic re-bootstrapping to the convenience Makefiles.
2 parents 5856c7a + 5100390 commit 2142449

File tree

3 files changed

+145
-6
lines changed

3 files changed

+145
-6
lines changed

‎Makefile-Android‎

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,48 @@ ABI_CXXFLAGS_x86_64 = -I$(ANDROID_NDK_HOME)/platforms/android-$(ANDR
212212
ABI_LDFLAGS_x86_64 = -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel
213213

214214

215+
#
216+
# automake files
217+
#
218+
AMFILES = src/system/SystemLayer.am \
219+
src/system/Makefile.am \
220+
src/platform/ble/bluez/Makefile.am \
221+
src/adaptations/device-layer/Makefile.am \
222+
src/include/Makefile.am \
223+
src/lib/profiles/WeaveProfiles.am \
224+
src/lib/core/WeaveCore.am \
225+
src/lib/support/verhoeff/Makefile.am \
226+
src/lib/support/WeaveSupport.am \
227+
src/lib/support/Makefile.am \
228+
src/lib/Makefile.am \
229+
src/warm/Warm.am \
230+
src/warm/Makefile.am \
231+
src/inet/InetLayer.am \
232+
src/inet/Makefile.am \
233+
src/ble/BleLayer.am \
234+
src/ble/Makefile.am \
235+
src/test-apps/fuzz/Makefile.am \
236+
src/test-apps/wrapper-tests/jni/Makefile.am \
237+
src/test-apps/Makefile.am \
238+
src/examples/Makefile.am \
239+
src/wrappers/jni/jni-utils/Makefile.am \
240+
src/wrappers/jni/security-support/Makefile.am \
241+
src/wrappers/jni/Makefile.am \
242+
src/lwip/Makefile.am \
243+
src/Makefile.am \
244+
src/ra-daemon/Makefile.am \
245+
src/tools/weave/Makefile.am \
246+
src/tools/misc/Makefile.am \
247+
src/device-manager/DeviceManager.am \
248+
src/device-manager/cocoa/Makefile.am \
249+
src/device-manager/java/Makefile.am \
250+
src/device-manager/python/Makefile.am \
251+
third_party/Makefile.am \
252+
doc/Makefile.am \
253+
Makefile.am \
254+
configure.ac \
255+
$(NULL)
256+
215257
#
216258
# configure-action <abi>
217259
#
@@ -367,14 +409,18 @@ endef # ABI_template
367409

368410
.DEFAULT_GOAL := all
369411

370-
.PHONY : all configure build stage pretty lint pretty check clean env-check help
412+
.PHONY : all configure build stage check pretty lint pretty-check clean env-check help
371413

372414
# Instantiate an ABI-specific set of rules to build weave for each target ABI.
373415
$(foreach abi,$(ANDROID_ABI),$(eval $(call ABI_template,$(abi))))
374416

375417
all: stage
376418

377-
configure: $(CONFIGURE_TARGETS)
419+
Makefile.in: $(AMFILES)
420+
$(ECHO) "BOOTSTRAP"
421+
@./bootstrap
422+
423+
configure: Makefile.in $(CONFIGURE_TARGETS)
378424

379425
build: $(BUILD_TARGETS)
380426

‎Makefile-Standalone‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,48 @@ BuildJobs := $(shell getconf _NPROCESSORS_ONLN)
254254
endif
255255
JOBSFLAG := -j$(BuildJobs)
256256

257+
#
258+
# automake files
259+
#
260+
AMFILES = src/system/SystemLayer.am \
261+
src/system/Makefile.am \
262+
src/platform/ble/bluez/Makefile.am \
263+
src/adaptations/device-layer/Makefile.am \
264+
src/include/Makefile.am \
265+
src/lib/profiles/WeaveProfiles.am \
266+
src/lib/core/WeaveCore.am \
267+
src/lib/support/verhoeff/Makefile.am \
268+
src/lib/support/WeaveSupport.am \
269+
src/lib/support/Makefile.am \
270+
src/lib/Makefile.am \
271+
src/warm/Warm.am \
272+
src/warm/Makefile.am \
273+
src/inet/InetLayer.am \
274+
src/inet/Makefile.am \
275+
src/ble/BleLayer.am \
276+
src/ble/Makefile.am \
277+
src/test-apps/fuzz/Makefile.am \
278+
src/test-apps/wrapper-tests/jni/Makefile.am \
279+
src/test-apps/Makefile.am \
280+
src/examples/Makefile.am \
281+
src/wrappers/jni/jni-utils/Makefile.am \
282+
src/wrappers/jni/security-support/Makefile.am \
283+
src/wrappers/jni/Makefile.am \
284+
src/lwip/Makefile.am \
285+
src/Makefile.am \
286+
src/ra-daemon/Makefile.am \
287+
src/tools/weave/Makefile.am \
288+
src/tools/misc/Makefile.am \
289+
src/device-manager/DeviceManager.am \
290+
src/device-manager/cocoa/Makefile.am \
291+
src/device-manager/java/Makefile.am \
292+
src/device-manager/python/Makefile.am \
293+
third_party/Makefile.am \
294+
doc/Makefile.am \
295+
Makefile.am \
296+
configure.ac \
297+
$(NULL)
298+
257299
#
258300
# configure-arch <target>
259301
#
@@ -373,7 +415,7 @@ PRETTY_CHECK_TARGETS += pretty-check-$(1)
373415
BUILD_DIRS += $(BuildPath)/$(1)
374416
DIRECTORIES += $(BuildPath)/$(1)
375417

376-
configure-$(1): $(BuildPath)/$(1)/config.status
418+
configure-$(1): Makefile.in $(BuildPath)/$(1)/config.status
377419

378420
$(BuildPath)/$(1)/config.status: | $(BuildPath)/$(1)
379421
$$(call configure-target,$(1))
@@ -407,7 +449,7 @@ lint-$(1) pretty-check-$(1): configure-$(1)
407449
$(1): stage-$(1)
408450
endef # TARGET_template
409451

410-
.PHONY : clean ensure-sudo help
452+
.PHONY : configure build check coverage stage pretty lint pretty-check clean ensure-sudo help
411453

412454
ensure-sudo:
413455
$(ECHO) "Selected target will require sudo access."
@@ -425,6 +467,10 @@ $(eval $(call TARGET_template,$(TargetTuple)))
425467
# Common / Finalization
426468
#
427469

470+
Makefile.in: $(AMFILES)
471+
$(ECHO) "BOOTSTRAP"
472+
@./bootstrap
473+
428474
configure: $(CONFIGURE_TARGETS)
429475

430476
build: $(BUILD_TARGETS)
@@ -509,4 +555,3 @@ command line or in the environment:
509555
the Happy tool.
510556

511557
endef
512-

‎Makefile-iOS‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,48 @@ BuildJobs := $(shell getconf _NPROCESSORS_ONLN)
208208
endif
209209
JOBSFLAG := -j$(BuildJobs)
210210

211+
#
212+
# automake files
213+
#
214+
AMFILES = src/system/SystemLayer.am \
215+
src/system/Makefile.am \
216+
src/platform/ble/bluez/Makefile.am \
217+
src/adaptations/device-layer/Makefile.am \
218+
src/include/Makefile.am \
219+
src/lib/profiles/WeaveProfiles.am \
220+
src/lib/core/WeaveCore.am \
221+
src/lib/support/verhoeff/Makefile.am \
222+
src/lib/support/WeaveSupport.am \
223+
src/lib/support/Makefile.am \
224+
src/lib/Makefile.am \
225+
src/warm/Warm.am \
226+
src/warm/Makefile.am \
227+
src/inet/InetLayer.am \
228+
src/inet/Makefile.am \
229+
src/ble/BleLayer.am \
230+
src/ble/Makefile.am \
231+
src/test-apps/fuzz/Makefile.am \
232+
src/test-apps/wrapper-tests/jni/Makefile.am \
233+
src/test-apps/Makefile.am \
234+
src/examples/Makefile.am \
235+
src/wrappers/jni/jni-utils/Makefile.am \
236+
src/wrappers/jni/security-support/Makefile.am \
237+
src/wrappers/jni/Makefile.am \
238+
src/lwip/Makefile.am \
239+
src/Makefile.am \
240+
src/ra-daemon/Makefile.am \
241+
src/tools/weave/Makefile.am \
242+
src/tools/misc/Makefile.am \
243+
src/device-manager/DeviceManager.am \
244+
src/device-manager/cocoa/Makefile.am \
245+
src/device-manager/java/Makefile.am \
246+
src/device-manager/python/Makefile.am \
247+
third_party/Makefile.am \
248+
doc/Makefile.am \
249+
Makefile.am \
250+
configure.ac \
251+
$(NULL)
252+
211253
#
212254
# configure-arch <arch>
213255
#
@@ -363,7 +405,7 @@ configure-$(1): IOS_SDK=$$($(1)_arch_IOS_SDK)
363405
configure-$(1): CROSS_SDK=$$($(1)_arch_CROSS_SDK)
364406
configure-$(1): CROSS_TOP=$$($(1)_arch_CROSS_TOP)
365407

366-
configure-$(1): $(BuildPath)/$(1)-$(TargetTuple)/config.status
408+
configure-$(1): Makefile.in $(BuildPath)/$(1)-$(TargetTuple)/config.status
367409

368410
$(BuildPath)/$(1)-$(TargetTuple)/config.status: | $(BuildPath)/$(1)-$(TargetTuple)
369411
$$(call configure-arch,$(1))
@@ -444,6 +486,12 @@ $(foreach arch,$(ARCHS),$(eval $(call ARCH_template,$(arch))))
444486
# Common / Finalization
445487
#
446488

489+
.PHONY : configure build check coverage stage pretty lint pretty-check clean help
490+
491+
Makefile.in: $(AMFILES)
492+
$(ECHO) "BOOTSTRAP"
493+
@./bootstrap
494+
447495
configure: $(CONFIGURE_TARGETS)
448496

449497
build: $(BUILD_TARGETS)

0 commit comments

Comments
 (0)