From 9ae26f7e2e7e57245776805e187c6d3ad4b4c679 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 7 Apr 2005 23:37:06 +0000 Subject: [PATCH] 2005-04-07 Shaun Jackman * libc/unix/Makefile.am (LIB_OBJS): Include all the ELIX objects if no ELIX level is defined. * libc/unix/Makefile.in: Regenerated. --- newlib/ChangeLog | 6 ++++++ newlib/libc/unix/Makefile.am | 2 -- newlib/libc/unix/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 0b3b33700..68097d161 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,9 @@ +2005-04-07 Shaun Jackman + + * libc/unix/Makefile.am (LIB_OBJS): Include all the ELIX objects if no + ELIX level is defined. + * libc/unix/Makefile.in: Regenerated. + 2005-04-05 Dave Korn * libc/stdio/vfscanf.c (__svfscanf_r): If an error occurs processing diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am index 24d1bfb5c..a5d57cf87 100644 --- a/newlib/libc/unix/Makefile.am +++ b/newlib/libc/unix/Makefile.am @@ -29,12 +29,10 @@ else if ELIX_LEVEL_3 LIB_OBJS = $(ELIX_2_OBJS) else -if ELIX_LEVEL_4 LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS) endif endif endif -endif libunix_la_LDFLAGS = -Xcompiler -nostdlib diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in index cdc056b90..a3bb1b02e 100644 --- a/newlib/libc/unix/Makefile.in +++ b/newlib/libc/unix/Makefile.in @@ -121,7 +121,7 @@ ELIX_4_OBJS = getlogin.$(oext) getpass.$(oext) getpwent.$(oext) getut.$(o @ELIX_LEVEL_1_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS) @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS) -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@ELIX_LEVEL_4_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS) libunix_la_LDFLAGS = -Xcompiler -nostdlib