diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | MakeTAGS | 5 | ||||
| -rw-r--r-- | Makerules | 3 | ||||
| -rw-r--r-- | catgets/gencat.c | 6 | ||||
| -rw-r--r-- | locale/Makefile | 13 | ||||
| -rw-r--r-- | resolv/res_debug.c | 5 |
6 files changed, 37 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index a7842c4bfe..3b9846e948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Tue Jun 25 09:55:47 1996 David Mosberger-Tang <davidm@AZStarNet.com> + + * catgets/gencat.c (write_out): Use %Zu to print variables of type + size_t. + * resolv/res_debug.c (__p_rr): Print size_t variable as %lu and + cast it to (unsigned long) to make it work both on 32 and 64 + bit architectures. + +Sat Jun 22 13:05:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * locale/Makefile (distribute): Add `programs/' prefix to all + files in that directory. + + * Makerules (distinfo-vars): Assign subdir directly so that `ifdef + subdir' works. + + * MakeTAGS (sources, headers): Make them simply expanded variables + so that all-dist is expanded before it is changed. + Tue Jun 25 02:59:11 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * Make-dist (dist): Don't depend on crypt tar file. Remove that rule. diff --git a/MakeTAGS b/MakeTAGS index e346ac7a1a..f734cbc327 100644 --- a/MakeTAGS +++ b/MakeTAGS @@ -73,8 +73,9 @@ else all-dist = $(distribute) endif -sources += $(filter %.c %.s %.S,$(all-dist)) -headers += $(filter %.h,$(all-dist)) +# sources and headers must be simply expanded variables +sources := $(sources) $(filter %.c %.s %.S,$(all-dist)) +headers := $(headers) $(filter %.h,$(all-dist)) all-dist := $(filter-out %.h %.c %.s %.S,$(all-dist)) sources += $(foreach lib,$(extra-libs),$($(lib)-routines:=.c)) diff --git a/Makerules b/Makerules index 84afdd53a9..cb6b35425a 100644 --- a/Makerules +++ b/Makerules @@ -823,7 +823,8 @@ distinfo: $(common-objpfx)distinfo-$(subdir) define distinfo-vars rm -f $@.new -$(foreach var,subdir subdir-dirs sources elided-routines sysdep_routines \ +echo > $@.new 'subdir := $(subdir)' +$(foreach var,subdir-dirs sources elided-routines sysdep_routines \ headers sysdep_headers distribute dont_distribute generated \ others tests extra-libs $(extra-libs:%=%-routines) \ versioned \ diff --git a/catgets/gencat.c b/catgets/gencat.c index 4b6eb43255..4dca43a5c8 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -803,7 +803,7 @@ write_out (struct catalog *catalog, const char *output_name, /* If the current message set has a symbolic name write this out first. */ if (set_run->symbol != NULL) - fprintf (fp, "%s#define %sSet %#x\t/* %s:%u */\n", + fprintf (fp, "%s#define %sSet %#x\t/* %s:%Zu */\n", first ? "" : "\n", set_run->symbol, set_run->number - 1, set_run->fname, set_run->line); first = 0; @@ -816,12 +816,12 @@ write_out (struct catalog *catalog, const char *output_name, not having a symbolic name. */ if (message_run->symbol != NULL) if (set_run->symbol == NULL) - fprintf (fp, "#define AutomaticSet%d%s %#x\t/* %s:%u */\n", + fprintf (fp, "#define AutomaticSet%d%s %#x\t/* %s:%Zu */\n", set_run->number, message_run->symbol, message_run->number, message_run->fname, message_run->line); else - fprintf (fp, "#define %s%s %#x\t/* %s:%u */\n", + fprintf (fp, "#define %s%s %#x\t/* %s:%Zu */\n", set_run->symbol, message_run->symbol, message_run->number, message_run->fname, message_run->line); diff --git a/locale/Makefile b/locale/Makefile index 8069e7e311..c7d00cfc38 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -22,12 +22,13 @@ subdir := locale headers = locale.h langinfo.h -distribute = localeinfo.h categories.def \ - $(localedef-modules:=.c) $(locale-modules:=.c) \ - $(lib-modules:=.c) config.h simple-hash.h iso-4217.def \ - charmap-kw.gperf charmap-kw.h locfile-token.h \ - locfile-kw.gperf locfile-kw.h linereader.h \ - locales.h locfile.h stringtrans.h weight.h charset.h +distribute = localeinfo.h categories.def iso-4217.def weight.h \ + $(addprefix programs/, \ + $(localedef-modules:=.c) $(locale-modules:=.c) \ + $(lib-modules:=.c) config.h simple-hash.h \ + charmap-kw.gperf charmap-kw.h locfile-token.h \ + locfile-kw.gperf locfile-kw.h linereader.h \ + locales.h locfile.h stringtrans.h charset.h) routines = setlocale findlocale loadlocale localeconv nl_langinfo \ mb_cur_max codeset_name categories = ctype messages monetary numeric time collate diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 4cbed577f8..62cd81cd0f 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -689,8 +689,9 @@ __p_rr(cp, msg, file) putc('\n', file); #endif if (cp - cp1 != dlen) { - fprintf(file, ";; packet size error (found %d, dlen was %d)\n", - cp - cp1, dlen); + fprintf(file, + ";; packet size error (found %lu, dlen was %d)\n", + (unsigned long) (cp - cp1), dlen); cp = NULL; } return (cp); |