X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=497de15b0e1e2a03e0dc816b00669a25920a1fff;hb=HEAD;hp=af16906ccffc62dafadb8b94c353b9d423eb83ae;hpb=d0c5e5d0aa3a75e256333d47a3c711f1c1c73b14;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index af16906cc..497de15b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,65 +1,57 @@
 include sdk.mk
-.PHONY: clean all osgi jni
-
-all: osgi jni move-rap
-	$(MAKE) -f Makefile-rcp.mk
-
-move-rap:
-	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
 
 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.cms \
 org.argeo.cms \
-org.argeo.cms.pgsql \
 org.argeo.cms.ux \
-eclipse/org.argeo.ext.equinox.jetty \
-eclipse/org.argeo.cms.servlet \
-eclipse/org.argeo.cms.swt \
-eclipse/org.argeo.cms.e4 \
-rap/org.argeo.cms.ui.rap \
-rap/org.argeo.swt.specific.rap \
-rap/org.argeo.cms.e4.rap \
-jcr/org.argeo.cms.jcr \
-jcr/org.argeo.cms.ui \
+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/rap/org.argeo.swt.specific.rap \
+swt/rap/org.argeo.cms.swt.rap \
 
-JAVADOC_BUNDLES =  \
-org.argeo.api.uuid \
-org.argeo.api.acr \
-org.argeo.api.cms
+DEP_CATEGORIES = \
+crypto/fips/org.argeo.tp.crypto \
+org.argeo.tp \
+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 \
+$(A2_CATEGORY) \
+swt/$(A2_CATEGORY) \
+swt/rap/$(A2_CATEGORY) \
 
 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 = .:eclipse:rap:jcr
+all: osgi-all
+	$(MAKE) -f Makefile-rcp.mk all
+	
+clean: osgi-clean
+	$(MAKE) -f Makefile-rcp.mk clean
 
-DEP_CATEGORIES = \
-org.argeo.tp \
-org.argeo.tp.apache \
-org.argeo.tp.jetty \
-org.argeo.tp.eclipse.equinox \
-org.argeo.tp.eclipse.rwt \
-org.argeo.tp.eclipse.rap \
-org.argeo.tp.jcr
+install: osgi-install
+	$(MAKE) -f Makefile-rcp.mk install
 
-jni:
-	$(MAKE) -C jni
+uninstall: osgi-uninstall
+	$(MAKE) -f Makefile-rcp.mk uninstall
 
-clean:
-	rm -rf $(BUILD_BASE)
-	$(MAKE) -C jni clean
-	$(MAKE) -f Makefile-rcp.mk clean
+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