Skip to content

R
riscv-gcc-1
Commit 6efbd53f by Ralf Wildenhues Committed by Ralf Wildenhues
Options

Makefile.in (AUTOCONF, [...]): New variables. 

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.

From-SVN: r150277
parent 7ce18a45
Showing with 222 additions and 36 deletions
fixincludes/ChangeLog
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> 2009-07-04 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
* inclhack.def (darwin_stdint_5, darwin_stdint_6, * inclhack.def (darwin_stdint_5, darwin_stdint_6,
......
fixincludes/Makefile.in
...@@ -63,6 +63,11 @@ itoolsdatadir = $(libsubdir)/install-tools ...@@ -63,6 +63,11 @@ itoolsdatadir = $(libsubdir)/install-tools
# Locate mkinstalldirs. # Locate mkinstalldirs.
mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs
AUTOCONF = autoconf
AUTOHEADER = autoheader
ACLOCAL = aclocal
ACLOCAL_AMFLAGS = -I ../gcc -I .. -I ../config
default : all default : all
# Now figure out from those variables how to compile and link. # Now figure out from those variables how to compile and link.
...@@ -159,13 +164,13 @@ config.status: $(srcdir)/configure ...@@ -159,13 +164,13 @@ config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4
cd $(srcdir) && autoconf cd $(srcdir) && $(AUTOCONF)
$(srcdir)/config.h.in: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config.h.in: @MAINT@ $(srcdir)/configure.ac
cd $(srcdir) && autoheader cd $(srcdir) && $(AUTOHEADER)
$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac
cd $(srcdir) && aclocal -I ../gcc -I .. -I ../config cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
check : all check : all
autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
......
gcc/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* 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.
2009-07-30 Michael Meissner <meissner@linux.vnet.ibm.com> 2009-07-30 Michael Meissner <meissner@linux.vnet.ibm.com>
Pat Haugen <pthaugen@us.ibm.com> Pat Haugen <pthaugen@us.ibm.com>
Revital Eres <ERES@il.ibm.com> Revital Eres <ERES@il.ibm.com>
......
gcc/Makefile.in
...@@ -1592,9 +1592,35 @@ cs-tm_p.h: Makefile ...@@ -1592,9 +1592,35 @@ cs-tm_p.h: Makefile
# might be on a read-only file system. If configured for maintainer mode # might be on a read-only file system. If configured for maintainer mode
# then do allow autoconf to be run. # then do allow autoconf to be run.
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4 \ AUTOCONF = autoconf
$(srcdir)/acinclude.m4 ACLOCAL = aclocal
(cd $(srcdir) && autoconf) ACLOCAL_AMFLAGS = -I ../config -I ..
aclocal_deps = \
$(srcdir)/../libtool.m4 \
$(srcdir)/../ltoptions.m4 \
$(srcdir)/../ltsugar.m4 \
$(srcdir)/../ltversion.m4 \
$(srcdir)/../lt~obsolete.m4 \
$(srcdir)/../config/acx.m4 \
$(srcdir)/../config/codeset.m4 \
$(srcdir)/../config/extensions.m4 \
$(srcdir)/../config/gettext-sister.m4 \
$(srcdir)/../config/iconv.m4 \
$(srcdir)/../config/lcmessage.m4 \
$(srcdir)/../config/lib-ld.m4 \
$(srcdir)/../config/lib-link.m4 \
$(srcdir)/../config/lib-prefix.m4 \
$(srcdir)/../config/override.m4 \
$(srcdir)/../config/progtest.m4 \
$(srcdir)/../config/unwind_ipinfo.m4 \
$(srcdir)/../config/warnings.m4 \
$(srcdir)/acinclude.m4
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4
(cd $(srcdir) && $(AUTOCONF))
$(srcdir)/aclocal.m4 : @MAINT@ $(aclocal_deps)
(cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS))
gccbug: $(srcdir)/gccbug.in gccbug: $(srcdir)/gccbug.in
CONFIG_FILES=gccbug CONFIG_HEADERS= ./config.status CONFIG_FILES=gccbug CONFIG_HEADERS= ./config.status
...@@ -1611,9 +1637,10 @@ gccbug: $(srcdir)/gccbug.in ...@@ -1611,9 +1637,10 @@ gccbug: $(srcdir)/gccbug.in
# Don't run autoheader automatically either. # Don't run autoheader automatically either.
# Only run it if maintainer mode is enabled. # Only run it if maintainer mode is enabled.
@MAINT@ AUTOHEADER = autoheader
@MAINT@ $(srcdir)/config.in: $(srcdir)/cstamp-h.in @MAINT@ $(srcdir)/config.in: $(srcdir)/cstamp-h.in
@MAINT@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.ac @MAINT@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.ac
@MAINT@ (cd $(srcdir) && autoheader) @MAINT@ (cd $(srcdir) && $(AUTOHEADER))
@MAINT@ @rm -f $(srcdir)/cstamp-h.in @MAINT@ @rm -f $(srcdir)/cstamp-h.in
@MAINT@ echo timestamp > $(srcdir)/cstamp-h.in @MAINT@ echo timestamp > $(srcdir)/cstamp-h.in
auto-host.h: cstamp-h ; @true auto-host.h: cstamp-h ; @true
......
gcc/aclocal.m4
...@@ -92,6 +92,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then ...@@ -92,6 +92,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
fi fi
]) ])
m4_include([../libtool.m4])
m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4])
m4_include([../config/acx.m4]) m4_include([../config/acx.m4])
m4_include([../config/codeset.m4]) m4_include([../config/codeset.m4])
m4_include([../config/extensions.m4]) m4_include([../config/extensions.m4])
...@@ -105,9 +110,4 @@ m4_include([../config/override.m4]) ...@@ -105,9 +110,4 @@ m4_include([../config/override.m4])
m4_include([../config/progtest.m4]) m4_include([../config/progtest.m4])
m4_include([../config/unwind_ipinfo.m4]) m4_include([../config/unwind_ipinfo.m4])
m4_include([../config/warnings.m4]) m4_include([../config/warnings.m4])
m4_include([../libtool.m4])
m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4])
m4_include([acinclude.m4]) m4_include([acinclude.m4])
gnattools/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (AUTOCONF, configure_deps): New variables.
($(srcdir)/configure): Use them.
2009-05-18 Bechir Zalila <bechir.zalila@gmail.com> 2009-05-18 Bechir Zalila <bechir.zalila@gmail.com>
PR ada/40166 PR ada/40166
......
gnattools/Makefile.in
...@@ -305,9 +305,14 @@ Makefile: $(srcdir)/Makefile.in config.status ...@@ -305,9 +305,14 @@ Makefile: $(srcdir)/Makefile.in config.status
config.status: $(srcdir)/configure config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac \ AUTOCONF = autoconf
$(srcdir)/../config/acx.m4 $(srcdir)/../config/override.m4 configure_deps = \
cd $(srcdir) && autoconf $(srcdir)/configure.ac \
$(srcdir)/../config/acx.m4 \
$(srcdir)/../config/override.m4
$(srcdir)/configure: @MAINT@ $(configure_deps)
cd $(srcdir) && $(AUTOCONF)
# Don't export variables to the environment, in order to not confuse # Don't export variables to the environment, in order to not confuse
# configure. # configure.
......
intl/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (aclocal_deps): New variable.
($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate. * configure: Regenerate.
......
intl/Makefile.in
...@@ -211,16 +211,28 @@ config.status: $(srcdir)/configure ...@@ -211,16 +211,28 @@ config.status: $(srcdir)/configure
$(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/configure.ac $(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/configure.ac
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac \ aclocal_deps = \
$(srcdir)/../config/codeset.m4 $(srcdir)/../config/gettext.m4 \ $(srcdir)/configure.ac \
$(srcdir)/../config/glibc21.m4 $(srcdir)/../config/iconv.m4 \ $(srcdir)/../config/codeset.m4 \
$(srcdir)/../config/intdiv0.m4 $(srcdir)/../config/inttypes-pri.m4 \ $(srcdir)/../config/gettext.m4 \
$(srcdir)/../config/inttypes.m4 $(srcdir)/../config/inttypes_h.m4 \ $(srcdir)/../config/glibc21.m4 \
$(srcdir)/../config/lcmessage.m4 $(srcdir)/../config/lib-ld.m4 \ $(srcdir)/../config/iconv.m4 \
$(srcdir)/../config/lib-link.m4 $(srcdir)/../config/lib-prefix.m4 \ $(srcdir)/../config/intdiv0.m4 \
$(srcdir)/../config/nls.m4 $(srcdir)/../config/po.m4 \ $(srcdir)/../config/inttypes-pri.m4 \
$(srcdir)/../config/progtest.m4 $(srcdir)/../config/stdint_h.m4 \ $(srcdir)/../config/inttypes.m4 \
$(srcdir)/../config/uintmax_t.m4 $(srcdir)/../config/ulonglong.m4 $(srcdir)/../config/inttypes_h.m4 \
$(srcdir)/../config/lcmessage.m4 \
$(srcdir)/../config/lib-ld.m4 \
$(srcdir)/../config/lib-link.m4 \
$(srcdir)/../config/lib-prefix.m4 \
$(srcdir)/../config/nls.m4 \
$(srcdir)/../config/po.m4 \
$(srcdir)/../config/progtest.m4 \
$(srcdir)/../config/stdint_h.m4 \
$(srcdir)/../config/uintmax_t.m4 \
$(srcdir)/../config/ulonglong.m4
$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
cd $(srcdir) && $(ACLOCAL) -I ../config cd $(srcdir) && $(ACLOCAL) -I ../config
config.h: stamp-h1 config.h: stamp-h1
......
libada/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (AUTOCONF, configure_deps): New variables.
($(srcdir)/configure)): Use them. Also depend on multi.m4.
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.
2009-07-13 Eric Botcazou <ebotcazou@adacore.com> 2009-07-13 Eric Botcazou <ebotcazou@adacore.com>
......
libada/Makefile.in
...@@ -171,9 +171,15 @@ Makefile: $(srcdir)/Makefile.in config.status ...@@ -171,9 +171,15 @@ Makefile: $(srcdir)/Makefile.in config.status
config.status: $(srcdir)/configure config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac \ AUTOCONF = autoconf
$(srcdir)/../config/acx.m4 $(srcdir)/../config/override.m4 configure_deps = \
cd $(srcdir) && autoconf $(srcdir)/configure.ac \
$(srcdir)/../config/acx.m4 \
$(srcdir)/../config/override.m4 \
$(srcdir)/../config/multi.m4
$(srcdir)/configure: @MAINT@ $(configure_deps)
cd $(srcdir) && $(AUTOCONF)
# Don't export variables to the environment, in order to not confuse # Don't export variables to the environment, in order to not confuse
# configure. # configure.
......
libdecnumber/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (aclocal_deps): New variable.
($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
2009-05-31 Ian Lance Taylor <iant@google.com> 2009-05-31 Ian Lance Taylor <iant@google.com>
* decContext.h: Add extern "C" if compiling with C++. * decContext.h: Add extern "C" if compiling with C++.
......
libdecnumber/Makefile.in
...@@ -94,9 +94,13 @@ config.status: $(srcdir)/configure ...@@ -94,9 +94,13 @@ config.status: $(srcdir)/configure
$(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/../config/stdint.m4 \ aclocal_deps = \
$(srcdir)/../config/warnings.m4 $(srcdir)/../config/override.m4 \ $(srcdir)/../config/stdint.m4 \
$(srcdir)/../config/warnings.m4 \
$(srcdir)/../config/override.m4 \
$(srcdir)/configure.ac $(srcdir)/configure.ac
$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
cd $(srcdir) && $(ACLOCAL) -I ../config cd $(srcdir) && $(ACLOCAL) -I ../config
config.h: stamp-h1 config.h: stamp-h1
......
libgcc/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* 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.
2009-06-23 DJ Delorie <dj@redhat.com> 2009-06-23 DJ Delorie <dj@redhat.com>
Add MeP port. Add MeP port.
......
libgcc/Makefile.in
...@@ -140,6 +140,17 @@ stamp-h: $(srcdir)/config.in config.status Makefile ...@@ -140,6 +140,17 @@ stamp-h: $(srcdir)/config.in config.status Makefile
config.status: $(srcdir)/configure $(srcdir)/config.host config.status: $(srcdir)/configure $(srcdir)/config.host
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
AUTOCONF = autoconf
configure_deps = \
$(srcdir)/../config/enable.m4 \
$(srcdir)/../config/tls.m4 \
$(srcdir)/../config/acx.m4 \
$(srcdir)/../config/no-executables.m4 \
$(srcdir)/../config/override.m4 \
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
cd $(srcdir) && $(AUTOCONF)
include $(gcc_objdir)/libgcc.mvars include $(gcc_objdir)/libgcc.mvars
# Flags to pass to recursive makes. # Flags to pass to recursive makes.
......
libgcc/configure
...@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.0' ...@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.0'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
ac_unique_file="static-object.mk" ac_unique_file="static-object.mk"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
ac_pwd=`pwd` ac_pwd=`pwd`
...@@ -812,6 +812,9 @@ Optional Features: ...@@ -812,6 +812,9 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-shared don't provide a shared libgcc --disable-shared don't provide a shared libgcc
--enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
--enable-decimal-float={no,yes,bid,dpd} --enable-decimal-float={no,yes,bid,dpd}
enable decimal float extension to C. Selecting 'bid' enable decimal float extension to C. Selecting 'bid'
or 'dpd' choses which decimal floating point format or 'dpd' choses which decimal floating point format
...@@ -1419,6 +1422,23 @@ fi ...@@ -1419,6 +1422,23 @@ fi
fi; fi;
# Command-line options.
# Very limited version of AC_MAINTAINER_MODE.
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
case ${enable_maintainer_mode} in
yes) MAINT='' ;;
no) MAINT='#' ;;
*) { { echo "$as_me:$LINENO: error: --enable-maintainer-mode must be yes or no" >&5
echo "$as_me: error: --enable-maintainer-mode must be yes or no" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
maintainer_mode=${enableval}
else
MAINT='#'
fi;
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or # so one script is as good as another. But avoid the broken or
# incompatible versions: # incompatible versions:
...@@ -4226,6 +4246,7 @@ s,@LIBS@,$LIBS,;t t ...@@ -4226,6 +4246,7 @@ s,@LIBS@,$LIBS,;t t
s,@libgcc_topdir@,$libgcc_topdir,;t t s,@libgcc_topdir@,$libgcc_topdir,;t t
s,@enable_shared@,$enable_shared,;t t s,@enable_shared@,$enable_shared,;t t
s,@slibdir@,$slibdir,;t t s,@slibdir@,$slibdir,;t t
s,@MAINT@,$MAINT,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t
......
libgcc/configure.ac
...@@ -78,6 +78,21 @@ else ...@@ -78,6 +78,21 @@ else
fi) fi)
AC_SUBST(slibdir) AC_SUBST(slibdir)
# Command-line options.
# Very limited version of AC_MAINTAINER_MODE.
AC_ARG_ENABLE([maintainer-mode],
[AC_HELP_STRING([--enable-maintainer-mode],
[enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer])],
[case ${enable_maintainer_mode} in
yes) MAINT='' ;;
no) MAINT='#' ;;
*) AC_MSG_ERROR([--enable-maintainer-mode must be yes or no]) ;;
esac
maintainer_mode=${enableval}],
[MAINT='#'])
AC_SUBST([MAINT])dnl
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_AWK AC_PROG_AWK
......
libiberty/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (AUTOCONF, configure_deps): New variables.
($(srcdir)/configure): New rule, active only in maintainer mode.
2009-07-29 Douglas B Rupp <rupp@gnat.com> 2009-07-29 Douglas B Rupp <rupp@gnat.com>
* make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS. * make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS.
......
libiberty/Makefile.in
...@@ -459,6 +459,16 @@ stamp-h: $(srcdir)/config.in config.status Makefile ...@@ -459,6 +459,16 @@ stamp-h: $(srcdir)/config.in config.status Makefile
config.status: $(srcdir)/configure config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
AUTOCONF = autoconf
configure_deps = $(srcdir)/aclocal.m4 \
$(srcdir)/../config/acx.m4 \
$(srcdir)/../config/no-executables.m4 \
$(srcdir)/../config/override.m4 \
$(srcdir)/../config/warnings.m4 \
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
cd $(srcdir) && $(AUTOCONF)
# Depending on config.h makes sure that config.status has been re-run # Depending on config.h makes sure that config.status has been re-run
# if needed. This prevents problems with parallel builds, in case # if needed. This prevents problems with parallel builds, in case
# subdirectories need to run config.status also. # subdirectories need to run config.status also.
......
libobjc/ChangeLog
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
New variables.
($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.
2009-04-09 Nick Clifton <nickc@redhat.com> 2009-04-09 Nick Clifton <nickc@redhat.com>
......
libobjc/Makefile.in
...@@ -333,9 +333,25 @@ config.status: configure ...@@ -333,9 +333,25 @@ config.status: configure
CONFIG_SITE=no-such-file CC='$(CC)' AR='$(AR)' CFLAGS='$(CFLAGS)' \ CONFIG_SITE=no-such-file CC='$(CC)' AR='$(AR)' CFLAGS='$(CFLAGS)' \
CPPFLAGS='$(CPPFLAGS)' $(SHELL) config.status --recheck CPPFLAGS='$(CPPFLAGS)' $(SHELL) config.status --recheck
${srcdir}/configure: @MAINT@ configure.ac AUTOCONF = autoconf
ACLOCAL = aclocal
ACLOCAL_AMFLAGS = -I ../config -I ..
aclocal_deps = \
$(srcdir)/../config/multi.m4 \
$(srcdir)/../config/override.m4 \
$(srcdir)/../config/proginstall.m4 \
$(srcdir)/../ltoptions.m4 \
$(srcdir)/../ltsugar.m4 \
$(srcdir)/../ltversion.m4 \
$(srcdir)/../lt~obsolete.m4 \
$(srcdir)/acinclude.m4
$(srcdir)/configure: @MAINT@ configure.ac $(srcdir)/aclocal.m4
rm -f config.cache rm -f config.cache
cd ${srcdir} && autoconf cd $(srcdir) && $(AUTOCONF)
$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
install: install-libs install-headers install: install-libs install-headers
......
libobjc/aclocal.m4
...@@ -154,11 +154,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then ...@@ -154,11 +154,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
fi fi
]) ])
m4_include([../config/multi.m4])
m4_include([../config/override.m4])
m4_include([../config/proginstall.m4])
m4_include([../ltoptions.m4]) m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4]) m4_include([../ltsugar.m4])
m4_include([../ltversion.m4]) m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4]) m4_include([../lt~obsolete.m4])
m4_include([../config/multi.m4])
m4_include([../config/override.m4])
m4_include([../config/proginstall.m4])
m4_include([acinclude.m4]) m4_include([acinclude.m4])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment