Force removal of Require-Bundle

[cc0/argeo-build.git] / osgi.mk

diff --git a/osgi.mk b/osgi.mk
index ad772336afe5df5a0914fb52f66827f1d31da38d..334714bf6ad9f6d37ac2c39edfda1ede82e5389e 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -2,16 +2,16 @@ ARGEO_BUILD_BASE := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(ARGEO_BUILD_BASE)common.mk
 
 # The following variables should be declared in the including Makefile:
-# BUNDLES                      the space-separated list of bundles to build
-# A2_CATEGORY          the (single) a2 category the bundles will belong to
+# BUNDLES           the space-separated list of bundles to build
+# A2_CATEGORY       the (single) a2 category the bundles will belong to
 
 # The following environment variables can change the behaviour of the build
-# SOURCE_BUNDLES       sources will be packaged separately in Eclipse-compatible source bundles
-# NO_MANIFEST_COPY     generated MANIFESTs won't be copied to the source tree
+# SOURCE_BUNDLES    sources will be packaged separately in Eclipse-compatible source bundles
+# NO_MANIFEST_COPY  generated MANIFESTs won't be copied to the source tree
 
 # The following variables have default values which can be overriden
-# DEP_CATEGORIES       the a2 categories the compilation depends on
-# JAVADOC_PACKAGES     the space-separated list of packages for which javadoc will be generated
+# DEP_CATEGORIES    the a2 categories the compilation depends on
+# JAVADOC_PACKAGES  the space-separated list of packages for which javadoc will be generated
 # NATIVE_PACKAGES   the space-separated list of JNI packages (directories)
 DEP_CATEGORIES ?=
 JAVADOC_PACKAGES ?=
@@ -80,12 +80,14 @@ osgi-clean: jni-clean
 osgi-install: jni-install
        $(ARGEO_MAKE) \
         install --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-        --target $(A2_INSTALL_TARGET)
+        --target $(A2_INSTALL_TARGET) \
+        --os $(TARGET_OS) --target-native $(A2_NATIVE_INSTALL_TARGET)
 
 osgi-uninstall: jni-uninstall
        $(ARGEO_MAKE) \
         uninstall --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-        --target $(A2_INSTALL_TARGET)
+        --target $(A2_INSTALL_TARGET) \
+        --os $(TARGET_OS) --target-native $(A2_NATIVE_INSTALL_TARGET)
 
 jni-all: 
        $(foreach dir, $(JNIDIRS), $(MAKE) -C $(dir) all;)
@@ -103,10 +105,4 @@ jni-uninstall:
 javadoc: $(BUILD_BASE)/built
        $(JAVADOC) -noindex -quiet -Xmaxwarns 1 -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
 
-# Make variables used to replace spaces by a separator, typically in order to generate classpaths
-# for example: CLASSPATH = $(subst $(space),$(pathsep),$(strip $(JARS)))
-null  :=
-space := $(null) #
-pathsep := :
-
 .PHONY: osgi manifests javadoc osgi-all osgi-clean osgi-install osgi-uninstall jni-all jni-clean jni-install jni-uninstall