Prepare next development cycle

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index db2389ed6f3941914260f2167610a61de648b813..497de15b0e1e2a03e0dc816b00669a25920a1fff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,4 @@
 include sdk.mk
-.PHONY: clean all osgi
-
-all: osgi
-       $(MAKE) -f Makefile-rcp.mk all
 
 A2_CATEGORY = org.argeo.cms
 
@@ -11,31 +7,30 @@ org.argeo.init \
 org.argeo.api.uuid \
 org.argeo.api.register \
 org.argeo.api.acr \
-org.argeo.api.cli \
 org.argeo.api.cms \
 org.argeo.cms \
 org.argeo.cms.ux \
-org.argeo.cms.ee \
+org.argeo.cms.jshell \
+org.argeo.cms.lib.json \
 org.argeo.cms.lib.jetty \
 org.argeo.cms.lib.dbus \
 org.argeo.cms.lib.sshd \
+org.argeo.cms.ee \
 org.argeo.cms.cli \
 osgi/equinox/org.argeo.cms.lib.equinox \
 swt/org.argeo.swt.minidesktop \
 swt/org.argeo.cms.swt \
-swt/org.argeo.cms.e4 \
 swt/rap/org.argeo.swt.specific.rap \
 swt/rap/org.argeo.cms.swt.rap \
-swt/rap/org.argeo.cms.e4.rap \
 
 DEP_CATEGORIES = \
 crypto/fips/org.argeo.tp.crypto \
 org.argeo.tp \
-org.argeo.tp.jetty \
-osgi/api/org.argeo.tp.osgi \
+org.argeo.tp.httpd \
+org.argeo.tp.sshd \
+osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
-swt/rap/org.argeo.tp.swt.workbench \
 $(A2_CATEGORY) \
 swt/$(A2_CATEGORY) \
 swt/rap/$(A2_CATEGORY) \
@@ -45,10 +40,18 @@ org.argeo.api.uuid \
 org.argeo.api.acr \
 org.argeo.api.cms
 
-clean:
-       rm -rf $(BUILD_BASE)
+all: osgi-all
+       $(MAKE) -f Makefile-rcp.mk all
+       
+clean: osgi-clean
        $(MAKE) -f Makefile-rcp.mk clean
 
-A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
+install: osgi-install
+       $(MAKE) -f Makefile-rcp.mk install
+
+uninstall: osgi-uninstall
+       $(MAKE) -f Makefile-rcp.mk uninstall
+
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+.PHONY: clean all install uninstall