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

apps/Makefile: Change BIN_DIR to BINDIR to follow nuttx style.

Browse Source
This commit is contained in:
Xiang Xiao 2019-10-01 11:43:40 -06:00 committed by Gregory Nutt
parent 031a5270d0
commit c73af9c3c8
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Application.mk
View File

@ -85,10 +85,10 @@ endif
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
BIN = "${shell cygpath -w $(APPDIR)$(DELIM)libapps$(LIBEXT)}" BIN = "${shell cygpath -w $(APPDIR)$(DELIM)libapps$(LIBEXT)}"
INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}" INSTALL_DIR = "${shell cygpath -w $(BINDIR)}"
else else
BIN = $(APPDIR)$(DELIM)libapps$(LIBEXT) BIN = $(APPDIR)$(DELIM)libapps$(LIBEXT)
INSTALL_DIR = $(BIN_DIR) INSTALL_DIR = $(BINDIR)
endif endif
ROOTDEPPATH += --dep-path . ROOTDEPPATH += --dep-path .

30
Makefile
View File

@ -72,7 +72,7 @@ LIBPATH ?= $(TOPDIR)$(DELIM)staging
# The install path # The install path
BIN_DIR = $(APPDIR)$(DELIM)bin BINDIR = $(APPDIR)$(DELIM)bin
# The final build target # The final build target
@ -90,13 +90,13 @@ all: $(BIN)
.PRECIOUS: libapps$(LIBEXT) .PRECIOUS: libapps$(LIBEXT)
define MAKE_template define MAKE_template
$(Q) cd $(1) && $(MAKE) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" $(Q) cd $(1) && $(MAKE) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BINDIR="$(BINDIR)"
endef endef
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(Q) cd $(1) && $(MAKE) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" $(Q) cd $(1) && $(MAKE) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BINDIR="$(BINDIR)"
endef endef
@ -114,15 +114,15 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
.install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install) .install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
install: $(BIN_DIR) .install install: $(BINDIR) .install
$(BIN_DIR): $(BINDIR):
$(Q) mkdir -p $(BIN_DIR) $(Q) mkdir -p $(BINDIR)
.import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all) .import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
import: $(BIN_DIR) import: $(BINDIR)
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import" $(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
else else
@ -138,7 +138,7 @@ else
$(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all) $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BIN_DIR) $(SYMTABSRC) $(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) $(SYMTABSRC)
$(SYMTABOBJ): %$(OBJEXT): %.c $(SYMTABOBJ): %$(OBJEXT): %.c
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
@ -157,10 +157,10 @@ endif # !CONFIG_BUILD_KERNEL && CONFIG_BUILD_LOADABLE
.install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install) .install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
$(BIN_DIR): $(BINDIR):
$(Q) mkdir -p $(BIN_DIR) $(Q) mkdir -p $(BINDIR)
install: $(BIN_DIR) .install install: $(BINDIR) .install
.import: $(BIN) install .import: $(BIN) install
@ -170,7 +170,7 @@ import:
endif # CONFIG_BUILD_KERNEL endif # CONFIG_BUILD_KERNEL
dirlinks: dirlinks:
$(Q) $(MAKE) -C platform dirlinks TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" $(Q) $(MAKE) -C platform dirlinks TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BINDIR="$(BINDIR)"
context_rest: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_context) context_rest: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_context)
@ -204,14 +204,14 @@ endif
depend: .depend depend: .depend
clean_context: clean_context:
$(Q) $(MAKE) -C platform clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" $(Q) $(MAKE) -C platform clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BINDIR="$(BINDIR)"
clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean) clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
$(call DELFILE, $(SYMTABSRC)) $(call DELFILE, $(SYMTABSRC))
$(call DELFILE, $(SYMTABOBJ)) $(call DELFILE, $(SYMTABOBJ))
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))
$(call DELFILE, Kconfig) $(call DELFILE, Kconfig)
$(call DELDIR, $(BIN_DIR)) $(call DELDIR, $(BINDIR))
$(call CLEAN) $(call CLEAN)
distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean) distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
@ -234,5 +234,5 @@ endif
$(call DELFILE, $(SYMTABOBJ)) $(call DELFILE, $(SYMTABOBJ))
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))
$(call DELFILE, Kconfig) $(call DELFILE, Kconfig)
$(call DELDIR, $(BIN_DIR)) $(call DELDIR, $(BINDIR))
$(call CLEAN) $(call CLEAN)