diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2001-12-19 23:41:46 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2001-12-19 23:41:46 +0000 |
| commit | 1f93c55ff7f7613d779ed770a60be13c14b0858f (patch) | |
| tree | 2bf6cd9827015e6dd5b9a385085dfc6d82fde25c /newlib/libm | |
| parent | 4b31ae795b3f7bc50b0b8ae9a94740a1d356ab1a (diff) | |
| download | newlib-1f93c55ff7f7613d779ed770a60be13c14b0858f.zip newlib-1f93c55ff7f7613d779ed770a60be13c14b0858f.tar.gz newlib-1f93c55ff7f7613d779ed770a60be13c14b0858f.tar.bz2 | |
* libm/machine/configure.in (HAVE_LIBM_MACHINE_DIR): New conditional.
* libm/machine/Makefile.am [HAVE_LIBM_MACHINE_DIR] (LIBM_MACHLIB): New variable.
Diffstat (limited to 'newlib/libm')
| -rw-r--r-- | newlib/libm/machine/Makefile.am | 12 | ||||
| -rw-r--r-- | newlib/libm/machine/Makefile.in | 4 | ||||
| -rwxr-xr-x | newlib/libm/machine/configure | 11 | ||||
| -rw-r--r-- | newlib/libm/machine/configure.in | 1 |
4 files changed, 23 insertions, 5 deletions
diff --git a/newlib/libm/machine/Makefile.am b/newlib/libm/machine/Makefile.am index f72a8ee..4b972f7 100644 --- a/newlib/libm/machine/Makefile.am +++ b/newlib/libm/machine/Makefile.am @@ -4,9 +4,13 @@ AUTOMAKE_OPTIONS = cygnus SUBDIRS = $(libm_machine_dir) . +if HAVE_LIBM_MACHINE_DIR +LIBM_MACHLIB = lib.a +endif + if USE_LIBTOOL else -noinst_LIBRARIES = lib.a +noinst_LIBRARIES = $(LIBM_MACHLIB) lib.a: $(libm_machine_dir)/lib.a rm -f $@ @@ -14,9 +18,9 @@ lib.a: $(libm_machine_dir)/lib.a cp $(libm_machine_dir)/lib.a $@ endif # USE_LIBTOOL -ACLOCAL_AMFLAGS = -I ../.. -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host - $(libm_machine_dir)/lib.a: doc: + +ACLOCAL_AMFLAGS = -I ../.. +CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libm/machine/Makefile.in b/newlib/libm/machine/Makefile.in index 0b8964f..339a0f8 100644 --- a/newlib/libm/machine/Makefile.in +++ b/newlib/libm/machine/Makefile.in @@ -87,7 +87,9 @@ AUTOMAKE_OPTIONS = cygnus SUBDIRS = $(libm_machine_dir) . -@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a +@HAVE_LIBM_MACHINE_DIR_TRUE@LIBM_MACHLIB = @HAVE_LIBM_MACHINE_DIR_TRUE@lib.a + +@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@$(LIBM_MACHLIB) ACLOCAL_AMFLAGS = -I ../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libm/machine/configure b/newlib/libm/machine/configure index dc9ea15..1d08c87 100755 --- a/newlib/libm/machine/configure +++ b/newlib/libm/machine/configure @@ -2284,6 +2284,15 @@ 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 trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2473,6 +2482,8 @@ s%@OBJDUMP@%$OBJDUMP%g s%@LIBTOOL@%$LIBTOOL%g s%@subdirs@%$subdirs%g s%@machlib@%$machlib%g +s%@HAVE_LIBM_MACHINE_DIR_TRUE@%$HAVE_LIBM_MACHINE_DIR_TRUE%g +s%@HAVE_LIBM_MACHINE_DIR_FALSE@%$HAVE_LIBM_MACHINE_DIR_FALSE%g CEOF EOF diff --git a/newlib/libm/machine/configure.in b/newlib/libm/machine/configure.in index 00a27a1..ee3749d 100644 --- a/newlib/libm/machine/configure.in +++ b/newlib/libm/machine/configure.in @@ -33,6 +33,7 @@ fi AC_SUBST(libm_machine_dir) AC_SUBST(machlib) +AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test x${libm_machine_dir} != x) AC_OUTPUT(Makefile) |