From d389acbabf615d25eff5940d75fd43221597b039 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 7 Oct 2002 23:10:13 +0000 Subject: [PATCH] 2002-10-07 Jeff Johnston * 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. --- newlib/ChangeLog | 13 +++++++++++++ newlib/Makefile.am | 2 +- newlib/Makefile.in | 5 +++-- newlib/configure | 4 ++++ newlib/configure.in | 3 +++ newlib/libc/sys/linux/Makefile.am | 2 ++ newlib/libc/sys/linux/Makefile.in | 6 +++++- newlib/libc/sys/linux/configure | 10 ++++++++-- newlib/libc/sys/linux/configure.in | 6 +++++- 9 files changed, 44 insertions(+), 7 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 246fb94dd..f8a307d7e 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,16 @@ +2002-10-07 Jeff Johnston + + * 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 * libc/include/reent.h: Update documentation at start of file. diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 7afb28a75..f3be4de5e 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -63,7 +63,7 @@ DOCDIR = endif SUBDIRS = libc libm \ - $(DOCDIR) . + $(DOCDIR) . $(EXTRA_DIRS) tooldir = $(exec_prefix)/$(host_alias) toollibdir = $(tooldir)/lib$(MULTISUBDIR) diff --git a/newlib/Makefile.in b/newlib/Makefile.in index a58444bf0..77d1ca114 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -78,6 +78,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ +EXTRA_DIRS = @EXTRA_DIRS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ LDFLAGS = @LDFLAGS@ @@ -164,7 +165,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @HAVE_DOC_FALSE@DOCDIR = SUBDIRS = libc libm \ - $(DOCDIR) . + $(DOCDIR) . $(EXTRA_DIRS) tooldir = $(exec_prefix)/$(host_alias) @@ -281,7 +282,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar 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` 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) diff --git a/newlib/configure b/newlib/configure index 915901636..c55a6b993 100755 --- a/newlib/configure +++ b/newlib/configure @@ -3066,6 +3066,9 @@ else HAVE_DOC_FALSE= fi +EXTRA_DIRS= + + # These get added in the top-level configure.in, except in the case where # newlib is being built natively. 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%@HAVE_DOC_TRUE@%$HAVE_DOC_TRUE%g s%@HAVE_DOC_FALSE@%$HAVE_DOC_FALSE%g +s%@EXTRA_DIRS@%$EXTRA_DIRS%g s%@CC_FOR_NEWLIB@%$CC_FOR_NEWLIB%g s%@subdirs@%$subdirs%g s%@CRT0@%$CRT0%g diff --git a/newlib/configure.in b/newlib/configure.in index e3e257fb3..99a4b40b3 100644 --- a/newlib/configure.in +++ b/newlib/configure.in @@ -50,6 +50,9 @@ else fi 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 # newlib is being built natively. if test -z `echo ${CC} | grep \/libc\/include`; then diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am index 9f3986f5b..69eaa7e88 100644 --- a/newlib/libc/sys/linux/Makefile.am +++ b/newlib/libc/sys/linux/Makefile.am @@ -15,10 +15,12 @@ endif SUBDIRS = machine \ $(argp_dir) \ cmath \ + $(EXTRA_SUBDIRS)\ . SUBLIBS = \ $(ARGP_LIB) \ cmath/libcmath.la \ + $(EXTRA_SUBLIBS) \ $(LINUX_MACH_LIB) GENERAL_SOURCES = \ diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in index 9a36c9cc9..7a4045431 100644 --- a/newlib/libc/sys/linux/Makefile.in +++ b/newlib/libc/sys/linux/Makefile.in @@ -72,6 +72,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ +EXTRA_SUBDIRS = @EXTRA_SUBDIRS@ +EXTRA_SUBLIBS = @EXTRA_SUBLIBS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ LDFLAGS = @LDFLAGS@ @@ -105,11 +107,13 @@ INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) SUBDIRS = machine \ $(argp_dir) \ cmath \ + $(EXTRA_SUBDIRS)\ . SUBLIBS = \ $(ARGP_LIB) \ cmath/libcmath.la \ + $(EXTRA_SUBLIBS) \ $(LINUX_MACH_LIB) @@ -349,7 +353,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best -DIST_SUBDIRS = machine argp cmath . +DIST_SUBDIRS = machine argp cmath @EXTRA_SUBDIRS@ . SOURCES = $(lib_a_SOURCES) $(liblinux_la_SOURCES) OBJECTS = $(lib_a_OBJECTS) $(liblinux_la_OBJECTS) diff --git a/newlib/libc/sys/linux/configure b/newlib/libc/sys/linux/configure index 5a8a2c5ed..363c3dff3 100755 --- a/newlib/libc/sys/linux/configure +++ b/newlib/libc/sys/linux/configure @@ -3017,8 +3017,12 @@ if test -n "${machine_dir}"; then fi +EXTRA_SUBDIRS= +EXTRA_SUBLIBS= -subdirs="machine $EXTRA_DIRS" + + +subdirs="machine $EXTRA_CONFIG_DIRS" trap '' 1 2 15 @@ -3227,6 +3231,8 @@ s%@OBJDUMP@%$OBJDUMP%g s%@LIBTOOL@%$LIBTOOL%g s%@AWK@%$AWK%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 CEOF @@ -3365,7 +3371,7 @@ if test "$no_recursion" != yes; then esac 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 # parts of a large source tree are present. diff --git a/newlib/libc/sys/linux/configure.in b/newlib/libc/sys/linux/configure.in index 857c6f9e7..c97ca87d7 100644 --- a/newlib/libc/sys/linux/configure.in +++ b/newlib/libc/sys/linux/configure.in @@ -29,7 +29,11 @@ if test -n "${machine_dir}"; then fi 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)