aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-01-20 23:48:14 +1300
committerTom Ryder <tom@sanctum.geek.nz>2020-01-20 23:48:14 +1300
commit8b570274d4cec0984801a12b8c8eb9b19644fbd8 (patch)
tree7e0bd2ebdbd96c67e8538976d36da711a27c36ab
parentMerge branch 'release/v1.2.0' (diff)
parentBump VERSION (diff)
downloadcrypt-8b570274d4cec0984801a12b8c8eb9b19644fbd8.tar.gz
crypt-8b570274d4cec0984801a12b8c8eb9b19644fbd8.zip
Merge branch 'release/v2.0.0'v2.0.0
* release/v2.0.0: Realised there was no need for a separate header
-rw-r--r--Makefile6
-rw-r--r--VERSION2
-rw-r--r--crypt.c10
-rw-r--r--crypt.h9
4 files changed, 12 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index b5ddaf2..078e40b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,11 @@ PREFIX = /usr/local
#CC = gcc
#CFLAGS = -Wall -Werror -Wextra -ansi -pedantic
LDFLAGS = -lcrypt
-ALL = crypt
-all: $(ALL)
-crypt: crypt.c crypt.h
+all: crypt
install:
mkdir -p -- $(PREFIX)/bin
cp -- crypt $(PREFIX)/bin
mkdir -p -- $(PREFIX)/share/man/man1
cp -- crypt.1 $(PREFIX)/share/man/man1
clean distclean:
- rm -f -- $(ALL)
+ rm -f -- crypt
diff --git a/VERSION b/VERSION
index 26aaba0..227cea2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0
+2.0.0
diff --git a/crypt.c b/crypt.c
index 7ba42ef..4c9f0fb 100644
--- a/crypt.c
+++ b/crypt.c
@@ -1,4 +1,12 @@
-#include "crypt.h"
+#define _XOPEN_SOURCE
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h> /* strerror(3) */
+#include <unistd.h> /* crypt(3) */
+
+void error(char *);
+void usage(FILE *, int);
int main (int argc, char **argv)
{
diff --git a/crypt.h b/crypt.h
deleted file mode 100644
index 0a25c0d..0000000
--- a/crypt.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define _XOPEN_SOURCE
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h> /* strerror(3) */
-#include <unistd.h> /* crypt(3) */
-
-void error(char *);
-void usage(FILE *, int);