summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2019-01-29 12:23:01 +0100
committerNeal H. Walfield <neal@pep.foundation>2019-01-29 12:23:01 +0100
commit36e6633a7c25464cc556949dbd2aefc9e3ec0b9e (patch)
tree84b5b335a9395fa16279119203736062436e71bb /Makefile
parent1ab35113634a15927ca87254a6769bc1e2decdf3 (diff)
Execute normal build targets in openpgp-ffi too.
- Any place where we execute a build command for the ffi crate, we should do the same for the openpgp-ffi crate, too.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 819340a2..ba9363f4 100644
--- a/Makefile
+++ b/Makefile
@@ -43,12 +43,14 @@ all: build examples
.PHONY: build
build:
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) $(CARGO) build $(CARGO_FLAGS) --all
+ $(MAKE) -Copenpgp-ffi build
$(MAKE) -Cffi build
# Testing and examples.
.PHONY: test check
test check:
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) $(CARGO) test $(CARGO_FLAGS) $(CARGO_TEST_ARGS)
+ $(MAKE) -Copenpgp-ffi test
$(MAKE) -Cffi test
$(MAKE) examples
@@ -76,6 +78,7 @@ deploy-doc: doc
build-release:
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
$(CARGO) build $(CARGO_FLAGS) --release --all
+ $(MAKE) -Copenpgp-ffi build-release
$(MAKE) -Cffi build-release
.PHONY: install
@@ -86,6 +89,7 @@ install: build-release
$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
$(INSTALL) -t $(DESTDIR)$(PREFIX)/bin \
$(CARGO_TARGET_DIR)/release/sq
+ $(MAKE) -Copenpgp-ffi install
$(MAKE) -Cffi install
$(MAKE) -Csqv install
@@ -126,4 +130,5 @@ dist-test dist-check: $(CARGO_TARGET_DIR)/dist/sequoia-$(VERSION).tar.xz
.PHONY: clean
clean:
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) $(CARGO) $(CARGO_FLAGS) clean
+ $(MAKE) -Copenpgp-ffi clean
$(MAKE) -Cffi clean