atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] remove recursive search of the makefiles ==> optimise in windows

Browse Source
This commit is contained in:
Edouard DUPIN 2012-11-11 20:39:29 +01:00
parent 858172d2c0
commit 128be4a46f
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@ -165,7 +165,7 @@ endef
## Replace '\"' by '"'. ## Replace '\"' by '"'.
############################################################################### ###############################################################################
define generate-autoconf-file define generate-autoconf-file
echo "Generating $(call path-from-top,$2) from $(call path-from-top,$1)"; \ echo "conf: $(call path-from-top,$2) <== $(call path-from-top,$1)"; \
mkdir -p $(dir $2); \ mkdir -p $(dir $2); \
sed \ sed \
-e 's/^CONFIG_//' \ -e 's/^CONFIG_//' \

22
core/main.mk
View File

@ -75,16 +75,16 @@ TARGET_OUT_STAGING ?= $(shell pwd)/out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/stag
TARGET_OUT_FINAL ?= $(shell pwd)/out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/final TARGET_OUT_FINAL ?= $(shell pwd)/out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/final
# Note : Yhis permit to create a recursive search of all the .mk existed ==> but speed is really slow in Windows
ifeq ("$(USE_RECURSIVE_FIND)","1")
# Makefile with the list of all makefiles available and include them
SCAN_TARGET := scan
# Get the list of all makefiles available and include them this find the TARGET_OS.mk and the Generic.mk # Get the list of all makefiles available and include them this find the TARGET_OS.mk and the Generic.mk
_moduleFolder = $(shell find $(USER_PACKAGES) -name $(TARGET_OS).mk) _moduleFolder = $(shell find $(USER_PACKAGES) -name $(TARGET_OS).mk)
_moduleFolder += $(shell find $(USER_PACKAGES) -name Generic.mk) _moduleFolder += $(shell find $(USER_PACKAGES) -name Generic.mk)
# only keep one folder for each makefile found. # only keep one folder for each makefile found.
_tmpDirectory = $(sort $(dir $(_moduleFolder))) _tmpDirectory = $(sort $(dir $(_moduleFolder)))
else
_tmpDirectory := $(sort $(USER_PACKAGES))
endif
# this section have all the makefile possible for a specific target, # this section have all the makefile possible for a specific target,
# this isolate the good makefile for every folder where a makefile present # this isolate the good makefile for every folder where a makefile present
# for each folder # for each folder
@ -93,9 +93,12 @@ _tmpDirectory = $(sort $(dir $(_moduleFolder)))
# otherwise # otherwise
# add generic makefile # add generic makefile
$(foreach __makefile,$(_tmpDirectory), \ $(foreach __makefile,$(_tmpDirectory), \
$(if $(wildcard $(__makefile)$(TARGET_OS).mk), \ $(if $(wildcard $(__makefile)/$(TARGET_OS).mk), \
$(eval makefiles += $(__makefile)$(TARGET_OS).mk) , \ $(eval makefiles += $(__makefile)/$(TARGET_OS).mk) \
$(eval makefiles += $(__makefile)Generic.mk) \ , \
$(if $(wildcard $(__makefile)/Generic.mk), \
$(eval makefiles += $(__makefile)/Generic.mk) \
) \
) \ ) \
) )
ifeq ("$(V)","1") ifeq ("$(V)","1")
@ -125,7 +128,6 @@ $(call modules-check-variables)
# Concatenate all in one # Concatenate all in one
AUTOCONF_FILE := $(TARGET_OUT_BUILD)/autoconf.h AUTOCONF_FILE := $(TARGET_OUT_BUILD)/autoconf.h
$(AUTOCONF_FILE): $(CONFIG_GLOBAL_FILE) $(AUTOCONF_FILE): $(CONFIG_GLOBAL_FILE)
@echo "Generating autoconf-merge.h"
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@rm -f $@ @rm -f $@
@$(call generate-autoconf-file,$^,$@) @$(call generate-autoconf-file,$^,$@)
@ -153,7 +155,9 @@ ALL_BUILD_MODULES := \
$(foreach __mod,$(__modules), \ $(foreach __mod,$(__modules), \
$(if $(call is-module-in-build-config,$(__mod)),$(__mod))) $(if $(call is-module-in-build-config,$(__mod)),$(__mod)))
ifeq ("$(V)","1")
$(info ALL_BUILD_MODULES=$(ALL_BUILD_MODULES)) $(info ALL_BUILD_MODULES=$(ALL_BUILD_MODULES))
endif
# TODO : Set ALL_BUILD_MODULES ==> find the end point module (SHARED/BINARY) # TODO : Set ALL_BUILD_MODULES ==> find the end point module (SHARED/BINARY)
.PHONY: all .PHONY: all