mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-02-09 23:26:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some pre-pretest release cleanup.

Browse source
This commit is contained in:
Paul Smith 2000-01-27 00:00:27 +00:00
parent de2a8fc730
commit 95a09e94f7
5 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -12,7 +12,7 @@ SRCS = ar.c arscan.c commands.c dir.c expand.c file.c function.c \
rule.c signame.c variable.c vpath.c rule.c signame.c variable.c vpath.c
make_SOURCES = $(SRCS) default.c remote-$(REMOTE).c version.c \ make_SOURCES = $(SRCS) default.c remote-$(REMOTE).c version.c \
getopt.c getopt1.c getopt1.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 make.h rule.h variable.h \
debug.h signame.h getopt.h gettext.h debug.h signame.h getopt.h gettext.h

1
configure.in
View file

@ -36,6 +36,7 @@ AC_CHECK_HEADERS(stdlib.h unistd.h limits.h sys/param.h fcntl.h string.h \
AC_PROG_CC_C_O AC_PROG_CC_C_O
AM_PROG_CC_STDC AM_PROG_CC_STDC
AC_C_CONST dnl getopt needs this. AC_C_CONST dnl getopt needs this.
AC_C_INLINE dnl gettext needs this.
AC_HEADER_STAT AC_HEADER_STAT
AC_STRUCT_ST_MTIM_NSEC AC_STRUCT_ST_MTIM_NSEC

23
gettext.c
View file

@ -56,6 +56,15 @@ char *alloca ();
# endif # endif
#endif #endif
#if defined STDC_HEADERS || defined _LIBC
#else
char *getenv ();
# ifdef HAVE_MALLOC_H
# else
void free ();
# endif
#endif
#if defined _LIBC || defined HAVE_ARGZ_H #if defined _LIBC || defined HAVE_ARGZ_H
# include <argz.h> # include <argz.h>
#endif #endif
@ -64,6 +73,10 @@ char *alloca ();
#if defined STDC_HEADERS || defined _LIBC #if defined STDC_HEADERS || defined _LIBC
# include <stdlib.h> # include <stdlib.h>
#else
# ifdef HAVE_MEMORY_H
# include <memory.h>
# endif
#endif #endif
/* Interrupt of l10nflist.c */ /* Interrupt of l10nflist.c */
@ -248,7 +261,7 @@ pop (x)
return x; return x;
} }
struct loaded_l10nfile * static struct loaded_l10nfile *
_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
territory, codeset, normalized_codeset, modifier, special, territory, codeset, normalized_codeset, modifier, special,
sponsor, revision, filename, do_allocate) sponsor, revision, filename, do_allocate)
@ -2207,10 +2220,10 @@ void free ();
#endif #endif
/* Contains the default location of the message catalogs. */ /* Contains the default location of the message catalogs. */
static const char _nl_default_dirname[]; /* static const char _nl_default_dirname[]; */
/* List with bindings of specific domains. */ /* List with bindings of specific domains. */
static struct binding *_nl_domain_bindings; /* static struct binding *_nl_domain_bindings; */
/* Names for the libintl functions are a problem. They must not clash /* Names for the libintl functions are a problem. They must not clash
with existing names and they should follow ANSI C. But this source with existing names and they should follow ANSI C. But this source
@ -2473,10 +2486,10 @@ GETTEXT (msgid)
#endif #endif
/* Name of the default text domain. */ /* Name of the default text domain. */
static const char _nl_default_default_domain[]; /* static const char _nl_default_default_domain[]; */
/* Default text domain in which entries for gettext(3) are to be found. */ /* Default text domain in which entries for gettext(3) are to be found. */
static const char *_nl_current_default_domain; /* static const char *_nl_current_default_domain; */
/* Names for the libintl functions are a problem. They must not clash /* Names for the libintl functions are a problem. They must not clash
with existing names and they should follow ANSI C. But this source with existing names and they should follow ANSI C. But this source

10
i18n/Makefile.am
View file

@ -32,10 +32,10 @@ if USE_NLS
files='$(MOFILES)'; \ files='$(MOFILES)'; \
for file in $$files; do \ for file in $$files; do \
base=`basename $$file`; \ base=`basename $$file`; \
langdir=$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \ langdir=$(DESTDIR)$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \
$(mkinstalldirs) $$langdir; \ $(mkinstalldirs) $$langdir; \
echo " $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$$langdir/$(PACKAGE).mo"; \ echo " $(INSTALL_DATA) $(srcdir)/$$file $$langdir/$(PACKAGE).mo"; \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$$langdir/$(PACKAGE).mo; \ $(INSTALL_DATA) $(srcdir)/$$file $$langdir/$(PACKAGE).mo; \
done done
endif endif
@ -44,8 +44,8 @@ if USE_NLS
files='$(MOFILES)'; \ files='$(MOFILES)'; \
for file in $$files; do \ for file in $$files; do \
base=`basename $$file`; \ base=`basename $$file`; \
langdir=$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \ langdir=$(DESTDIR)$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \
rm -f $(DESTDIR)$$langdir/$(PACKAGE).mo; \ rm -f $$langdir/$(PACKAGE).mo; \
done done
endif endif

16
tests/scripts/features/double_colon
View file

@ -96,17 +96,13 @@ $answer = "f2.h\nfoo SECOND\n";
&compare_output($answer, &get_logfile(1)); &compare_output($answer, &get_logfile(1));
# TEST 8: I don't grok why this is different than the above, but it is... # TEST 8: I don't grok why this is different than the above, but it is...
#
&run_make_with_options($makefile, "-j10 biz", &get_logfile, 0); # Hmm... further testing indicates this might be timing-dependent?
$answer = "aaa\ntwo\nbbb\n"; #
&compare_output($answer, &get_logfile(1)); #&run_make_with_options($makefile, "-j10 biz", &get_logfile, 0);
#$answer = "aaa\ntwo\nbbb\n";
#&compare_output($answer, &get_logfile(1));
unlink('foo','f1.h','f2.h'); unlink('foo','f1.h','f2.h');
1; 1;