X-Git-Url: http://nitlanguage.org diff --git a/Makefile b/Makefile index e7cae2b..4f4f71b 100644 --- a/Makefile +++ b/Makefile @@ -14,15 +14,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -NITCOPT= contrib_dir = ./contrib examples_dir = ./examples -all_contribs = $(dir $(contrib_dir)/*/Makefile) +all_contribs = $(dir $(wildcard $(contrib_dir)/*/Makefile)) # Additional program directories (contrib and examples) that are buildable extras = $(filter-out $(contrib_dir)/nitc/,$(all_contribs)) -extras += $(dir $(examples_dir)/*/Makefile) +extras += $(dir $(wildcard $(examples_dir)/*/Makefile)) all: tools man @echo "" @@ -30,10 +29,13 @@ all: tools man @echo "To configure your shell environment, execute the following command:" @echo " source misc/nit_env.sh install" +more: + cd src; make more + # Compile all programs in `contrib`, `examples` and `src`. # # Furthermore, build the toolchain’s `man` pages. -full: all +full: all more for directory in $(extras); do \ (cd "$${directory}" && $(MAKE)) || exit 1; \ done @@ -58,10 +60,6 @@ doc/stdlib/index.html: bin/nitdoc bin/nitls --custom-brand "Nitlanguage.org" \ --custom-overview-text "

Documentation for the standard library of Nit
Version $$(git describe)
Date: $$(git show --format="%cd" | head -1)

" \ --custom-footer-text "Nit standard library. Version $$(git describe)." \ - --github-upstream "nitlang:nit:master" \ - --github-base-sha1 "$$(git rev-parse HEAD)" \ - --github-gitdir "." \ - --source "https://github.com/nitlang/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \ --piwik-tracker "pratchett.info.uqam.ca/piwik/" \ --piwik-site-id "2" \ @@ -72,10 +70,6 @@ doc/nitc/index.html: bin/nitdoc bin/nitls --custom-brand "Nitlanguage.org" \ --custom-overview-text "

Documentation for the Nit tools
Version $$(git describe)
Date: $$(git show --format="%cd" | head -1)

" \ --custom-footer-text "Nit tools. Version $$(git describe)." \ - --github-upstream "nitlang:nit:master" \ - --github-base-sha1 "$$(git rev-parse HEAD)" \ - --github-gitdir "." \ - --source "https://github.com/nitlang/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \ --piwik-tracker "pratchett.info.uqam.ca/piwik/" \ --piwik-site-id "3" @@ -89,6 +83,8 @@ clean: cd src; make clean cd tests; make clean cd share/man; make clean - for directory in $(extras); do \ - (cd "$$directory" && $(MAKE) clean); \ + -for directory in $(extras); do \ + (echo "CLEANING $$directory" && cd "$$directory" && $(MAKE) clean); \ done + @echo "" + @echo "Nit was succesfully cleaned." \ No newline at end of file