Rewrite with style (and relicense)8.0

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

1 files changed, 22 insertions, 202 deletions

diff --git a/Makefile b/Makefile
index 3bfbdbb..d88ecc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,212 +1,32 @@
-# Copyright © 2012, 2013, 2014  Mattias Andrée (maandree@member.fsf.org)
-# 
-# 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.
-# 
-# [GNU All Permissive License]
+.POSIX:
 
-PREFIX = /usr
-BIN = /bin
-BINDIR = $(PREFIX)$(BIN)
-DATA = /share
-DATADIR = $(PREFIX)$(DATA)
-DOCDIR = $(DATADIR)/doc
-INFODIR = $(DATADIR)/info
-MANDIR = $(DATADIR)/man
-MAN1DIR = $(MANDIR)/man1
-LICENSEDIR = $(DATADIR)/licenses
+CONFIGFILE = config.mk
+include $(CONFIGFILE)
 
+all: adjbacklight
 
-PKGNAME = adjbacklight
-COMMAND = adjbacklight
+adjbacklight.o: adjbacklight.c arg.h
+	$(CC) -c -o adjbacklight.o adjbacklight.c $(CCFLAGS) $(CPPFLAGS)
 
+adjbacklight: adjbacklight.o
+	$(CC) -o adjbacklight adjbacklight.o $(LDFLAGS)
 
-OPTIMISATION = -Ofast
-# -Os     optimise for small size
-# -Ofast  optimise for performance
-# -Og     optimise for debugging
-# -g      include debugging data (use together with -Og or alone)
+install: adjbacklight
+	mkdir -p -- "$(DESTDIR)$(PREFIX)/bin"
+	mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man1"
+	mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight"
+	cp -- adjbacklight "$(DESTDIR)$(PREFIX)/bin"
+	cp -- adjbacklight.1 "$(DESTDIR)$(MANPREFIX)/man1"
+	cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight"
+	chmod -- 4755 "$(DESTDIR)$(PREFIX)/bin/adjbacklight"
 
-WARN = -Wall -Wextra -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 -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 -Wconversion        \
-       -fstrict-aliasing -fstrict-overflow -fipa-pure-const -ftree-vrp -fstack-usage             \
-       -funsafe-loop-optimizations
-# excluded: -pedantic
-
-
-
-# compile the package
-.PHONY: default
-default: code info shell
-
-.PHONY: all
-all: code doc shell
-
-.PHONY: code
-code: bin/adjbacklight
-
-bin/adjbacklight: src/adjbacklight.c
-	@mkdir -p bin
-	$(CC) $(OPTIMISATION) $(WARN) -std=gnu90 -o "$@" "$<"
-
-.PHONY: code
-doc: info pdf dvi ps
-
-.PHONY: info
-info: bin/adjbacklight.info
-bin/%.info: doc/info/%.texinfo
-	@mkdir -p bin
-	$(MAKEINFO) "$<"
-	mv $*.info $@
-
-.PHONY: pdf
-pdf: bin/adjbacklight.pdf
-bin/%.pdf: doc/info/%.texinfo
-	@! test -d obj/pdf || rm -rf obj/pdf
-	@mkdir -p bin obj/pdf
-	cd obj/pdf && texi2pdf ../../"$<" < /dev/null
-	mv obj/pdf/$*.pdf $@
-
-.PHONY: dvi
-dvi: bin/adjbacklight.dvi
-bin/%.dvi: doc/info/%.texinfo
-	@! test -d obj/dvi || rm -rf obj/dvi
-	@mkdir -p bin obj/dvi
-	cd obj/dvi && $(TEXI2DVI) ../../"$<" < /dev/null
-	mv obj/dvi/$*.dvi $@
-
-.PHONY: ps
-ps: bin/adjbacklight.ps
-bin/%.ps: doc/info/%.texinfo
-	@! test -d obj/ps || rm -rf obj/ps
-	@mkdir -p bin obj/ps
-	cd obj/ps && texi2pdf --ps ../../"$<" < /dev/null
-	mv obj/ps/$*.ps $@
-
-.PHONY: shell
-shell: bash fish zsh
-
-.PHONY: bash
-bash: bin/adjbacklight.bash-completion
-
-.PHONY: fish
-fish: bin/adjbacklight.fish-completion
-
-.PHONY: zsh
-zsh: bin/adjbacklight.zsh-completion
-
-obj/adjbacklight.auto-completion: src/adjbacklight.auto-completion
-	@mkdir -p obj
-	cp "$<" "$@"
-	sed -i 's/^(adjbacklight$$/($(COMMAND)/' "$@"
-
-bin/adjbacklight.%sh-completion: obj/adjbacklight.auto-completion
-	@mkdir -p bin
-	auto-auto-complete "$*sh" --output "$@" --source "$<"
-
-
-# install to system
-.PHONY: install
-install: install-base install-info install-man install-shell
-
-.PHONY: install-all
-install-all: install-base install-doc install-shell
-
-.PHONY: install-base
-install-base: install-cmd install-copyright
-
-.PHONY: install-cmd
-install-cmd: bin/adjbacklight
-	install -d -- "$(DESTDIR)$(BINDIR)"
-	install -m4755 -- bin/adjbacklight "$(DESTDIR)$(BINDIR)/$(COMMAND)"
-
-.PHONY: install-copyright
-install-copyright: install-copying install-license
-
-.PHONY: install-copying
-install-copying:
-	install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	install -m644 -- COPYING "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-
-.PHONY: install-license
-install-license:
-	install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	install -m644 -- LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-
-.PHONY: install-doc
-install-doc: install-info install-pdf install-dvi install-ps install-man
-
-.PHONY: install-info
-install-info: bin/adjbacklight.info
-	install -dm755 -- "$(DESTDIR)$(INFODIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
-
-.PHONY: install-pdf
-install-pdf: bin/adjbacklight.pdf
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
-
-.PHONY: install-dvi
-install-dvi: bin/adjbacklight.dvi
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
-
-.PHONY: install-ps
-install-ps: bin/adjbacklight.ps
-	install -dm755 -- "$(DESTDIR)$(DOCDIR)"
-	install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
-
-.PHONY: install-man
-install-man: doc/man/adjbacklight.1
-	install -dm755 -- "$(DESTDIR)$(MAN1DIR)"
-	install -m644 "$<" -- "$(DESTDIR)$(MAN1DIR)/$(COMMAND).1"
-
-.PHONY: install-shell
-install-shell: install-bash install-fish install-zsh
-
-.PHONY: install-bash
-install-bash: bin/adjbacklight.bash-completion
-	install -dm755 -- "$(DESTDIR)$(DATADIR)/bash-completion/completions"
-	install -m644 "$<" -- "$(DESTDIR)$(DATADIR)/bash-completion/completions/$(COMMAND)"
-
-.PHONY: install-fish
-install-fish: bin/adjbacklight.fish-completion
-	install -dm755 -- "$(DESTDIR)$(DATADIR)/fish/completions"
-	install -m644 "$<" -- "$(DESTDIR)$(DATADIR)/fish/completions/$(COMMAND).fish"
-
-.PHONY: install-zsh
-install-zsh: bin/adjbacklight.zsh-completion
-	install -dm755 -- "$(DESTDIR)$(DATADIR)/zsh/site-functions"
-	install -m644 "$<" -- "$(DESTDIR)$(DATADIR)/zsh/site-functions/_$(COMMAND)"
-
-
-# remove files created by `install`
-.PHONY: uninstall
 uninstall:
-	-rm -- "$(DESTDIR)$(BINDIR)/$(COMMAND)"
-	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING"
-	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE"
-	-rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	-rm -- "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
-	-rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
-	-rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
-	-rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
-	-rm -- "$(DESTDIR)$(DATADIR)/bash-completion/completions/$(COMMAND)"
-	-rm -- "$(DESTDIR)$(DATADIR)/fish/completions/$(COMMAND).fish"
-	-rm -- "$(DESTDIR)$(DATADIR)/zsh/site-functions/_$(COMMAND)"
-	-rm -- "$(DESTDIR)$(MAN1)/$(COMMAND).1"
-
+	-rm -- "$(DESTDIR)$(PREFIX)/bin/adjbacklight"
+	-rm -- "$(DESTDIR)$(MANPREFIX)/man1/adjbacklight.1"
+	-rm -- "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight/LICENSE"
+	-rmdir -- "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight"
 
-# remove files created by `all`
-.PHONY: clean
 clean:
-	-rm -r bin obj
+	-rm -- adjbacklight *.o
 
+.PHONY: all install uninstall clean