X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=497de15b0e1e2a03e0dc816b00669a25920a1fff;hb=HEAD;hp=74920833fa431ecad193c2a1d78104420eea4846;hpb=20a04a1f0a610a5c10354c5d765e721ee9881afb;p=lgpl%2Fargeo-commons.git diff --git a/Makefile b/Makefile index 74920833f..497de15b0 100644 --- 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,14 +7,15 @@ 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 \ @@ -30,7 +27,8 @@ DEP_CATEGORIES = \ crypto/fips/org.argeo.tp.crypto \ org.argeo.tp \ org.argeo.tp.httpd \ -osgi/api/org.argeo.tp.osgi \ +org.argeo.tp.sshd \ +osgi/equinox/org.argeo.tp.osgi \ osgi/equinox/org.argeo.tp.eclipse \ swt/rap/org.argeo.tp.swt \ $(A2_CATEGORY) \ @@ -42,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