diff options
author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-30 22:33:49 +0000 |
---|---|---|
committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-30 22:33:49 +0000 |
commit | a2655af126b7d95fd7824291b5b1be33518c8e7c (patch) | |
tree | fe36bb9b424aa4d54d507386453cb4a4b5db4c67 /fixincludes | |
parent | 3f501de4aadd548abdae65ccc8291b4d2dc05a64 (diff) | |
download | gcc-a2655af126b7d95fd7824291b5b1be33518c8e7c.tar.gz |
fixincludes/
* Makefile.in (AUTOCONF, AUTOHEADER, ACLOCAL, ACLOCAL_AMFLAGS):
New variables.
($(srcdir)/configure, $(srcdir)/config.h.in, $(srcdir)/aclocal.m4):
Use them.
gcc/
* Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
New variables.
($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.
(AUTOHEADER): New variable.
($(srcdir)/cstamp-h.in): Use it.
gnattools/
* Makefile.in (AUTOCONF, configure_deps): New variables.
($(srcdir)/configure): Use them.
libada/
* Makefile.in (AUTOCONF, configure_deps): New variables.
($(srcdir)/configure)): Use them. Also depend on multi.m4.
libgcc/
* configure.ac: Add snippet for maintainer-mode.
* configure: Regenerate.
* Makefile.in (AUTOCONF, configure_deps): New variables.
($(srcdir)/configure)): New rule, active only with maintainer
mode turned on.
libiberty/
* Makefile.in (AUTOCONF, configure_deps): New variables.
($(srcdir)/configure): New rule, active only in maintainer mode.
libobjc/
* Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
New variables.
($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.
intl/
* Makefile.in (aclocal_deps): New variable.
($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
libdecnumber/
* Makefile.in (aclocal_deps): New variable.
($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150277 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes')
-rw-r--r-- | fixincludes/ChangeLog | 7 | ||||
-rw-r--r-- | fixincludes/Makefile.in | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 35260caca66..62300af7c25 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,10 @@ +2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * Makefile.in (AUTOCONF, AUTOHEADER, ACLOCAL, ACLOCAL_AMFLAGS): + New variables. + ($(srcdir)/configure, $(srcdir)/config.h.in, $(srcdir)/aclocal.m4): + Use them. + 2009-07-04 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> * inclhack.def (darwin_stdint_5, darwin_stdint_6, diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in index 1f89cf9edeb..f91a70d2e6e 100644 --- a/fixincludes/Makefile.in +++ b/fixincludes/Makefile.in @@ -63,6 +63,11 @@ itoolsdatadir = $(libsubdir)/install-tools # Locate mkinstalldirs. mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs +AUTOCONF = autoconf +AUTOHEADER = autoheader +ACLOCAL = aclocal +ACLOCAL_AMFLAGS = -I ../gcc -I .. -I ../config + default : all # Now figure out from those variables how to compile and link. @@ -159,13 +164,13 @@ config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4 - cd $(srcdir) && autoconf + cd $(srcdir) && $(AUTOCONF) $(srcdir)/config.h.in: @MAINT@ $(srcdir)/configure.ac - cd $(srcdir) && autoheader + cd $(srcdir) && $(AUTOHEADER) $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac - cd $(srcdir) && aclocal -I ../gcc -I .. -I ../config + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) check : all autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def |