Use new build mechanism

diff --git a/Makefile-ext.mk b/Makefile-ext.mk
deleted file mode 100644 (file)
index f671f28..0000000
--- a/Makefile-ext.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-include sdk.mk
-.PHONY: clean all osgi
-
-all: osgi
-
-A2_CATEGORY = org.argeo.tp
-
-BUNDLES = \
-ext/org.argeo.ext.slf4j \
-ext/javax.mail.mbox \
-
-clean:
-       rm -rf $(BUILD_BASE)
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
-VPATH = .:ext
-DEP_CATEGORIES = org.argeo.tp
-
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file

diff --git a/Makefile-tp.mk b/Makefile-tp.mk
index ba01d243ed0ebc2da76ad01dea2aa0cfa2e59fd8..2d4630e8e4f5de29aa5fb399077f71a377dfb747 100644 (file)
--- 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/ext/Makefile b/ext/Makefile
new file mode 100644 (file)
index 0000000..fae40cc
--- /dev/null
+++ b/ext/Makefile
@@ -0,0 +1,21 @@
+include ../sdk.mk
+.PHONY: clean all osgi
+
+all: osgi
+
+A2_CATEGORY = org.argeo.tp
+
+BUNDLES = \
+org.argeo.ext.slf4j \
+javax.mail.mbox \
+
+clean:
+       rm -rf $(BUILD_BASE)
+
+A2_OUTPUT = $(SDK_BUILD_BASE)/a2
+A2_BASE = $(A2_OUTPUT)
+
+VPATH = .:ext
+DEP_CATEGORIES = org.argeo.tp
+
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 0d5780a1346ab30294998a894fe8b63d1de9f5d6..3dc9a223f1177b4eb34ccac1e96a354d4dd8ee25 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 0d5780a1346ab30294998a894fe8b63d1de9f5d6
+Subproject commit 3dc9a223f1177b4eb34ccac1e96a354d4dd8ee25