X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=497de15b0e1e2a03e0dc816b00669a25920a1fff;hb=refs%2Fheads%2Funstable;hp=9011b2dc0aa267d56969f17b19c082368e37144b;hpb=16c76e7d8c6a01211d4fc3d209ae75ba85d4d21b;p=lgpl%2Fargeo-commons.git diff --git a/Makefile b/Makefile index 9011b2dc0..de809221a 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,4 @@ include sdk.mk -.PHONY: clean all osgi - -all: osgi - $(MAKE) -f Makefile-rcp.mk all - -install: osgi-install - -uninstall: osgi-uninstall A2_CATEGORY = org.argeo.cms @@ -15,7 +7,6 @@ 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 \ @@ -37,6 +28,7 @@ crypto/fips/org.argeo.tp.crypto \ org.argeo.tp \ org.argeo.tp.httpd \ org.argeo.tp.sshd \ +osgi/equinox/org.argeo.tp.osgi.framework \ osgi/equinox/org.argeo.tp.osgi \ osgi/equinox/org.argeo.tp.eclipse \ swt/rap/org.argeo.tp.swt \ @@ -49,10 +41,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