Mercurial > octave
changeset 26492:67724e9f6661 stable
build: add custom silent rule tags for jar and javac
* scripts/java/module.mk (OCT_V_JAR, OCT_V_JAVAC): Define and use custom
silent build rule variables for the javac compiler and jar tool.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Mon, 07 Jan 2019 17:51:39 -0800 |
| parents | 6b703927b891 |
| children | bc6237a189e1 |
| files | scripts/java/module.mk |
| diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/java/module.mk Mon Jan 07 17:07:28 2019 -0800 +++ b/scripts/java/module.mk Mon Jan 07 17:51:39 2019 -0800 @@ -34,8 +34,18 @@ %canon_reldir%_JAVA_CLASSES = $(addprefix %reldir%/, $(JAVA_CLASSES)) +OCT_V_JAR = $(oct__v_JAR_$(V)) +oct__v_JAR_ = $(oct__v_JAR_$(AM_DEFAULT_VERBOSITY)) +oct__v_JAR_0 = @echo " JAR " $@; +oct__v_JAR_1 = + +OCT_V_JAVAC = $(oct__v_JAVAC_$(V)) +oct__v_JAVAC_ = $(oct__v_JAVAC_$(AM_DEFAULT_VERBOSITY)) +oct__v_JAVAC_0 = @echo " JAVAC " $@; +oct__v_JAVAC_1 = + $(%canon_reldir%_JAVA_CLASSES) : %.class : %.java | %reldir%/$(octave_dirstamp) - $(AM_V_GEN)$(MKDIR_P) %reldir%/$(org_octave_dir) && \ + $(OCT_V_JAVAC)$(MKDIR_P) %reldir%/$(org_octave_dir) && \ ( cd $(srcdir)/scripts/java; \ "$(JAVAC)" -source 1.6 -target 1.6 -Xlint:-options \ -d $(abs_top_builddir)/scripts/java \ @@ -43,7 +53,7 @@ if AMCOND_HAVE_JAVA %reldir%/octave.jar: $(%canon_reldir%_JAVA_CLASSES) - $(AM_V_GEN)rm -f $@-t $@ && \ + $(OCT_V_JAR)rm -f $@-t $@ && \ ( cd scripts/java; \ "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \ mv $@-t $@