summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-12-23 17:35:06 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-12-23 17:35:06 +0000
commit99b4705b554f71a05f8924d92a5b8013bc6ca70e (patch)
tree3bf73332cc39e6e0595f6280d5aad46cd9324c6d /apps
parent10b6fd31cc5b27540bdde4999060a42de3e44d26 (diff)
downloadnuttx-99b4705b554f71a05f8924d92a5b8013bc6ca70e.tar.gz
nuttx-99b4705b554f71a05f8924d92a5b8013bc6ca70e.tar.bz2
nuttx-99b4705b554f71a05f8924d92a5b8013bc6ca70e.zip
Remove some dependencies of distclean on clean. This should not be necessary in higher level makefiles and should speed up make distclean
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5453 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r--apps/ChangeLog.txt5
-rw-r--r--apps/Makefile2
-rw-r--r--apps/examples/Makefile2
-rw-r--r--apps/interpreters/Makefile2
-rw-r--r--apps/netutils/Makefile2
-rw-r--r--apps/system/Makefile2
6 files changed, 10 insertions, 5 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 0695747f8..614538ad5 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -435,3 +435,8 @@
logic to find the absolute path to the program using the PATH variable.
6.25 2013-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+ * Makefiles: Removed dependency of distclean on clean in most top-level
+ files. It makes sense for 'leaf' Makefiles to have this dependency,
+ but it does not make sense for upper-level Makefiles.
+
diff --git a/apps/Makefile b/apps/Makefile
index 353894b7f..0973d64b5 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -177,7 +177,7 @@ endif
$(call DELFILE, $(BIN))
$(call CLEAN)
-distclean: # clean
+distclean:
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
$(Q) for %%G in ($(SUBDIRS)) do ( \
$(MAKE) -C %%G distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" \
diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index bdbfd4de8..50e9596d7 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -120,7 +120,7 @@ depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
-distclean: clean $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
+distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
-include Make.dep
diff --git a/apps/interpreters/Makefile b/apps/interpreters/Makefile
index 867d45f99..f78528714 100644
--- a/apps/interpreters/Makefile
+++ b/apps/interpreters/Makefile
@@ -73,4 +73,4 @@ depend: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_depend)
clean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_clean)
-distclean: clean $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean)
+distclean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean)
diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile
index 0879ada4e..781770fc1 100644
--- a/apps/netutils/Makefile
+++ b/apps/netutils/Makefile
@@ -64,4 +64,4 @@ depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
-distclean: clean $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
+distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
diff --git a/apps/system/Makefile b/apps/system/Makefile
index 9955a6b2c..057fbcf77 100644
--- a/apps/system/Makefile
+++ b/apps/system/Makefile
@@ -73,4 +73,4 @@ depend: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_depend)
clean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_clean)
-distclean: clean $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean)
+distclean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean)