diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | TODO.private | 115 | ||||
| -rw-r--r-- | glob/ChangeLog | 13 | ||||
| -rw-r--r-- | glob/fnmatch.c | 48 | ||||
| -rw-r--r-- | glob/glob.h | 28 | ||||
| -rw-r--r-- | make.texinfo | 13 |
7 files changed, 160 insertions, 64 deletions
@@ -1,3 +1,8 @@ +1999-09-13 Paul D. Smith <psmith@gnu.org> + + * Makefile.am (loadavg): Use CPPFLAGS, etc. to make sure we get + all the right #defines to compile. + 1999-09-10 Paul Eggert <eggert@twinsun.com> * acinclude.m4 (AC_SYS_LARGEFILE_FLAGS): If on HP-UX 10.20 or diff --git a/Makefile.am b/Makefile.am index d09ae48..bcddcb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,7 +80,7 @@ check-local: check-loadavg check-regression # loadavg: loadavg.c config.h @rm -f loadavg - $(LINK) -I. -I$(srcdir) -DHAVE_CONFIG_H -DTEST $(make_LDFLAGS) loadavg.c $(LIBS) + $(LINK) $(DEFS) $(CPPFLAGS) -DTEST $(make_LDFLAGS) loadavg.c $(LIBS) # We copy getloadavg.c into a different file rather than compiling it # directly because some compilers clobber getloadavg.o in the process. diff --git a/TODO.private b/TODO.private index 21f79e2..ea2c99e 100644 --- a/TODO.private +++ b/TODO.private @@ -14,38 +14,107 @@ However, if you see something here you really, really want, speak up. All other things being equal, I will tend to implement things that seem to maximize user satisfaction. -Also, this list doesn't include things which I'm pretty sure would -require serious, fundamental change to GNU make; those things belong on -the mythical "Make 4.0" list. I admit, that line can be somewhat fuzzy :) +If you want to implement some of them yourself, barring the ones I've +marked below, have at it! Please contact me first to let me know you're +working on it, and give me some info about the design--and, critically, +information about any user-visible syntax change, etc. - * Per-target variable definitions (a la SunOS make's ":=" feature, but - note the syntax here will definitely be different!) +The Top Item +------------ - * Multi-token pattern rule matching (allow %1/%2.c : %1/obj/%2.o, etc.) +If you know perl (or want to learn DejaGNU or similar), the number one +priority on my list of things I don't have time to do right now is +fixing up the GNU make test suite. Most importantly it needs to be made +"parallelizable", so more than one regression can run at the same time +(essentially, make the "work" directory local). Also, the CWD during +the test should be in the work directory; right now sometimes tests leak +files into the main directory which causes subsequent tests to fail +(some tests may need to be tweaked). Beyond that, any cleanup done to +make writing, reading, or handling tests simpler would be great! Please +feel free to make whatever changes you like to the current tests, given +some high-level goals, and that you'll port the current tests to +whatever you do :). - * More robust clock skew detection algorithm. +If someone does this work I'll be able to start including the test suite +with make itself, which would be very cool. - * Provide MAKETARGETS and MAKEVARIABLES variables, containing the - names of the targets and variables defined in the makefile. - * If the user asks for parallelization, rebuild any "include"'d files - in parallel as well (helps esp. when there are many .d files to be - built). +The Rest of the List +-------------------- + + 1) Allow variables/functions to expand to other make rules which are + then interpreted, with newlines handled correctly. This is a + biggee, and is on my plate. I already have partially-working code. + + 2) Option to check more than timestamps to determine if targets have + changed. This is also a very big one. It's _close_ to my plate :), + and I have very definite ideas about how I want it done. Please + pick something else unless you must have this feature. If you try + it, please work _extremely_ closely with me on it. + + 2a) Possibly a special case of this is the .KEEP_STATE feature of Sun's + make. Some great folks at W U. in Canada did an implementation of + this for a class project. Their approach is reasonable and + workable, but doesn't really fit into my ideas for #2. Maybe + that's OK. I have paperwork for their work so if you want to do + this one talk to me to get what they've already done. + + 3) Currently you can use "%.foo %.bar : %.baz" to mean that one + invocation of the rule builds both targets. GNU make needs a way to + do that for explicit rules, too. I heard a rumor that some versions + of make all you to say "a.foo + a.bar : a.baz" to do this (i.e., a + "+" means one invocation builds both). Don't know if this is the + best syntax or not... what if you say "a.foo + a.bar a.bam : a.baz"; + what does that mean? + + 4) Multi-token pattern rule matching (allow %1/%2.c : %1/obj/%2.o, + etc., or something like that). I have an implementation of this + already, it just needs some refinement... maybe. Additionally I + think it only works for static pattern rules; it might need to be + fixed up to work with normal pattern rules, too. - * Allow variables/functions to expand to other make rules which are - then interpreted, with newlines handled correctly. + 5) More robust clock skew detection algorithm: less false hits. I have + some notes on this from various discussions. - * More intelligent submake handling when doing parallel makes: - currently each submake gets a "-j 1" option. It would be good if - make was smart enough to give some/all its slots to the submake - (esp. if there is no other rule that can be run by the parent in - parallel, a common situation). Doing this perfectly might be too - hard, but something less than perfect is certainly possible. + 6) Provide MAKETARGETS and MAKEVARIABLES variables, containing the + names of the targets and variables defined in the makefile. - * Option to check more than timestamps to determine if targets have - changed (MD5 checksumming?) + Actually, I now think a $(targets ...) function, at least, would be + better than a MAKETARGETS variable. The argument would be types of + targets to list: "phony" is the most useful one. I suppose + "default" might also be useful. Maybe some others; check the + bitfields to see what might be handy. This one is pretty easy. - * Some sort of operating-system independent way of handling paths + 7) Some sort of operating-system independent way of handling paths would be outstanding, so makefiles can be written for UNIX, VMS, DOS, MS-Windows, Amiga, etc. with a minimum of specialization. + + Or, perhaps related/instead of, some sort of meta-quoting syntax so + make can deal with filenames containing spaces, colons, etc. I + dunno, maybe something like $[...]? This may well not be worth + doing until #1 is done. + + 9) Right now the .PRECIOUS, .INTERMEDIATE, and .SECONDARY + psuedo-targets have different capabilities. For example, .PRECIOUS + can take a "%", the others can't. Etc. These should all work the + same, insofar as that makes sense. + +10) A syntax that specifies a build order _without_ implying a + dependency relationship. That is, a way to say "A must be built + before B" that doesn't force B to be built when A changes. This is + very important for parallel builds: sometimes you need some stuff + done first but you don't want to rebuild everything because of it. + +11) Improved debugging/logging/etc. capabilities. This area is in + desparate need of work; the current -d, -s, etc. options are simply + insufficient. We need different levels of output: some that are + much less verbose. E.g., maybe just print one line about why make + decides to rebuild each target. Also, we could use something like + the -E option for preprocessors; this would print out makefiles + after resolving all includes, immediate variable reverences, etc. + Also, a way to turn on and off obeying the "@" token for scripts + that's independent of -n (so we could have them in effect for -n, + and have them not in effect without -n). + + Maybe other things. Contact me about the user interface. diff --git a/glob/ChangeLog b/glob/ChangeLog index 0cb2fcb..98c506d 100644 --- a/glob/ChangeLog +++ b/glob/ChangeLog @@ -1,3 +1,16 @@ +1999-09-12 Paul D. Smith <psmith@gnu.org> + + * fnmatch.c: Last GLIBC version wouldn't compile outside of GLIBC + (undefined reference to internal_function). Update to the latest + version + +1999-09-11 Paul Eggert <eggert@twinsun.com> + + * glob.h (glob): If #defining to glob64, do this before + declaring it, so that all declarations and uses match, and + do not declare glob64, to avoid a declaration clash. + (globfree): Likewise with globfree64. + 1999-09-08 Eli Zaretskii <eliz@is.elta.co.il> * glob.c (prefix_array) [__MSDOS__,WINDOWS32]: Keep the trailing diff --git a/glob/fnmatch.c b/glob/fnmatch.c index b1e1b94..1f4ead5 100644 --- a/glob/fnmatch.c +++ b/glob/fnmatch.c @@ -64,27 +64,27 @@ # define ISASCII(c) isascii(c) # endif -#ifdef isblank -# define ISBLANK(c) (ISASCII (c) && isblank (c)) -#else -# define ISBLANK(c) ((c) == ' ' || (c) == '\t') -#endif -#ifdef isgraph -# define ISGRAPH(c) (ISASCII (c) && isgraph (c)) -#else -# define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c)) -#endif +# ifdef isblank +# define ISBLANK(c) (ISASCII (c) && isblank (c)) +# else +# define ISBLANK(c) ((c) == ' ' || (c) == '\t') +# endif +# ifdef isgraph +# define ISGRAPH(c) (ISASCII (c) && isgraph (c)) +# else +# define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c)) +# endif -#define ISPRINT(c) (ISASCII (c) && isprint (c)) -#define ISDIGIT(c) (ISASCII (c) && isdigit (c)) -#define ISALNUM(c) (ISASCII (c) && isalnum (c)) -#define ISALPHA(c) (ISASCII (c) && isalpha (c)) -#define ISCNTRL(c) (ISASCII (c) && iscntrl (c)) -#define ISLOWER(c) (ISASCII (c) && islower (c)) -#define ISPUNCT(c) (ISASCII (c) && ispunct (c)) -#define ISSPACE(c) (ISASCII (c) && isspace (c)) -#define ISUPPER(c) (ISASCII (c) && isupper (c)) -#define ISXDIGIT(c) (ISASCII (c) && isxdigit (c)) +# define ISPRINT(c) (ISASCII (c) && isprint (c)) +# define ISDIGIT(c) (ISASCII (c) && isdigit (c)) +# define ISALNUM(c) (ISASCII (c) && isalnum (c)) +# define ISALPHA(c) (ISASCII (c) && isalpha (c)) +# define ISCNTRL(c) (ISASCII (c) && iscntrl (c)) +# define ISLOWER(c) (ISASCII (c) && islower (c)) +# define ISPUNCT(c) (ISASCII (c) && ispunct (c)) +# define ISSPACE(c) (ISASCII (c) && isspace (c)) +# define ISUPPER(c) (ISASCII (c) && isupper (c)) +# define ISXDIGIT(c) (ISASCII (c) && isxdigit (c)) # define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) @@ -142,15 +142,19 @@ __strchrnul (s, c) } # endif +# ifndef internal_function +/* Inside GNU libc we mark some function in a special way. In other + environments simply ignore the marking. */ +# define internal_function +# endif + /* Match STRING against the filename pattern PATTERN, returning zero if it matches, nonzero if not. */ static int internal_fnmatch __P ((const char *pattern, const char *string, int no_leading_period, int flags)) internal_function; static int -#ifdef _LIBC internal_function -#endif internal_fnmatch (pattern, string, no_leading_period, flags) const char *pattern; const char *string; diff --git a/glob/glob.h b/glob/glob.h index 6a3ab18..7c2a67a 100644 --- a/glob/glob.h +++ b/glob/glob.h @@ -140,6 +140,19 @@ typedef struct } glob64_t; #endif +#if _FILE_OFFSET_BITS == 64 && __GNUC__ < 2 +# define glob glob64 +# define globfree globfree64 +#else +# ifdef _LARGEFILE64_SOURCE +extern int glob64 __P ((__const char *__pattern, int __flags, + int (*__errfunc) (__const char *, int), + glob64_t *__pglob)); + +extern void globfree64 __P ((glob64_t *__pglob)); +# endif +#endif + /* Do glob searching for PATTERN, placing results in PGLOB. The bits defined above may be set in FLAGS. If a directory cannot be opened or read and ERRFUNC is not nil, @@ -148,7 +161,7 @@ typedef struct `glob' returns GLOB_ABEND; if it returns zero, the error is ignored. If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned. Otherwise, `glob' returns zero. */ -#if _FILE_OFFSET_BITS != 64 +#if _FILE_OFFSET_BITS != 64 || __GNUC__ < 2 extern int glob __P ((__const char *__pattern, int __flags, int (*__errfunc) (__const char *, int), glob_t *__pglob)); @@ -156,24 +169,11 @@ extern int glob __P ((__const char *__pattern, int __flags, /* Free storage allocated in PGLOB by a previous `glob' call. */ extern void globfree __P ((glob_t *__pglob)); #else -# if __GNUC__ >= 2 extern int glob __P ((__const char *__pattern, int __flags, int (*__errfunc) (__const char *, int), glob_t *__pglob)) __asm__ ("glob64"); extern void globfree __P ((glob_t *__pglob)) __asm__ ("globfree64"); -# else -# define glob glob64 -# define globfree globfree64 -# endif -#endif - -#ifdef _LARGEFILE64_SOURCE -extern int glob64 __P ((__const char *__pattern, int __flags, - int (*__errfunc) (__const char *, int), - glob64_t *__pglob)); - -extern void globfree64 __P ((glob64_t *__pglob)); #endif diff --git a/make.texinfo b/make.texinfo index 73ac73f..8334526 100644 --- a/make.texinfo +++ b/make.texinfo @@ -5568,10 +5568,10 @@ respectively. @xref{Testing Flags}, for a practical application of @cindex filtering words @cindex words, filtering @item $(filter @var{pattern}@dots{},@var{text}) -Removes all whitespace-separated words in @var{text} that do -@emph{not} match any of the @var{pattern} words, returning only -matching words. The patterns are written using @samp{%}, just like -the patterns used in the @code{patsubst} function above.@refill +Returns all whitespace-separated words in @var{text} that @emph{do} match +any of the @var{pattern} words, removing any words that @emph{do not} +match. The patterns are written using @samp{%}, just like the patterns +used in the @code{patsubst} function above.@refill The @code{filter} function can be used to separate out different types of strings (such as file names) in a variable. For example: @@ -5592,6 +5592,11 @@ compiler.@refill @findex filter-out @cindex filtering out words @cindex words, filtering out +Returns all whitespace-separated words in @var{text} that @emph{do not} +match any of the @var{pattern} words, removing the words that @emph{do} +match one or more. This is the exact opposite of the @code{filter} +function.@refill + Removes all whitespace-separated words in @var{text} that @emph{do} match the @var{pattern} words, returning only the words that @emph{do not} match. This is the exact opposite of the @code{filter} |