From 0324070e352783db45f2c2b9ab7c9af1edaf0ab1 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 7 Sep 2006 17:32:19 +0000 Subject: [PATCH] 2006-09-07 Masaki Muranaka * libc/machine/xstormy16/Makefile.am: Add $(lpfx) prefix to LIBADD objects. lib_a_DEPENDENCIES uses the value of lib_a_LIBADD. * libc/machine/xstormy16/Makefile.in: Regenerated. --- newlib/ChangeLog | 7 +++++++ newlib/libc/machine/xstormy16/Makefile.am | 21 ++++++++++++++++--- newlib/libc/machine/xstormy16/Makefile.in | 25 ++++++++++++++++------- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 33270bc4e..9c9d8d221 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2006-09-07 Masaki Muranaka + + * libc/machine/xstormy16/Makefile.am: + Add $(lpfx) prefix to LIBADD objects. + lib_a_DEPENDENCIES uses the value of lib_a_LIBADD. + * libc/machine/xstormy16/Makefile.in: Regenerated. + 2006-09-06 Eric Blake * libc/stdio/vfprintf.c (_vfprintf_r, get_arg): Add 'hh', 'j', diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am index 0a154a29e..e6c25acd9 100644 --- a/newlib/libc/machine/xstormy16/Makefile.am +++ b/newlib/libc/machine/xstormy16/Makefile.am @@ -17,9 +17,24 @@ lib_a_CFLAGS = $(AM_CFLAGS) ACLOCAL_AMFLAGS = -I ../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host -lib_a_LIBADD = malloc.o free.o realloc.o calloc.o cfree.o malign.o \ - valloc.o pvalloc.o mallinfo.o mallstats.o msize.o mallopt.o \ - mallocr.o freer.o reallocr.o callocr.o +lib_a_LIBADD = $(lpfx)malloc.o \ + $(lpfx)free.o \ + $(lpfx)realloc.o \ + $(lpfx)calloc.o \ + $(lpfx)cfree.o \ + $(lpfx)malign.o \ + $(lpfx)valloc.o \ + $(lpfx)pvalloc.o \ + $(lpfx)mallinfo.o \ + $(lpfx)mallstats.o \ + $(lpfx)msize.o \ + $(lpfx)mallopt.o \ + $(lpfx)mallocr.o \ + $(lpfx)freer.o \ + $(lpfx)reallocr.o \ + $(lpfx)callocr.o + +lib_a_DEPENDENCIES = $(lib_a_LIBADD) MALLOC_COMPILE = $(COMPILE) diff --git a/newlib/libc/machine/xstormy16/Makefile.in b/newlib/libc/machine/xstormy16/Makefile.in index b61ea8e60..7e880e282 100644 --- a/newlib/libc/machine/xstormy16/Makefile.in +++ b/newlib/libc/machine/xstormy16/Makefile.in @@ -55,9 +55,6 @@ CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru lib_a_AR = $(AR) $(ARFLAGS) -lib_a_DEPENDENCIES = malloc.o free.o realloc.o calloc.o cfree.o \ - malign.o valloc.o pvalloc.o mallinfo.o mallstats.o msize.o \ - mallopt.o mallocr.o freer.o reallocr.o callocr.o am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a_OBJECTS = $(am_lib_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) @@ -191,10 +188,24 @@ lib_a_CCASFLAGS = $(AM_CCASFLAGS) lib_a_CFLAGS = $(AM_CFLAGS) ACLOCAL_AMFLAGS = -I ../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host -lib_a_LIBADD = malloc.o free.o realloc.o calloc.o cfree.o malign.o \ - valloc.o pvalloc.o mallinfo.o mallstats.o msize.o mallopt.o \ - mallocr.o freer.o reallocr.o callocr.o - +lib_a_LIBADD = $(lpfx)malloc.o \ + $(lpfx)free.o \ + $(lpfx)realloc.o \ + $(lpfx)calloc.o \ + $(lpfx)cfree.o \ + $(lpfx)malign.o \ + $(lpfx)valloc.o \ + $(lpfx)pvalloc.o \ + $(lpfx)mallinfo.o \ + $(lpfx)mallstats.o \ + $(lpfx)msize.o \ + $(lpfx)mallopt.o \ + $(lpfx)mallocr.o \ + $(lpfx)freer.o \ + $(lpfx)reallocr.o \ + $(lpfx)callocr.o + +lib_a_DEPENDENCIES = $(lib_a_LIBADD) MALLOC_COMPILE = $(COMPILE) all: all-am -- 2.43.5