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

Comment out most of 430060e92e. Clean-up some dependencies in top-level Makefile

Browse Source
This commit is contained in:
Gregory Nutt 2017-06-02 16:42:44 -06:00
parent c584d27c3c
commit 6c3a3c305f
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile.unix
View File

@ -281,19 +281,21 @@ tools/cnvwindeps$(HOSTEXEEXT):
# setting up symbolic links with 'generic' directory names to specific,
# configured directories.
Make.defs:
<<<<<<< HEAD
$(Q) echo "No Make.defs file found, creating one"
$(Q) echo "include $(TOPDIR)$(DELIM).config" > Make.defs
$(Q) echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
=======
echo "include $(TOPDIR)$(DELIM).config" > Make.defs
echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
>>>>>>> parent of 430060e92e... Build system: Hook tools/initconfig into top-level Makefiles.
# Make.defs:
# $(Q) echo "No Make.defs file found, creating one"
# $(Q) echo "include $(TOPDIR)$(DELIM).config" > Make.defs
# $(Q) echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
# tools/initialconfig$(HOSTEXEEXT):
# $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" initialconfig$(HOSTEXEEXT)
#
# .config: tools/initialconfig$(HOSTEXEEXT)
# $(Q) echo "No .config file found, creating one"
# $(Q) tools/initialconfig$(HOSTEXEEXT)
# Link the arch/<arch-name>/include directory to include/arch
include/arch: Make.defs
include/arch: .config
@echo "LN: include/arch to $(ARCH_DIR)/include"
$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch
@ -305,13 +307,13 @@ include/arch/board: include/arch Make.defs include/arch
# Link the configs/<board-name>/src dir to arch/<arch-name>/src/board
$(ARCH_SRC)/board: Make.defs
$(ARCH_SRC)/board: .config
@echo "LN: $(ARCH_SRC)/board to $(BOARD_DIR)/src"
$(Q) $(DIRLINK) $(BOARD_DIR)/src $(ARCH_SRC)/board
# Link arch/<arch-name>/include/<chip-name> to arch/<arch-name>/include/chip
$(ARCH_SRC)/chip: Make.defs
$(ARCH_SRC)/chip: .config
ifneq ($(CONFIG_ARCH_CHIP),)
@echo "LN: $(ARCH_SRC)/chip to $(ARCH_SRC)/$(CONFIG_ARCH_CHIP)"
$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_SRC)/$(CONFIG_ARCH_CHIP) $(ARCH_SRC)/chip

21
Makefile.win
View File

@ -276,14 +276,21 @@ tools\mkdeps$(HOSTEXEEXT):
# setting up symbolic links with 'generic' directory names to specific,
# configured directories.
Make.defs:
$(Q) echo "No Make.defs file found, creating one"
$(Q) echo "include $(TOPDIR)$(DELIM).config" > Make.defs
$(Q) echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
# Make.defs:
# $(Q) echo "No Make.defs file found, creating one"
# $(Q) echo "include $(TOPDIR)$(DELIM).config" > Make.defs
# $(Q) echo "include $(TOPDIR)$(DELIM)tools$(DELIM)Config.mk" >> Make.defs
# tools\initialconfig$(HOSTEXEEXT):
# $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" initialconfig$(HOSTEXEEXT)
#
# .config: tools\initialconfig$(HOSTEXEEXT)
# $(Q) echo "No .config file found, creating one"
# $(Q) tools\initialconfig$(HOSTEXEEXT)
# Link the arch\<arch-name>\include directory to include\arch
include\arch: Make.defs
include\arch: .config
@echo LN: include\arch to $(ARCH_DIR)\include
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include
@ -305,7 +312,7 @@ endif
# Link the configs\<board-name>\src dir to arch\<arch-name>\src\board
$(ARCH_SRC)\board: Make.defs
$(ARCH_SRC)\board: .config
@echo LN: $(ARCH_SRC)\board to $(BOARD_DIR)\src
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(BOARD_DIR)\src
@ -316,7 +323,7 @@ endif
# Link arch\<arch-name>\include\<chip-name> to arch\<arch-name>\include\chip
$(ARCH_SRC)\chip: Make.defs
$(ARCH_SRC)\chip: .config
ifneq ($(CONFIG_ARCH_CHIP),)
@echo LN: $(ARCH_SRC)\chip to $(ARCH_SRC)\$(CONFIG_ARCH_CHIP)
ifeq ($(CONFIG_WINDOWS_MKLINK),y)