From 897fefbcdd4366437ff1c5a544405388ee250533 Mon Sep 17 00:00:00 2001 From: mlelansky Date: Tue, 7 Apr 2015 11:56:41 +0200 Subject: [PATCH 1/2] Edit the generation of the platform documentation. Remove no more used options. --- apps/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 23fad0551b..42f18aa02b 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -34,6 +34,8 @@ BASEDIR = $(shell pwd | sed 's@\(.*\)/apps.*$$@\1@' ) # The output directory for generated documentation DOCDIR = $(BASEDIR)/doc/nesdoc +PLATFORMS=btnode3 epic eyesIFX eyesIFXv1 eyesIFXv2 intelmote2 iris mica2 mica2dot micaz mulle null sam3s_ek sam3u_ek shimmer shimmer2 shimmer2r span telos telosa telosb tinynode tmote ucbase ucmini ucprotonb z1 + nesdoc: @echo This target rebuilds documentation for all known platforms. @echo It DOES NOT overwrite any existing documentation, thus, it @@ -42,9 +44,9 @@ nesdoc: @echo To delete all old documentation, delete the contents of the @echo $(DOCDIR) directory. @echo - @echo Press Enter to continue, or ^C to abort. - @read - for platform in `ncc -print-platforms`; do \ - $(MAKE) $$platform docs.nohtml.preserve; \ - nesdoc -o $(DOCDIR) -html -target=$$platform; \ + #@echo Press Enter to continue, or ^C to abort. + #@read + @echo Building the platformdocumentation. + for platform in $(PLATFORMS); do \ + $(MAKE) $$platform docs; \ done From 54872de71763985e3603ed3fec554cd8ae7ae8b9 Mon Sep 17 00:00:00 2001 From: mlelansky Date: Tue, 7 Apr 2015 12:10:59 +0200 Subject: [PATCH 2/2] Edit the makefile so that the shell wait for the read commands. --- apps/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 42f18aa02b..09bc7df507 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -44,8 +44,8 @@ nesdoc: @echo To delete all old documentation, delete the contents of the @echo $(DOCDIR) directory. @echo - #@echo Press Enter to continue, or ^C to abort. - #@read + @echo Press Enter to continue, or ^C to abort. + @read docs @echo Building the platformdocumentation. for platform in $(PLATFORMS); do \ $(MAKE) $$platform docs; \