diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.ami | 44 | ||||
| -rw-r--r-- | SMakefile.template | 2 | ||||
| -rw-r--r-- | amiga.c | 2 | ||||
| -rw-r--r-- | ar.c | 2 | ||||
| -rw-r--r-- | arscan.c | 2 | ||||
| -rw-r--r-- | commands.c | 2 | ||||
| -rw-r--r-- | config.h-vms.template | 2 | ||||
| -rw-r--r-- | default.c | 2 | ||||
| -rw-r--r-- | dir.c | 2 | ||||
| -rw-r--r-- | expand.c | 2 | ||||
| -rw-r--r-- | file.c | 2 | ||||
| -rw-r--r-- | function.c | 4 | ||||
| -rw-r--r-- | getloadavg.c | 2 | ||||
| -rw-r--r-- | guile.c | 2 | ||||
| -rw-r--r-- | hash.c | 2 | ||||
| -rw-r--r-- | implicit.c | 2 | ||||
| -rw-r--r-- | job.c | 4 | ||||
| -rw-r--r-- | load.c | 2 | ||||
| -rw-r--r-- | main.c | 2 | ||||
| -rw-r--r-- | maintMakefile | 4 | ||||
| -rw-r--r-- | make_msvc_net2003.vcproj | 2 | ||||
| -rw-r--r-- | makeint.h (renamed from make.h) | 2 | ||||
| -rw-r--r-- | misc.c | 2 | ||||
| -rw-r--r-- | read.c | 2 | ||||
| -rw-r--r-- | remake.c | 2 | ||||
| -rw-r--r-- | remote-cstms.c | 2 | ||||
| -rw-r--r-- | remote-stub.c | 2 | ||||
| -rw-r--r-- | rule.c | 2 | ||||
| -rw-r--r-- | signame.c | 2 | ||||
| -rw-r--r-- | strcache.c | 2 | ||||
| -rw-r--r-- | variable.c | 2 | ||||
| -rw-r--r-- | version.c | 2 | ||||
| -rw-r--r-- | vmsfunctions.c | 2 | ||||
| -rw-r--r-- | vpath.c | 4 | ||||
| -rw-r--r-- | w32/pathstuff.c | 2 | ||||
| -rw-r--r-- | w32/subproc/w32err.c | 2 |
38 files changed, 67 insertions, 62 deletions
@@ -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 c5ea81f..5507750 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 3a0313d..1dc98c3 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 ea737a4..15c5374 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 @@ -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> @@ -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 @@ -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> @@ -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 1956cea..e5e623c 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 @@ -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" @@ -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 @@ -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> @@ -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> @@ -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 d8f2acd..dfc2e4a 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) @@ -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" @@ -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))) @@ -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" @@ -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) @@ -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 @@ -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 a4fb2f1..bca38ce 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 cfb0deb..50492ad 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">
@@ -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 @@ -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" @@ -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> @@ -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 155c516..713b89a 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 b02c9d9..13c6273 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" @@ -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> @@ -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. */ @@ -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> @@ -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> @@ -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 8cae17f..6b3ecd4 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" @@ -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 a2532d0..5e0f52c 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 1cb14d4..74b48ab 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" /* |