From 46e70207ede819e3855c0b605c57d04c849bfd31 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 5 Sep 2014 09:16:08 -0600
Subject: Flesh out apps/import/Make.defs a little

---
 apps/import/Make.defs | 43 +++++++++++++++++++++++++++++++++++++++++++
 apps/import/Makefile  | 24 ++++--------------------
 2 files changed, 47 insertions(+), 20 deletions(-)

(limited to 'apps/import')

diff --git a/apps/import/Make.defs b/apps/import/Make.defs
index a3c73e7e5..aad7d3f3a 100644
--- a/apps/import/Make.defs
+++ b/apps/import/Make.defs
@@ -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
diff --git a/apps/import/Makefile b/apps/import/Makefile
index a0ce283da..e247fa3ef 100644
--- a/apps/import/Makefile
+++ b/apps/import/Makefile
@@ -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
-- 
cgit v1.2.3