Move sources under src/.

pull/2/head
Christopher Wellons 2017-03-05 20:20:24 -05:00
parent b1856fb9eb
commit 72544c4301
9 changed files with 10 additions and 10 deletions

View File

@ -3,16 +3,16 @@
CC = cc CC = cc
CFLAGS = -ansi -pedantic -Wall -Wextra -O3 -g3 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) 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) enchive: $(objects)
$(CC) $(LDFLAGS) -o $@ $(objects) $(LDLIBS) $(CC) $(LDFLAGS) -o $@ $(objects) $(LDLIBS)
enchive.o: enchive.c config.h docs.h src/enchive.o: src/enchive.c config.h src/docs.h
chacha.o: chacha.c config.h src/chacha.o: src/chacha.c config.h
curve25519-donna.o: curve25519-donna.c config.h src/curve25519-donna.o: src/curve25519-donna.c config.h
sha256.o: sha256.c config.h src/sha256.o: src/sha256.c config.h
enchive-cli.c: $(sources) $(headers) enchive-cli.c: $(sources) $(headers)
cat $(headers) $(sources) | sed -r 's@^(#include +".+)@/* \1 */@g' > $@ cat $(headers) $(sources) | sed -r 's@^(#include +".+)@/* \1 */@g' > $@

View File

@ -1,7 +1,7 @@
#ifndef CHACHA_H #ifndef CHACHA_H
#define CHACHA_H #define CHACHA_H
#include "config.h" #include "../config.h"
#define CHACHA_BLOCKLENGTH 64 #define CHACHA_BLOCKLENGTH 64

View File

@ -46,7 +46,7 @@
* from the sample implementation. */ * from the sample implementation. */
#include <string.h> #include <string.h>
#include "config.h" #include "../config.h"
/* Field element representation: /* Field element representation:
* *

View File

View File

@ -1,4 +1,4 @@
#include "config.h" #include "../config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -10,7 +10,7 @@
#define SHA256_H #define SHA256_H
#include <stddef.h> #include <stddef.h>
#include "config.h" #include "../config.h"
#define SHA256_BLOCK_SIZE 32 #define SHA256_BLOCK_SIZE 32