aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--ext/tweetnacl.c (renamed from ext/tweetnacl/tweetnacl.c)0
-rw-r--r--ext/tweetnacl.h (renamed from ext/tweetnacl/tweetnacl.h)0
-rw-r--r--ext/tweetpwhash.c (renamed from ext/tweetpwhash/tweetpwhash.c)0
-rw-r--r--ext/tweetpwhash.h (renamed from ext/tweetpwhash/tweetpwhash.h)0
-rw-r--r--ext/util.c (renamed from ext/util/util.c)0
-rw-r--r--ext/util.h (renamed from ext/util/util.h)0
7 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fb589f6..28209e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
PREFIX ?= /usr/local
WFLAGS ?= -Wall -Wextra -Wmissing-prototypes -Wdiv-by-zero -Wbad-function-cast -Wcast-align -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wnested-externs -Wno-unknown-pragmas -Wpointer-arith -Wredundant-decls -Wstrict-prototypes -Wswitch-enum -Wno-type-limits
CFLAGS ?= -O3 -mtune=native -fno-exceptions -flto $(WFLAGS)
-CPPFLAGS += -I. -Iext/tweetnacl -Iext/tweetpwhash -Iext/util
+CPPFLAGS += -I. -Iext
STRIP ?= strip
-OBJ = ext/tweetnacl/tweetnacl.o ext/tweetpwhash/tweetpwhash.o ext/util/util.o src/tweetpipe.o src/safe_rw.o
+OBJ = ext/tweetnacl.o ext/tweetpwhash.o ext/util.o src/tweetpipe.o src/safe_rw.o
SRC = \
- ext/tweetnacl/tweetnacl.c \
- ext/tweetpwhash/tweetpwhash.c \
- ext/util/util.c \
+ ext/tweetnacl.c \
+ ext/tweetpwhash.c \
+ ext/util.c \
src/common.h \
src/tweetpipe.c \
src/tweetpipe_p.h \
diff --git a/ext/tweetnacl/tweetnacl.c b/ext/tweetnacl.c
index 8ac0a18..8ac0a18 100644
--- a/ext/tweetnacl/tweetnacl.c
+++ b/ext/tweetnacl.c
diff --git a/ext/tweetnacl/tweetnacl.h b/ext/tweetnacl.h
index 9277fbf..9277fbf 100644
--- a/ext/tweetnacl/tweetnacl.h
+++ b/ext/tweetnacl.h
diff --git a/ext/tweetpwhash/tweetpwhash.c b/ext/tweetpwhash.c
index cd738cf..cd738cf 100644
--- a/ext/tweetpwhash/tweetpwhash.c
+++ b/ext/tweetpwhash.c
diff --git a/ext/tweetpwhash/tweetpwhash.h b/ext/tweetpwhash.h
index 177c304..177c304 100644
--- a/ext/tweetpwhash/tweetpwhash.h
+++ b/ext/tweetpwhash.h
diff --git a/ext/util/util.c b/ext/util.c
index 42fe8ac..42fe8ac 100644
--- a/ext/util/util.c
+++ b/ext/util.c
diff --git a/ext/util/util.h b/ext/util.h
index c67972e..c67972e 100644
--- a/ext/util/util.h
+++ b/ext/util.h