sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/Config.mk and Makefile.unix: Support the incremental build for configuration change.

Browse Source
This commit is contained in:
Xiang Xiao 2019-09-15 10:56:26 -06:00 committed by Gregory Nutt
parent 7ce51e66b9
commit bf84868360
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/Config.mk
View File

@ -2,7 +2,8 @@
# Config.mk # Config.mk
# Global build rules and macros. # Global build rules and macros.
# #
# Copyright (C) 2011, 2013-2014, 2018 Gregory Nutt. All rights reserved. # Copyright (C) 2011, 2013-2014, 2018-2019 Gregory Nutt. All rights
* reserved.
# Author: Richard Cochran # Author: Richard Cochran
# Gregory Nutt <gnutt@nuttx.org> # Gregory Nutt <gnutt@nuttx.org>
# #
@ -306,7 +307,7 @@ endif
# #
# USAGE: FILELIST = $(call RWILDCARD,<dir>,<wildcard-filename) # USAGE: FILELIST = $(call RWILDCARD,<dir>,<wildcard-filename)
# #
# This is functionally equivent to the following, but has the advantage in # This is functionally equivalent to the following, but has the advantage in
# that it is portable # that it is portable
# #
# FILELIST = ${shell find <dir> -name <wildcard-file>} # FILELIST = ${shell find <dir> -name <wildcard-file>}
@ -329,3 +330,25 @@ define CLEAN
$(Q) rm -f *$(OBJEXT) *$(LIBEXT) *~ .*.swp $(Q) rm -f *$(OBJEXT) *$(LIBEXT) *~ .*.swp
endef endef
endif endif
# TESTANDREPLACEFILE - Test if two files are different. If so replace the
# second with the first. Otherwise, delete the first.
#
# USAGE: $(call TESTANDREPLACEFILE, newfile, oldfile)
#
# args: $1 - newfile: Temporary file to test
# $2 - oldfile: File to replace
ifneq ($(CONFIG_WINDOWS_NATIVE),y)
define TESTANDREPLACEFILE
if [ -f $2 ]; then \
if cmp $1 $2; then \
rm -f $1; \
else \
mv $1 $2; \
fi \
else \
mv $1 $2; \
fi
endef
endif

18
tools/Makefile.unix
View File

@ -235,7 +235,7 @@ endif
ifeq ($(NEED_MATH_H),y) ifeq ($(NEED_MATH_H),y)
include/math.h: include/nuttx/lib/math.h include/math.h: include/nuttx/lib/math.h
$(Q) cp -f include/nuttx/lib/math.h include/math.h $(Q) cp -pf include/nuttx/lib/math.h include/math.h
else else
include/math.h: include/math.h:
endif endif
@ -248,7 +248,7 @@ endif
ifeq ($(CONFIG_ARCH_FLOAT_H),y) ifeq ($(CONFIG_ARCH_FLOAT_H),y)
include/float.h: include/nuttx/lib/float.h include/float.h: include/nuttx/lib/float.h
$(Q) cp -f include/nuttx/lib/float.h include/float.h $(Q) cp -pf include/nuttx/lib/float.h include/float.h
else else
include/float.h: include/float.h:
endif endif
@ -260,7 +260,7 @@ endif
ifeq ($(CONFIG_ARCH_STDARG_H),y) ifeq ($(CONFIG_ARCH_STDARG_H),y)
include/stdarg.h: include/nuttx/lib/stdarg.h include/stdarg.h: include/nuttx/lib/stdarg.h
$(Q) cp -f include/nuttx/lib/stdarg.h include/stdarg.h $(Q) cp -pf include/nuttx/lib/stdarg.h include/stdarg.h
else else
include/stdarg.h: include/stdarg.h:
endif endif
@ -272,7 +272,7 @@ endif
ifeq ($(CONFIG_ARCH_SETJMP_H),y) ifeq ($(CONFIG_ARCH_SETJMP_H),y)
include/setjmp.h: include/nuttx/lib/setjmp.h include/setjmp.h: include/nuttx/lib/setjmp.h
$(Q) cp -f include/nuttx/lib/setjmp.h include/setjmp.h $(Q) cp -pf include/nuttx/lib/setjmp.h include/setjmp.h
else else
include/setjmp.h: include/setjmp.h:
endif endif
@ -296,7 +296,8 @@ endif
include/nuttx/version.h: $(TOPDIR)/.version tools/mkversion$(HOSTEXEEXT) include/nuttx/version.h: $(TOPDIR)/.version tools/mkversion$(HOSTEXEEXT)
$(Q) echo "Create version.h" $(Q) echo "Create version.h"
$(Q) tools/mkversion $(TOPDIR) > $@ $(Q) tools/mkversion $(TOPDIR) > $@.tmp
$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
# Targets used to build include/nuttx/config.h. Creation of config.h is # Targets used to build include/nuttx/config.h. Creation of config.h is
# part of the overall NuttX configuration sequence. Notice that the # part of the overall NuttX configuration sequence. Notice that the
@ -309,7 +310,8 @@ staging:
$(Q) mkdir staging $(Q) mkdir staging
include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig$(HOSTEXEEXT) include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig$(HOSTEXEEXT)
$(Q) tools/mkconfig $(TOPDIR) > include/nuttx/config.h $(Q) tools/mkconfig $(TOPDIR) > include/nuttx/config.h.tmp
$(Q) $(call TESTANDREPLACEFILE, include/nuttx/config.h.tmp, $@)
# Targets used to create dependencies # Targets used to create dependencies
@ -412,8 +414,6 @@ context: check_context staging include/nuttx/config.h include/nuttx/version.h in
clean_context: clean_context:
$(Q) $(MAKE) -C boards TOPDIR="$(TOPDIR)" clean_context $(Q) $(MAKE) -C boards TOPDIR="$(TOPDIR)" clean_context
$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) TOPDIR="$(TOPDIR)" clean_context $(Q) $(MAKE) -C $(CONFIG_APPS_DIR) TOPDIR="$(TOPDIR)" clean_context
$(call DELFILE, include/nuttx/config.h)
$(call DELFILE, include/nuttx/version.h)
$(call DELFILE, include/math.h) $(call DELFILE, include/math.h)
$(call DELFILE, include/stdarg.h) $(call DELFILE, include/stdarg.h)
$(call DELFILE, include/setjmp.h) $(call DELFILE, include/setjmp.h)
@ -679,6 +679,8 @@ distclean: clean subdir_distclean clean_context
ifeq ($(CONFIG_BUILD_2PASS),y) ifeq ($(CONFIG_BUILD_2PASS),y)
$(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" distclean
endif endif
$(call DELFILE, include/nuttx/config.h)
$(call DELFILE, include/nuttx/version.h)
$(call DELFILE, Make.defs) $(call DELFILE, Make.defs)
$(call DELFILE, .config) $(call DELFILE, .config)
$(call DELFILE, .config.old) $(call DELFILE, .config.old)