Make OSGi init more robust

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index 7129324bef247949a6fe97f5310dfb50838516b7..5d0ce97ce3865568fd59653bacf9e734da1372b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,8 @@
 include sdk.mk
 .PHONY: clean all osgi jni
 
-all: osgi jni move-rap
-       $(MAKE) -f Makefile-rcp.mk
-
-move-rap: osgi
-       mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
-       mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
-       touch $(BUILD_BASE)/*.rap/bnd.bnd
+all: osgi
+       $(MAKE) -f Makefile-rcp.mk all
 
 A2_CATEGORY = org.argeo.cms
 
@@ -33,33 +28,23 @@ swt/rap/org.argeo.swt.specific.rap \
 swt/rap/org.argeo.cms.swt.rap \
 swt/rap/org.argeo.cms.swt.rap.cli \
 swt/rap/org.argeo.cms.e4.rap \
-jcr/org.argeo.cms.jcr \
-jcr/org.argeo.cms.ui \
-
-JAVADOC_BUNDLES =  \
-org.argeo.api.uuid \
-org.argeo.api.acr \
-org.argeo.api.cms
-
-JAVADOC_PACKAGES =  \
-org.argeo.api.uuid \
-org.argeo.api.acr \
-org.argeo.api.cms
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
-VPATH = .:jcr:swt:swt/rap
 
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
-org.argeo.tp.eclipse \
 osgi/api/org.argeo.tp.osgi \
+osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
-org.argeo.tp.jcr
+$(A2_CATEGORY) \
+swt/$(A2_CATEGORY) \
+swt/rap/$(A2_CATEGORY) \
+
+JAVADOC_PACKAGES =  \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms
 
 jni:
        $(MAKE) -C jni