This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new e6c5ff9 Remove the unnecessary touch and clean from Makefile
e6c5ff9 is described below
commit e6c5ff92084111f6083882b212aabe8810700b05
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Tue Aug 11 00:57:42 2020 +0800
Remove the unnecessary touch and clean from Makefile
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
examples/lvgldemo/Makefile | 5 +----
fsutils/inih/Makefile | 1 -
graphics/lvgl/Makefile | 3 ---
netutils/cjson/.gitignore | 2 +-
netutils/cjson/Makefile | 6 +-----
system/embedlog/Makefile | 2 --
system/psmq/Makefile | 1 -
testing/unity/.gitignore | 2 +-
testing/unity/Makefile | 6 +-----
9 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index f4aecb4..1e48d47 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -37,7 +37,7 @@ include $(APPDIR)/Make.defs
# LittleVGL demo built-in application info
-CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_examples/archive
+CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_examples/archive
LVGL_EXAMPLES_VERSION ?= 7.0.2
LVGL_EXAMPLES_TARBALL = v$(LVGL_EXAMPLES_VERSION).zip
@@ -101,9 +101,6 @@ $(LVGL_EXAMPLES_UNPACKNAME): $(LVGL_EXAMPLES_TARBALL)
context:: $(LVGL_EXAMPLES_UNPACKNAME)
-clean::
- $(call DELDIR, build)
-
distclean::
$(call DELDIR, $(LVGL_EXAMPLES_UNPACKNAME))
$(call DELFILE, $(LVGL_EXAMPLES_TARBALL))
diff --git a/fsutils/inih/Makefile b/fsutils/inih/Makefile
index ac0cfbf..cbf0281 100644
--- a/fsutils/inih/Makefile
+++ b/fsutils/inih/Makefile
@@ -83,7 +83,6 @@ $(INIH_TARBALL):
@echo "Downloading: $@"
$(Q) $(WGET) -O $@ $(INIH_URL)/$@
${Q} $(NXTOOLSDIR)/check-hash.sh sha256 $(INIH_SRC_SHA256) $@
- $(Q) touch $@
$(INIH_SOURCES): $(INIH_TARBALL)
@echo "Unpacking $< -> $@"
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index ce1cac8..16e278a 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -78,9 +78,6 @@ $(LVGL_UNPACKNAME): $(LVGL_TARBALL)
context:: $(LVGL_UNPACKNAME)
-clean::
- $(call DELDIR, build)
-
distclean::
$(call DELDIR, $(LVGL_UNPACKNAME))
$(call DELFILE, $(LVGL_TARBALL))
diff --git a/netutils/cjson/.gitignore b/netutils/cjson/.gitignore
index c1c513d..4b59934 100644
--- a/netutils/cjson/.gitignore
+++ b/netutils/cjson/.gitignore
@@ -1,2 +1,2 @@
-/cJSON-*
+/cJSON*
/v*.tar.gz
diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile
index 68a2ec1..e8185b3 100644
--- a/netutils/cjson/Makefile
+++ b/netutils/cjson/Makefile
@@ -69,7 +69,7 @@ $(CJSON_TARBALL):
$(CJSON_UNPACKNAME): $(CJSON_TARBALL)
@echo "Unpacking: $(CJSON_TARBALL) -> $(CJSON_UNPACKNAME)"
$(Q) $(UNPACK) $(CJSON_TARBALL)
- @touch $(CJSON_UNPACKNAME)
+ $(Q) touch $(CJSON_UNPACKNAME)
$(CJSON_SRCDIR)$(DELIM)cJSON.h: $(CJSON_UNPACKNAME)
@@ -83,12 +83,8 @@ $(APPS_INCDIR)$(DELIM)cJSON_Utils.h:
$(CJSON_SRCDIR)$(DELIM)cJSON_Utils.h
context:: $(APPS_INCDIR)$(DELIM)cJSON.h $(APPS_INCDIR)$(DELIM)cJSON_Utils.h
-clean::
- $(call DELDIR, build)
-
distclean::
$(call DELDIR, $(CJSON_UNPACKNAME))
- $(call DELFILE, .downloaded)
$(call DELFILE, $(CJSON_TARBALL))
$(call DELFILE, $(APPDIR)/include/netutils/cJSON.h)
$(call DELFILE, $(APPDIR)/include/netutils/cJSON_Utils.h)
diff --git a/system/embedlog/Makefile b/system/embedlog/Makefile
index ea19905..7d85483 100644
--- a/system/embedlog/Makefile
+++ b/system/embedlog/Makefile
@@ -178,7 +178,6 @@ $(EMBEDLOG_TARBALL):
@echo "Downloading: $@"
$(Q) $(WGET) -O $@ $(EMBEDLOG_URL)/$@
${Q} $(NXTOOLSDIR)/check-hash.sh sha256 $(EMBEDLOG_SRC_SHA256) $@
- $(Q) touch $@
$(EMBEDLOG_SOURCES): $(EMBEDLOG_TARBALL)
@echo "Unpacking $< -> $@"
@@ -189,7 +188,6 @@ $(EMBEDLOG_SOURCES): $(EMBEDLOG_TARBALL)
embedlog: $(EMBEDLOG_SOURCES)
$(call DELDIR, $@)
$(Q) $(CP) $< $@
- $(Q) touch $@
create_includes:
$(Q) $(CP) $(EMBEDLOG_SOURCES)/include/embedlog.h
$(APPDIR)/include/system
diff --git a/system/psmq/Makefile b/system/psmq/Makefile
index a104bd4..736277b 100644
--- a/system/psmq/Makefile
+++ b/system/psmq/Makefile
@@ -110,7 +110,6 @@ $(PSMQ_TARBALL):
@echo "Downloading: $@"
$(Q) $(WGET) -O $@ $(PSMQ_URL)/$@
$(Q) $(NXTOOLSDIR)/check-hash.sh sha256 $(PSMQ_SRC_SHA256) $@
- $(Q) touch $@
$(PSMQ_SOURCES): $(PSMQ_TARBALL)
@echo "Unpacking $< -> $@"
diff --git a/testing/unity/.gitignore b/testing/unity/.gitignore
index 073ab6c..516c28f 100644
--- a/testing/unity/.gitignore
+++ b/testing/unity/.gitignore
@@ -1,2 +1,2 @@
-/Unity-*
+/Unity*
/v*.tar.gz
diff --git a/testing/unity/Makefile b/testing/unity/Makefile
index 964ec4e..613d3dc 100644
--- a/testing/unity/Makefile
+++ b/testing/unity/Makefile
@@ -68,7 +68,7 @@ $(UNITY_TARBALL):
$(UNITY_UNPACKNAME): $(UNITY_TARBALL)
@echo "Unpacking: $(UNITY_TARBALL) -> $(UNITY_UNPACKNAME)"
$(Q) $(UNPACK) $(UNITY_TARBALL)
- @touch $(UNITY_UNPACKNAME)
+ $(Q) touch $(UNITY_UNPACKNAME)
$(UNITY_SRCDIR)$(DELIM)unity.h: $(UNITY_UNPACKNAME)
@@ -82,12 +82,8 @@ $(APPS_INCDIR)$(DELIM)unity_internals.h:
$(UNITY_SRCDIR)$(DELIM)unity_internals.
context:: $(APPS_INCDIR)$(DELIM)unity.h $(APPS_INCDIR)$(DELIM)unity_internals.h
-clean::
- $(call DELDIR, build)
-
distclean::
$(call DELDIR, $(UNITY_UNPACKNAME))
- $(call DELFILE, .downloaded)
$(call DELFILE, $(UNITY_TARBALL))
$(call DELFILE, $(APPDIR)/include/testing/unity.h)
$(call DELFILE, $(APPDIR)/include/testing/unity_internals.h)
