change license + misc

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 14 insertions, 73 deletions

diff --git a/Makefile b/Makefile
index e860609..6707703 100644
--- a/Makefile
+++ b/Makefile
@@ -1,83 +1,24 @@
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
+.POSIX:
 
+CONFIGFILE = config.mk
+include $(CONFIGFILE)
 
-# The package path prefix, if you want to install to another root, set DESTDIR to that root.
-PREFIX ?= /usr
-# The command path excluding prefix.
-BIN ?= /bin
-# The resource path excluding prefix.
-DATA ?= /share
-# The command path including prefix.
-BINDIR ?= $(PREFIX)$(BIN)
-# The resource path including prefix.
-DATADIR ?= $(PREFIX)$(DATA)
-# The license base path including prefix.
-LICENSEDIR ?= $(DATADIR)/licenses
+all: file2key
 
-# The name of the package as it should be installed.
-PKGNAME ?= file2key
-# The name of the command as it should be installed.
-COMMAND ?= file2key
+file2key: file2key.o
+	$(CC) -o $@ file2key.o $(LDFLAGS)
 
+file2key.o: file2key.c settings.h config.h
+	$(CC) -c -o $@ file2key.c $(CFLAGS) $(CPPFLAGS)
 
-# Optimisation level (and debug flags.)
-OPTIMISE = -O3
+install: file2key
+	mkdir -p -- "$(DESTDIR)$(PREFIX)/bin"
+	cp -- file2key "$(DESTDIR)$(PREFIX)/bin/"
 
-# Enabled Warnings.
-WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self       \
-       -Wmissing-include-dirs -Wtrampolines -Wfloat-equal -Wshadow             \
-       -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls           \
-       -Wnested-externs -Wno-variadic-macros -Wsign-conversion                 \
-       -Wswitch-default -Wconversion -Wsync-nand -Wunsafe-loop-optimizations   \
-       -Wcast-align -Wstrict-overflow -Wdeclaration-after-statement -Wundef    \
-       -Wbad-function-cast -Wcast-qual -Wwrite-strings -Wlogical-op            \
-       -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wpacked  \
-       -Wvector-operation-performance -Wunsuffixed-float-constants             \
-       -Wsuggest-attribute=const -Wsuggest-attribute=noreturn                  \
-       -Wsuggest-attribute=pure -Wsuggest-attribute=format -Wnormalized=nfkc
-
-# The C standard used in the code.
-STD = gnu99
-
-
-# Options for the C compiler.
-FLAGS = $(OPTIMISE) $(WARN) -std=$(STD) \
-        -ftree-vrp -fstrict-aliasing -fipa-pure-const -fstack-usage \
-        -fstrict-overflow -funsafe-loop-optimizations -fno-builtin
-
-
-
-.PHONY: all
-all: bin/file2key
-
-bin/file2key: obj/file2key.o
-	@mkdir -p bin
-	$(CC) $(FLAGS) -lpassphrase -lkeccak -o $@ $^ $(LDFLAGS)
-
-obj/%.o: src/%.c
-	@mkdir -p obj
-	$(CC) $(FLAGS) -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
-
-
-.PHONY: install
-install: bin/file2key
-	install -dm755 -- "$(DESTDIR)$(BINDIR)"
-	install -m755 bin/file2key -- "$(DESTDIR)$(BINDIR)/$(COMMAND)"
-	install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	install -m644 LICENSE COPYING -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-
-.PHONY: uninstall
 uninstall:
-	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING"
-	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE"
-	-rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	-rm -- "$(DESTDIR)$(BINDIR)/$(COMMAND)"
-
+	-rm -f -- "$(DESTDIR)$(PREFIX)/bin/file2key"
 
-.PHONY: clean
 clean:
-	-rm -r bin obj
+	-rm -rf -- *.o file2key
 
+.PHONY: all install uninstall clean