diff --git a/.gitignore b/.gitignore
index 083f0fba..400ed21c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,27 @@ reconfigure.sh
 # readline/ is intentionally NOT converted and keeps its tracked static Makefile.)
 # --- converted dirs below ---
 tiles/Makefile
+bplane/Makefile
+calma/Makefile
+cif/Makefile
+cmwind/Makefile
+dbwind/Makefile
+debug/Makefile
+drc/Makefile
+extflat/Makefile
+extract/Makefile
+garouter/Makefile
+gcr/Makefile
+grouter/Makefile
+irouter/Makefile
+mzrouter/Makefile
+netmenu/Makefile
+plow/Makefile
+resis/Makefile
+select/Makefile
+sim/Makefile
+textio/Makefile
+wiring/Makefile
 
 # Compiled objects / libraries
 *.o
diff --git a/bplane/Makefile b/bplane/Makefile.in
similarity index 100%
rename from bplane/Makefile
rename to bplane/Makefile.in
diff --git a/calma/Makefile b/calma/Makefile.in
similarity index 100%
rename from calma/Makefile
rename to calma/Makefile.in
diff --git a/cif/Makefile b/cif/Makefile.in
similarity index 100%
rename from cif/Makefile
rename to cif/Makefile.in
diff --git a/cmwind/Makefile b/cmwind/Makefile.in
similarity index 100%
rename from cmwind/Makefile
rename to cmwind/Makefile.in
diff --git a/dbwind/Makefile b/dbwind/Makefile.in
similarity index 100%
rename from dbwind/Makefile
rename to dbwind/Makefile.in
diff --git a/debug/Makefile b/debug/Makefile.in
similarity index 100%
rename from debug/Makefile
rename to debug/Makefile.in
diff --git a/drc/Makefile b/drc/Makefile.in
similarity index 100%
rename from drc/Makefile
rename to drc/Makefile.in
diff --git a/extflat/Makefile b/extflat/Makefile.in
similarity index 100%
rename from extflat/Makefile
rename to extflat/Makefile.in
diff --git a/extract/Makefile b/extract/Makefile.in
similarity index 100%
rename from extract/Makefile
rename to extract/Makefile.in
diff --git a/garouter/Makefile b/garouter/Makefile.in
similarity index 100%
rename from garouter/Makefile
rename to garouter/Makefile.in
diff --git a/gcr/Makefile b/gcr/Makefile.in
similarity index 100%
rename from gcr/Makefile
rename to gcr/Makefile.in
diff --git a/grouter/Makefile b/grouter/Makefile.in
similarity index 100%
rename from grouter/Makefile
rename to grouter/Makefile.in
diff --git a/irouter/Makefile b/irouter/Makefile.in
similarity index 100%
rename from irouter/Makefile
rename to irouter/Makefile.in
diff --git a/mzrouter/Makefile b/mzrouter/Makefile.in
similarity index 100%
rename from mzrouter/Makefile
rename to mzrouter/Makefile.in
diff --git a/netmenu/Makefile b/netmenu/Makefile.in
similarity index 100%
rename from netmenu/Makefile
rename to netmenu/Makefile.in
diff --git a/plow/Makefile b/plow/Makefile.in
similarity index 100%
rename from plow/Makefile
rename to plow/Makefile.in
diff --git a/resis/Makefile b/resis/Makefile.in
similarity index 100%
rename from resis/Makefile
rename to resis/Makefile.in
diff --git a/scripts/configure b/scripts/configure
index 98a3a0ab..08137250 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -9401,6 +9401,48 @@ ac_config_files="$ac_config_files rules.mak:rules.mak"
 
 ac_config_files="$ac_config_files tiles/Makefile:tiles/Makefile.in"
 
+ac_config_files="$ac_config_files bplane/Makefile:bplane/Makefile.in"
+
+ac_config_files="$ac_config_files calma/Makefile:calma/Makefile.in"
+
+ac_config_files="$ac_config_files cif/Makefile:cif/Makefile.in"
+
+ac_config_files="$ac_config_files cmwind/Makefile:cmwind/Makefile.in"
+
+ac_config_files="$ac_config_files dbwind/Makefile:dbwind/Makefile.in"
+
+ac_config_files="$ac_config_files debug/Makefile:debug/Makefile.in"
+
+ac_config_files="$ac_config_files drc/Makefile:drc/Makefile.in"
+
+ac_config_files="$ac_config_files extflat/Makefile:extflat/Makefile.in"
+
+ac_config_files="$ac_config_files extract/Makefile:extract/Makefile.in"
+
+ac_config_files="$ac_config_files garouter/Makefile:garouter/Makefile.in"
+
+ac_config_files="$ac_config_files gcr/Makefile:gcr/Makefile.in"
+
+ac_config_files="$ac_config_files grouter/Makefile:grouter/Makefile.in"
+
+ac_config_files="$ac_config_files irouter/Makefile:irouter/Makefile.in"
+
+ac_config_files="$ac_config_files mzrouter/Makefile:mzrouter/Makefile.in"
+
+ac_config_files="$ac_config_files netmenu/Makefile:netmenu/Makefile.in"
+
+ac_config_files="$ac_config_files plow/Makefile:plow/Makefile.in"
+
+ac_config_files="$ac_config_files resis/Makefile:resis/Makefile.in"
+
+ac_config_files="$ac_config_files select/Makefile:select/Makefile.in"
+
+ac_config_files="$ac_config_files sim/Makefile:sim/Makefile.in"
+
+ac_config_files="$ac_config_files textio/Makefile:textio/Makefile.in"
+
+ac_config_files="$ac_config_files wiring/Makefile:wiring/Makefile.in"
+
 
 if test "`cd $srcdir && pwd`" = "`pwd`" ; then
   magic_config_header=magic/autoconf/config.h
@@ -10131,6 +10173,27 @@ do
     "scripts/makedbh") CONFIG_FILES="$CONFIG_FILES scripts/makedbh:scripts/makedbh.in" ;;
     "rules.mak") CONFIG_FILES="$CONFIG_FILES rules.mak:rules.mak" ;;
     "tiles/Makefile") CONFIG_FILES="$CONFIG_FILES tiles/Makefile:tiles/Makefile.in" ;;
+    "bplane/Makefile") CONFIG_FILES="$CONFIG_FILES bplane/Makefile:bplane/Makefile.in" ;;
+    "calma/Makefile") CONFIG_FILES="$CONFIG_FILES calma/Makefile:calma/Makefile.in" ;;
+    "cif/Makefile") CONFIG_FILES="$CONFIG_FILES cif/Makefile:cif/Makefile.in" ;;
+    "cmwind/Makefile") CONFIG_FILES="$CONFIG_FILES cmwind/Makefile:cmwind/Makefile.in" ;;
+    "dbwind/Makefile") CONFIG_FILES="$CONFIG_FILES dbwind/Makefile:dbwind/Makefile.in" ;;
+    "debug/Makefile") CONFIG_FILES="$CONFIG_FILES debug/Makefile:debug/Makefile.in" ;;
+    "drc/Makefile") CONFIG_FILES="$CONFIG_FILES drc/Makefile:drc/Makefile.in" ;;
+    "extflat/Makefile") CONFIG_FILES="$CONFIG_FILES extflat/Makefile:extflat/Makefile.in" ;;
+    "extract/Makefile") CONFIG_FILES="$CONFIG_FILES extract/Makefile:extract/Makefile.in" ;;
+    "garouter/Makefile") CONFIG_FILES="$CONFIG_FILES garouter/Makefile:garouter/Makefile.in" ;;
+    "gcr/Makefile") CONFIG_FILES="$CONFIG_FILES gcr/Makefile:gcr/Makefile.in" ;;
+    "grouter/Makefile") CONFIG_FILES="$CONFIG_FILES grouter/Makefile:grouter/Makefile.in" ;;
+    "irouter/Makefile") CONFIG_FILES="$CONFIG_FILES irouter/Makefile:irouter/Makefile.in" ;;
+    "mzrouter/Makefile") CONFIG_FILES="$CONFIG_FILES mzrouter/Makefile:mzrouter/Makefile.in" ;;
+    "netmenu/Makefile") CONFIG_FILES="$CONFIG_FILES netmenu/Makefile:netmenu/Makefile.in" ;;
+    "plow/Makefile") CONFIG_FILES="$CONFIG_FILES plow/Makefile:plow/Makefile.in" ;;
+    "resis/Makefile") CONFIG_FILES="$CONFIG_FILES resis/Makefile:resis/Makefile.in" ;;
+    "select/Makefile") CONFIG_FILES="$CONFIG_FILES select/Makefile:select/Makefile.in" ;;
+    "sim/Makefile") CONFIG_FILES="$CONFIG_FILES sim/Makefile:sim/Makefile.in" ;;
+    "textio/Makefile") CONFIG_FILES="$CONFIG_FILES textio/Makefile:textio/Makefile.in" ;;
+    "wiring/Makefile") CONFIG_FILES="$CONFIG_FILES wiring/Makefile:wiring/Makefile.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/scripts/configure.in b/scripts/configure.in
index bf8c702f..3e6e8b55 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -2006,6 +2006,27 @@ AC_CONFIG_FILES([rules.mak:rules.mak])
 dnl Per-module Makefiles (Makefile.in migration).  Each converted module lists
 dnl its Makefile here; config.status creates the build subdir and the Makefile.
 AC_CONFIG_FILES([tiles/Makefile:tiles/Makefile.in])
+AC_CONFIG_FILES([bplane/Makefile:bplane/Makefile.in])
+AC_CONFIG_FILES([calma/Makefile:calma/Makefile.in])
+AC_CONFIG_FILES([cif/Makefile:cif/Makefile.in])
+AC_CONFIG_FILES([cmwind/Makefile:cmwind/Makefile.in])
+AC_CONFIG_FILES([dbwind/Makefile:dbwind/Makefile.in])
+AC_CONFIG_FILES([debug/Makefile:debug/Makefile.in])
+AC_CONFIG_FILES([drc/Makefile:drc/Makefile.in])
+AC_CONFIG_FILES([extflat/Makefile:extflat/Makefile.in])
+AC_CONFIG_FILES([extract/Makefile:extract/Makefile.in])
+AC_CONFIG_FILES([garouter/Makefile:garouter/Makefile.in])
+AC_CONFIG_FILES([gcr/Makefile:gcr/Makefile.in])
+AC_CONFIG_FILES([grouter/Makefile:grouter/Makefile.in])
+AC_CONFIG_FILES([irouter/Makefile:irouter/Makefile.in])
+AC_CONFIG_FILES([mzrouter/Makefile:mzrouter/Makefile.in])
+AC_CONFIG_FILES([netmenu/Makefile:netmenu/Makefile.in])
+AC_CONFIG_FILES([plow/Makefile:plow/Makefile.in])
+AC_CONFIG_FILES([resis/Makefile:resis/Makefile.in])
+AC_CONFIG_FILES([select/Makefile:select/Makefile.in])
+AC_CONFIG_FILES([sim/Makefile:sim/Makefile.in])
+AC_CONFIG_FILES([textio/Makefile:textio/Makefile.in])
+AC_CONFIG_FILES([wiring/Makefile:wiring/Makefile.in])
 
 dnl Emit an autoconf config header, available to the tree as
 dnl   #include <magic/autoconf/config.h>
diff --git a/select/Makefile b/select/Makefile.in
similarity index 100%
rename from select/Makefile
rename to select/Makefile.in
diff --git a/sim/Makefile b/sim/Makefile.in
similarity index 100%
rename from sim/Makefile
rename to sim/Makefile.in
diff --git a/textio/Makefile b/textio/Makefile.in
similarity index 100%
rename from textio/Makefile
rename to textio/Makefile.in
diff --git a/wiring/Makefile b/wiring/Makefile.in
similarity index 100%
rename from wiring/Makefile
rename to wiring/Makefile.in