2005-04-07 Shaun Jackman <sjackman@gmail.com>

* libc/unix/Makefile.am (LIB_OBJS): Include all the ELIX objects if no
        ELIX level is defined.
        * libc/unix/Makefile.in: Regenerated.
This commit is contained in:
Jeff Johnston 2005-04-07 23:37:06 +00:00
parent 2ecb1a58cf
commit 9ae26f7e2e
3 changed files with 7 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2005-04-07 Shaun Jackman <sjackman@gmail.com>
* 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 <dave.korn@artimi.com>
* libc/stdio/vfscanf.c (__svfscanf_r): If an error occurs processing

View File

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

View File

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