projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v2.3.28' into testing
[lgpl/argeo-commons.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 9011b2dc0aa267d56969f17b19c082368e37144b..497de15b0e1e2a03e0dc816b00669a25920a1fff 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,12
+1,4
@@
include sdk.mk
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
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.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.api.cms \
org.argeo.cms \
org.argeo.cms.ux \
@@
-49,10
+40,18
@@
org.argeo.api.uuid \
org.argeo.api.acr \
org.argeo.api.cms
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
$(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