Adapt Makefile

diff --git a/Makefile b/Makefile
index 0a6d791f77159394b332fa29a7b1c6a8a981340b..7914476982d2dc3a9f5b1f4d3452dd0d578a0133 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,9 @@
 include sdk.mk
-.PHONY: clean all osgi jni move-swt move-rap
+.PHONY: clean all osgi jni
 
 all: osgi jni
        $(MAKE) -f Makefile-rcp.mk all
 
-move-rap: move-swt
-       #mkdir -p $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
-       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
-       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.cli.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
-       #touch $(BUILD_BASE)/*.rap/bnd.bnd
-
-move-swt: osgi
-       #mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.swt.minidesktop.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.swt.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.e4.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-
 A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
@@ -43,22 +31,6 @@ swt/rap/org.argeo.cms.e4.rap \
 jcr/org.argeo.cms.jcr \
 jcr/org.argeo.cms.jcr.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
-#vpath %.$(MAJOR).$(MINOR).jar .:jcr/$(A2_CATEGORY):swt/$(A2_CATEGORY):swt/rap/$(A2_CATEGORY)
-
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.apache \
@@ -72,6 +44,11 @@ $(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