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. etc/ * Makefile.in (AUTOCONF, configure_deps): New variables. ($(srcdir)/configure, config.status): New rules. (Makefile): Depend on config.status. * configure.in: Accept --enable-maintainer-mode, set and substitute MAINT accordingly. gdb/ * Makefile.in (ACLOCAL, ACLOCAL_AMFLAGS, aclocal_m4_deps) (AUTOCONF, configure_deps, AUTOHEADER): New variables. ($(srcdir)/aclocal.m4, $(srcdir)/configure, $(srcdir)/config.in) (am--refresh): New rules. (stamp-h, config.status): List config.in and configure including $(srcdir)/ prefix. * aclocal.m4: Regenerate. * configure: Regenerate.
This commit is contained in:
parent
5bb4d8dedf
commit
1983cb9a62
12 changed files with 167 additions and 19 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* Makefile.in (AUTOCONF, configure_deps): New variables.
|
||||||
|
($(srcdir)/configure, config.status): New rules.
|
||||||
|
(Makefile): Depend on config.status.
|
||||||
|
* configure.in: Accept --enable-maintainer-mode, set and
|
||||||
|
substitute MAINT accordingly.
|
||||||
|
|
||||||
2009-02-03 Carlos O'Donell <carlos@codesourcery.com>
|
2009-02-03 Carlos O'Donell <carlos@codesourcery.com>
|
||||||
|
|
||||||
* configure.in: AC_SUBST pdfdir.
|
* configure.in: AC_SUBST pdfdir.
|
||||||
|
|
|
@ -228,9 +228,19 @@ maintainer-clean realclean: distclean
|
||||||
rm -f *.html*
|
rm -f *.html*
|
||||||
rm -f *.info*
|
rm -f *.info*
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
|
Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag) \
|
||||||
|
config.status
|
||||||
$(SHELL) ./config.status
|
$(SHELL) ./config.status
|
||||||
|
|
||||||
|
AUTOCONF = autoconf
|
||||||
|
configure_deps = $(srcdir)/configure.in
|
||||||
|
|
||||||
|
$(srcdir)/configure: @MAINT@ $(configure_deps)
|
||||||
|
cd $(srcdir) && $(AUTOCONF)
|
||||||
|
|
||||||
|
config.status: $(srcdir)/configure
|
||||||
|
$(SHELL) ./config.status --recheck
|
||||||
|
|
||||||
## these last targets are for standards.texi conformance
|
## these last targets are for standards.texi conformance
|
||||||
dist:
|
dist:
|
||||||
check:
|
check:
|
||||||
|
|
27
etc/configure
vendored
27
etc/configure
vendored
|
@ -272,7 +272,7 @@ PACKAGE_STRING=
|
||||||
PACKAGE_BUGREPORT=
|
PACKAGE_BUGREPORT=
|
||||||
|
|
||||||
ac_unique_file="Makefile.in"
|
ac_unique_file="Makefile.in"
|
||||||
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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA datarootdir docdir htmldir pdfdir 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINT datarootdir docdir htmldir pdfdir LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
|
@ -780,6 +780,13 @@ if test -n "$ac_init_help"; then
|
||||||
|
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
|
Optional Features:
|
||||||
|
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||||
|
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||||
|
--enable-maintainer-mode
|
||||||
|
enable make rules and dependencies not useful (and
|
||||||
|
sometimes confusing) to the casual installer
|
||||||
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -1321,6 +1328,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||||
|
|
||||||
|
|
||||||
|
# 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;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1965,6 +1989,7 @@ s,@LIBS@,$LIBS,;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
|
||||||
|
s,@MAINT@,$MAINT,;t t
|
||||||
s,@datarootdir@,$datarootdir,;t t
|
s,@datarootdir@,$datarootdir,;t t
|
||||||
s,@docdir@,$docdir,;t t
|
s,@docdir@,$docdir,;t t
|
||||||
s,@htmldir@,$htmldir,;t t
|
s,@htmldir@,$htmldir,;t t
|
||||||
|
|
|
@ -4,6 +4,21 @@ AC_INIT(Makefile.in)
|
||||||
|
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
|
# 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_SUBST(datarootdir)
|
AC_SUBST(datarootdir)
|
||||||
AC_SUBST(docdir)
|
AC_SUBST(docdir)
|
||||||
AC_SUBST(htmldir)
|
AC_SUBST(htmldir)
|
||||||
|
|
|
@ -1,3 +1,14 @@
|
||||||
|
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* Makefile.in (ACLOCAL, ACLOCAL_AMFLAGS, aclocal_m4_deps)
|
||||||
|
(AUTOCONF, configure_deps, AUTOHEADER): New variables.
|
||||||
|
($(srcdir)/aclocal.m4, $(srcdir)/configure, $(srcdir)/config.in)
|
||||||
|
(am--refresh): New rules.
|
||||||
|
(stamp-h, config.status): List config.in and configure including
|
||||||
|
$(srcdir)/ prefix.
|
||||||
|
* aclocal.m4: Regenerate.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
2009-07-30 Thomas Schwinge <tschwinge@gnu.org>
|
2009-07-30 Thomas Schwinge <tschwinge@gnu.org>
|
||||||
|
|
||||||
* gnu-nat.c (add_task_commands) <stopped>: Register the correct
|
* gnu-nat.c (add_task_commands) <stopped>: Register the correct
|
||||||
|
|
|
@ -1212,16 +1212,69 @@ gnulib/Makefile: gnulib/Makefile.in gnulib/Makefile.in config.status @frags@
|
||||||
$(SHELL) config.status
|
$(SHELL) config.status
|
||||||
|
|
||||||
config.h: stamp-h ; @true
|
config.h: stamp-h ; @true
|
||||||
stamp-h: config.in config.status
|
stamp-h: $(srcdir)/config.in config.status
|
||||||
CONFIG_HEADERS=config.h:config.in \
|
CONFIG_HEADERS=config.h:config.in \
|
||||||
CONFIG_COMMANDS="default depdir" \
|
CONFIG_COMMANDS="default depdir" \
|
||||||
CONFIG_FILES= \
|
CONFIG_FILES= \
|
||||||
CONFIG_LINKS= \
|
CONFIG_LINKS= \
|
||||||
$(SHELL) config.status
|
$(SHELL) config.status
|
||||||
|
|
||||||
config.status: configure configure.tgt configure.host
|
config.status: $(srcdir)/configure configure.tgt configure.host
|
||||||
$(SHELL) config.status --recheck
|
$(SHELL) config.status --recheck
|
||||||
|
|
||||||
|
ACLOCAL = aclocal
|
||||||
|
ACLOCAL_AMFLAGS = -I gnulib/m4
|
||||||
|
aclocal_m4_deps = \
|
||||||
|
configure.ac \
|
||||||
|
gnulib/m4/extensions.m4 \
|
||||||
|
gnulib/m4/gnulib-common.m4 \
|
||||||
|
gnulib/m4/gnulib-comp.m4 \
|
||||||
|
gnulib/m4/include_next.m4 \
|
||||||
|
gnulib/m4/longlong.m4 \
|
||||||
|
gnulib/m4/memchr.m4 \
|
||||||
|
gnulib/m4/memcmp.m4 \
|
||||||
|
gnulib/m4/memmem.m4 \
|
||||||
|
gnulib/m4/onceonly_2_57.m4 \
|
||||||
|
gnulib/m4/stdint.m4 \
|
||||||
|
gnulib/m4/string_h.m4 \
|
||||||
|
gnulib/m4/wchar.m4 \
|
||||||
|
../config/extensions.m4 \
|
||||||
|
../config/lead-dot.m4 \
|
||||||
|
../config/proginstall.m4 \
|
||||||
|
../bfd/bfd.m4 \
|
||||||
|
../config/acinclude.m4 \
|
||||||
|
../config/override.m4 \
|
||||||
|
../config/gettext-sister.m4 \
|
||||||
|
../config/lib-ld.m4 \
|
||||||
|
../config/lib-prefix.m4 \
|
||||||
|
../config/lib-link.m4 \
|
||||||
|
../config/acx.m4 \
|
||||||
|
../config/tcl.m4 \
|
||||||
|
../config/depstand.m4 \
|
||||||
|
../config/lcmessage.m4 \
|
||||||
|
../config/codeset.m4
|
||||||
|
|
||||||
|
$(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps)
|
||||||
|
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
||||||
|
|
||||||
|
AUTOCONF = autoconf
|
||||||
|
configure_deps = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
|
||||||
|
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(configure_deps)
|
||||||
|
cd $(srcdir) && $(AUTOCONF)
|
||||||
|
|
||||||
|
AUTOHEADER = autoheader
|
||||||
|
$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(configure_deps)
|
||||||
|
cd $(srcdir) && $(AUTOHEADER)
|
||||||
|
rm -f stamp-h
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
# automatic rebuilding in automake-generated Makefiles requires
|
||||||
|
# this rule in the toplevel Makefile, which, with GNU make, causes
|
||||||
|
# the desired updates through the implicit regeneration of the Makefile
|
||||||
|
# and all of its prerequisites.
|
||||||
|
am--refresh:
|
||||||
|
@:
|
||||||
|
|
||||||
force:
|
force:
|
||||||
|
|
||||||
# Documentation!
|
# Documentation!
|
||||||
|
|
5
gdb/aclocal.m4
vendored
5
gdb/aclocal.m4
vendored
|
@ -856,6 +856,8 @@ AC_SUBST([am__tar])
|
||||||
AC_SUBST([am__untar])
|
AC_SUBST([am__untar])
|
||||||
]) # _AM_PROG_TAR
|
]) # _AM_PROG_TAR
|
||||||
|
|
||||||
|
m4_include([../config/lead-dot.m4])
|
||||||
|
m4_include([../config/proginstall.m4])
|
||||||
m4_include([gnulib/m4/extensions.m4])
|
m4_include([gnulib/m4/extensions.m4])
|
||||||
m4_include([gnulib/m4/gnulib-common.m4])
|
m4_include([gnulib/m4/gnulib-common.m4])
|
||||||
m4_include([gnulib/m4/gnulib-comp.m4])
|
m4_include([gnulib/m4/gnulib-comp.m4])
|
||||||
|
@ -868,7 +870,4 @@ m4_include([gnulib/m4/onceonly_2_57.m4])
|
||||||
m4_include([gnulib/m4/stdint.m4])
|
m4_include([gnulib/m4/stdint.m4])
|
||||||
m4_include([gnulib/m4/string_h.m4])
|
m4_include([gnulib/m4/string_h.m4])
|
||||||
m4_include([gnulib/m4/wchar.m4])
|
m4_include([gnulib/m4/wchar.m4])
|
||||||
m4_include([../config/extensions.m4])
|
|
||||||
m4_include([../config/lead-dot.m4])
|
|
||||||
m4_include([../config/proginstall.m4])
|
|
||||||
m4_include([acinclude.m4])
|
m4_include([acinclude.m4])
|
||||||
|
|
1
gdb/configure
vendored
1
gdb/configure
vendored
|
@ -15865,6 +15865,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for ac_func in canonicalize_file_name realpath getrusage getuid \
|
for ac_func in canonicalize_file_name realpath getrusage getuid \
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
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.
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
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++.
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue