diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2020-06-15 01:37:14 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2020-06-15 01:37:14 +0000 |
| commit | be382c572561862fee3a7bf3dae1b0236ac3216b (patch) | |
| tree | 6b8cbcf67d431133d7ae433b188d2b27534da9e3 /Makefile | |
| parent | 30da7aa93492bbe72c27b4bfca4a30fcf9a11f79 (diff) | |
| download | mandoc-be382c572561862fee3a7bf3dae1b0236ac3216b.tar.gz mandoc-be382c572561862fee3a7bf3dae1b0236ac3216b.tar.zst mandoc-be382c572561862fee3a7bf3dae1b0236ac3216b.zip | |
Only compile compat_*.c implementations that are actually needed.
That's cleaner and it is supposed to fix compiler warnings with gcc 10
reported by Wynn Wolf Arbor <wolf at oriole dot systems> on discuss@.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.532 2020/03/13 17:31:44 schwarze Exp $ +# $Id: Makefile,v 1.533 2020/06/15 01:37:14 schwarze Exp $ # # Copyright (c) 2011, 2013-2020 Ingo Schwarze <schwarze@openbsd.org> # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> @@ -250,7 +250,7 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ read.o \ tag.o -COMPAT_OBJS = compat_err.o \ +ALL_COBJS = compat_err.o \ compat_fts.o \ compat_getline.o \ compat_getsubopt.o \ @@ -320,13 +320,6 @@ MANDOCD_OBJS = $(MANDOC_HTML_OBJS) \ DEMANDOC_OBJS = demandoc.o -SOELIM_OBJS = soelim.o \ - compat_err.o \ - compat_getline.o \ - compat_progname.o \ - compat_reallocarray.o \ - compat_stringlist.o - WWW_MANS = apropos.1.html \ demandoc.1.html \ man.1.html \ @@ -394,12 +387,12 @@ distclean: clean rm -f Makefile.local config.h config.h.old config.log config.log.old clean: - rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) + rm -f libmandoc.a $(LIBMANDOC_OBJS) $(ALL_COBJS) rm -f mandoc man $(MAIN_OBJS) rm -f man.cgi $(CGI_OBJS) rm -f mandocd catman catman.o $(MANDOCD_OBJS) rm -f demandoc $(DEMANDOC_OBJS) - rm -f soelim $(SOELIM_OBJS) + rm -f soelim soelim.o rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256 rm -f Makefile.tmp1 Makefile.tmp2 rm -rf *.dSYM @@ -514,8 +507,8 @@ Makefile.local config.h: configure $(TESTSRCS) @echo "$@ is out of date; please run ./configure" @exit 1 -libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) - ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) +libmandoc.a: $(MANDOC_COBJS) $(LIBMANDOC_OBJS) + ar rs $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS) mandoc: $(MAIN_OBJS) libmandoc.a $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD) @@ -535,8 +528,8 @@ catman: catman.o libmandoc.a demandoc: $(DEMANDOC_OBJS) libmandoc.a $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD) -soelim: $(SOELIM_OBJS) - $(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS) +soelim: $(SOELIM_COBJS) soelim.o + $(CC) -o $@ $(LDFLAGS) $(SOELIM_COBJS) soelim.o # --- maintainer targets --- |