From fee2317e973b25dc0e73603702dc686eb058b397 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sat, 12 Sep 2015 03:42:24 +0200
Subject: update makefile + update gitignore + fix warnings + remove old
 implementation + add deps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 Makefile | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 16 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ee560f5..de9ebe0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,50 +6,76 @@
 PREFIX = /usr
 DATA = /share
 BIN = /bin
-LIBEXEC = /libexec
 PKGNAME = mongoclock
 COMMAND = mongoclock
 LICENSES = $(PREFIX)$(DATA)
 
 
-all: mongoclock.install doc
+GPP = gpp
+
+
+WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self -Wmissing-include-dirs      \
+       -Wtrampolines -Wmissing-prototypes -Wmissing-declarations -Wnested-externs                    \
+       -Wno-variadic-macros -Wsync-nand -Wunsafe-loop-optimizations -Wcast-align                     \
+       -Wdeclaration-after-statement -Wundef -Wbad-function-cast -Wwrite-strings -Wlogical-op        \
+       -Wstrict-prototypes -Wold-style-definition -Wpacked -Wvector-operation-performance            \
+       -Wunsuffixed-float-constants -Wsuggest-attribute=const -Wsuggest-attribute=noreturn           \
+       -Wsuggest-attribute=format -Wnormalized=nfkc -Wshadow -Wredundant-decls -Winline -Wcast-qual  \
+       -Wsign-conversion -Wstrict-overflow=5 -Wconversion -Wsuggest-attribute=pure -Wswitch-default  \
+       -Wstrict-aliasing=1 -fstrict-overflow -Wfloat-equal -Wpadded -Waggregate-return               \
+       -Wtraditional-conversion
+
+FFLAGS = -fstrict-aliasing -fipa-pure-const -ftree-vrp -fstack-usage -funsafe-loop-optimizations
+STD = c99
+OPTIMISE = -O2
+
+FLAGS = $(OPTIMISE) -std=$(STD) $(WARN) $(FFLAGS)
+
+
+all: mongoclock doc
 
 doc: info
 
-info: mongoclock.info.gz
+info: mongoclock.info
 
-%.info.gz: info/%.texinfo
+%.info: info/%.texinfo
 	makeinfo "$<"
-	gzip -9 -f "$*.info"
 
-mongoclock.install: mongoclock
-	cp "$<" "$@"
-	sed -i 's:$$0.py:$(PREFIX)$(LIBEXEC)/$(COMMAND).py:g' "$@"
+mongoclock: bin/mongoclock
+
+bin/mongoclock: obj/mongoclock.o
+	mkdir -p bin
+	$(CC) $(FLAGS) -o $@ $^ $(LDFLAGS)
+
+obj/mongoclock.o: obj/mongoclock.c
+	$(CC) $(FLAGS) -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
+
+obj/mongoclock.c: src/mongoclock.c
+	mkdir -p obj
+	$(GPP) -s '$$' -i $< -o $@
 
 install: install-cmd install-license install-info
 
-install-cmd:
+install-cmd: bin/mongoclock
 	install -dm755 "$(DESTDIR)$(PREFIX)$(BIN)"
 	install -dm755 "$(DESTDIR)$(PREFIX)$(LIBEXEC)"
-	install -m755 mongoclock.install "$(DESTDIR)$(PREFIX)$(BIN)/$(COMMAND)"
-	install -m755 mongoclock.py "$(DESTDIR)$(PREFIX)$(LIBEXEC)/$(COMMAND).py"
+	install -m755 bin/mongoclock "$(DESTDIR)$(PREFIX)$(BIN)/$(COMMAND)"
 
 install-license:
 	install -dm755 "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
 	install -m644 COPYING "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
 
-install-info: mongoclock.info.gz
+install-info: mongoclock.info
 	install -dm755 "$(DESTDIR)$(PREFIX)$(DATA)/info"
-	install -m644 mongoclock.info.gz "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info.gz"
+	install -m644 mongoclock.info "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info"
 
 uninstall:
 	-rm -- "$(DESTDIR)$(PREFIX)$(BIN)/$(COMMAND)"
-	-rm -- "$(DESTDIR)$(PREFIX)$(LIBEXEC)/$(COMMAND).py"
 	-rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/COPYING"
 	-rmdir -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
-	-rm -- "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info.gz"
+	-rm -- "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info"
 
 .PHONY: clean
 clean:
-	-rm -f mongoclock.info.gz mongoclock.install
+	-rm -f bin obj mongoclock.info
 
-- 
cgit v1.2.3-70-g09d2