diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2002-10-08 03:10:13 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2002-10-08 03:10:13 +0400 |
| commit | d389acbabf615d25eff5940d75fd43221597b039 (patch) | |
| tree | dbe6e2b135b7310b6acbf7205a75174a3c0a534d /newlib/libc/sys/linux | |
| parent | dd76747b8e7892a8a17be9149c600561f518399a (diff) | |
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.
Diffstat (limited to 'newlib/libc/sys/linux')
| -rw-r--r-- | newlib/libc/sys/linux/Makefile.am | 2 | ||||
| -rw-r--r-- | newlib/libc/sys/linux/Makefile.in | 6 | ||||
| -rwxr-xr-x | newlib/libc/sys/linux/configure | 10 | ||||
| -rw-r--r-- | newlib/libc/sys/linux/configure.in | 6 |
4 files changed, 20 insertions, 4 deletions
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) |