Parcourir la source

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.
sh3port_dev
Ralf Wildenhues il y a 11 ans
Parent
révision
f4a7842850
4 fichiers modifiés avec 60 ajouts et 2 suppressions
  1. +8
    -0
      etc/ChangeLog
  2. +11
    -1
      etc/Makefile.in
  3. +26
    -1
      etc/configure
  4. +15
    -0
      etc/configure.in

+ 8
- 0
etc/ChangeLog Voir le fichier

@@ -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>

* configure.in: AC_SUBST pdfdir.


+ 11
- 1
etc/Makefile.in Voir le fichier

@@ -228,9 +228,19 @@ maintainer-clean realclean: distclean
rm -f *.html*
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

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
dist:
check:


+ 26
- 1
etc/configure Voir le fichier

@@ -272,7 +272,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT=

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=''

# Initialize some variables set by options.
@@ -780,6 +780,13 @@ if test -n "$ac_init_help"; then

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
fi

@@ -1321,6 +1328,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
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_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@MAINT@,$MAINT,;t t
s,@datarootdir@,$datarootdir,;t t
s,@docdir@,$docdir,;t t
s,@htmldir@,$htmldir,;t t


+ 15
- 0
etc/configure.in Voir le fichier

@@ -4,6 +4,21 @@ AC_INIT(Makefile.in)

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(docdir)
AC_SUBST(htmldir)


Chargement…
Annuler
Enregistrer