diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-09-16 18:32:09 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-09-16 18:32:09 +0200 |
| commit | 45b62beddc014daf0ad5da0320155598b641a7ea (patch) | |
| tree | 90f41c2999fd5e68de378c4be27eb00bbd8c81cd | |
| parent | Exit when user presses q (diff) | |
| download | mongotimer-45b62beddc014daf0ad5da0320155598b641a7ea.tar.gz mongotimer-45b62beddc014daf0ad5da0320155598b641a7ea.tar.bz2 mongotimer-45b62beddc014daf0ad5da0320155598b641a7ea.tar.xz | |
Improve makefile + m whitespace fix1.1.4
Signed-off-by: Mattias Andrée <maandree@kth.se>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | config.mk | 6 | ||||
| -rw-r--r-- | mongotimer.c | 1 |
3 files changed, 8 insertions, 7 deletions
@@ -8,13 +8,14 @@ DIGITS =\ mongo_5.h mongo_6.h mongo_7.h mongo_8.h mongo_9.h \ mongo_c.h mongo_m.h + all: mongotimer mongotimer: mongotimer.o $(CC) -o $@ mongotimer.o $(LDFLAGS) mongotimer.o: mongotimer.c arg.h $(DIGITS) - $(CC) -c -o $@ mongotimer.c $(CPPFLAGS) $(CFLAGS) + $(CC) -c -o $@ mongotimer.c $(CFLAGS) $(CPPFLAGS) mongo_0.h: digit.sh ./digit.sh 0 > $@ @@ -54,18 +55,15 @@ mongo_m.h: digit.sh install: mongotimer mkdir -p -- "$(DESTDIR)$(PREFIX)/bin" - mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/mongotimer" mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man1" cp -- mongotimer "$(DESTDIR)$(PREFIX)/bin/" - cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/mongotimer/" cp -- mongotimer.1 "$(DESTDIR)$(MANPREFIX)/man1/" uninstall: -rm -- "$(DESTDIR)$(PREFIX)/bin/mongotimer" -rm -- "$(DESTDIR)$(MANPREFIX)/man1/mongotimer.1" - -rm -r -- "$(DESTDIR)$(PREFIX)/share/licenses/mongotimer" clean: - -rm -f -- *.o mongotimer mongo_*.h + -rm -f -- *.o *.su mongotimer mongo_*.h .PHONY: all install uninstall clean @@ -1,6 +1,8 @@ -PREFIX = /usr/local +PREFIX = /usr MANPREFIX = $(PREFIX)/share/man -CFLAGS = -std=c99 -Wall -Wextra -O2 +CC = cc + CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_GNU_SOURCE +CFLAGS = -std=c99 -Wall -O2 LDFLAGS = -s diff --git a/mongotimer.c b/mongotimer.c index 5bf9e0f..7fe6e05 100644 --- a/mongotimer.c +++ b/mongotimer.c @@ -32,6 +32,7 @@ #include "mongo_c.h" #include "mongo_m.h" + static const char **mongo_ds[] = { mongo_0, mongo_1, mongo_2, mongo_3, mongo_4, mongo_5, mongo_6, mongo_7, mongo_8, mongo_9 |