X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=65c241c943fbf54954311d3456b10984a4a2279d;hb=d41dc2832ca76e40cb16b3eacad54b71b0f09599;hp=a0a17d608c460b9d6ecbf0d463e111e38424d754;hpb=ff6b85864271f75b795f88333f329a52db3b901f;p=gpl%2Fargeo-slc.git

diff --git a/Makefile b/Makefile
index a0a17d608..65c241c94 100644
--- a/Makefile
+++ b/Makefile
@@ -1,51 +1,49 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi jni
 
-all: osgi
+all: osgi jni
+	$(MAKE) -f Makefile-rcp.mk all
+	
+install: osgi-install
+
+uninstall: osgi-uninstall
+
+jni:
+	$(MAKE) -C jni
 
 A2_CATEGORY = org.argeo.slc
 
 BUNDLES = \
 org.argeo.slc.api \
-org.argeo.slc.factory \
 org.argeo.slc.runtime \
-cms/org.argeo.slc.cms \
-suite/org.argeo.slc.tool \
-
-VPATH = .:cms:suite
-
-clean:
-	rm -rf $(BUILD_BASE)
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
+org.argeo.slc.cms \
+lib/linux/org.argeo.slc.systemd \
+swt/org.argeo.cms.e4 \
+swt/rap/org.argeo.cms.e4.rap \
+swt/rap/org.argeo.tool.rap.cli \
+swt/rap/org.argeo.tool.server \
 
 DEP_CATEGORIES = \
+crypto/fips/org.argeo.tp.crypto \
+log/syslogger/org.argeo.tp \
 org.argeo.tp \
-org.argeo.tp.sdk \
-org.argeo.tp.apache \
-org.argeo.tp.jetty \
-org.argeo.tp.eclipse \
+org.argeo.tp.httpd \
+org.argeo.tp.sys \
 osgi/api/org.argeo.tp.osgi \
-swt/rcp/org.argeo.tp.swt \
-lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
-swt/rcp/org.argeo.tp.swt.workbench \
-org.argeo.tp.jcr \
-org.argeo.tp.formats \
-org.argeo.tp.gis \
+osgi/equinox/org.argeo.tp.eclipse \
+swt/rap/org.argeo.tp.swt \
+swt/rap/org.argeo.tp.swt.workbench \
 org.argeo.cms \
-org.argeo.cms.eclipse.rcp \
-
-A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
-
-native-image:
-	mkdir -p $(A2_OUTPUT)/libexec/$(A2_CATEGORY)
-	cd $(A2_OUTPUT)/libexec/$(A2_CATEGORY) && /opt/graalvm-ce/bin/native-image \
-		-cp $(A2_CLASSPATH):$(A2_BUNDLES_CLASSPATH) org.argeo.slc.tool.Main \
-		--enable-url-protocols=http,https \
-		-H:AdditionalSecurityProviders=sun.security.jgss.SunProvider,org.bouncycastle.jce.provider.BouncyCastleProvider,net.i2p.crypto.eddsa.EdDSASecurityProvider \
-		--initialize-at-build-time=org.argeo.init.logging.ThinLogging,org.slf4j.LoggerFactory \
-		--no-fallback 
- 
+swt/org.argeo.cms \
+swt/rap/org.argeo.cms \
+$(A2_CATEGORY)
+
+clean:
+	rm -rf $(BUILD_BASE)
+	$(MAKE) -C jni clean
+	$(MAKE) -f Makefile-rcp.mk clean
+
+native-deps-debian:
+	sudo apt install uuid-dev
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file