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

Revert "Build system: Hook tools/initconfig into top-level Makefiles."

Browse Source 
This reverts commit 430060e92e.

That commit has some unexpected side-effects
This commit is contained in:
Gregory Nutt 2017-06-02 16:14:13 -06:00
parent 2c903d5c7a
commit c584d27c3c
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.unix
View File

@ -282,38 +282,36 @@ tools/cnvwindeps$(HOSTEXEEXT):
# 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
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)
=======
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.
# Link the arch/<arch-name>/include directory to include/arch
include/arch: .config Make.defs
include/arch: Make.defs
@echo "LN: include/arch to $(ARCH_DIR)/include"
$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch
# Link the configs/<board-name>/include directory to include/arch/board
include/arch/board: include/arch
include/arch/board: include/arch Make.defs include/arch
@echo "LN: include/arch/board to $(BOARD_DIR)/include"
$(Q) $(DIRLINK) $(BOARD_DIR)/include include/arch/board
# Link the configs/<board-name>/src dir to arch/<arch-name>/src/board
$(ARCH_SRC)/board:
$(ARCH_SRC)/board: Make.defs
@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:
$(ARCH_SRC)/chip: Make.defs
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
@ -321,7 +319,7 @@ endif
# Link arch/<arch-name>/src/<chip-name> to arch/<arch-name>/src/chip
include/arch/chip: include/arch
include/arch/chip: include/arch Make.defs
ifneq ($(CONFIG_ARCH_CHIP),)
@echo "LN: include/arch/chip to $(ARCH_INC)/$(CONFIG_ARCH_CHIP)"
$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip

17
Makefile.win
View File

@ -281,16 +281,9 @@ Make.defs:
$(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: .config Make.defs
include\arch: Make.defs
@echo LN: include\arch to $(ARCH_DIR)\include
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include
@ -301,7 +294,7 @@ endif
# Link the configs\<board-name>\include directory to include\arch\board
include\arch\board: include\arch
include\arch\board: include\arch Make.defs include\arch
@echo LN: include\arch\board to $(BOARD_DIR)\include
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
$(Q) /user:administrator mklink /d include\arch\board $(BOARD_DIR)\include
@ -312,7 +305,7 @@ endif
# Link the configs\<board-name>\src dir to arch\<arch-name>\src\board
$(ARCH_SRC)\board:
$(ARCH_SRC)\board: Make.defs
@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
@ -323,7 +316,7 @@ endif
# Link arch\<arch-name>\include\<chip-name> to arch\<arch-name>\include\chip
$(ARCH_SRC)\chip:
$(ARCH_SRC)\chip: Make.defs
ifneq ($(CONFIG_ARCH_CHIP),)
@echo LN: $(ARCH_SRC)\chip to $(ARCH_SRC)\$(CONFIG_ARCH_CHIP)
ifeq ($(CONFIG_WINDOWS_MKLINK),y)
@ -336,7 +329,7 @@ endif
# Link arch\<arch-name>\src\<chip-name> to arch\<arch-name>\src\chip
include\arch\chip: include\arch
include\arch\chip: include\arch Make.defs
ifneq ($(CONFIG_ARCH_CHIP),)
@echo LN: include\arch\chip to $(ARCH_INC)\$(CONFIG_ARCH_CHIP)
ifeq ($(CONFIG_WINDOWS_MKLINK),y)

5
tools/initialconfig.c
View File

@ -841,10 +841,5 @@ int main(int argc, char **argv)
*/
create_config();
/* TODO: Copy a Make.defs file from a configuration for the selected
* board that supports the selected MCU.
*/
return 0;
}