From c251842e350f5b130f689910461ab85fbe556e7b Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Tue, 29 Jan 2019 17:39:58 +0100
Subject: openpgp-ffi: Build examples below CARGO_TARGET_DIR.

  - Addresses #172.
---
 openpgp-ffi/examples/.gitignore |  7 -------
 openpgp-ffi/examples/Makefile   | 12 +++++++++++-
 2 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 openpgp-ffi/examples/.gitignore

(limited to 'openpgp-ffi/examples')

diff --git a/openpgp-ffi/examples/.gitignore b/openpgp-ffi/examples/.gitignore
deleted file mode 100644
index 3370781f..00000000
--- a/openpgp-ffi/examples/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-armor
-encrypt-for
-example
-parser
-reader
-type-safety-demo
-use-after-free-demo
diff --git a/openpgp-ffi/examples/Makefile b/openpgp-ffi/examples/Makefile
index 3b659e50..7986d7d6 100644
--- a/openpgp-ffi/examples/Makefile
+++ b/openpgp-ffi/examples/Makefile
@@ -5,13 +5,23 @@ CARGO_TARGET_DIR	?= $(shell pwd)/../../target
 # We currently only support absolute paths.
 CARGO_TARGET_DIR	:= $(abspath $(CARGO_TARGET_DIR))
 
-TARGETS = example reader parser encrypt-for armor type-safety-demo use-after-free-demo
+# We are producing binaries here.
+EXAMPLE_TARGET_DIR      ?= $(CARGO_TARGET_DIR)/debug/c-examples/openpgp-ffi
+
+EXAMPLES = example reader parser encrypt-for armor type-safety-demo use-after-free-demo
 CFLAGS  = -I../include -O0 -g -Wall -Werror
 LDFLAGS = -L$(CARGO_TARGET_DIR)/debug -lsequoia_openpgp_ffi
 
+# Prefix our target directory.
+TARGETS := $(foreach example,$(EXAMPLES),$(EXAMPLE_TARGET_DIR)/$(example))
+
 all: $(TARGETS)
 
 clean:
 	rm -f $(TARGETS)
 
 $(TARGETS): ../include/sequoia/openpgp.h
+
+$(EXAMPLE_TARGET_DIR)/%: %.c
+	mkdir -p $(EXAMPLE_TARGET_DIR)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o "$@" "$<"
-- 
cgit v1.2.3