diff options
author | Jeff Johnston <jjohnstn@redhat.com> | 2006-05-02 02:01:07 +0400 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2006-05-02 02:01:07 +0400 |
commit | 8f8f1db12f5ac069d7e44c7ea9b2eed55f2b0b96 (patch) | |
tree | 63736be05c366aa4eb54d745238770f758ea659b /newlib/libc/reent | |
parent | 0015de8d38a42066853e29ce2ff543578ad28299 (diff) |
2006-05-01 Jeff Johnston <jjohnstn@redhat.com>
* libc/argz/Makefile.am: Prefix any objects specified with $(lpfx). If source file can
be specified instead of object, do so.
* libc/ctype/Makefile.am: Ditto.
* libc/iconv/ccs/Makefile.am: Ditto.
* libc/iconv/ces/Makefile.am: Ditto.
* libc/iconv/lib/Makefile.am: Ditto.
* libc/locale/Makefile.am: Ditto.
* libc/posix/Makefile.am: Ditto.
* libc/reent/Makefile.am: Ditto.
* libc/search/Makefile.am: Ditto.
* libc/stdio/Makefile.am: Ditto.
* libc/stdio64/Makefile.am: Ditto.
* libc/stdlib/Makefile.am: Ditto.
* libc/string/Makefile.am: Ditto.
* libc/syscalls/Makefile.am: Ditto.
* libc/unix/Makefile.am: Ditto.
* libc/machine/a29k/Makefile.am: Specify lib_a_CCASFLAGS so .S files will get
prefix added automatically. Any specified rules must use $(lpfx) for
object file names.
* libc/machine/arm/Makefile.am: Ditto.
* libc/machine/cris/Makefile.am: Ditto.
* libc/machine/crx/Makefile.am: Ditto.
* libc/machine/d10v/Makefile.am: Ditto.
* libc/machine/d30v/Makefile.am: Ditto.
* libc/machine/fr30/Makefile.am: Ditto.
* libc/machine/frv/Makefile.am: Ditto.
* libc/machine/h8300/Makefile.am: Ditto.
* libc/machine/h8500/Makefile.am: Ditto.
* libc/machine/hppa/Makefile.am: Ditto.
* libc/machine/i386/Makefile.am: Ditto.
* libc/machine/i960/Makefile.am: Ditto.
* libc/machine/iq2000/Makefile.am: Ditto.
* libc/machine/m32c/Makefile.am: Ditto.
* libc/machine/m32r/Makefile.am: Ditto.
* libc/machine/m68hc11/Makefile.am: Ditto.
* libc/machine/m68k/Makefile.am: Ditto.
* libc/machine/m88k/Makefile.am: Ditto.
* libc/machine/mips/Makefile.am: Ditto.
* libc/machine/mn10200/Makefile.am: Ditto.
* libc/machine/mn10300/Makefile.am: Ditto.
* libc/machine/mt/Makefile.am: Ditto.
* libc/machine/necv70/Makefile.am: Ditto.
* libc/machine/powerpc/Makefile.am: Ditto.
* libc/machine/sh/Makefile.am: Ditto.
* libc/machine/sh/Makefile.in: Ditto.
* libc/machine/sparc/Makefile.am: Ditto.
* libc/machine/tic4x/Makefile.am: Ditto.
* libc/machine/tic80/Makefile.am: Ditto.
* libc/machine/v850/Makefile.am: Ditto.
* libc/machine/w65/Makefile.am: Ditto.
* libc/machine/xscale/Makefile.am: Ditto.
* libc/machine/xstormy16/Makefile.am: Ditto.
* libc/machine/z8k/Makefile.am: Ditto.
* libc/sys/a29khif/Makefile.am: Ditto.
* libc/sys/arm/Makefile.am: Ditto.
* libc/sys/d10v/Makefile.am: Ditto.
* libc/sys/h8300hms/Makefile.am: Ditto.
* libc/sys/h8500hms/Makefile.am: Ditto.
* libc/sys/linux/Makefile.am: Ditto.
* libc/sys/linux/linuxthreads/Makefile.am: Ditto.
* libc/sys/linux/net/Makefile.am: Ditto.
* libc/sys/linux/stdlib/Makefile.am: Ditto.
* libc/sys/m88kbug/Makefile.am: Ditto.
* libc/sys/mmixware/Makefile.am: Ditto.
* libc/sys/rdos/Makefile.am: Ditto.
* libc/sys/rtems/Makefile.am: Ditto.
* libc/sys/sh/Makefile.am: Ditto.
* libc/sys/sun4/Makefile.am: Ditto.
* libc/sys/sysmec/Makefile.am: Ditto.
* libc/sys/sysnec810/Makefile.am: Ditto.
* libc/sys/sysnecv850/Makefile.am: Ditto.
* libc/sys/sysvi386/Makefile.am: Ditto.
* libc/sys/sysvnecv70/Makefile.am: Ditto.
* libc/sys/tic80/Makefile.am: Ditto.
* libc/sys/w65/Makefile.am: Ditto.
* libc/sys/z8ksim/Makefile.am: Ditto.
* libc/machine/necv70/fastmath.S: Renamed from .s file.
* libc/machine/necv70/setjmp.S: Ditto.
* libc/machine/necv70/fastmath.s: Removed.
* libc/machine/necv70/setjmp.s: Ditto.
* libc/machine/w65/*.S: New files renamed from .s files.
* libc/machine/w65/*.s: Renamed and removed.
* libc/sys/a29khif/*.S: New files renamed from .s files.
* libc/sys/a29khif/*.s: Renamed and removed.
* libc/sys/sysvi386/*.S: New files renamed from .s files.
* libc/sys/sysvi386/*.s: Renamed and removed.
* libc/sys/sysvnecv70/*.S: New files renamed from .s files.
* libc/sys/sysvnecv70/*.s: Renamed and removed.
* libc/*Makefile.in: Regenerated as appropriate.
Diffstat (limited to 'newlib/libc/reent')
-rw-r--r-- | newlib/libc/reent/Makefile.am | 28 | ||||
-rw-r--r-- | newlib/libc/reent/Makefile.in | 90 |
2 files changed, 74 insertions, 44 deletions
diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am index 5cee2751e..babdd7046 100644 --- a/newlib/libc/reent/Makefile.am +++ b/newlib/libc/reent/Makefile.am @@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) if HAVE_STDIO64_DIR -STDIO64_OBJECTS = \ - fstat64r.$(oext) \ - lseek64r.$(oext) \ - open64r.$(oext) +STDIO64_SOURCES = \ + fstat64r.c \ + lseek64r.c \ + open64r.c STDIO64_DEFS = \ fstat64r.def \ @@ -16,16 +16,16 @@ STDIO64_DEFS = \ open64r.def endif -ELIX_2_OBJS = $(STDIO64_OBJECTS) -ELIX_3_OBJS = execr.$(oext) +ELIX_2_SOURCES = $(STDIO64_SOURCES) +ELIX_3_SOURCES = execr.c if ELIX_LEVEL_1 -LIB_OBJS = +ELIX_SOURCES = else if ELIX_LEVEL_2 -LIB_OBJS = $(ELIX_2_OBJS) +ELIX_SOURCES = $(ELIX_2_SOURCES) else -LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) +ELIX_SOURCES = $(ELIX_2_SOURCES) $(ELIX_3_SOURCES) endif endif @@ -52,16 +52,12 @@ libreent_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libreent.la -libreent_la_SOURCES = $(GENERAL_SOURCES) -libreent_la_LIBADD = $(LIB_OBJS) -libreent_la_DEPENDENCIES = $(LIB_OBJS) +libreent_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(GENERAL_SOURCES) -lib_a_LIBADD = $(LIB_OBJS) +lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) -lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL @@ -98,6 +94,6 @@ TARGETDOC = ../tmp.texi doc: $(CHEWOUT_FILES) cat $(srcdir)/reent.tex >> $(TARGETDOC) -impure.$(oext): $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h +$(lpfx)impure.$(oext): $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h CLEANFILES = $(CHEWOUT_FILES) *.ref diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in index cd61c8101..0f1e37bab 100644 --- a/newlib/libc/reent/Makefile.in +++ b/newlib/libc/reent/Makefile.in @@ -53,15 +53,7 @@ CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru lib_a_AR = $(AR) $(ARFLAGS) -@HAVE_STDIO64_DIR_TRUE@am__DEPENDENCIES_1 = fstat64r.$(oext) \ -@HAVE_STDIO64_DIR_TRUE@ lseek64r.$(oext) open64r.$(oext) -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -am__DEPENDENCIES_3 = execr.$(oext) -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@am__DEPENDENCIES_4 = \ -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ $(am__DEPENDENCIES_2) \ -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ $(am__DEPENDENCIES_3) -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@am__DEPENDENCIES_4 = \ -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@ $(am__DEPENDENCIES_2) +lib_a_LIBADD = am__objects_1 = lib_a-closer.$(OBJEXT) lib_a-reent.$(OBJEXT) \ lib_a-impure.$(OBJEXT) lib_a-fcntlr.$(OBJEXT) \ lib_a-fstatr.$(OBJEXT) lib_a-getreent.$(OBJEXT) \ @@ -71,13 +63,35 @@ am__objects_1 = lib_a-closer.$(OBJEXT) lib_a-reent.$(OBJEXT) \ lib_a-sbrkr.$(OBJEXT) lib_a-statr.$(OBJEXT) \ lib_a-timer.$(OBJEXT) lib_a-unlinkr.$(OBJEXT) \ lib_a-writer.$(OBJEXT) -@USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1) +@HAVE_STDIO64_DIR_TRUE@am__objects_2 = lib_a-fstat64r.$(OBJEXT) \ +@HAVE_STDIO64_DIR_TRUE@ lib_a-lseek64r.$(OBJEXT) \ +@HAVE_STDIO64_DIR_TRUE@ lib_a-open64r.$(OBJEXT) +am__objects_3 = $(am__objects_2) +am__objects_4 = lib_a-execr.$(OBJEXT) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@am__objects_5 = \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ $(am__objects_3) \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ $(am__objects_4) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@am__objects_5 = \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@ $(am__objects_3) +@USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1) \ +@USE_LIBTOOL_FALSE@ $(am__objects_5) lib_a_OBJECTS = $(am_lib_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) -am__objects_2 = closer.lo reent.lo impure.lo fcntlr.lo fstatr.lo \ +libreent_la_LIBADD = +am__objects_6 = closer.lo reent.lo impure.lo fcntlr.lo fstatr.lo \ getreent.lo linkr.lo lseekr.lo openr.lo readr.lo signalr.lo \ signgam.lo sbrkr.lo statr.lo timer.lo unlinkr.lo writer.lo -@USE_LIBTOOL_TRUE@am_libreent_la_OBJECTS = $(am__objects_2) +@HAVE_STDIO64_DIR_TRUE@am__objects_7 = fstat64r.lo lseek64r.lo \ +@HAVE_STDIO64_DIR_TRUE@ open64r.lo +am__objects_8 = $(am__objects_7) +am__objects_9 = execr.lo +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@am__objects_10 = \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ $(am__objects_8) \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ $(am__objects_9) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@am__objects_10 = \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@ $(am__objects_8) +@USE_LIBTOOL_TRUE@am_libreent_la_OBJECTS = $(am__objects_6) \ +@USE_LIBTOOL_TRUE@ $(am__objects_10) libreent_la_OBJECTS = $(am_libreent_la_OBJECTS) @USE_LIBTOOL_TRUE@am_libreent_la_rpath = DEFAULT_INCLUDES = -I. -I$(srcdir) @@ -235,21 +249,21 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -@HAVE_STDIO64_DIR_TRUE@STDIO64_OBJECTS = \ -@HAVE_STDIO64_DIR_TRUE@ fstat64r.$(oext) \ -@HAVE_STDIO64_DIR_TRUE@ lseek64r.$(oext) \ -@HAVE_STDIO64_DIR_TRUE@ open64r.$(oext) +@HAVE_STDIO64_DIR_TRUE@STDIO64_SOURCES = \ +@HAVE_STDIO64_DIR_TRUE@ fstat64r.c \ +@HAVE_STDIO64_DIR_TRUE@ lseek64r.c \ +@HAVE_STDIO64_DIR_TRUE@ open64r.c @HAVE_STDIO64_DIR_TRUE@STDIO64_DEFS = \ @HAVE_STDIO64_DIR_TRUE@ fstat64r.def \ @HAVE_STDIO64_DIR_TRUE@ lseek64r.def \ @HAVE_STDIO64_DIR_TRUE@ open64r.def -ELIX_2_OBJS = $(STDIO64_OBJECTS) -ELIX_3_OBJS = execr.$(oext) -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) -@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS) -@ELIX_LEVEL_1_TRUE@LIB_OBJS = +ELIX_2_SOURCES = $(STDIO64_SOURCES) +ELIX_3_SOURCES = execr.c +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ELIX_SOURCES = $(ELIX_2_SOURCES) $(ELIX_3_SOURCES) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@ELIX_SOURCES = $(ELIX_2_SOURCES) +@ELIX_LEVEL_1_TRUE@ELIX_SOURCES = GENERAL_SOURCES = \ closer.c \ reent.c \ @@ -271,16 +285,12 @@ GENERAL_SOURCES = \ libreent_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libreent.la -@USE_LIBTOOL_TRUE@libreent_la_SOURCES = $(GENERAL_SOURCES) -@USE_LIBTOOL_TRUE@libreent_la_LIBADD = $(LIB_OBJS) -@USE_LIBTOOL_TRUE@libreent_la_DEPENDENCIES = $(LIB_OBJS) +@USE_LIBTOOL_TRUE@libreent_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES) @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES) -@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES) @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS) -@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS) CHEWOUT_FILES = \ closer.def \ reent.def \ @@ -472,6 +482,30 @@ lib_a-writer.o: writer.c lib_a-writer.obj: writer.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-writer.obj `if test -f 'writer.c'; then $(CYGPATH_W) 'writer.c'; else $(CYGPATH_W) '$(srcdir)/writer.c'; fi` +lib_a-fstat64r.o: fstat64r.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fstat64r.o `test -f 'fstat64r.c' || echo '$(srcdir)/'`fstat64r.c + +lib_a-fstat64r.obj: fstat64r.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fstat64r.obj `if test -f 'fstat64r.c'; then $(CYGPATH_W) 'fstat64r.c'; else $(CYGPATH_W) '$(srcdir)/fstat64r.c'; fi` + +lib_a-lseek64r.o: lseek64r.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-lseek64r.o `test -f 'lseek64r.c' || echo '$(srcdir)/'`lseek64r.c + +lib_a-lseek64r.obj: lseek64r.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-lseek64r.obj `if test -f 'lseek64r.c'; then $(CYGPATH_W) 'lseek64r.c'; else $(CYGPATH_W) '$(srcdir)/lseek64r.c'; fi` + +lib_a-open64r.o: open64r.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-open64r.o `test -f 'open64r.c' || echo '$(srcdir)/'`open64r.c + +lib_a-open64r.obj: open64r.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-open64r.obj `if test -f 'open64r.c'; then $(CYGPATH_W) 'open64r.c'; else $(CYGPATH_W) '$(srcdir)/open64r.c'; fi` + +lib_a-execr.o: execr.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-execr.o `test -f 'execr.c' || echo '$(srcdir)/'`execr.c + +lib_a-execr.obj: execr.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-execr.obj `if test -f 'execr.c'; then $(CYGPATH_W) 'execr.c'; else $(CYGPATH_W) '$(srcdir)/execr.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -633,7 +667,7 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) doc: $(CHEWOUT_FILES) cat $(srcdir)/reent.tex >> $(TARGETDOC) -impure.$(oext): $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h +$(lpfx)impure.$(oext): $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |