X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi.mk;h=df9afc223b2f8e637d6b615de9927743560e8f6c;hb=7fc10b339ec1c6bb0e6cb340e1ee374484933e1e;hp=3fff8b22459e34a0f08b277e2f04f03a02eec4a4;hpb=8c0a738c86e5d2f661b7ef4fcc4ef7e07fe98806;p=cc0%2Fargeo-build.git diff --git a/osgi.mk b/osgi.mk index 3fff8b2..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 @@ -21,10 +21,10 @@ DEP_CATEGORIES ?= JAVADOC_PACKAGES ?= A2_BASE ?= $(A2_OUTPUT) -LOGGER_JAR ?= $(A2_BASE)/org.argeo.tp.log/org.argeo.tp.syslogger.2.3.jar +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)