aboutsummaryrefslogtreecommitdiff
path: root/apps/system/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-15 19:22:47 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-15 19:22:47 +0000
commitafda7763683b2b6accbdf4b721b6a5b118d386ac (patch)
tree33cb0e776f79bb599b9c39f34e063fd8238288bd /apps/system/Makefile
parent98c0270edecaaca7d0f4ad387cce7c91a4ddbbd9 (diff)
downloadpx4-firmware-afda7763683b2b6accbdf4b721b6a5b118d386ac.tar.gz
px4-firmware-afda7763683b2b6accbdf4b721b6a5b118d386ac.tar.bz2
px4-firmware-afda7763683b2b6accbdf4b721b6a5b118d386ac.zip
Fix various build-related typos
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5358 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/system/Makefile')
-rw-r--r--apps/system/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/system/Makefile b/apps/system/Makefile
index 572598e39..c59059d81 100644
--- a/apps/system/Makefile
+++ b/apps/system/Makefile
@@ -41,9 +41,15 @@ SUBDIRS = free i2c install readline poweroff ramtron sdcard sysinfo
# Create the list of installed runtime modules (INSTALLED_DIRS)
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ADD_DIRECTORY
-INSTALLED_DIRS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi}
+ INSTALLED_DIRS += $(if $(wildcard .\$1\Makefile),$1,)
endef
+else
+define ADD_DIRECTORY
+ INSTALLED_DIRS += $(if $(wildcard ./$1/Makefile),$1,)
+endef
+endif
$(foreach DIR, $(SUBDIRS), $(eval $(call ADD_DIRECTORY,$(DIR))))
@@ -52,12 +58,12 @@ all: nothing
define SDIR_template
$(1)_$(2):
- $(MAKE) -C $(1) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
+ $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef
$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
-$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),disclean)))
+$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
nothing: