X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=d83a2247970def5dbce28f6e8d7a4ee3832a985c;hb=f4a9e6b6194e40a73996e1b18aaf3379e93f0927;hp=fa16c39e26d5f998fef37650509447ada4af9dd8;hpb=cbb16b11a8fbff17d0e6af8976335edd230ad878;p=gpl%2Fargeo-suite.git

diff --git a/Makefile b/Makefile
index fa16c39..d83a224 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,43 @@
 include sdk.mk
-.PHONY: clean all osgi move-swt
+.PHONY: clean all osgi
 
-all: move-swt
+all: osgi
+	
+install: osgi-install
 
-move-swt: osgi
-	mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.app*.ui.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+uninstall: osgi-uninstall
 
 A2_CATEGORY = org.argeo.suite
 
 BUNDLES = \
 org.argeo.app.api \
 org.argeo.app.core \
+org.argeo.app.jcr \
 org.argeo.app.servlet.odk \
 org.argeo.app.servlet.publish \
-org.argeo.app.swt \
-org.argeo.app.ui \
 org.argeo.app.theme.default \
 org.argeo.app.profile.acr.fs \
 org.argeo.app.profile.acr.jcr \
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
+swt/org.argeo.app.swt \
+swt/org.argeo.app.ui \
+org.argeo.suite.knowledge \
 
 DEP_CATEGORIES = \
 org.argeo.tp \
-org.argeo.tp.apache \
-org.argeo.tp.jetty \
-osgi/api/org.argeo.tp.osgi \
+org.argeo.tp.httpd \
+org.argeo.tp.jcr \
+org.argeo.tp.utils \
+org.argeo.tp.publish \
+org.argeo.tp.math \
+org.argeo.tp.earth \
+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 \
-org.argeo.tp.jcr \
-org.argeo.tp.formats \
-org.argeo.tp.gis \
 org.argeo.cms \
 org.argeo.cms.jcr \
 swt/org.argeo.cms \
+swt/org.argeo.cms.jcr \
 swt/rap/org.argeo.cms \
 
 clean: