Cleanup, improve makefile, and change license

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

1 files changed, 25 insertions, 67 deletions

diff --git a/Makefile b/Makefile
index 61162c5..86b50a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,77 +1,35 @@
-# 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: timeprefix
 
-# The name of the command as it should be installed
-COMMAND ?= timeprefix
-# The name of the package as it should be installed
-PKGNAME ?= timeprefix
+timeprefix: timeprefix.o
+	$(CC) -o $@ timeprefix.o $(LDFLAGS)
 
+.c.o:
+	$(CC) -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
-# Optimisation level (and debug flags.)
-OPTIMISE = -Ofast
+install: timeprefix
+	mkdir -p -- "$(DESTDIR)$(PREFIX)/bin"
+	mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/timeprefix"
+	mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man1"
+	cp -- timeprefix "$(DESTDIR)$(PREFIX)/bin/"
+	cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/timeprefix/"
+	cp -- timeprefix.1 "$(DESTDIR)$(MANPREFIX)/man1/"
 
-# 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 -Winline -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
-
-
-
-.PHONY: all
-all: bin/timeprefix
-
-bin/timeprefix: obj/timeprefix.o
-	@mkdir -p bin
-	$(CC) -std=$(STD) $(OPTIMISE) $(WARN) -lrt $(LDFLAGS) -o $@ $^
-
-obj/%.o: src/%.c
-	@mkdir -p obj
-	$(CC) -std=$(STD) $(OPTIMISE) $(WARN) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
-
-.PHONY: install
-install: bin/timeprefix
-	install -dm755 -- "$(DESTDIR)$(BINDIR)"
-	install -m755 bin/timeprefix -- "$(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/timeprefix"
+	-rm -rf -- "$(DESTDIR)$(PREFIX)/share/licenses/timeprefix"
+	-rm -- "$(DESTDIR)$(MANPREFIX)/man1/timeprefix.1"
+	-rmdir -- "$(DESTDIR)$(PREFIX)/bin"
+	-rmdir -- "$(DESTDIR)$(MANPREFIX)/man1"
 
-
-.PHONY: clean
 clean:
-	-rm -r obj bin
+	-rm -f -- timeprefix *.o
+
+.SUFFIXES:
+.SUFFIXES: .o .c
 
+.PHONY: all install uninstall clean