diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-31 06:07:42 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-31 06:07:42 +0000 |
| commit | a455468e9f5a16d5b354df6f7f4e3a7571c772cf (patch) | |
| tree | 6b7798294fc47b211fc16dc6a97c40cc7b860112 /gcc/Makefile.in | |
| parent | 3cd4a2f8fdf8eb686268fb88787ffd20d9280b51 (diff) | |
| download | gcc-a455468e9f5a16d5b354df6f7f4e3a7571c772cf.tar.gz | |
* configure.frag: Delete file.
* configure.in: Rename the substitution variables
dep_host_xmake_file and dep_tmake_file to xmake_file and
tmake_file respectively. Do not expand $srcdir in the
value of these; leave that for Make. Introduce a new
substitution varaible, all_lang_makefrags, which lists
subdirectory Make-lang.in files; exclude these from
all_lang_makefiles, which is now only for subdirectory
outputs. Do not invoke configure.frag. Do not set nor
AC_SUBST_FILE target_overrides, host_overrides, or
language_fragments. Create build subdirectories in
config.status extra commands.
* configure: Regenerate.
* Makefile.in: Update substitutions to match changes to
configure. Use include directives instead of @-insertions
to read in host, target, and language fragments.
(Makefile rule): Do not invoke configure.frag. Do not copy
config.status to config.run before executing it. Set
CONFIG_HEADERS and CONFIG_FILES so that only Makefile gets
regenerated.
(cstamp-h rule): Set CONFIG_FILES as well as CONFIG_HEADERS.
ada:
* Makefile.in: Update substitutions to match changes to
configure. Use include directives instead of @-insertions
to read in host and target fragments. Add a rule to
regenerate ada/Makefile.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70957 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 3ea2c569d74..f71b5fe457a 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -336,8 +336,8 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ -xmake_file=@dep_host_xmake_file@ -tmake_file=@dep_tmake_file@ +xmake_file=@xmake_file@ +tmake_file=@tmake_file@ out_file=$(srcdir)/config/@out_file@ out_object_file=@out_object_file@ md_file=$(srcdir)/config/@md_file@ @@ -661,12 +661,16 @@ PRETTY_PRINT_H = pretty-print.h input.h $(OBSTACK_H) DIAGNOSTIC_H = diagnostic.h diagnostic.def $(PRETTY_PRINT_H) C_PRETTY_PRINT_H = $(PRETTY_PRINT_H) $(C_COMMON_H) $(TREE_H) -# sed inserts variable overrides after the following line. -####target overrides -@target_overrides@ +# target overrides +ifneq ($(tmake_file),) +include $(tmake_file) +endif + +# host overrides +ifneq ($(xmake_file),) +include $(xmake_file) +endif -####host overrides -@host_overrides@ # # Now figure out from those variables how to compile and link. @@ -735,6 +739,7 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \ # Support for additional languages (other than C). # C can be supported this way too (leave for later). +LANG_MAKEFRAGS = @all_lang_makefrags@ LANG_MAKEFILES = @all_lang_makefiles@ LANG_STAGESTUFF = @all_stagestuff@ @@ -917,27 +922,24 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4 # targets). The name of each hooked is "lang.${target_name}" (eg: lang.info). # Configure computes and adds these here. -####language hooks +# language hooks, generated by configure @language_hooks@ -# sed inserts language fragments after the following line. -####language fragments -@language_fragments@ +# per-language makefile fragments +ifneq ($(LANG_MAKEFRAGS),) +include $(LANG_MAKEFRAGS) +endif -# End of language makefile fragments. # # ----------------------------- # Rebuilding this configuration # ----------------------------- -Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \ - $(xmake_file) $(tmake_file) $(LANG_MAKEFILES) - $(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \ - "$(xmake_file)" "$(tmake_file)" - cp config.status config.run - LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.run - rm -f config.run +Makefile: config.status $(srcdir)/Makefile.in $(srcdir)/version.c + LANGUAGES="$(CONFIG_LANGUAGES)" \ + CONFIG_HEADERS= \ + CONFIG_FILES=$@ $(SHELL) config.status config.h: cs-config.h ; @true bconfig.h: cs-bconfig.h ; @true @@ -1006,7 +1008,9 @@ mkheaders: $(srcdir)/mkheaders.in @MAINT@ echo timestamp > $(srcdir)/cstamp-h.in auto-host.h: cstamp-h ; @true cstamp-h: config.in config.status - CONFIG_HEADERS=auto-host.h:config.in LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status + CONFIG_HEADERS=auto-host.h:config.in \ + CONFIG_FILES= \ + LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status # Really, really stupid make features, such as SUN's KEEP_STATE, may force # a target to build even if it is up-to-date. So we must verify that |