You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/01/17 20:46:16 UTC
[incubator-nuttx-apps] branch revert-21-curdir created (now 822eeea)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch revert-21-curdir
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
at 822eeea Revert "apps/Makefile: Fix APPDIR path for native build."
This branch includes the following new commits:
new e264d68 Revert "apps/Makefile: Improve some comments."
new 822eeea Revert "apps/Makefile: Fix APPDIR path for native build."
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-nuttx-apps] 01/02: Revert "apps/Makefile: Improve some
comments."
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch revert-21-curdir
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit e264d68c3e36620835dff3df8b56f4163c2add95
Author: patacongo <sp...@yahoo.com>
AuthorDate: Fri Jan 17 14:46:07 2020 -0600
Revert "apps/Makefile: Improve some comments."
This reverts commit 9b077dc2206ec6a9cd48268086125c02fd6e7f19.
---
Makefile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index e0ad31f..599641b 100644
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,10 @@ TOPDIR ?= $(APPDIR)/import
-include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
-# The GNU make CURDIR will always be a POSIX-like path with forward slashes
-# as path segment separators. This is fine for the above inclusions but
-# will cause problems later for the native build. If we know that this is
-# a native build, then we need to fix up the APPDIR path for subsequent
-# use
+# The GNU make CURDIR will always be a POSIX-like paths withi forward
+# slashes as path segment separators. This is fine for the above inclusion,
+# but will cause problems later for the native build. If we know that this
+# is a native build, then fix up the paths
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
APPDIR := ${shell echo %CD%}
[incubator-nuttx-apps] 02/02: Revert "apps/Makefile: Fix APPDIR
path for native build."
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch revert-21-curdir
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 822eeeaba2d745e658a17cf5be7e529d8b71ae46
Author: patacongo <sp...@yahoo.com>
AuthorDate: Fri Jan 17 14:46:07 2020 -0600
Revert "apps/Makefile: Fix APPDIR path for native build."
This reverts commit 7e3cd91c2648d71da53e1749abe8836130afd682.
---
Makefile | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/Makefile b/Makefile
index 599641b..8d59176 100644
--- a/Makefile
+++ b/Makefile
@@ -40,15 +40,6 @@ TOPDIR ?= $(APPDIR)/import
-include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
-# The GNU make CURDIR will always be a POSIX-like paths withi forward
-# slashes as path segment separators. This is fine for the above inclusion,
-# but will cause problems later for the native build. If we know that this
-# is a native build, then fix up the paths
-
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-APPDIR := ${shell echo %CD%}
-endif
-
# Symbol table for loadable apps.
SYMTABSRC = symtab_apps.c