From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Make the "make depend" maintainer target more convenient by
Date: Fri, 13 Mar 2020 12:32:14 -0500 (EST) [thread overview]
Message-ID: <11ff0ea1ba2b54b1@mandoc.bsd.lv> (raw)
Log Message:
-----------
Make the "make depend" maintainer target more convenient
by having it run ./configure with native fts and ohash disabled.
Modified Files:
--------------
mandoc:
Makefile
configure
Revision Data
-------------
Index: configure
===================================================================
RCS file: /home/cvs/mandoc/mandoc/configure,v
retrieving revision 1.72
retrieving revision 1.73
diff -Lconfigure -Lconfigure -u -p -r1.72 -r1.73
--- configure
+++ configure
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Copyright (c) 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
@@ -327,7 +327,13 @@ if [ ${HAVE_ENDIAN} -eq 0 -a \
exit 1
fi
-if ismanual fts FTS ${HAVE_FTS}; then
+if [ "$1" == "-depend" ]; then
+ HAVE_FTS=0
+ HAVE_FTS_COMPARE_CONST=0
+ echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&2
+ echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&3
+ echo 1>&3
+elif ismanual fts FTS ${HAVE_FTS}; then
HAVE_FTS_COMPARE_CONST=0
elif runtest fts FTS_COMPARE_CONST -DFTS_COMPARE_CONST; then
HAVE_FTS=1
@@ -406,7 +412,12 @@ if [ ${BUILD_CATMAN} -gt 0 ]; then
fi
# --- ohash ---
-if ismanual ohash OHASH "${HAVE_OHASH}"; then
+if [ "$1" == "-depend" ]; then
+ HAVE_OHASH=0
+ echo "tested ohash: HAVE_OHASH=0 (for make depend)" 1>&2
+ echo "tested ohash: HAVE_OHASH=0 (for make depend)" 1>&3
+ echo 1>&3
+elif ismanual ohash OHASH "${HAVE_OHASH}"; then
:
elif [ -n "${LD_OHASH}" ]; then
runtest ohash OHASH "${LD_OHASH}" || true
Index: Makefile
===================================================================
RCS file: /home/cvs/mandoc/mandoc/Makefile,v
retrieving revision 1.531
retrieving revision 1.532
diff -LMakefile -LMakefile -u -p -r1.531 -r1.532
--- Makefile
+++ Makefile
@@ -401,6 +401,7 @@ clean:
rm -f demandoc $(DEMANDOC_OBJS)
rm -f soelim $(SOELIM_OBJS)
rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
+ rm -f Makefile.tmp1 Makefile.tmp2
rm -rf *.dSYM
base-install: mandoc demandoc soelim
@@ -545,11 +546,13 @@ www-install: www
$(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
depend: config.h
- mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
+ ./configure -depend
+ mkdep -f Makefile.tmp1 $(CFLAGS) $(SRCS)
perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
s|\\\n||g; s| +| |g; s| $$||mg; print;' \
- Makefile.depend > Makefile.tmp
- mv Makefile.tmp Makefile.depend
+ Makefile.tmp1 > Makefile.tmp2
+ rm Makefile.tmp1
+ mv Makefile.tmp2 Makefile.depend
regress-distclean:
@find regress \
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2020-03-13 17:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11ff0ea1ba2b54b1@mandoc.bsd.lv \
--to=schwarze@mandoc.bsd.lv \
--cc=source@mandoc.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).