From fa549820911d021ac65b3d8b9b6c4c55ad315eb8 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 9 Oct 2022 15:14:08 +0200 Subject: [PATCH] Use new build mechanism --- Makefile-tp.mk | 2 +- Makefile-ext.mk => ext/Makefile | 6 +++--- sdk/argeo-build | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename Makefile-ext.mk => ext/Makefile (65%) diff --git a/Makefile-tp.mk b/Makefile-tp.mk index ba01d243e..2d4630e8e 100644 --- a/Makefile-tp.mk +++ b/Makefile-tp.mk @@ -2,7 +2,7 @@ include sdk.mk .PHONY: clean all all: distribution - $(MAKE) -f Makefile-ext.mk + $(MAKE) -C ext BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap diff --git a/Makefile-ext.mk b/ext/Makefile similarity index 65% rename from Makefile-ext.mk rename to ext/Makefile index f671f2822..fae40cc4b 100644 --- a/Makefile-ext.mk +++ b/ext/Makefile @@ -1,4 +1,4 @@ -include sdk.mk +include ../sdk.mk .PHONY: clean all osgi all: osgi @@ -6,8 +6,8 @@ all: osgi A2_CATEGORY = org.argeo.tp BUNDLES = \ -ext/org.argeo.ext.slf4j \ -ext/javax.mail.mbox \ +org.argeo.ext.slf4j \ +javax.mail.mbox \ clean: rm -rf $(BUILD_BASE) diff --git a/sdk/argeo-build b/sdk/argeo-build index 0d5780a13..3dc9a223f 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 0d5780a1346ab30294998a894fe8b63d1de9f5d6 +Subproject commit 3dc9a223f1177b4eb34ccac1e96a354d4dd8ee25 -- 2.39.2