PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* libm/machine/configure.in (HAVE_LIBM_MACHINE_DIR): New conditional. 

* libm/machine/Makefile.am [HAVE_LIBM_MACHINE_DIR] (LIBM_MACHLIB): New variable.
This commit is contained in:
Thomas Fitzsimmons 2001-12-19 23:41:46 +00:00
parent 4b31ae795b
commit 1f93c55ff7
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2001-12-19 Thomas Fitzsimmons <fitzsim@redhat.com>
* libm/machine/configure.in (HAVE_LIBM_MACHINE_DIR): New conditional.
* libm/machine/Makefile.am [HAVE_LIBM_MACHINE_DIR] (LIBM_MACHLIB): New variable.
2001-12-19 Corinna Vinschen <corinna@vinschen.de>
* libm/machine/Makefile.am: Change rules to create correct lib.a.

12
newlib/libm/machine/Makefile.am
View File

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

4
newlib/libm/machine/Makefile.in
View File

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

11
newlib/libm/machine/configure vendored
View File

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

1
newlib/libm/machine/configure.in
View File

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