You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/06/10 13:32:05 UTC
[incubator-nuttx-apps] 01/02: examples/thttpd: update Makefile etc
to fix build break
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 0b322c9784136a4168aaa44537a798d7cda26dd2
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Wed Jun 10 19:34:53 2020 +0800
examples/thttpd: update Makefile etc to fix build break
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
examples/thttpd/content/Makefile.nxflat | 4 +++-
examples/thttpd/thttpd_main.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/examples/thttpd/content/Makefile.nxflat b/examples/thttpd/content/Makefile.nxflat
index 7384242..fc793da 100644
--- a/examples/thttpd/content/Makefile.nxflat
+++ b/examples/thttpd/content/Makefile.nxflat
@@ -33,6 +33,8 @@
#
############################################################################
+include $(TOPDIR)/Make.defs
+
SUBDIRS = hello tasks
INSTALL_FILES = index.html style.css
@@ -76,7 +78,7 @@ $(ROMFS_SRC): $(ROMFS_IMG)
# Create the exported symbol table list from the derived *-thunk.S files
$(SYMTAB_SRC): install
- $(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(CONTENT_DIR) g_thttpd >$@.tmp
+ $(Q) $(APPDIR)/tools/mksymtab.sh $(CONTENT_DIR) g_thttpd >$@.tmp
$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
# Nothing special needs to be done during the context phase
diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c
index 5812c0c..1b4dff3 100644
--- a/examples/thttpd/thttpd_main.c
+++ b/examples/thttpd/thttpd_main.c
@@ -183,7 +183,7 @@ int g_thttpdnsymbols;
extern const unsigned char romfs_img[];
extern const unsigned int romfs_img_len;
-#ifdef CONFIG_THTTPD_FLAT
+#ifdef CONFIG_THTTPD_NXFLAT
extern const struct symtab_s g_thttpd_exports[];
extern const int g_thttpd_nexports;
#endif