summaryrefslogtreecommitdiff
path: root/share/mk
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2007-03-17 19:32:43 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2007-03-17 19:32:43 +0000
commitd1d7a07ac4c573930a0e17f91121fa0f74ef1bd8 (patch)
treed221cf2d6116119967c2838eb0226e50fa6e6d47 /share/mk
parent0b87b101a088469abe32857f087d3a33b348c1dc (diff)
Touch files that would be modified by autotools to avoid un-needed
calls to automake and autoconf. Code stolen from ports tree. suggested by espie@. Tested by todd@.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/automake.dep35
-rw-r--r--share/mk/bsd.xorg.mk20
2 files changed, 54 insertions, 1 deletions
diff --git a/share/mk/automake.dep b/share/mk/automake.dep
new file mode 100644
index 000000000..3554936f4
--- /dev/null
+++ b/share/mk/automake.dep
@@ -0,0 +1,35 @@
+# $OpenBSD: automake.dep,v 1.1 2007/03/17 19:32:42 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
+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 729e6f427..650f8e8a7 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.12 2007/02/04 23:15:27 matthieu Exp $ -*- makefile -*-
+# $OpenBSD: bsd.xorg.mk,v 1.13 2007/03/17 19:32:41 matthieu Exp $ -*- makefile -*-
#
# Copyright © 2006 Matthieu Herrb
#
@@ -67,10 +67,28 @@ all: config.status
${MAKE_ENV} ${MAKE} ${_lt_libs}
.endif
+
+REORDER_DEPENDENCIES += ${X11BASE}/share/mk/automake.dep
+
.if !target(config.status)
config.status:
.if defined(XENOCARA_RERUN_AUTOCONF) && ${XENOCARA_RERUN_AUTOCONF:L} == "yes"
cd ${.CURDIR}; ${MAKE_ENV} autoreconf -v --install --force
+.else
+ @sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
+ tsort -r|while read f; do \
+ cd ${.CURDIR}; \
+ case $$f in \
+ /*) \
+ find . -name $${f#/} -print| while read i; \
+ do echo "Touching $$i"; touch $$i; done \
+ ;; \
+ *) \
+ if test -e $$f ; then \
+ echo "Touching $$f"; touch $$f; \
+ fi \
+ ;; \
+ esac; done
.endif
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" CFLAGS="$(CFLAGS:C/ *$//)" \
${CONFIGURE_ENV} ${.CURDIR}/configure --prefix=${X11BASE} \