From: Mathieu Baudier Date: Thu, 16 Mar 2023 06:40:58 +0000 (+0100) Subject: Use recursive assignment for make output variables X-Git-Tag: v2.3.5~105 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=cf1c40e568422cf1a18ef17b0af15408f6f57b5c;hp=00cb05eb3acc5b6900320cc672ecd865114612a5;p=cc0%2Fargeo-build.git Use recursive assignment for make output variables --- diff --git a/osgi.mk b/osgi.mk index 96652c8..df9afc2 100644 --- a/osgi.mk +++ b/osgi.mk @@ -5,7 +5,7 @@ # SDK_SRC_BASE the base of the source code, typically the root of the cloned git repository # SDK_BUILD_BASE the base of the output # JAVA_HOME the base of the JDK used to build -A2_OUTPUT := $(SDK_BUILD_BASE)/a2 +A2_OUTPUT = $(SDK_BUILD_BASE)/a2 JVM ?= $(JAVA_HOME)/bin/java JAVADOC ?= $(JAVA_HOME)/bin/javadoc @@ -24,7 +24,7 @@ A2_BASE ?= $(A2_OUTPUT) LOGGER_JAR ?= $(A2_BASE)/org.argeo.tp/org.argeo.tp.syslogger.2.3.jar ECJ_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.32.jar BNDLIB_JAR ?= $(A2_BASE)/org.argeo.tp.sdk/biz.aQute.bndlib.5.3.jar -ARGEO_MAKE := $(JVM) -cp $(LOGGER_JAR):$(ECJ_JAR):$(BNDLIB_JAR) $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Make.java +ARGEO_MAKE = $(JVM) -cp $(LOGGER_JAR):$(ECJ_JAR):$(BNDLIB_JAR) $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Make.java #ARGEO_MAKE = $(JVM) -cp $(ECJ_JAR):$(BNDLIB_JAR):$(SLF4J_API_JAR):$(BUILD_BASE)/bin org/argeo/build/Make JAVADOC_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src)