Adapt to changes in Argeo Commons

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index 3d881b870532d9081cac41e9c34b866d1914b823..9011b2dc0aa267d56969f17b19c082368e37144b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,38 +3,43 @@ include sdk.mk
 
 all: osgi
        $(MAKE) -f Makefile-rcp.mk all
+       
+install: osgi-install
+
+uninstall: osgi-uninstall
 
 A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
 org.argeo.init \
-org.argeo.util \
 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.apache \
-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) \