diff options
Diffstat (limited to 'newlib/libc/unix')
-rw-r--r-- | newlib/libc/unix/Makefile.am | 42 | ||||
-rw-r--r-- | newlib/libc/unix/Makefile.in | 44 |
2 files changed, 67 insertions, 19 deletions
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am index 83fd26254..24d1bfb5c 100644 --- a/newlib/libc/unix/Makefile.am +++ b/newlib/libc/unix/Makefile.am @@ -4,19 +4,51 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - getcwd.c getlogin.c getpass.c getpwent.c getut.c \ - pread.c pwrite.c sigset.c ttyname.c +GENERAL_SOURCES = \ + getcwd.c \ + pread.c \ + pwrite.c \ + sigset.c + +## Distinguish different EL/IX level interfaces +ELIX_2_OBJS = \ + ttyname.$(oext) + +ELIX_4_OBJS = \ + getlogin.$(oext) \ + getpass.$(oext) \ + getpwent.$(oext) \ + getut.$(oext) + +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = $(ELIX_2_OBJS) +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 if USE_LIBTOOL noinst_LTLIBRARIES = libunix.la -libunix_la_SOURCES = $(LIB_SOURCES) +libunix_la_SOURCES = $(GENERAL_SOURCES) +libunix_la_LIBADD = $(LIB_OBJS) +libunix_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in index 60a069d55..56e5c1b58 100644 --- a/newlib/libc/unix/Makefile.in +++ b/newlib/libc/unix/Makefile.in @@ -110,19 +110,40 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - getcwd.c getlogin.c getpass.c getpwent.c getut.c \ - pread.c pwrite.c sigset.c ttyname.c +GENERAL_SOURCES = \ + getcwd.c \ + pread.c \ + pwrite.c \ + sigset.c +ELIX_2_OBJS = \ + ttyname.$(oext) + + +ELIX_4_OBJS = \ + getlogin.$(oext) \ + getpass.$(oext) \ + getpwent.$(oext) \ + getut.$(oext) + +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@ELIX_LEVEL_4_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@ELIX_LEVEL_4_TRUE@$(ELIX_2_OBJS) $(ELIX_4_OBJS) + libunix_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libunix.la -@USE_LIBTOOL_TRUE@libunix_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libunix_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libunix_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libunix_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = @@ -141,17 +162,12 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = getcwd.$(OBJEXT) getlogin.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getpass.$(OBJEXT) getpwent.$(OBJEXT) getut.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@pread.$(OBJEXT) pwrite.$(OBJEXT) sigset.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ttyname.$(OBJEXT) +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = getcwd.$(OBJEXT) pread.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@pwrite.$(OBJEXT) sigset.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libunix_la_LIBADD = -@USE_LIBTOOL_TRUE@libunix_la_OBJECTS = getcwd.lo getlogin.lo getpass.lo \ -@USE_LIBTOOL_TRUE@getpwent.lo getut.lo pread.lo pwrite.lo sigset.lo \ -@USE_LIBTOOL_TRUE@ttyname.lo +@USE_LIBTOOL_TRUE@libunix_la_OBJECTS = getcwd.lo pread.lo pwrite.lo \ +@USE_LIBTOOL_TRUE@sigset.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |