sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/builtin/Makefile. This commit changes apps/builtin to search the registry recursively. By supporting directories, external projects can install the hooks into the registry and easily clean them up and reinstall if something needs to be updated. Based on an idea from Anthony Merlino.

Browse Source
This commit is contained in:
Gregory Nutt 2018-08-15 18:30:59 -06:00
parent 2e3f1c69d1
commit 904d68cd1f
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
builtin/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/builtin/Makefile # apps/builtin/Makefile
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2012, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -60,9 +60,20 @@ endif
ROOTDEPPATH = --dep-path . ROOTDEPPATH = --dep-path .
VPATH = VPATH =
# RWILDCARD - Recursive wildcard used to get lists of files
define RWILDCARD
$(foreach d,$(wildcard $1/*),$(call RWILDCARD,$d/)$(filter $(subst *,%,$2),$d))
endef
# Registry entry lists
PDATLIST = $(call RWILDCARD, registry, *.pdat)
BDATLIST = $(call RWILDCARD, registry, *.bdat)
# Build Targets # Build Targets
all: .built all: .built
.PHONY: context depend clean distclean preconfig .PHONY: context depend clean distclean preconfig
.PRECIOUS: ../libapps$(LIBEXT) .PRECIOUS: ../libapps$(LIBEXT)
@ -80,31 +91,13 @@ builtin_list$(OBJEXT): builtin_list.h builtin_proto.h
builtin_list.h: registry$(DELIM).updated builtin_list.h: registry$(DELIM).updated
$(call DELFILE, .xx_builtin_list.h) $(call DELFILE, .xx_builtin_list.h)
$(Q) touch .xx_builtin_list.h $(Q) touch .xx_builtin_list.h
ifeq ($(CONFIG_WINDOWS_NATIVE),y) $(call CATFILE, .xx_builtin_list.h, $(BDATLIST))
$(Q) (for /f %%G in ('dir /b registry\*.bdat') do ( type registry\%%G >> .xx_builtin_list.h )) || echo ""
else
$(Q) ( \
filelist=`ls registry/*.bdat 2>/dev/null || echo ""`; \
for file in $$filelist; \
do cat $$file >> .xx_builtin_list.h; \
done; \
)
endif
$(Q) mv .xx_builtin_list.h builtin_list.h $(Q) mv .xx_builtin_list.h builtin_list.h
builtin_proto.h: registry$(DELIM).updated builtin_proto.h: registry$(DELIM).updated
$(call DELFILE, .xx_builtin_proto.h) $(call DELFILE, .xx_builtin_proto.h)
$(Q) touch .xx_builtin_proto.h $(Q) touch .xx_builtin_proto.h
ifeq ($(CONFIG_WINDOWS_NATIVE),y) $(call CATFILE, .xx_builtin_proto.h, $(PDATLIST))
$(Q) (for /f %%G in ('dir /b registry\*.pdat') do ( type registry\%%G >> .xx_builtin_proto.h )) || echo ""
else
$(Q) ( \
filelist=`ls registry/*.pdat 2>/dev/null || echo ""`; \
for file in $$filelist; \
do cat $$file >> .xx_builtin_proto.h; \
done; \
)
endif
$(Q) mv .xx_builtin_proto.h builtin_proto.h $(Q) mv .xx_builtin_proto.h builtin_proto.h
.built: $(OBJS) .built: $(OBJS)