From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (mandoc.bsd.lv [local])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id ea7eea87
	for <source@mandoc.bsd.lv>;
	Fri, 13 Mar 2020 12:32:14 -0500 (EST)
Date: Fri, 13 Mar 2020 12:32:14 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Make the "make depend" maintainer target more convenient by 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <11ff0ea1ba2b54b1@mandoc.bsd.lv>

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