Rename the make.h file to makeint.h for internal use only.

diff --git a/ChangeLog b/ChangeLog
index 48d4451b0377c90358b1193fa241f59b60c16ff1..92302a386b2d2b1dfa9bc38e15495ffb545bcd39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-20  Paul Smith  <psmith@gnu.org>
+
+       * make.h: Rename to makeint.h.
+       * Many: Use the new name makeint.h.
+
 2013-01-19  Paul Smith  <psmith@gnu.org>
 
        * doc/make.texi (load Directive): Update to discuss location of

diff --git a/Makefile.am b/Makefile.am
index c5ea81fd42e3d8b3794d0a52fa93cc2a63542292..5507750369b41880558f158081ad4032a6a0353a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ endif
 
 EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cstms.c
 
-noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \
+noinst_HEADERS = commands.h dep.h filedef.h job.h makeint.h rule.h variable.h \
                debug.h getopt.h gettext.h hash.h
 
 make_LDADD =   @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@ \

diff --git a/Makefile.ami b/Makefile.ami
index 3a0313d70e55b5ca9e03fe3d29e7f978ab568c26..1dc98c360f2aa3125489af0b2b2a38a9dc593c19 100644 (file)
--- a/Makefile.ami
+++ b/Makefile.ami
@@ -134,7 +134,7 @@ srcs = $(srcdir)commands.c $(srcdir)job.c $(srcdir)dir.c             \
        $(srcdir)ar.c $(srcdir)arscan.c $(srcdir)strcache.c           \
        $(srcdir)signame.c $(srcdir)signame.h $(GETOPT_SRC)           \
        $(srcdir)commands.h $(srcdir)dep.h $(srcdir)filedep.h         \
-       $(srcdir)job.h $(srcdir)make.h $(srcdir)rule.h                \
+       $(srcdir)job.h $(srcdir)makeint.h $(srcdir)rule.h             \
        $(srcdir)variable.h $(ALLOCA_SRC) $(srcdir)config.h.in
 
 
@@ -273,36 +273,36 @@ $(objs): config.h
 # Automatically generated dependencies will be put at the end of the file.
 
 # Automatically generated dependencies.
-commands.o: commands.c make.h dep.h filedef.h variable.h job.h \
+commands.o: commands.c makeint.h dep.h filedef.h variable.h job.h \
  commands.h
-job.o: job.c make.h job.h filedef.h commands.h variable.h
-dir.o: dir.c make.h
-file.o: file.c make.h dep.h filedef.h job.h commands.h variable.h
-misc.o: misc.c make.h dep.h
-main.o: main.c make.h dep.h filedef.h variable.h job.h commands.h \
+job.o: job.c makeint.h job.h filedef.h commands.h variable.h
+dir.o: dir.c makeint.h
+file.o: file.c makeint.h dep.h filedef.h job.h commands.h variable.h
+misc.o: misc.c makeint.h dep.h
+main.o: main.c makeint.h dep.h filedef.h variable.h job.h commands.h \
  getopt.h
-guile.o: guile.c make.h dep.h debug.h variable.h gmk-default.h
-read.o: read.c make.h dep.h filedef.h job.h commands.h variable.h \
+guile.o: guile.c makeint.h dep.h debug.h variable.h gmk-default.h
+read.o: read.c makeint.h dep.h filedef.h job.h commands.h variable.h \
  glob/glob.h
-remake.o: remake.c make.h filedef.h job.h commands.h dep.h
-rule.o: rule.c make.h dep.h filedef.h job.h commands.h variable.h \
+remake.o: remake.c makeint.h filedef.h job.h commands.h dep.h
+rule.o: rule.c makeint.h dep.h filedef.h job.h commands.h variable.h \
  rule.h
-implicit.o: implicit.c make.h rule.h dep.h filedef.h
-default.o: default.c make.h rule.h dep.h filedef.h job.h commands.h \
+implicit.o: implicit.c makeint.h rule.h dep.h filedef.h
+default.o: default.c makeint.h rule.h dep.h filedef.h job.h commands.h \
  variable.h
-variable.o: variable.c make.h dep.h filedef.h job.h commands.h \
+variable.o: variable.c makeint.h dep.h filedef.h job.h commands.h \
  variable.h
-expand.o: expand.c make.h filedef.h job.h commands.h variable.h
-function.o: function.c make.h filedef.h variable.h dep.h job.h \
+expand.o: expand.c makeint.h filedef.h job.h commands.h variable.h
+function.o: function.c makeint.h filedef.h variable.h dep.h job.h \
  commands.h amiga.h
-vpath.o: vpath.c make.h filedef.h variable.h
-strcache.o: strcache.c make.h hash.h
+vpath.o: vpath.c makeint.h filedef.h variable.h
+strcache.o: strcache.c makeint.h hash.h
 version.o: version.c
-ar.o: ar.c make.h filedef.h dep.h
-arscan.o: arscan.c make.h
+ar.o: ar.c makeint.h filedef.h dep.h
+arscan.o: arscan.c makeint.h
 signame.o: signame.c signame.h
-remote-stub.o: remote-stub.c make.h filedef.h job.h commands.h
+remote-stub.o: remote-stub.c makeint.h filedef.h job.h commands.h
 getopt.o: getopt.c
 getopt1.o : getopt1.c getopt.h
 getloadavg.o: getloadavg.c
-amiga.o: amiga.c make.h variable.h amiga.h
+amiga.o: amiga.c makeint.h variable.h amiga.h

diff --git a/SMakefile.template b/SMakefile.template
index ea737a4a0f4336565d5ed4cbbe6a32121437f30a..15c53747e6247adf62d7a0e1ad95bec2ea0b6b88 100644 (file)
--- a/SMakefile.template
+++ b/SMakefile.template
@@ -140,7 +140,7 @@ srcs = $(srcdir)commands.c $(srcdir)job.c $(srcdir)dir.c             \
        $(srcdir)ar.c $(srcdir)arscan.c $(srcdir)strcache.c           \
        $(srcdir)signame.c $(srcdir)signame.h $(GETOPT_SRC)           \
        $(srcdir)commands.h $(srcdir)dep.h $(srcdir)file.h            \
-       $(srcdir)job.h $(srcdir)make.h $(srcdir)rule.h                \
+       $(srcdir)job.h $(srcdir)makeint.h $(srcdir)rule.h             \
        $(srcdir)variable.h $(ALLOCA_SRC) $(srcdir)config.h.in
 
 

diff --git a/amiga.c b/amiga.c
index 573220908334d70f242ff113511566b330377e1a..360d9f8591e2923ad1e840a01f555e7569e48506 100644 (file)
--- a/amiga.c
+++ b/amiga.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "variable.h"
 #include "amiga.h"
 #include <assert.h>

diff --git a/ar.c b/ar.c
index c57ed97ecf2d788a8519874a354f394c805dd599..8eb4e839262b3bfe53d6770f30bc955195a6a65f 100644 (file)
--- a/ar.c
+++ b/ar.c
@@ -15,7 +15,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #ifndef        NO_ARCHIVES
 

diff --git a/arscan.c b/arscan.c
index 4fcf060ee473c0c6277489664784d93234caebf2..51c83b51b0417eab87019985bb3238f91767b580 100644 (file)
--- a/arscan.c
+++ b/arscan.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

diff --git a/commands.c b/commands.c
index 5e02ee72809116ccd681460406b6c331a92f7fe2..698816fab500c7b8ea10dac5afc4fdb951186127 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "dep.h"
 #include "filedef.h"
 #include "variable.h"

diff --git a/config.h-vms.template b/config.h-vms.template
index 1956cea97968d1860c504614a422030d8222b169..e5e623cf95b74aca149091a803f00bcc6ef135d7 100644 (file)
--- a/config.h-vms.template
+++ b/config.h-vms.template
@@ -424,7 +424,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Define if using alloca.c.  */
 /* #undef C_ALLOCA */
-/* maybe this should be placed into make.h */
+/* maybe this should be placed into makeint.h */
 #if    defined(__VAX) && defined(__DECC)
 #define alloca(n)      __ALLOCA(n)
 #endif

diff --git a/default.c b/default.c
index 27718099b1d1f1b029e60a69fdb1ecaf1ff209e1..9f02dd40a5757e9287680e262bb3c459e6244b9c 100644 (file)
--- a/default.c
+++ b/default.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "filedef.h"
 #include "variable.h"
 #include "rule.h"

diff --git a/dir.c b/dir.c
index 7ab164f8c9964fc0a2211f6a0ff3907433a585e9..69eeb48179e32030eabd5ae59e0d73a32b8367e9 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "hash.h"
 
 #ifdef HAVE_DIRENT_H

diff --git a/expand.c b/expand.c
index f3b316412f90e215333f8c2f73e0866e2157fb29..cce3bcde668888716d1ae0e9350b537845ba6f30 100644 (file)
--- a/expand.c
+++ b/expand.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <assert.h>
 

diff --git a/file.c b/file.c
index 896f7e223059902f82dae19d9fce42bfa5415cfa..b36edcb3a2689486b41928a58facdf38aa6c6166 100644 (file)
--- a/file.c
+++ b/file.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <assert.h>
 

diff --git a/function.c b/function.c
index 325d9304387a64c38aeb84ca547e9f46a2cc94aa..d1b00ccca99daf4f33c77858627952ff7f061813 100644 (file)
--- a/function.c
+++ b/function.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "filedef.h"
 #include "variable.h"
 #include "dep.h"
@@ -736,7 +736,7 @@ check_numeric (const char *s, const char *msg)
   strip_whitespace (&s, &end);
 
   for (; s <= end; ++s)
-    if (!ISDIGIT (*s))  /* ISDIGIT only evals its arg once: see make.h.  */
+    if (!ISDIGIT (*s))  /* ISDIGIT only evals its arg once: see makeint.h.  */
       break;
 
   if (s <= end || end - beg < 0)

diff --git a/getloadavg.c b/getloadavg.c
index d8f2acd45c22f6dce29c95949f9c78866f6fae79..dfc2e4a0459afe96dabddcf81e1568975c54ed3e 100644 (file)
--- a/getloadavg.c
+++ b/getloadavg.c
@@ -985,7 +985,7 @@ getloadavg (double loadavg[], int nelem)
 #endif /* ! HAVE_GETLOADAVG */
 \f
 #ifdef TEST
-#include "make.h"
+#include "makeint.h"
 
 int
 main (int argc, char **argv)

diff --git a/guile.c b/guile.c
index 9c9d958f0464f626155d9f80295e412e49dbcecf..5a652d9e2f0f01a4ff39879802ef9a3e2f375474 100644 (file)
--- a/guile.c
+++ b/guile.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "debug.h"
 #include "dep.h"
 #include "variable.h"

diff --git a/hash.c b/hash.c
index e04b1bbe22d72df215bf7f75436f818d244c1d17..d1c2facac8ff268d1f011c1fd13ac0fd4a2315e7 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "hash.h"
 
 #define        CALLOC(t, n) ((t *) calloc (sizeof (t), (n)))

diff --git a/implicit.c b/implicit.c
index 060a80c525f9813561279e980963b3532608c458..fce9c89794fa27b4e2ba59ea4b4aaccf15d69451 100644 (file)
--- a/implicit.c
+++ b/implicit.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "filedef.h"
 #include "rule.h"
 #include "dep.h"

diff --git a/job.c b/job.c
index 970a2fc2f43c61a0da2495dbad0d1500f2ea1fde..aa8748f99c71ec155b768641fbe448a8f5dce104 100644 (file)
--- a/job.c
+++ b/job.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <assert.h>
 
@@ -245,7 +245,7 @@ unsigned int jobserver_tokens = 0;
 \f
 #ifdef WINDOWS32
 /*
- * The macro which references this function is defined in make.h.
+ * The macro which references this function is defined in makeint.h.
  */
 int
 w32_kill(pid_t pid, int sig)

diff --git a/load.c b/load.c
index 26432b757637f2ca6e0ac5d7c25fda78fc9a7ca3..3e06982df52100e948f6a54d18ac4e354d8338b2 100644 (file)
--- a/load.c
+++ b/load.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #if MAKE_LOAD
 

diff --git a/main.c b/main.c
index 54b20617876be3ecfb08f8d0ebc6e98b5f8f7901..d06825e476a83aa82340b00ad49250ba095db0d2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "dep.h"
 #include "filedef.h"
 #include "variable.h"

diff --git a/maintMakefile b/maintMakefile
index a4fb2f14d4a1b005f71c17ce882aee45cb4d2340..bca38cec254e4ff8586ee8595aed684a84b41737 100644 (file)
--- a/maintMakefile
+++ b/maintMakefile
@@ -203,11 +203,11 @@ changelog-check:
        fi
 
 # Verify that all source files using _() are listed in po/POTFILES.in.
-# Ignore make.h; it defines _().
+# Ignore makeint.h; it defines _().
 po-check:
        if test -f po/POTFILES.in; then \
          grep '^[^#]' po/POTFILES.in | sort > $@-1; \
-         $(PERL) -wn -e 'if (/\b_\(/) { $$ARGV eq "make.h" || print "$$ARGV\n" and close ARGV }' *.c *.h | sort > $@-2; \
+         $(PERL) -wn -e 'if (/\b_\(/) { $$ARGV eq "makeint.h" || print "$$ARGV\n" and close ARGV }' *.c *.h | sort > $@-2; \
          diff -u $@-1 $@-2 || exit 1; \
          rm -f $@-1 $@-2; \
        fi

diff --git a/make_msvc_net2003.vcproj b/make_msvc_net2003.vcproj
index cfb0debdd8f3591168628431e5f983def5389d3e..50492ad085b919259147a4404553a14a2feb7583 100644 (file)
--- a/make_msvc_net2003.vcproj
+++ b/make_msvc_net2003.vcproj
@@ -278,7 +278,7 @@
                                RelativePath=".\job.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\make.h">\r
+                               RelativePath=".\makeint.h">\r
                        </File>\r
                        <File\r
                                RelativePath=".\rule.h">\r

diff --git a/make.h b/makeint.h
similarity index 99%
rename from make.h
rename to makeint.h
index 7bde58e0cd93b8282b344f534ca1293640b19c1e..60ffb4ce48e0faa582e379147935378841d0e4e1 100644 (file)
--- a/make.h
+++ b/makeint.h
@@ -16,7 +16,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* We use <config.h> instead of "config.h" so that a compilation
    using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because make.h was found in $srcdir).  */
+   (which it would do because makeint.h was found in $srcdir).  */
 #include <config.h>
 #undef  HAVE_CONFIG_H
 #define HAVE_CONFIG_H 1

diff --git a/misc.c b/misc.c
index cf371bed9330684fc398a7effc6955601d0cd5a3..e6151512c6b760d9ef5b8aa7e4026d4a75dd7d89 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "dep.h"
 #include "debug.h"
 

diff --git a/read.c b/read.c
index 98361c880d29e41671bf916fffa1d66aa5eb96f7..0c682ad354a85d77a400af16f55db517c1fb9075 100644 (file)
--- a/read.c
+++ b/read.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <assert.h>
 

diff --git a/remake.c b/remake.c
index b1ddd239bb3aaf3978dad1a7a923e4107c9edfcd..85102648cdda35d7f4242de92eb757bd711199ff 100644 (file)
--- a/remake.c
+++ b/remake.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "filedef.h"
 #include "job.h"
 #include "commands.h"

diff --git a/remote-cstms.c b/remote-cstms.c
index 155c516eb54b2dc07a96e2ba4e28eb165d79a2a5..713b89a6b1fb3d05457042d2dd1949c1e187e832 100644 (file)
--- a/remote-cstms.c
+++ b/remote-cstms.c
@@ -18,7 +18,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "job.h"
 #include "filedef.h"
 #include "commands.h"

diff --git a/remote-stub.c b/remote-stub.c
index b02c9d9365874ec73ec2c6774697d9ceda52fe2b..13c6273d29e60af79dafc5e57f98e1de894bf035 100644 (file)
--- a/remote-stub.c
+++ b/remote-stub.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "filedef.h"
 #include "job.h"
 #include "commands.h"

diff --git a/rule.c b/rule.c
index 36eb308a28103577830364930337cf5e1adf958c..7627225f2fcd2e7188fe0f9274ce1cb337dfa226 100644 (file)
--- a/rule.c
+++ b/rule.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <assert.h>
 

diff --git a/signame.c b/signame.c
index 43f84e3576232f8b10b9243c65dc0d0bd0ca3794..c54a8ea608b2849f4b2e7398b4b6861dc3c8aa77 100644 (file)
--- a/signame.c
+++ b/signame.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 /* If the system provides strsignal, we don't need it. */
 

diff --git a/strcache.c b/strcache.c
index 3e8d5d870be47e6204e68128a1d9be622a627290..beb2b044306e007b2c2995d9594210561efa591c 100644 (file)
--- a/strcache.c
+++ b/strcache.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <stddef.h>
 #include <assert.h>

diff --git a/variable.c b/variable.c
index 8576d6a8c45fd601c81dc2be4a19bf95dff93f6b..0a544ad7302f1acc6fbf57e782c68075f81393c7 100644 (file)
--- a/variable.c
+++ b/variable.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <assert.h>
 

diff --git a/version.c b/version.c
index 20eb417451f51513d169de5321d56931b4d7610e..32167ed8d618dd538a9a5c33f2497305905b6637 100644 (file)
--- a/version.c
+++ b/version.c
@@ -16,7 +16,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* We use <config.h> instead of "config.h" so that a compilation
    using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because make.h was found in $srcdir).  */
+   (which it would do because makeint.h was found in $srcdir).  */
 #include <config.h>
 
 #ifndef MAKE_HOST

diff --git a/vmsfunctions.c b/vmsfunctions.c
index 8cae17fed2d3803f2116c1797a0cd3f3f914ecf0..6b3ecd4fa315350c25b36cd55b952aab569ed8c5 100644 (file)
--- a/vmsfunctions.c
+++ b/vmsfunctions.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "debug.h"
 #include "job.h"
 

diff --git a/vpath.c b/vpath.c
index 35664e6747879f588136d4405fa171da85f29d52..33191f2465974d639a843be3dc325bd73a25b155 100644 (file)
--- a/vpath.c
+++ b/vpath.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include "filedef.h"
 #include "variable.h"
 #ifdef WINDOWS32
@@ -146,7 +146,7 @@ build_vpath_lists ()
    If DIRPATH is nil, remove all previous listings with the same
    pattern.  If PATTERN is nil, remove all VPATH listings.  Existing
    and readable directories that are not "." given in the DIRPATH
-   separated by the path element separator (defined in make.h) are
+   separated by the path element separator (defined in makeint.h) are
    loaded into the directory hash table if they are not there already
    and put in the VPATH searchpath for the given pattern with trailing
    slashes stripped off if present (and if the directory is not the

diff --git a/w32/pathstuff.c b/w32/pathstuff.c
index a2532d092ae94c4e6fa947d5c7a08d0cc4bc7deb..5e0f52c2529066cc30f8247e01ddd0e0dfa91610 100644 (file)
--- a/w32/pathstuff.c
+++ b/w32/pathstuff.c
@@ -14,7 +14,7 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 #include <string.h>
 #include <stdlib.h>
 #include "pathstuff.h"

diff --git a/w32/subproc/w32err.c b/w32/subproc/w32err.c
index 1cb14d4903103546742776c7b9f11e0923e29c0c..74b48abb724be76a20909eca335f86b6829a5a45 100644 (file)
--- a/w32/subproc/w32err.c
+++ b/w32/subproc/w32err.c
@@ -16,7 +16,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdlib.h>
 #include <windows.h>
-#include "make.h"
+#include "makeint.h"
 #include "w32err.h"
 
 /*