18 files changed, 60 insertions, 107 deletions
diff --git a/.gitignore b/.gitignore
index 46c1b9f..575cf5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-obj/
-bin/
 *~
 *\#*
 *.o
@@ -10,3 +8,4 @@ bin/
 *.gch
 *.1
 !/xsum.1
+/*sum
diff --git a/Makefile b/Makefile
index 5590bd0..007ad42 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,26 @@
 .NONPOSIX:
 
-PREFIX = /usr/local
-BINDIR = $(PREFIX)/bin
-DATADIR = $(PREFIX)/share
-DOCDIR = $(DATADIR)/doc
-MANDIR = $(DATADIR)/man
-INFODIR = $(DATADIR)/info
-LICENSEDIR = $(DATADIR)/licenses
-
-PKGNAME = sha3sum
-
-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 -Winline -Wno-variadic-macros -Wswitch-default         \
-       -Wpadded -Wsync-nand -Wunsafe-loop-optimizations -Wcast-align -Wstrict-overflow           \
-       -Wdeclaration-after-statement -Wundef -Wbad-function-cast -Wcast-qual -Wlogical-op        \
-       -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
-
-LDOPTIMISE =
-COPTIMISE = -O3
-
-FLAGS = $(WARN) -std=gnu99
-
-
-KECCAK_CMDS = keccak-224sum keccak-256sum keccak-384sum keccak-512sum keccaksum
-SHA3_CMDS = sha3-224sum sha3-256sum sha3-384sum sha3-512sum
-RAWSHAKE_CMDS = rawshake256sum rawshake512sum
-SHAKE_CMDS = shake256sum shake512sum
-
-CMDS = $(KECCAK_CMDS) $(SHA3_CMDS) $(RAWSHAKE_CMDS) $(SHAKE_CMDS)
+CONFIGFILE = config.mk
+include $(CONFIGFILE)
+
+
+BIN =\
+	keccaksum\
+	keccak-224sum\
+	keccak-256sum\
+	keccak-384sum\
+	keccak-512sum\
+	sha3-224sum\
+	sha3-256sum\
+	sha3-384sum\
+	sha3-512sum\
+	rawshake256sum\
+	rawshake512sum\
+	shake256sum\
+	shake512sum
+
+MAN1 = $(BIN:=.1)
+HDR = common.h
 
 keccak-224sum = Keccak-224
 keccak-256sum = Keccak-256
@@ -47,86 +37,35 @@ shake256sum = SHAKE256
 shake512sum = SHAKE512
 
 
-MAN1 =\
-	keccaksum.1\
-	keccak-224sum.1\
-	keccak-256sum.1\
-	keccak-384sum.1\
-	keccak-512sum.1\
-	sha3-224sum.1\
-	sha3-256sum.1\
-	sha3-384sum.1\
-	sha3-512sum.1\
-	rawshake256sum.1\
-	rawshake512sum.1\
-	shake256sum.1\
-	shake512sum.1
+all: $(BIN) $(MAN1)
 
+%: %.o common.o
+	$(CC) -o $@ $^ $(LDFLAGS)
 
-
-.PHONY: all
-all: command $(MAN1)
-
-
-.PHONY: command
-command: $(foreach C,$(CMDS),bin/$(C))
-
-bin/%: obj/%.o obj/common.o
-	@mkdir -p bin
-	$(CC) $(FLAGS) $(LDOPTIMISE) -o $@ $^ $(LDFLAGS) -lkeccak -largparser
-
-obj/%.o: src/%.c src/*.h
-	@mkdir -p obj
-	$(CC) $(FLAGS) $(COPTIMISE) -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
-
+%.o: %.c $(HDR)
+	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
 
 %.1: xsum.1
-	u=$$(printf '%s\n' $* | tr a-z A-Z); sed -e 's/xsum/$*/g' -e 's/XSUM/'"$$u"'/g' -e 's/Xsum/$($*)/g' < xsum.1 > $@
-
+	u=$$(printf '%s\n' $* | tr a-z A-Z); \
+	sed -e 's/xsum/$*/g' -e 's/XSUM/'"$$u"'/g' -e 's/Xsum/$($*)/g' < xsum.1 > $@
 
-.PHONY: install
-install: install-command install-license install-man
+install:
+	mkdir -p -- "$(DESTDIR)$(PREFIX)/bin"
+	mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man1"
+	mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum"
+	cp -- $(BIN) "$(DESTDIR)$(PREFIX)/bin/"
+	cp -- $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1/"
+	cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum/"
 
-.PHONY: install-command
-install-command: install-keccak install-sha3 install-rawshake install-shake
-
-.PHONY: install-keccak
-install-keccak: $(foreach C,$(KECCAK_CMDS),install-$(C))
-
-.PHONY: install-sha3
-install-sha3: $(foreach C,$(SHA3_CMDS),install-$(C))
-
-.PHONY: install-rawshake
-install-rawshake: $(foreach C,$(RAWSHAKE_CMDS),install-$(C))
-
-.PHONY: install-shake
-install-shake: $(foreach C,$(SHAKE_CMDS),install-$(C))
-
-.PHONY: install-%sum
-install-%sum: bin/%sum
-	install -dm755 -- "$(DESTDIR)$(BINDIR)"
-	install -m755 -- $< "$(DESTDIR)$(BINDIR)/$*sum"
-
-.PHONY: install-license
-install-license:
-	install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	install -m644 -- LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE"
-
-.PHONY: install-man
-install-man: $(MAN1)
-	mkdir -p -- "$(DESTDIR)$(MANDIR)/man1"
-	cp -- $(MAN1) "$(DESTDIR)$(MANDIR)/man1/"
-
-
-
-.PHONY: uninstall
 uninstall:
-	-rm -- $(foreach C,$(CMDS),"$(DESTDIR)$(BINDIR)/$(C)")
-	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE"
-	-rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	-cd -- "$(DESTDIR)$(MANDIR)/man1" && rm -- $(MAN1)
+	-cd -- "$(DESTDIR)$(PREFIX)/bin" && rm -- $(BIN)
+	-cd -- "$(DESTDIR)$(MANPREFIX)/man1" && rm -- $(MAN1)
+	-rm -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum/LICENSE"
+	-rmdir -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum"
 
-
-.PHONY: clean
 clean:
-	-rm -r -- bin obj $(MAN1)
+	-rm -r -- $(MAN1) $(BIN)
+
+.SUFFIXES:
+
+.PHONY: all install uninstall clean
diff --git a/src/common.c b/common.c
index 580ca72..580ca72 100644
--- a/src/common.c
+++ b/common.c
diff --git a/src/common.h b/common.h
index e3182dc..e3182dc 100644
--- a/src/common.h
+++ b/common.h
diff --git a/config.mk b/config.mk
new file mode 100644
index 0000000..e581aee
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,15 @@
+PREFIX = /usr/local
+MANPREFIX = $(PREFIX)/share/man
+
+WARN = -pedantic -Wdouble-promotion -Wformat=2 -Winit-self -Wmissing-include-dirs          \
+       -Wtrampolines -Wfloat-equal -Wshadow -Wmissing-prototypes -Wmissing-declarations    \
+       -Wredundant-decls -Wnested-externs -Winline -Wno-variadic-macros -Wswitch-default   \
+       -Wpadded -Wsync-nand -Wunsafe-loop-optimizations -Wcast-align -Wstrict-overflow     \
+       -Wdeclaration-after-statement -Wundef -Wbad-function-cast -Wcast-qual -Wlogical-op  \
+       -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
+
+CFLAGS   = -std=c99 -Wall -Wextra $(WARN) -O3
+CPPFLAGS =
+LDFLAGS  = -s -lkeccak -largparser
diff --git a/src/keccak-224sum.c b/keccak-224sum.c
index f7d3095..f7d3095 100644
--- a/src/keccak-224sum.c
+++ b/keccak-224sum.c
diff --git a/src/keccak-256sum.c b/keccak-256sum.c
index f4f78ac..f4f78ac 100644
--- a/src/keccak-256sum.c
+++ b/keccak-256sum.c
diff --git a/src/keccak-384sum.c b/keccak-384sum.c
index 3a6e3a0..3a6e3a0 100644
--- a/src/keccak-384sum.c
+++ b/keccak-384sum.c
diff --git a/src/keccak-512sum.c b/keccak-512sum.c
index 6ba1041..6ba1041 100644
--- a/src/keccak-512sum.c
+++ b/keccak-512sum.c
diff --git a/src/keccaksum.c b/keccaksum.c
index 8fc10a8..8fc10a8 100644
--- a/src/keccaksum.c
+++ b/keccaksum.c
diff --git a/src/rawshake256sum.c b/rawshake256sum.c
index 6d6e19a..6d6e19a 100644
--- a/src/rawshake256sum.c
+++ b/rawshake256sum.c
diff --git a/src/rawshake512sum.c b/rawshake512sum.c
index be1d8ac..be1d8ac 100644
--- a/src/rawshake512sum.c
+++ b/rawshake512sum.c
diff --git a/src/sha3-224sum.c b/sha3-224sum.c
index 15fac82..15fac82 100644
--- a/src/sha3-224sum.c
+++ b/sha3-224sum.c
diff --git a/src/sha3-256sum.c b/sha3-256sum.c
index 2273785..2273785 100644
--- a/src/sha3-256sum.c
+++ b/sha3-256sum.c
diff --git a/src/sha3-384sum.c b/sha3-384sum.c
index 2c18df7..2c18df7 100644
--- a/src/sha3-384sum.c
+++ b/sha3-384sum.c
diff --git a/src/sha3-512sum.c b/sha3-512sum.c
index a5b40e3..a5b40e3 100644
--- a/src/sha3-512sum.c
+++ b/sha3-512sum.c
diff --git a/src/shake256sum.c b/shake256sum.c
index 7ab6cc6..7ab6cc6 100644
--- a/src/shake256sum.c
+++ b/shake256sum.c
diff --git a/src/shake512sum.c b/shake512sum.c
index 3e24ddb..3e24ddb 100644
--- a/src/shake512sum.c
+++ b/shake512sum.c