From 1acb6e3c8941de5715e7008503a4c8a699873a3b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 16 Sep 2021 16:20:50 +0200 Subject: Improve makefile and fix bug in cg-limits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 4 ++-- cg-limits.c | 6 +++--- config.mk | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 455cdf4..c414146 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,8 @@ MAN1 = $(BIN:=.1) MAN7 = cg-tools.7 all: $(XBIN) $(OUT) -$(OBJ): $(@:.o=.c) $(HDR) -$(OUT): $(@:.out=.o) cg-base.o +$(OBJ): $(HDR) +$(OUT): cg-base.o .c.o: $(CC) -c -o $@ $< $(CPPFLAGS) $(CFLAGS) diff --git a/cg-limits.c b/cg-limits.c index 8f596f2..1048e13 100644 --- a/cg-limits.c +++ b/cg-limits.c @@ -362,13 +362,13 @@ parse_conf_file(const char *restrict pathname, char ***restrict names, *b++ = '\0'; q = strpbrk(r, " \t"); - if (!q) + if (q) *q = '\0'; q = strpbrk(g, " \t"); - if (!q) + if (q) *q = '\0'; q = strpbrk(b, " \t"); - if (!q) + if (q) *q = '\0'; q = strchr(p, '\0'); diff --git a/config.mk b/config.mk index a3ec1ce..90d9484 100644 --- a/config.mk +++ b/config.mk @@ -1,8 +1,10 @@ -PREFIX = /usr +PREFIX = /usr MANPREFIX = $(PREFIX)/share/man PKGNAME = cg-tools -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D'PKGNAME="$(PKGNAME)"' +CC = cc + +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D'PKGNAME="$(PKGNAME)"' CFLAGS = -std=c99 -Wall -O2 LDFLAGS = -lcoopgamma -lm -s -- cgit v1.2.3-70-g09d2