Remove the REORDER_DEPENDENCIES mechanism.

The xenocara build process is not writing in the source tree.
This and previous commits was done in cooperation with natano@
and deraadt@

3 files changed, 3 insertions, 61 deletions

diff --git a/share/mk/Makefile b/share/mk/Makefile
index e517288a9..fb090474d 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.6 2012/11/03 15:19:02 espie Exp $
+#	$OpenBSD: Makefile,v 1.7 2016/10/11 22:36:53 matthieu Exp $
 
 .include <bsd.own.mk>
 
-FILES=	automake.dep bsd.xconf.mk bsd.xorg.mk package_version.m4
+FILES=	bsd.xconf.mk bsd.xorg.mk package_version.m4
 
 all:
 
diff --git a/share/mk/automake.dep b/share/mk/automake.dep
deleted file mode 100644
index 739ebc45d..000000000
--- a/share/mk/automake.dep
+++ /dev/null
@@ -1,37 +0,0 @@
-# $OpenBSD: automake.dep,v 1.2 2014/05/19 21:09:08 matthieu Exp $
-configure configure.ac
-configure configure.in
-/Makefile.in /Makefile.am
-/Makefile.in configure.in
-/Makefile.in configure.ac
-/Makefile.in aclocal.m4
-aclocal.m4 configure.in
-aclocal.m4 configure.ac
-aclocal.m4 acinclude.m4
-/config.h.in configure.in
-/config.h.in configure.ac
-/config.h.in aclocal.m4
-/do-not-use-config.h.in  configure.ac
-/do-not-use-config.h.in  aclocal.m4
-configure configure.in
-configure configure.ac
-configure aclocal.m4
-stamp-h.in configure.in
-stamp-h.in configure.ac
-stamp-h.in aclocal.m4
-stamp-h.in acconfig.h
-# kde files
-acinclude.m4 admin/cvs.sh
-configure.in admin/cvs.sh
-/Makefile.am admin/cvs.sh
-subdirs admin/cvs.sh
-/Makefile.am subdirs
-/Makefile.am /Makefile.am.in
-subdirs /Makefile.am.in
-configure.files subdirs
-configure.files /configure.in.in
-configure.files admin/configure.in.min
-configure.in configure.files
-acinclude.m4 admin/libtool.m4.in
-acinclude.m4 admin/acinclude.m4.in
-acinclude.m4 libltdl/ltdl.m4
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index 2a7ef0317..ebcc3ae81 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.54 2016/10/10 13:34:43 matthieu Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.55 2016/10/11 22:36:53 matthieu Exp $ -*- makefile  -*-
 #
 # Copyright © 2006,2012 Matthieu Herrb
 #
@@ -141,31 +141,10 @@ all:	config.status
 	@exec ${MAKE} ${_lt_libs}
 .endif
 
-
-REORDER_DEPENDENCIES += ${X11BASE}/share/mk/automake.dep
-ECHO_REORDER ?= :
-
 .if !target(config.status)
 config.status:
 .if defined(XENOCARA_RERUN_AUTOCONF) && ${XENOCARA_RERUN_AUTOCONF:L} == "yes"
 	cd ${_SRCDIR}; ${AUTOTOOLS_ENV} exec autoreconf -v --install --force
-.else
-.if !defined(NO_REORDER)
-	@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
-	  tsort -r|while read f; do \
-	    cd ${_SRCDIR}; \
-		case $$f in \
-		/*) \
-			find . -name $${f#/} -print| while read i; \
-				do ${ECHO_REORDER} "Touching $$i"; touch $$i; done \
-			;; \
-		*) \
-			if test -e $$f ; then \
-				${ECHO_REORDER} "Touching $$f"; touch $$f; \
-			fi \
-			;; \
-		esac; done
-.endif
 .endif
 	${CONFIGURE_ENV} PATH=$(XENOCARA_PATH) \
 		exec sh ${_SRCDIR}/configure --prefix=${X11BASE} \