make/bsd/makefiles/sa.make

@@ -23,10 +23,16 @@
 #
 
 # This makefile (sa.make) is included from the sa.make in the
 # build directories.
 
+define print_info
+  ifneq ($$(LOG_LEVEL), warn)
+    $$(shell echo >&2 "INFO: $1")
+  endif
+endef
+
 # This makefile is used to build Serviceability Agent java code
 # and generate JNI header file for native methods.
 
 include $(GAMMADIR)/make/bsd/makefiles/rules.make
 

@@ -51,11 +57,11 @@
       APPLE_JAR=$(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
       SA_CLASSPATH=$(shell test -f $(APPLE_JAR) && echo $(APPLE_JAR))
     endif
   endif
 else
-  _JUNK_ := $(shell echo >&2 "INFO: ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)")
+  $(eval $(call print_info, "ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)"))
   SA_CLASSPATH=$(shell test -f $(ALT_SA_CLASSPATH) && echo $(ALT_SA_CLASSPATH))
 endif
 
 # TODO: if it's a modules image, check if SA module is installed.
 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules

@@ -78,11 +84,11 @@
              -a "$(SRCARCH)" != "zero" ] ; then \
            $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
         fi
 
 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
-        $(QUIETLY) echo "Making $@"
+        $(QUIETLY) echo $(LOG_INFO) "Making $@"
         $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
           echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
           exit 1; \
         fi
         $(QUIETLY) if [ ! -f "$(SA_CLASSPATH)" -a ! -d $(MODULELIB_PATH) ] ; then \