From 420a8f079464bee9910b7c8085391d750d010c69 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Tue, 1 Oct 2019 07:28:58 -0600 Subject: [PATCH] import/Makefile's: Remove symbol table generation from imports/Makefile to avoid the confusion with the official method. --- import/.gitignore | 1 - import/Makefile | 27 ++------------------------- import/Makefile.symtab | 40 ---------------------------------------- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 import/Makefile.symtab diff --git a/import/.gitignore b/import/.gitignore index 3e61817a9..df2e109a3 100644 --- a/import/.gitignore +++ b/import/.gitignore @@ -4,7 +4,6 @@ /.config /System.map /User.map -/symtab.c /arch /build /libs diff --git a/import/Makefile b/import/Makefile index 75806ad96..7faaf2c7d 100644 --- a/import/Makefile +++ b/import/Makefile @@ -41,40 +41,17 @@ SUBDIRS = arch build include libs startup tmp FILES = .config System.map User.map -ifneq (,$(wildcard ./symtab.c)) -define MKSYMTAB - $(Q) $(MAKE) -f Makefile.symtab $1 TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" -endef -else -define MKSYMTAB -endef -endif - -all: symtab -.PHONY: symtab context depend clean distclean -.PRECIOUS: ../libapps$(LIBEXT) - -symtab: - $(call MKSYMTAB, all) +all: +.PHONY: context depend clean distclean install: - $(call MKSYMTAB, install) context: - $(call MKSYMTAB, context) depend: - $(call MKSYMTAB, depend) clean: - $(call MKSYMTAB, clean) distclean: $(foreach SDIR, $(SUBDIRS), $(call DELDIR, $(SDIR))) $(foreach FILE, $(FILES), $(call DELFILE, $(FILE))) - $(call MKSYMTAB, distclean) - $(call DELFILE, symtab.c) - -# Library path - -LIBPATH = $(TOPDIR)/staging diff --git a/import/Makefile.symtab b/import/Makefile.symtab deleted file mode 100644 index d73f4467e..000000000 --- a/import/Makefile.symtab +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -# apps/import/Makefile.symtab -# -# Copyright (C) 2018 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name NuttX nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - --include $(TOPDIR)/Make.defs - -CSRCS = symtab.c - -include $(APPDIR)/Application.mk