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

38 files changed, 67 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 48d4451b..92302a38 100644
--- 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 c5ea81fd..55077503 100644
--- 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 3a0313d7..1dc98c36 100644
--- 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 ea737a4a..15c53747 100644
--- 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 57322090..360d9f85 100644
--- 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 c57ed97e..8eb4e839 100644
--- 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 4fcf060e..51c83b51 100644
--- 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 5e02ee72..698816fa 100644
--- 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 1956cea9..e5e623cf 100644
--- 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 27718099..9f02dd40 100644
--- 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 7ab164f8..69eeb481 100644
--- 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 f3b31641..cce3bcde 100644
--- 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 896f7e22..b36edcb3 100644
--- 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 325d9304..d1b00ccc 100644
--- 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 d8f2acd4..dfc2e4a0 100644
--- a/getloadavg.c
+++ b/getloadavg.c
@@ -985,7 +985,7 @@ getloadavg (double loadavg[], int nelem)
 #endif /* ! HAVE_GETLOADAVG */
 
 #ifdef TEST
-#include "make.h"
+#include "makeint.h"
 
 int
 main (int argc, char **argv)
diff --git a/guile.c b/guile.c
index 9c9d958f..5a652d9e 100644
--- 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 e04b1bbe..d1c2faca 100644
--- 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 060a80c5..fce9c897 100644
--- 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 970a2fc2..aa8748f9 100644
--- 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;
 
 #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 26432b75..3e06982d 100644
--- 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 54b20617..d06825e4 100644
--- 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 a4fb2f14..bca38cec 100644
--- 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 cfb0debd..50492ad0 100644
--- a/make_msvc_net2003.vcproj
+++ b/make_msvc_net2003.vcproj
@@ -278,7 +278,7 @@
 				RelativePath=".\job.h">

 			</File>

 			<File

-				RelativePath=".\make.h">

+				RelativePath=".\makeint.h">

 			</File>

 			<File

 				RelativePath=".\rule.h">

diff --git a/make.h b/makeint.h
index 7bde58e0..60ffb4ce 100644
--- 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 cf371bed..e6151512 100644
--- 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 98361c88..0c682ad3 100644
--- 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 b1ddd239..85102648 100644
--- 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 155c516e..713b89a6 100644
--- 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 b02c9d93..13c6273d 100644
--- 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 36eb308a..7627225f 100644
--- 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 43f84e35..c54a8ea6 100644
--- 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 3e8d5d87..beb2b044 100644
--- 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 8576d6a8..0a544ad7 100644
--- 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 20eb4174..32167ed8 100644
--- 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 8cae17fe..6b3ecd4f 100644
--- 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 35664e67..33191f24 100644
--- 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 a2532d09..5e0f52c2 100644
--- 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 1cb14d49..74b48abb 100644
--- 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"
 
 /*