From 677dee1a04058aefe8c7689f88da52afe3b4b4bb Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@thewalter.net>
Date: Fri, 15 Aug 2014 08:41:43 +0200
Subject: Move to non-recursive Makefile for building bins and libs

Still use recursive for documentation and translation.
---
 build/certs/Makefile | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'build/certs')

diff --git a/build/certs/Makefile b/build/certs/Makefile
index 4e61b14..033ecde 100644
--- a/build/certs/Makefile
+++ b/build/certs/Makefile
@@ -3,39 +3,39 @@
 # We copy everything into its final location, and those test files are
 # distributed in the tarballs
 
-TRUST = ../../trust/tests
+TRUST = ../../trust
 
 prepare-certs:
 	cp -v cacert3.der $(TRUST)/input/anchors
-	cp -v cacert3.der $(TRUST)/files
-	cp -v cacert3.der $(TRUST)/files
-	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3.pem
-	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3.pem
-	cat $(TRUST)/files/cacert3.pem $(TRUST)/files/cacert3.pem > $(TRUST)/files/cacert3-twice.pem
-	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3-trusted.pem \
+	cp -v cacert3.der $(TRUST)/fixtures
+	cp -v cacert3.der $(TRUST)/fixtures
+	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3.pem
+	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3.pem
+	cat $(TRUST)/fixtures/cacert3.pem $(TRUST)/fixtures/cacert3.pem > $(TRUST)/fixtures/cacert3-twice.pem
+	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3-trusted.pem \
 		-addtrust serverAuth -addreject emailProtection \
 		-setalias "Custom Label"
-	cp $(TRUST)/files/cacert3-trusted.pem $(TRUST)/files/cacert3-trusted-server-alias.pem
-	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3-trusted-alias.pem \
+	cp $(TRUST)/fixtures/cacert3-trusted.pem $(TRUST)/fixtures/cacert3-trusted-server-alias.pem
+	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3-trusted-alias.pem \
 		-setalias "Custom Label"
-	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3-distrust-all.pem \
+	openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3-distrust-all.pem \
 		-addreject serverAuth -addreject clientAuth -addreject codeSigning \
 		-addreject emailProtection -addreject ipsecEndSystem -addreject ipsecTunnel \
 		-addreject ipsecUser -addreject timeStamping
-	openssl x509 -in verisign-v1.der -inform DER -out $(TRUST)/files/verisign-v1.pem \
+	openssl x509 -in verisign-v1.der -inform DER -out $(TRUST)/fixtures/verisign-v1.pem \
 		-setalias "Custom Label"
-	cat $(TRUST)/files/cacert3-trusted-server-alias.pem \
-		$(TRUST)/files/verisign-v1.pem > $(TRUST)/files/multiple.pem
+	cat $(TRUST)/fixtures/cacert3-trusted-server-alias.pem \
+		$(TRUST)/fixtures/verisign-v1.pem > $(TRUST)/fixtures/multiple.pem
 	cp -v cacert-ca.der $(TRUST)/input
-	cp -v cacert-ca.der $(TRUST)/files
-	openssl x509 -in redhat-newca.der -inform DER -out $(TRUST)/files/distrusted.pem \
+	cp -v cacert-ca.der $(TRUST)/fixtures
+	openssl x509 -in redhat-newca.der -inform DER -out $(TRUST)/fixtures/distrusted.pem \
 		-addreject clientAuth -setalias "Red Hat Is the CA"
-	cp -v $(TRUST)/files/distrusted.pem $(TRUST)/input
+	cp -v $(TRUST)/fixtures/distrusted.pem $(TRUST)/input
 	cp -v self-server.der $(TRUST)/input/blacklist
-	cp -v self-signed-with-eku.der $(TRUST)/files
-	cp -v self-signed-with-ku.der $(TRUST)/files
+	cp -v self-signed-with-eku.der $(TRUST)/fixtures
+	cp -v self-signed-with-ku.der $(TRUST)/fixtures
 	cp -v testing-ca.der $(TRUST)/input/anchors
-	cp -v testing-server.der $(TRUST)/files
+	cp -v testing-server.der $(TRUST)/fixtures
 
 # Rebuild the self-signed certificates. This is almost never necessary and
 # will require other changes in the code, mostly here as documentation
-- 
cgit v1.1