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

apps/Makefile: Remove EXE_DIR and put binary into bin folder like nuttx

Browse Source
This commit is contained in:
Xiang Xiao 2019-10-01 11:42:18 -06:00 committed by Gregory Nutt
parent b75e7bc32e
commit 031a5270d0
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,7 +12,6 @@ core
cscope.out cscope.out
/Kconfig /Kconfig
/bin /bin
/exe
/external /external
/.context /.context
/.config /.config
@ -20,5 +19,6 @@ cscope.out
/*.lib /*.lib
/romfs.img /romfs.img
/boot_romfsimg.h /boot_romfsimg.h
/symtab_apps.c
/*/*/.built /*/*/.built

9
Makefile
View File

@ -72,8 +72,7 @@ LIBPATH ?= $(TOPDIR)$(DELIM)staging
# The install path # The install path
EXE_DIR = $(APPDIR)$(DELIM)exe BIN_DIR = $(APPDIR)$(DELIM)bin
BIN_DIR = $(EXE_DIR)$(DELIM)system$(DELIM)bin
# The final build target # The final build target
@ -81,7 +80,7 @@ BIN = libapps$(LIBEXT)
# Symbol table for loadable apps. # Symbol table for loadable apps.
SYMTABSRC = $(EXE_DIR)$(DELIM)symtab_apps.c SYMTABSRC = symtab_apps.c
SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT)) SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
# Build targets # Build targets
@ -139,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 $(EXE_DIR)$(DELIM)system $(SYMTABSRC) $(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BIN_DIR) $(SYMTABSRC)
$(SYMTABOBJ): %$(OBJEXT): %.c $(SYMTABOBJ): %$(OBJEXT): %.c
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
@ -213,7 +212,6 @@ clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))
$(call DELFILE, Kconfig) $(call DELFILE, Kconfig)
$(call DELDIR, $(BIN_DIR)) $(call DELDIR, $(BIN_DIR))
$(call DELDIR, $(EXE_DIR))
$(call CLEAN) $(call CLEAN)
distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean) distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
@ -237,5 +235,4 @@ endif
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))
$(call DELFILE, Kconfig) $(call DELFILE, Kconfig)
$(call DELDIR, $(BIN_DIR)) $(call DELDIR, $(BIN_DIR))
$(call DELDIR, $(EXE_DIR))
$(call CLEAN) $(call CLEAN)

2
tools/mkromfsimg.sh
View File

@ -47,7 +47,7 @@ fi
# Environmental stuff # Environmental stuff
topdir=$PWD topdir=$PWD
fsdir=${topdir}/exe/system fsdir=${topdir}/bin
romfsimg=romfs.img romfsimg=romfs.img
headerfile=boot_romfsimg.h headerfile=boot_romfsimg.h