9
0
Fork 0

Flesh out apps/import/Make.defs a little

This commit is contained in:
Gregory Nutt 2014-09-05 09:16:08 -06:00
parent 78ee7731d4
commit 46e70207ed
3 changed files with 51 additions and 20 deletions

View File

@ -99,6 +99,10 @@ EXTERNAL_DIR := $(dir $(wildcard external$(DELIM)Makefile))
INSTALLED_APPS += $(EXTERNAL_DIR)
SUBDIRS += $(EXTERNAL_DIR)
# Library path
LIBPATH ?= $(TOPDIR)/libs
# The final build target
BIN = libapps$(LIBEXT)

View File

@ -34,4 +34,47 @@
############################################################################
include ${TOPDIR}/.config
include ${TOPDIR}/build/Make.defs
# Control build verbosity
#
# V=1,2: Enable echo of commands
# V=2: Enable bug/verbose options in tools and scripts
ifeq ($(V),1)
export Q :=
else
ifeq ($(V),2)
export Q :=
else
export Q := @
endif
endif
# Environment-specific settings
#
# DELIM - Environment-specific file path separator
# DELFILE - Delete one file
# DELDIR - Delete one directory
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
DELIM = $(strip \)
define DELFILE
$(Q) if exist $1 (del /f /q $1)
endef
define DELDIR
$(Q) if exist $(1) (rmdir /q /s $(1))
endef
else
DELIM = $(strip /)
define DELFILE
$(Q) rm -f $1
endef
define DELDIR
$(Q) rm -rf $(1)
endef
endif

View File

@ -34,32 +34,13 @@
############################################################################
-include $(TOPDIR)/.config
Q ?= @
-include $(TOPDIR)/Make.defs
# Sub-directories from the NuttX export package
SUBDIRS = arch build include libs startup tmp
FILES = .config
# DELDIR - Delete one directory
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define DELFILE
$(Q) if exist $1 (del /f /q $1)
endef
define DELDIR
$(Q) if exist $(1) (rmdir /q /s $(1))
endef
else
define DELFILE
$(Q) rm -f $1
endef
define DELDIR
$(Q) rm -rf $(1)
endef
endif
all: nothing
.PHONY: nothing context depend clean distclean
@ -75,3 +56,6 @@ distclean:
$(foreach SDIR, $(SUBDIRS), $(call DELDIR, $(SDIR)))
$(foreach FILE, $(FILES), $(call DELFILE, $(FILE)))
# Library path
LIBPATH = $(TOPDIR)/libs