X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d03ab969116fe715d569304c1c474749b2f64529..c760149fcb65296defd1af967fbfa098bd83143a:/genmodes

diff --git a/genmodes b/genmodes
index 48175ce..8ae737b 100755
--- a/genmodes
+++ b/genmodes
@@ -7,8 +7,8 @@ for i in $baselist; do
   I=`echo "$i" | tr -d '\n' | tr a-z A-Z | tr -c a-zA-Z0-9 _`
   for j in $extlist; do
     J=`echo "$j" | tr -d '\n' | tr a-z A-Z | tr -c a-zA-Z0-9 _`
-    guard="${I}_${J}_H"
-    cat >$i-$j.h <<EOF
+    guard="CATACOMB_${I}_${J}_H"
+    cat >$i-$j.h.new <<EOF
 /* -*-c-*-
  *
  * $i-$j.h [generated]
@@ -21,11 +21,11 @@ for i in $baselist; do
   extern "C" {
 #endif
 
-#ifndef ${J}_H
+#ifndef CATACOMB_${J}_H
 #  include "$j.h"
 #endif
 
-#ifndef ${I}_H
+#ifndef CATACOMB_${I}_H
 #  include "$i.h"
 #endif
 
@@ -37,14 +37,27 @@ ${J}_DECL($I, $i)
 
 #endif
 EOF
-    cat >$i-$j.c <<EOF
+    if cmp "$i-$j.h" "$i-$j.h.new" 2>/dev/null; then
+      rm "$i-$j.h.new"
+    else
+      mv "$i-$j.h.new" "$i-$j.h"
+      echo >&2 "Written new $i-$j.h."
+    fi
+    cat >$i-$j.c.new <<EOF
 /* -*-c-*-
  *
- * $i-$j.h [generated]
+ * $i-$j.c [generated]
  */
 
 #include "$i-$j.h"
+#include "$j-def.h"
 ${J}_DEF($I, $i)
 EOF
+    if cmp "$i-$j.c" "$i-$j.c.new" 2>/dev/null; then
+      rm "$i-$j.c.new"
+    else
+      mv "$i-$j.c.new" "$i-$j.c"
+      echo >&2 "Written new $i-$j.c."
+    fi
   done
 done