summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2008-06-15 01:51:57 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2008-06-15 01:51:57 +0000
commit3c4be4febeb2db9c9a6f5b6a16be37007f547dcf (patch)
treee6b1bdfc6757159815b4c5e0518ed2cb01171824
parente1baf18502b0c4f8e761428bf2b344a93e72cee4 (diff)
be smarter, only write a new MAKEDEV if more than just the rcsid changed
-rw-r--r--etc/Makefile.inc27
-rw-r--r--etc/etc.alpha/Makefile4
-rw-r--r--etc/etc.amd64/Makefile4
-rw-r--r--etc/etc.armish/Makefile4
-rw-r--r--etc/etc.aviion/Makefile4
-rw-r--r--etc/etc.hp300/Makefile4
-rw-r--r--etc/etc.hppa/Makefile4
-rw-r--r--etc/etc.hppa64/Makefile4
-rw-r--r--etc/etc.i386/Makefile4
-rw-r--r--etc/etc.landisk/Makefile4
-rw-r--r--etc/etc.luna88k/Makefile4
-rw-r--r--etc/etc.mac68k/Makefile4
-rw-r--r--etc/etc.macppc/Makefile4
-rw-r--r--etc/etc.mvme68k/Makefile4
-rw-r--r--etc/etc.mvme88k/Makefile4
-rw-r--r--etc/etc.sgi/Makefile4
-rw-r--r--etc/etc.socppc/Makefile4
-rw-r--r--etc/etc.sparc/Makefile4
-rw-r--r--etc/etc.sparc64/Makefile4
-rw-r--r--etc/etc.vax/Makefile4
-rw-r--r--etc/etc.zaurus/Makefile4
21 files changed, 41 insertions, 66 deletions
diff --git a/etc/Makefile.inc b/etc/Makefile.inc
index 31f86f14b34..76ce39c2f82 100644
--- a/etc/Makefile.inc
+++ b/etc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.1 2008/06/14 23:09:05 todd Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2008/06/15 01:51:55 todd Exp $
MAKEDEVSRC= ${.CURDIR}/../MAKEDEV.mi
MAKEDEVSRC+= ${.CURDIR}/../MAKEDEV.sub
@@ -6,8 +6,23 @@ MAKEDEVSRC+= ${.CURDIR}/../MAKEDEV.common
MAKEDEVSRC+= MAKEDEV.md
MAKEDEV: ${MAKEDEVSRC}
- @echo m4 -I.. ../MAKEDEV.mi '>' MAKEDEV
- @m4 -I${.CURDIR}/.. \
- ${.CURDIR}/../MAKEDEV.mi > .MAKEDEV.tmp && \
- mv .MAKEDEV.tmp MAKEDEV || \
- rm .MAKEDEV.tmp
+ @if m4 -I${.CURDIR}/.. -I${.CURDIR} \
+ ${.CURDIR}/../MAKEDEV.mi > MAKEDEV.tmp; then \
+ if ! [ -f ${.CURDIR}/MAKEDEV ]; then \
+ echo " m4 -I.. -I. ../MAKEDEV.mi > MAKEDEV"; \
+ cp MAKEDEV.tmp ${.CURDIR}/MAKEDEV; \
+ rm MAKEDEV.tmp; \
+ exit 0; \
+ fi; \
+ diff MAKEDEV.tmp ${.CURDIR}/MAKEDEV > diffout1 || true; \
+ sed -e 's/^--.*$$//' \
+ -e 's/^[\<\>] #.*OpenBSD.*Exp $$//' \
+ -e 's/^[0-9]*c[0-9]*$$//' \
+ -e '/^$$/d' \
+ diffout1 > diffout2; \
+ if [ -s diffout2 ]; then \
+ echo " m4 -I.. -I. ../MAKEDEV.mi > MAKEDEV"; \
+ cp MAKEDEV.tmp ${.CURDIR}/MAKEDEV || true; \
+ fi; \
+ rm diffout1 diffout2; \
+ fi
diff --git a/etc/etc.alpha/Makefile b/etc/etc.alpha/Makefile
index 69a699665b7..3e6ad0afdc9 100644
--- a/etc/etc.alpha/Makefile
+++ b/etc/etc.alpha/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:55 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.amd64/Makefile b/etc/etc.amd64/Makefile
index 69a699665b7..3e6ad0afdc9 100644
--- a/etc/etc.amd64/Makefile
+++ b/etc/etc.amd64/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:55 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.armish/Makefile b/etc/etc.armish/Makefile
index 69a699665b7..3e6ad0afdc9 100644
--- a/etc/etc.armish/Makefile
+++ b/etc/etc.armish/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:55 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.aviion/Makefile b/etc/etc.aviion/Makefile
index 69a699665b7..324bc9769a7 100644
--- a/etc/etc.aviion/Makefile
+++ b/etc/etc.aviion/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.hp300/Makefile b/etc/etc.hp300/Makefile
index 69a699665b7..324bc9769a7 100644
--- a/etc/etc.hp300/Makefile
+++ b/etc/etc.hp300/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.hppa/Makefile b/etc/etc.hppa/Makefile
index 69a699665b7..324bc9769a7 100644
--- a/etc/etc.hppa/Makefile
+++ b/etc/etc.hppa/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.hppa64/Makefile b/etc/etc.hppa64/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.hppa64/Makefile
+++ b/etc/etc.hppa64/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.i386/Makefile b/etc/etc.i386/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.i386/Makefile
+++ b/etc/etc.i386/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.landisk/Makefile b/etc/etc.landisk/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.landisk/Makefile
+++ b/etc/etc.landisk/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.luna88k/Makefile b/etc/etc.luna88k/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.luna88k/Makefile
+++ b/etc/etc.luna88k/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.mac68k/Makefile b/etc/etc.mac68k/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.mac68k/Makefile
+++ b/etc/etc.mac68k/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.macppc/Makefile b/etc/etc.macppc/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.macppc/Makefile
+++ b/etc/etc.macppc/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.mvme68k/Makefile b/etc/etc.mvme68k/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.mvme68k/Makefile
+++ b/etc/etc.mvme68k/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.mvme88k/Makefile b/etc/etc.mvme88k/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.mvme88k/Makefile
+++ b/etc/etc.mvme88k/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.sgi/Makefile b/etc/etc.sgi/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.sgi/Makefile
+++ b/etc/etc.sgi/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.socppc/Makefile b/etc/etc.socppc/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.socppc/Makefile
+++ b/etc/etc.socppc/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.sparc/Makefile b/etc/etc.sparc/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.sparc/Makefile
+++ b/etc/etc.sparc/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.sparc64/Makefile b/etc/etc.sparc64/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.sparc64/Makefile
+++ b/etc/etc.sparc64/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.vax/Makefile b/etc/etc.vax/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.vax/Makefile
+++ b/etc/etc.vax/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV
diff --git a/etc/etc.zaurus/Makefile b/etc/etc.zaurus/Makefile
index 26fbcdd4669..324bc9769a7 100644
--- a/etc/etc.zaurus/Makefile
+++ b/etc/etc.zaurus/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
all: MAKEDEV