2002-10-07 Jeff Johnston <jjohnstn@redhat.com>

* Makefile.am: Add EXTRA_DIRS to allow future dependencies on
        the build library.
        * configure.in: Ditto.
        * Makefile.in: Regenerated.
        * configure: Ditto.
        * libc/sys/linux/Makefile.am: Add EXTRA_SUBDIRS and EXTRA_SUBLIBS
        for specifying configured libraries/directories.
        * libc/sys/linux/configure.in: Ditto.
        * libc/sys/linux/Makefile.in: Regenerated.
        * libc/sys/linux/configure: Ditto.
This commit is contained in:
Jeff Johnston 2002-10-07 23:10:13 +00:00
parent dd76747b8e
commit d389acbabf
9 changed files with 44 additions and 7 deletions

View File

@ -1,3 +1,16 @@
2002-10-07 Jeff Johnston <jjohnstn@redhat.com>
* Makefile.am: Add EXTRA_DIRS to allow future dependencies on
the build library.
* configure.in: Ditto.
* Makefile.in: Regenerated.
* configure: Ditto.
* libc/sys/linux/Makefile.am: Add EXTRA_SUBDIRS and EXTRA_SUBLIBS
for specifying configured libraries/directories.
* libc/sys/linux/configure.in: Ditto.
* libc/sys/linux/Makefile.in: Regenerated.
* libc/sys/linux/configure: Ditto.
2002-10-03 Jeff Johnston <jjohnstn@redhat.com> 2002-10-03 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/reent.h: Update documentation at start of file. * libc/include/reent.h: Update documentation at start of file.

View File

@ -63,7 +63,7 @@ DOCDIR =
endif endif
SUBDIRS = libc libm \ SUBDIRS = libc libm \
$(DOCDIR) . $(DOCDIR) . $(EXTRA_DIRS)
tooldir = $(exec_prefix)/$(host_alias) tooldir = $(exec_prefix)/$(host_alias)
toollibdir = $(tooldir)/lib$(MULTISUBDIR) toollibdir = $(tooldir)/lib$(MULTISUBDIR)

View File

@ -78,6 +78,7 @@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_DIRS = @EXTRA_DIRS@
GCJ = @GCJ@ GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@ GCJFLAGS = @GCJFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -164,7 +165,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@HAVE_DOC_FALSE@DOCDIR = @HAVE_DOC_FALSE@DOCDIR =
SUBDIRS = libc libm \ SUBDIRS = libc libm \
$(DOCDIR) . $(DOCDIR) . $(EXTRA_DIRS)
tooldir = $(exec_prefix)/$(host_alias) tooldir = $(exec_prefix)/$(host_alias)
@ -281,7 +282,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = libc libm doc . DIST_SUBDIRS = libc libm doc . @EXTRA_DIRS@
EXPECT = `if test -f $(top_builddir)/../expect/expect; then echo $(top_builddir)/../expect/expect; else echo expect; fi` EXPECT = `if test -f $(top_builddir)/../expect/expect; then echo $(top_builddir)/../expect/expect; else echo expect; fi`
RUNTEST = `if test -f $(top_srcdir)/../dejagnu/runtest; then echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi` RUNTEST = `if test -f $(top_srcdir)/../dejagnu/runtest; then echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi`
SOURCES = libm.a.c libc.a.c $(libm_la_SOURCES) $(libc_la_SOURCES) SOURCES = libm.a.c libc.a.c $(libm_la_SOURCES) $(libc_la_SOURCES)

4
newlib/configure vendored
View File

@ -3066,6 +3066,9 @@ else
HAVE_DOC_FALSE= HAVE_DOC_FALSE=
fi fi
EXTRA_DIRS=
# These get added in the top-level configure.in, except in the case where # These get added in the top-level configure.in, except in the case where
# newlib is being built natively. # newlib is being built natively.
if test -z `echo ${CC} | grep \/libc\/include`; then if test -z `echo ${CC} | grep \/libc\/include`; then
@ -3369,6 +3372,7 @@ s%@NEWLIB_HW_FP_TRUE@%$NEWLIB_HW_FP_TRUE%g
s%@NEWLIB_HW_FP_FALSE@%$NEWLIB_HW_FP_FALSE%g s%@NEWLIB_HW_FP_FALSE@%$NEWLIB_HW_FP_FALSE%g
s%@HAVE_DOC_TRUE@%$HAVE_DOC_TRUE%g s%@HAVE_DOC_TRUE@%$HAVE_DOC_TRUE%g
s%@HAVE_DOC_FALSE@%$HAVE_DOC_FALSE%g s%@HAVE_DOC_FALSE@%$HAVE_DOC_FALSE%g
s%@EXTRA_DIRS@%$EXTRA_DIRS%g
s%@CC_FOR_NEWLIB@%$CC_FOR_NEWLIB%g s%@CC_FOR_NEWLIB@%$CC_FOR_NEWLIB%g
s%@subdirs@%$subdirs%g s%@subdirs@%$subdirs%g
s%@CRT0@%$CRT0%g s%@CRT0@%$CRT0%g

View File

@ -50,6 +50,9 @@ else
fi fi
AM_CONDITIONAL(HAVE_DOC, test x$have_doc = xyes) AM_CONDITIONAL(HAVE_DOC, test x$have_doc = xyes)
EXTRA_DIRS=
AC_SUBST(EXTRA_DIRS)
# These get added in the top-level configure.in, except in the case where # These get added in the top-level configure.in, except in the case where
# newlib is being built natively. # newlib is being built natively.
if test -z `echo ${CC} | grep \/libc\/include`; then if test -z `echo ${CC} | grep \/libc\/include`; then

View File

@ -15,10 +15,12 @@ endif
SUBDIRS = machine \ SUBDIRS = machine \
$(argp_dir) \ $(argp_dir) \
cmath \ cmath \
$(EXTRA_SUBDIRS)\
. .
SUBLIBS = \ SUBLIBS = \
$(ARGP_LIB) \ $(ARGP_LIB) \
cmath/libcmath.la \ cmath/libcmath.la \
$(EXTRA_SUBLIBS) \
$(LINUX_MACH_LIB) $(LINUX_MACH_LIB)
GENERAL_SOURCES = \ GENERAL_SOURCES = \

View File

@ -72,6 +72,8 @@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
GCJ = @GCJ@ GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@ GCJFLAGS = @GCJFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -105,11 +107,13 @@ INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
SUBDIRS = machine \ SUBDIRS = machine \
$(argp_dir) \ $(argp_dir) \
cmath \ cmath \
$(EXTRA_SUBDIRS)\
. .
SUBLIBS = \ SUBLIBS = \
$(ARGP_LIB) \ $(ARGP_LIB) \
cmath/libcmath.la \ cmath/libcmath.la \
$(EXTRA_SUBLIBS) \
$(LINUX_MACH_LIB) $(LINUX_MACH_LIB)
@ -349,7 +353,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = machine argp cmath . DIST_SUBDIRS = machine argp cmath @EXTRA_SUBDIRS@ .
SOURCES = $(lib_a_SOURCES) $(liblinux_la_SOURCES) SOURCES = $(lib_a_SOURCES) $(liblinux_la_SOURCES)
OBJECTS = $(lib_a_OBJECTS) $(liblinux_la_OBJECTS) OBJECTS = $(lib_a_OBJECTS) $(liblinux_la_OBJECTS)

View File

@ -3017,8 +3017,12 @@ if test -n "${machine_dir}"; then
fi fi
EXTRA_SUBDIRS=
EXTRA_SUBLIBS=
subdirs="machine $EXTRA_DIRS"
subdirs="machine $EXTRA_CONFIG_DIRS"
trap '' 1 2 15 trap '' 1 2 15
@ -3227,6 +3231,8 @@ s%@OBJDUMP@%$OBJDUMP%g
s%@LIBTOOL@%$LIBTOOL%g s%@LIBTOOL@%$LIBTOOL%g
s%@AWK@%$AWK%g s%@AWK@%$AWK%g
s%@LINUX_MACH_LIB@%$LINUX_MACH_LIB%g s%@LINUX_MACH_LIB@%$LINUX_MACH_LIB%g
s%@EXTRA_SUBDIRS@%$EXTRA_SUBDIRS%g
s%@EXTRA_SUBLIBS@%$EXTRA_SUBLIBS%g
s%@subdirs@%$subdirs%g s%@subdirs@%$subdirs%g
CEOF CEOF
@ -3365,7 +3371,7 @@ if test "$no_recursion" != yes; then
esac esac
done done
for ac_config_dir in machine $EXTRA_DIRS; do for ac_config_dir in machine $EXTRA_CONFIG_DIRS; do
# Do not complain, so a configure script can configure whichever # Do not complain, so a configure script can configure whichever
# parts of a large source tree are present. # parts of a large source tree are present.

View File

@ -29,7 +29,11 @@ if test -n "${machine_dir}"; then
fi fi
AC_SUBST(LINUX_MACH_LIB) AC_SUBST(LINUX_MACH_LIB)
EXTRA_SUBDIRS=
EXTRA_SUBLIBS=
AC_SUBST(EXTRA_SUBDIRS)
AC_SUBST(EXTRA_SUBLIBS)
AC_CONFIG_SUBDIRS(machine $EXTRA_DIRS) AC_CONFIG_SUBDIRS(machine $EXTRA_CONFIG_DIRS)
AC_OUTPUT(Makefile cmath/Makefile argp/Makefile) AC_OUTPUT(Makefile cmath/Makefile argp/Makefile)