From 72544c43012fbba112cb6623de488858f624b69d Mon Sep 17 00:00:00 2001
From: Christopher Wellons <wellons@nullprogram.com>
Date: Sun, 5 Mar 2017 20:20:24 -0500
Subject: [PATCH] Move sources under src/.

---
 Makefile                                     | 12 ++++++------
 chacha.c => src/chacha.c                     |  0
 chacha.h => src/chacha.h                     |  2 +-
 curve25519-donna.c => src/curve25519-donna.c |  2 +-
 docs.h => src/docs.h                         |  0
 enchive.c => src/enchive.c                   |  2 +-
 optparse.h => src/optparse.h                 |  0
 sha256.c => src/sha256.c                     |  0
 sha256.h => src/sha256.h                     |  2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename chacha.c => src/chacha.c (100%)
 rename chacha.h => src/chacha.h (93%)
 rename curve25519-donna.c => src/curve25519-donna.c (99%)
 rename docs.h => src/docs.h (100%)
 rename enchive.c => src/enchive.c (99%)
 rename optparse.h => src/optparse.h (100%)
 rename sha256.c => src/sha256.c (100%)
 rename sha256.h => src/sha256.h (96%)

diff --git a/Makefile b/Makefile
index fa2b7de..852c752 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,16 @@
 CC     = cc
 CFLAGS = -ansi -pedantic -Wall -Wextra -O3 -g3
 
-sources = enchive.c chacha.c curve25519-donna.c sha256.c
+sources = src/enchive.c src/chacha.c src/curve25519-donna.c src/sha256.c
 objects = $(sources:.c=.o)
-headers = config.h docs.h chacha.h sha256.h optparse.h
+headers = config.h src/docs.h src/chacha.h src/sha256.h src/optparse.h
 
 enchive: $(objects)
 	$(CC) $(LDFLAGS) -o $@ $(objects) $(LDLIBS)
-enchive.o: enchive.c config.h docs.h
-chacha.o: chacha.c config.h
-curve25519-donna.o: curve25519-donna.c config.h
-sha256.o: sha256.c config.h
+src/enchive.o: src/enchive.c config.h src/docs.h
+src/chacha.o: src/chacha.c config.h
+src/curve25519-donna.o: src/curve25519-donna.c config.h
+src/sha256.o: src/sha256.c config.h
 
 enchive-cli.c: $(sources) $(headers)
 	cat $(headers) $(sources) | sed -r 's@^(#include +".+)@/* \1 */@g' > $@
diff --git a/chacha.c b/src/chacha.c
similarity index 100%
rename from chacha.c
rename to src/chacha.c
diff --git a/chacha.h b/src/chacha.h
similarity index 93%
rename from chacha.h
rename to src/chacha.h
index aa22414..7d12198 100644
--- a/chacha.h
+++ b/src/chacha.h
@@ -1,7 +1,7 @@
 #ifndef CHACHA_H
 #define CHACHA_H
 
-#include "config.h"
+#include "../config.h"
 
 #define CHACHA_BLOCKLENGTH 64
 
diff --git a/curve25519-donna.c b/src/curve25519-donna.c
similarity index 99%
rename from curve25519-donna.c
rename to src/curve25519-donna.c
index 04e3490..28fb007 100644
--- a/curve25519-donna.c
+++ b/src/curve25519-donna.c
@@ -46,7 +46,7 @@
  * from the sample implementation. */
 
 #include <string.h>
-#include "config.h"
+#include "../config.h"
 
 /* Field element representation:
  *
diff --git a/docs.h b/src/docs.h
similarity index 100%
rename from docs.h
rename to src/docs.h
diff --git a/enchive.c b/src/enchive.c
similarity index 99%
rename from enchive.c
rename to src/enchive.c
index be8a3a3..003d834 100644
--- a/enchive.c
+++ b/src/enchive.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "../config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/optparse.h b/src/optparse.h
similarity index 100%
rename from optparse.h
rename to src/optparse.h
diff --git a/sha256.c b/src/sha256.c
similarity index 100%
rename from sha256.c
rename to src/sha256.c
diff --git a/sha256.h b/src/sha256.h
similarity index 96%
rename from sha256.h
rename to src/sha256.h
index 75732eb..863b91c 100644
--- a/sha256.h
+++ b/src/sha256.h
@@ -10,7 +10,7 @@
 #define SHA256_H
 
 #include <stddef.h>
-#include "config.h"
+#include "../config.h"
 
 #define SHA256_BLOCK_SIZE 32