When running javadoc, only print a single line saying we're generating javadoc documentation unless messages=yes is being used

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@29581 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2010-02-12 14:36:11 +00:00
parent 40f2775b7a
commit c1f31a89ae
3 changed files with 19 additions and 3 deletions

View file

@ -1,3 +1,11 @@
2010-02-12 Nicola Pero <nicola.pero@meta-innovation.com>
* messages.make (ECHO_JAVADOC): New variable.
* Instance/Documentation/javadoc.make (INTERNAL_JAVADOCFLAGS):
Unless messages=yes is being used, use -quiet flag to keep javadoc
quiet. Use ECHO_JAVADOC to print a line saying we are generating
the javadoc documentation.
2010-02-12 Nicola Pero <nicola.pero@meta-innovation.com>
Implemented parallelizing builds of multiple instances of

View file

@ -34,8 +34,12 @@ else
INTERNAL_JAVADOCFLAGS = -sourcepath ./:$(strip $(JAVADOC_SOURCEPATH))
endif
ifneq ($(messages),yes)
INTERNAL_JAVADOCFLAGS += -quiet
endif
ALL_JAVADOCFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(INTERNAL_JAVADOCFLAGS) \
$(ADDITIONAL_JAVADOCFLAGS) $(AUXILIARY_JAVADOCFLAGS)
$(ADDITIONAL_JAVADOCFLAGS) $(AUXILIARY_JAVADOCFLAGS)
# incremental compilation with javadoc is not supported - you can only
# build once, or always. by default we build only once - use
@ -46,7 +50,7 @@ ifneq ($(JAVADOC_BUILD_ALWAYS),YES) # Build only once
internal-doc-all_:: $(GNUSTEP_INSTANCE)/index.html
$(GNUSTEP_INSTANCE)/index.html:
$(ECHO_NOTHING)$(MKDIRS) $(GNUSTEP_INSTANCE); \
$(ECHO_JAVADOC)$(MKDIRS) $(GNUSTEP_INSTANCE); \
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)$(END_ECHO)
else # Build always
@ -54,7 +58,7 @@ else # Build always
internal-doc-all_:: generate-javadoc
generate-javadoc:
$(ECHO_NOTHING)$(MKDIRS) $(GNUSTEP_INSTANCE); \
$(ECHO_JAVADOC)$(MKDIRS) $(GNUSTEP_INSTANCE); \
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)$(END_ECHO)
endif

View file

@ -83,6 +83,9 @@ ifneq ($(messages),yes)
# Instance/Documentation/autogsdoc.make
ECHO_AUTOGSDOC = @(echo " Generating reference documentation...";
# Instance/Documentation/javadoc.make
ECHO_JAVADOC = @(echo " Generating javadoc documentation...";
END_ECHO = )
#
@ -137,6 +140,7 @@ else
ECHO_MAKING_STRINGS =
ECHO_AUTOGSDOC =
ECHO_JAVADOC =
END_ECHO =