makefile: split tools into 2 groups

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/Makefile b/Makefile
index 3ca637e..5029f2a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,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

diff --git a/src/Makefile b/src/Makefile
index 16aa172..96ac02e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,9 +16,12 @@
 
 NITCOPT=--semi-global
 OLDNITCOPT=--semi-global
-OBJS=nitc nitpick nit nitdoc nitls nitunit picnit nitpretty nitmetrics nitx nitlight nitserial nitrestful
+OBJS=nitc nitpick nit nitls nitunit picnit nitx nitlight nitserial nitrestful
 SRCS=$(patsubst %,%.nit,$(OBJS))
 BINS=$(patsubst %,../bin/%,$(OBJS))
+MOREOBJS=nitdoc nitweb nitcatalog nitmetrics nitpretty nitweb
+MORESRCS=$(patsubst %,%.nit,$(MOREOBJS))
+MOREBINS=$(patsubst %,../bin/%,$(MOREOBJS))
 DEPS=$(wildcard *.nit */*.nit) parser/parser.nit
 
 # Workaround: Cygwin requires peflags to bootstrap
@@ -26,6 +29,8 @@ peflags := ${shell which peflags 2>/dev/null}
 
 all: ../bin/nitc
 
+more: ../bin/nitdoc
+
 pre-build:
        ./git-gen-version.sh
 
@@ -47,6 +52,9 @@ endif
        test -d ../bin || mkdir ../bin
        ./nitc_0 ${NITCOPT} -v --dir ../bin $(SRCS)
 
+../bin/nitdoc: ../bin/nitc $(DEPS)
+       ../bin/nitc ${NITCOPT} -v --dir ../bin $(MORESRCS)
+
 $(OBJS): nitc_0 $(DEPS)
        ./git-gen-version.sh
        ./nitc_0 ${NITCOPT} -v $@.nit