diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-18 20:59:30 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-18 20:59:30 +0000 |
| commit | 7513c5be902a5df90eebd71a5300014736bb7f88 (patch) | |
| tree | 18ba50c73d2f9b7fdbf7504bcdc004c89e35ab7d | |
| parent | abe75281e693689f8efe02ddad2c82ae067e5d98 (diff) | |
| download | px4-nuttx-7513c5be902a5df90eebd71a5300014736bb7f88.tar.gz px4-nuttx-7513c5be902a5df90eebd71a5300014736bb7f88.tar.bz2 px4-nuttx-7513c5be902a5df90eebd71a5300014736bb7f88.zip | |
Fix typol in Config.mk that would effect non-Windows builds
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5369 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/Makefile.win | 12 | ||||
| -rw-r--r-- | nuttx/tools/Config.mk | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index f98c5e6d8..7f9620692 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -442,12 +442,12 @@ clean_context: $(call DELFILE include\nuttx\version.h) $(call DELFILE include\math.h) $(call DELFILE include\stdarg.h) - $(Q) $(DIRUNLINK) include\arch\board - $(Q) $(DIRUNLINK) include\arch\chip - $(Q) $(DIRUNLINK) include\arch - $(Q) $(DIRUNLINK) $(ARCH_SRC)\board - $(Q) $(DIRUNLINK) $(ARCH_SRC)\chip - $(Q) $(DIRUNLINK) include\apps + $(call DELDIR include\arch\board) + $(call DELDIR include\arch\chip) + $(call DELDIR include\arch) + $(call DELDIR $(ARCH_SRC)\board) + $(call DELDIR $(ARCH_SRC)\chip) + $(call DELDIR include\apps) # check_context # diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk index aafb58f35..300df7a6a 100644 --- a/nuttx/tools/Config.mk +++ b/nuttx/tools/Config.mk @@ -182,11 +182,23 @@ define DELFILE $(Q) if exist $1 (del /f /q $1) endef else -define CLEAN +define DELFILE $(Q) rm -f $1 endef endif +# DELDIR - Delect one directory + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) +define DELDIR + $(Q) if exist $1 (rmdir /q /s $1) +endef +else +define DELDIR + $(Q) rm -rf $1 +endef +endif + # CLEAN - Default clean target ifeq ($(CONFIG_WINDOWS_NATIVE),y) |