simplify a few accesses to fields of structs, using auxiliary pointer

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 17d445bf815dddc5e8598367ac728534c11b4355..48c4741812b62a3be4520d648ea8392a695c5688 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.536 2021/09/19 11:03:40 schwarze Exp $
+# $Id: Makefile,v 1.540 2021/09/21 11:04:40 schwarze Exp $
 #
-# Copyright (c) 2011, 2013-2020 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013-2021 Ingo Schwarze <schwarze@openbsd.org>
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -30,6 +30,7 @@ TESTSRCS       = test-attribute.c \
                   test-getsubopt.c \
                   test-isblank.c \
                   test-mkdtemp.c \
+                  test-mkstemps.c \
                   test-nanosleep.c \
                   test-noop.c \
                   test-ntohl.c \
@@ -66,6 +67,7 @@ SRCS           = arch.c \
                   compat_getsubopt.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
+                  compat_mkstemps.c \
                   compat_ohash.c \
                   compat_progname.c \
                   compat_reallocarray.c \
@@ -257,6 +259,7 @@ ALL_COBJS    = compat_err.o \
                   compat_getsubopt.o \
                   compat_isblank.o \
                   compat_mkdtemp.o \
+                  compat_mkstemps.o \
                   compat_ohash.o \
                   compat_progname.o \
                   compat_reallocarray.o \
@@ -370,7 +373,7 @@ include Makefile.local
 
 # === DEPENDENCY HANDLING ==============================================
 
-all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
+all: mandoc man demandoc soelim $(BUILD_TARGETS) Makefile.local
 
 install: base-install $(INSTALL_TARGETS)
 
@@ -499,7 +502,7 @@ uninstall:
        rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h
        [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
 
-regress: all man
+regress: all
        cd regress && ./regress.pl
 
 regress-clean:
@@ -510,7 +513,7 @@ Makefile.local config.h: configure $(TESTSRCS)
        @exit 1
 
 libmandoc.a: $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
-       ar rs $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
+       $(AR) rs $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
 
 mandoc: $(MAIN_OBJS) libmandoc.a
        $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
@@ -600,7 +603,7 @@ dist-install: dist
 .h.h.html:
        highlight -I $< > $@
 
-.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
-       mandoc -Thtml -Wwarning,stop \
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html:
+       ./mandoc -Thtml -Wwarning,stop \
                -O 'style=/mandoc.css,man=/man/%N.%S.html;https://man.openbsd.org/%N.%S,includes=/includes/%I.html' \
                $< > $@