From 43028b5f4c16a7d7c9a79f49292853a18bb0e104 Mon Sep 17 00:00:00 2001 From: Scott Fennell Date: Fri, 31 Jan 2020 14:29:45 -0600 Subject: [PATCH] refactor java makefile --- trick_source/java/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/trick_source/java/Makefile b/trick_source/java/Makefile index 5b2b307d..51189267 100644 --- a/trick_source/java/Makefile +++ b/trick_source/java/Makefile @@ -1,20 +1,16 @@ TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..) JAVA_BUILD_DIR = ${TRICK_HOME}/libexec/trick/java/build + + include ${TRICK_HOME}/share/trick/makefiles/Makefile.common -all: ${TRICK_HOME}/libexec/trick/java/build - @echo "Java build successful" - -${TRICK_HOME}/libexec/trick/java/build: +all: @echo "Building java application... For details see ${JAVA_BUILD_DIR}/maven.out" - @mkdir ${JAVA_BUILD_DIR} - @${MVN} package &> ${JAVA_BUILD_DIR}/maven.out + @${MVN} -q package javadoc: ${MVN} javadoc:javadoc clean: - @rm -rf ${JAVA_BUILD_DIR} + @${MVN} -q clean @echo java build directory cleaned. - -