JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
newlib/libc/sys/linux/Makefile.am
View File

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

6
newlib/libc/sys/linux/Makefile.in
View File

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

10
newlib/libc/sys/linux/configure vendored
View File

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

6
newlib/libc/sys/linux/configure.in
View File

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