From 26190be14491c1e855c8bcebf04028bca39e2781 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 11 Jan 2007 20:57:52 +0000 Subject: [PATCH] 2007-01-11 Jeff Johnston * libm/configure.in: Always configure machine directory. * libm/Makefile.am: Make machine subdirectory part of SUBDIRS unconditionally. * libm/configure: Regenerated. * libm/Makefile.in: Ditto. * libm/*/Makefile.in: Ditto. --- newlib/ChangeLog | 9 +++++++++ newlib/libm/Makefile.am | 4 ---- newlib/libm/Makefile.in | 5 +---- newlib/libm/common/Makefile.in | 2 -- newlib/libm/configure | 26 ++++---------------------- newlib/libm/configure.in | 4 ++-- newlib/libm/math/Makefile.in | 2 -- newlib/libm/mathfp/Makefile.in | 2 -- 8 files changed, 16 insertions(+), 38 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 3e7bd32b1..310a814c9 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2007-01-11 Jeff Johnston + + * libm/configure.in: Always configure machine directory. + * libm/Makefile.am: Make machine subdirectory part of SUBDIRS + unconditionally. + * libm/configure: Regenerated. + * libm/Makefile.in: Ditto. + * libm/*/Makefile.in: Ditto. + 2007-01-05 Brian Ford * configure.host (*-*-cygwin*): Define HAVE_BLKSIZE. diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am index 389e0767b..16c360f5b 100644 --- a/newlib/libm/Makefile.am +++ b/newlib/libm/Makefile.am @@ -8,11 +8,7 @@ else MATHDIR = math endif -if HAVE_LIBM_MACHINE_DIR SUBDIRS = $(MATHDIR) common machine -else -SUBDIRS = $(MATHDIR) common -endif libm_la_LDFLAGS = -Xcompiler -nostdlib diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in index 69b0b71dd..0fd2522de 100644 --- a/newlib/libm/Makefile.in +++ b/newlib/libm/Makefile.in @@ -142,8 +142,6 @@ ELIX_LEVEL_3_TRUE = @ELIX_LEVEL_3_TRUE@ ELIX_LEVEL_4_FALSE = @ELIX_LEVEL_4_FALSE@ ELIX_LEVEL_4_TRUE = @ELIX_LEVEL_4_TRUE@ EXEEXT = @EXEEXT@ -HAVE_LIBM_MACHINE_DIR_FALSE = @HAVE_LIBM_MACHINE_DIR_FALSE@ -HAVE_LIBM_MACHINE_DIR_TRUE = @HAVE_LIBM_MACHINE_DIR_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -232,8 +230,7 @@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = cygnus @NEWLIB_HW_FP_FALSE@MATHDIR = math @NEWLIB_HW_FP_TRUE@MATHDIR = mathfp -@HAVE_LIBM_MACHINE_DIR_FALSE@SUBDIRS = $(MATHDIR) common -@HAVE_LIBM_MACHINE_DIR_TRUE@SUBDIRS = $(MATHDIR) common machine +SUBDIRS = $(MATHDIR) common machine libm_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@SUBLIBS = $(MATHDIR)/lib.$(aext) common/lib.$(aext) $(LIBM_MACHINE_LIB) @USE_LIBTOOL_TRUE@SUBLIBS = $(MATHDIR)/lib$(MATHDIR).$(aext) common/libcommon.$(aext) $(LIBM_MACHINE_LIB) diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in index 25efa0a28..af1a70b2d 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -153,8 +153,6 @@ ELIX_LEVEL_3_TRUE = @ELIX_LEVEL_3_TRUE@ ELIX_LEVEL_4_FALSE = @ELIX_LEVEL_4_FALSE@ ELIX_LEVEL_4_TRUE = @ELIX_LEVEL_4_TRUE@ EXEEXT = @EXEEXT@ -HAVE_LIBM_MACHINE_DIR_FALSE = @HAVE_LIBM_MACHINE_DIR_FALSE@ -HAVE_LIBM_MACHINE_DIR_TRUE = @HAVE_LIBM_MACHINE_DIR_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/newlib/libm/configure b/newlib/libm/configure index 6050e14fc..180a54191 100755 --- a/newlib/libm/configure +++ b/newlib/libm/configure @@ -273,7 +273,7 @@ PACKAGE_BUGREPORT='' ac_unique_file="libm.texinfo" ac_subdirs_all="$ac_subdirs_all machine" -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 NEWLIB_HW_FP_TRUE NEWLIB_HW_FP_FALSE MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir CFLAGS CPPFLAGS ac_ct_CC EXEEXT LN_S LIBTOOL subdirs LIBM_MACHINE_LIB HAVE_LIBM_MACHINE_DIR_TRUE HAVE_LIBM_MACHINE_DIR_FALSE 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 NEWLIB_HW_FP_TRUE NEWLIB_HW_FP_FALSE MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir CFLAGS CPPFLAGS ac_ct_CC EXEEXT LN_S LIBTOOL subdirs LIBM_MACHINE_LIB LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4882,12 +4882,13 @@ exec 5>>./config.log fi -LIBM_MACHINE_LIB= -if test -n "${libm_machine_dir}"; then subdirs="$subdirs machine" + +LIBM_MACHINE_LIB= +if test -n "${libm_machine_dir}"; then if test "${use_libtool}" = "yes"; then LIBM_MACHINE_LIB=machine/${libm_machine_dir}/lib${libm_machine_dir}.${aext} else @@ -4897,16 +4898,6 @@ fi - -if test x${libm_machine_dir} != x; then - HAVE_LIBM_MACHINE_DIR_TRUE= - HAVE_LIBM_MACHINE_DIR_FALSE='#' -else - HAVE_LIBM_MACHINE_DIR_TRUE='#' - HAVE_LIBM_MACHINE_DIR_FALSE= -fi - - ac_config_files="$ac_config_files Makefile math/Makefile mathfp/Makefile common/Makefile" cat >confcache <<\_ACEOF @@ -5115,13 +5106,6 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_LIBM_MACHINE_DIR_TRUE}" && test -z "${HAVE_LIBM_MACHINE_DIR_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBM_MACHINE_DIR\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_LIBM_MACHINE_DIR\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -5737,8 +5721,6 @@ s,@LN_S@,$LN_S,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@subdirs@,$subdirs,;t t s,@LIBM_MACHINE_LIB@,$LIBM_MACHINE_LIB,;t t -s,@HAVE_LIBM_MACHINE_DIR_TRUE@,$HAVE_LIBM_MACHINE_DIR_TRUE,;t t -s,@HAVE_LIBM_MACHINE_DIR_FALSE@,$HAVE_LIBM_MACHINE_DIR_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/newlib/libm/configure.in b/newlib/libm/configure.in index 06e095103..da2a9ae74 100644 --- a/newlib/libm/configure.in +++ b/newlib/libm/configure.in @@ -28,9 +28,10 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL fi +AC_CONFIG_SUBDIRS(machine) + LIBM_MACHINE_LIB= if test -n "${libm_machine_dir}"; then - AC_CONFIG_SUBDIRS(machine) if test "${use_libtool}" = "yes"; then LIBM_MACHINE_LIB=machine/${libm_machine_dir}/lib${libm_machine_dir}.${aext} else @@ -39,7 +40,6 @@ if test -n "${libm_machine_dir}"; then fi AC_SUBST(LIBM_MACHINE_LIB) -AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test x${libm_machine_dir} != x) AC_CONFIG_FILES([Makefile math/Makefile mathfp/Makefile common/Makefile]) AC_OUTPUT diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in index b368ef564..504667a32 100644 --- a/newlib/libm/math/Makefile.in +++ b/newlib/libm/math/Makefile.in @@ -203,8 +203,6 @@ ELIX_LEVEL_3_TRUE = @ELIX_LEVEL_3_TRUE@ ELIX_LEVEL_4_FALSE = @ELIX_LEVEL_4_FALSE@ ELIX_LEVEL_4_TRUE = @ELIX_LEVEL_4_TRUE@ EXEEXT = @EXEEXT@ -HAVE_LIBM_MACHINE_DIR_FALSE = @HAVE_LIBM_MACHINE_DIR_FALSE@ -HAVE_LIBM_MACHINE_DIR_TRUE = @HAVE_LIBM_MACHINE_DIR_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in index 434e72c37..f20255b25 100644 --- a/newlib/libm/mathfp/Makefile.in +++ b/newlib/libm/mathfp/Makefile.in @@ -176,8 +176,6 @@ ELIX_LEVEL_3_TRUE = @ELIX_LEVEL_3_TRUE@ ELIX_LEVEL_4_FALSE = @ELIX_LEVEL_4_FALSE@ ELIX_LEVEL_4_TRUE = @ELIX_LEVEL_4_TRUE@ EXEEXT = @EXEEXT@ -HAVE_LIBM_MACHINE_DIR_FALSE = @HAVE_LIBM_MACHINE_DIR_FALSE@ -HAVE_LIBM_MACHINE_DIR_TRUE = @HAVE_LIBM_MACHINE_DIR_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@