From e2403327e9913bbcbd515f9c38b8f4e26fb9b0d9 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Thu, 30 Jul 1998 20:54:47 +0000 Subject: GNU make release 3.77. --- variable.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'variable.h') diff --git a/variable.h b/variable.h index 79d9739..4289c14 100644 --- a/variable.h +++ b/variable.h @@ -43,7 +43,8 @@ struct variable origin ENUM_BITFIELD (3); /* Variable origin. */ unsigned int recursive:1; /* Gets recursively re-evaluated. */ unsigned int expanding:1; /* Nonzero if currently being expanded. */ - enum + unsigned int per_target:1; /* Nonzero if a target-specific variable. */ + enum variable_export { v_export, /* Export this variable. */ v_noexport, /* Don't export this variable. */ @@ -68,20 +69,22 @@ struct variable_set_list struct variable_set *set; /* Variable set. */ }; +extern char *variable_buffer; extern struct variable_set_list *current_variable_set_list; /* expand.c */ extern char *variable_buffer_output PARAMS ((char *ptr, char *string, unsigned int length)); extern char *variable_expand PARAMS ((char *line)); -extern char *variable_expand_for_file PARAMS ((char *line, struct file *file)); extern char *allocated_variable_expand_for_file PARAMS ((char *line, struct file *file)); #define allocated_variable_expand(line) \ allocated_variable_expand_for_file (line, (struct file *) 0) extern char *expand_argument PARAMS ((char *str, char *end)); +extern char *variable_expand_string PARAMS ((char *line, char *string, + long length)); /* function.c */ extern int handle_function PARAMS ((char **op, char **stringp)); -extern int pattern_matches PARAMS ((char *pattern, char *percent, char *word)); +extern int pattern_matches PARAMS ((char *pattern, char *percent, char *str)); extern char *subst_expand PARAMS ((char *o, char *text, char *subst, char *replace, unsigned int slen, unsigned int rlen, int by_word, int suffix_only)); extern char *patsubst_expand PARAMS ((char *o, char *text, char *pattern, char *replace, @@ -91,17 +94,21 @@ extern char *patsubst_expand PARAMS ((char *o, char *text, char *pattern, char * extern char *recursively_expand PARAMS ((struct variable *v)); /* variable.c */ -extern void push_new_variable_scope PARAMS ((void)); +extern struct variable_set_list *create_new_variable_set PARAMS ((void)); +extern struct variable_set_list *push_new_variable_scope PARAMS ((void)); extern void pop_variable_scope PARAMS ((void)); extern void define_automatic_variables PARAMS ((void)); extern void initialize_file_variables PARAMS ((struct file *file)); extern void print_file_variables PARAMS ((struct file *file)); +extern void print_variable_set PARAMS ((struct variable_set *set, char *prefix)); extern void merge_variable_set_lists PARAMS ((struct variable_set_list **setlist0, struct variable_set_list *setlist1)); extern struct variable *try_variable_definition PARAMS ((char *filename, unsigned int lineno, char *line, enum variable_origin origin)); extern struct variable *lookup_variable PARAMS ((char *name, unsigned int length)); extern struct variable *define_variable PARAMS ((char *name, unsigned int length, char *value, enum variable_origin origin, int recursive)); +extern struct variable *define_variable_in_set PARAMS ((char *name, unsigned int length, + char *value, enum variable_origin origin, int recursive, struct variable_set *set)); extern struct variable *define_variable_for_file PARAMS ((char *name, unsigned int length, char *value, enum variable_origin origin, int recursive, struct file *file)); extern char **target_environment PARAMS ((struct file *file)); -- cgit v1.2.3