From 887eca61fef6aa9712c6c80c2b37ef3e08aa73ca Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Wed, 22 Jul 2026 18:30:10 +0000 Subject: [PATCH] build: generate magic/tcltk/scmos/doc/lisp Makefiles from Makefile.in (rename unit) Fourth batch of the Makefile.in migration: the top-level complex outliers magic tcltk scmos doc lisp Pure renames -- content unchanged, so each still builds via the defs.mak srcdir derivation; the @srcdir@ substitution follows. Their nested children (scmos/cif_template and doc/{man,tutcells,html, latexfiles}) are intentionally NOT converted here: scmos and doc recurse into them with `-f ${MAGICSRC}/.../Makefile`, which keeps working only while those children remain static Makefiles. They convert in a later step together with the parent-recursion updates. * git mv /Makefile -> /Makefile.in (5 modules) * configure.in: AC_CONFIG_FILES for each; regenerated configure. * .gitignore: ignore each generated /Makefile, same commit. Verified out-of-tree: full `make` rc=0 -- tclmagic.so, scmos techs (scmos recurses into the static cif_template via -f, 8 objs), 27/28 docs. Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitignore | 5 +++++ doc/{Makefile => Makefile.in} | 0 lisp/{Makefile => Makefile.in} | 0 magic/{Makefile => Makefile.in} | 0 scmos/{Makefile => Makefile.in} | 0 scripts/configure | 15 +++++++++++++++ scripts/configure.in | 5 +++++ tcltk/{Makefile => Makefile.in} | 0 8 files changed, 25 insertions(+) rename doc/{Makefile => Makefile.in} (100%) rename lisp/{Makefile => Makefile.in} (100%) rename magic/{Makefile => Makefile.in} (100%) rename scmos/{Makefile => Makefile.in} (100%) rename tcltk/{Makefile => Makefile.in} (100%) diff --git a/.gitignore b/.gitignore index 46f5b7be..9b071905 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,11 @@ extcheck/Makefile net2ir/Makefile graphics/Makefile oa/Makefile +magic/Makefile +tcltk/Makefile +scmos/Makefile +doc/Makefile +lisp/Makefile # Compiled objects / libraries *.o diff --git a/doc/Makefile b/doc/Makefile.in similarity index 100% rename from doc/Makefile rename to doc/Makefile.in diff --git a/lisp/Makefile b/lisp/Makefile.in similarity index 100% rename from lisp/Makefile rename to lisp/Makefile.in diff --git a/magic/Makefile b/magic/Makefile.in similarity index 100% rename from magic/Makefile rename to magic/Makefile.in diff --git a/scmos/Makefile b/scmos/Makefile.in similarity index 100% rename from scmos/Makefile rename to scmos/Makefile.in diff --git a/scripts/configure b/scripts/configure index 0404abd0..bb2948f4 100755 --- a/scripts/configure +++ b/scripts/configure @@ -9469,6 +9469,16 @@ ac_config_files="$ac_config_files graphics/Makefile:graphics/Makefile.in" ac_config_files="$ac_config_files oa/Makefile:oa/Makefile.in" +ac_config_files="$ac_config_files magic/Makefile:magic/Makefile.in" + +ac_config_files="$ac_config_files tcltk/Makefile:tcltk/Makefile.in" + +ac_config_files="$ac_config_files scmos/Makefile:scmos/Makefile.in" + +ac_config_files="$ac_config_files doc/Makefile:doc/Makefile.in" + +ac_config_files="$ac_config_files lisp/Makefile:lisp/Makefile.in" + if test "`cd $srcdir && pwd`" = "`pwd`" ; then magic_config_header=magic/autoconf/config.h @@ -10233,6 +10243,11 @@ do "net2ir/Makefile") CONFIG_FILES="$CONFIG_FILES net2ir/Makefile:net2ir/Makefile.in" ;; "graphics/Makefile") CONFIG_FILES="$CONFIG_FILES graphics/Makefile:graphics/Makefile.in" ;; "oa/Makefile") CONFIG_FILES="$CONFIG_FILES oa/Makefile:oa/Makefile.in" ;; + "magic/Makefile") CONFIG_FILES="$CONFIG_FILES magic/Makefile:magic/Makefile.in" ;; + "tcltk/Makefile") CONFIG_FILES="$CONFIG_FILES tcltk/Makefile:tcltk/Makefile.in" ;; + "scmos/Makefile") CONFIG_FILES="$CONFIG_FILES scmos/Makefile:scmos/Makefile.in" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile:doc/Makefile.in" ;; + "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile:lisp/Makefile.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/scripts/configure.in b/scripts/configure.in index eb0a120b..ed129d7a 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -2040,6 +2040,11 @@ AC_CONFIG_FILES([extcheck/Makefile:extcheck/Makefile.in]) AC_CONFIG_FILES([net2ir/Makefile:net2ir/Makefile.in]) AC_CONFIG_FILES([graphics/Makefile:graphics/Makefile.in]) AC_CONFIG_FILES([oa/Makefile:oa/Makefile.in]) +AC_CONFIG_FILES([magic/Makefile:magic/Makefile.in]) +AC_CONFIG_FILES([tcltk/Makefile:tcltk/Makefile.in]) +AC_CONFIG_FILES([scmos/Makefile:scmos/Makefile.in]) +AC_CONFIG_FILES([doc/Makefile:doc/Makefile.in]) +AC_CONFIG_FILES([lisp/Makefile:lisp/Makefile.in]) dnl Emit an autoconf config header, available to the tree as dnl #include diff --git a/tcltk/Makefile b/tcltk/Makefile.in similarity index 100% rename from tcltk/Makefile rename to tcltk/Makefile.in