From 9e9072bd006f4bac4b927ebd0584abb90a61116f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 15 Aug 2018 18:46:04 -0600 Subject: [PATCH] apps/builtin/Makefile: Move the RWILDCARD function definition from apps/builtin/Makefile to nuttx/tools/Config.mk. It may have a broader usage than it does now. --- builtin/Makefile | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/builtin/Makefile b/builtin/Makefile index 73d0ba572..55386431d 100644 --- a/builtin/Makefile +++ b/builtin/Makefile @@ -38,33 +38,27 @@ include $(APPDIR)/Make.defs # Source and object files -ASRCS = -CSRCS = builtin_forindex.c builtin_list.c exec_builtin.c +ASRCS = +CSRCS = builtin_forindex.c builtin_list.c exec_builtin.c -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BIN = ..\libapps$(LIBEXT) + BIN = ..\libapps$(LIBEXT) else ifeq ($(WINTOOL),y) - BIN = ..\\libapps$(LIBEXT) + BIN = ..\\libapps$(LIBEXT) else - BIN = ../libapps$(LIBEXT) + BIN = ../libapps$(LIBEXT) endif endif -ROOTDEPPATH = --dep-path . -VPATH = - -# RWILDCARD - Recursive wildcard used to get lists of files - -define RWILDCARD - $(foreach d,$(wildcard $1/*),$(call RWILDCARD,$d/)$(filter $(subst *,%,$2),$d)) -endef +ROOTDEPPATH = --dep-path . +VPATH = # Registry entry lists