From 2ed26f6bd11f3e6321338fc6423257f418e1081c Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Sun, 31 Aug 2003 06:07:42 +0000 Subject: configure.frag: Delete file. * 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. From-SVN: r70957 --- gcc/ada/ChangeLog | 21 ++++++++++++++------- gcc/ada/Makefile.in | 29 ++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 14 deletions(-) (limited to 'gcc/ada') diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index e5764a4..9efeeb8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2003-08-30 Zack Weinberg + + * 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. + 2003-07-18 Neil Booth * lang-options.h: Remove. @@ -142,10 +149,10 @@ Thu Jun 5 18:33:40 CEST 2003 Jan Hubicka 2003-06-04 Olivier Hainque - PR ada/9953: - * 5hsystem.ads: Remove pragma Linker_Option for pthreads library, - and turn ZCX_By_Default back to False since the underlying support - is not quite there yet. + PR ada/9953: + * 5hsystem.ads: Remove pragma Linker_Option for pthreads library, + and turn ZCX_By_Default back to False since the underlying support + is not quite there yet. 2003-06-01 Andreas Jaeger @@ -173,9 +180,9 @@ Thu Jun 5 18:33:40 CEST 2003 Jan Hubicka 2003-05-01 Laurent Guerby - PR ada/10546 - * 5iosinte.ads: Increase pthread_cond_t size to match recent - LinuxThread and NPTL version, merge from ACT. + PR ada/10546 + * 5iosinte.ads: Increase pthread_cond_t size to match recent + LinuxThread and NPTL version, merge from ACT. 2003-04-28 Zack Weinberg diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index c10bbc4..abed86b 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -177,8 +177,8 @@ objdir = . target=@target@ target_alias=@target_alias@ -xmake_file=@dep_host_xmake_file@ -tmake_file=@dep_tmake_file@ +xmake_file = @xmake_file@ +tmake_file = @tmake_file@ host_canonical=@host@ #version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c` #mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c` @@ -217,12 +217,20 @@ all: all.indirect # This tells GNU Make version 3 not to put all variables in the environment. .NOEXPORT: -# sed inserts variable overrides after the following line. -####target overrides -@target_overrides@ +# tmake_file and xmake_file expand to lists with entries of the form +# $(srcdir)/config/... but here $(srcdir) is the ada subdirectory so we +# need to adjust the paths. There can't be spaces in the subst arguments +# or we get spurious spaces in the actual list of files to include. -####host overrides -@host_overrides@ +# target overrides +ifneq ($(tmake_file),) +include $(subst /config,/../config,$(tmake_file)) +endif + +# host overrides +ifneq ($(xmake_file),) +include $(subst /config,/../config,$(xmake_file)) +endif # Now figure out from those variables how to compile and link. @@ -278,6 +286,13 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir) .ads.o: $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< +# how to regenerate this file +Makefile: ../config.status $(srcdir)/Makefile.in $(srcdir)/../version.c + cd ..; \ + LANGUAGES="$(CONFIG_LANGUAGES)" \ + CONFIG_HEADERS= \ + CONFIG_FILES=ada/Makefile $(SHELL) config.status + # This tells GNU make version 3 not to export all the variables # defined in this file into the environment. .NOEXPORT: -- cgit v1.1