diff --git a/.gitignore b/.gitignore index 2810adfc..083f0fba 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,8 @@ reconfigure.sh # "/Makefile" here in the *same commit*, so an in-tree build never lets a # generated Makefile be committed. (Top-level /Makefile is handled above; # readline/ is intentionally NOT converted and keeps its tracked static Makefile.) -# --- converted dirs below (none yet) --- +# --- converted dirs below --- +tiles/Makefile # Compiled objects / libraries *.o diff --git a/scripts/configure b/scripts/configure index 5f93d65c..98a3a0ab 100755 --- a/scripts/configure +++ b/scripts/configure @@ -9399,6 +9399,9 @@ ac_config_files="$ac_config_files scripts/makedbh:scripts/makedbh.in" ac_config_files="$ac_config_files rules.mak:rules.mak" +ac_config_files="$ac_config_files tiles/Makefile:tiles/Makefile.in" + + if test "`cd $srcdir && pwd`" = "`pwd`" ; then magic_config_header=magic/autoconf/config.h else @@ -10127,6 +10130,7 @@ do "defs.mak") CONFIG_FILES="$CONFIG_FILES defs.mak:scripts/defs.mak.in" ;; "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" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/scripts/configure.in b/scripts/configure.in index c928c238..bf8c702f 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -2003,6 +2003,10 @@ dnl places it next to the generated defs.mak so a single ${MAGICDIR} resolves dnl both `include`s in every subdir Makefile out-of-tree). 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]) + dnl Emit an autoconf config header, available to the tree as dnl #include dnl It carries every autoconf define (i.e. at least all the -D options that diff --git a/tiles/Makefile b/tiles/Makefile.in similarity index 100% rename from tiles/Makefile rename to tiles/Makefile.in