diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2006-05-09 21:55:21 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2006-05-09 21:55:21 +0400 |
| commit | bac01fc8f796741efe8b9214646ba4aa8eb207f2 (patch) | |
| tree | b646683c76351c8fa8d9fac6501972d5570d9a47 /newlib | |
| parent | 56aed3f578544d2eedebde560da6d0a7966fa018 (diff) | |
2006-05-09 Kazu Hirata <kazu@codesourcery.com>
* libc/machine/arm/Makefile.am: Fix a typo.
* libc/machine/arm/Makefile.in: Regenerated.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/machine/arm/Makefile.am | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/arm/Makefile.in | 13 |
3 files changed, 16 insertions, 4 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 182793cb7..bd36170db 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2006-05-09 Kazu Hirata <kazu@codesourcery.com> + + * libc/machine/arm/Makefile.am: Fix a typo. + * libc/machine/arm/Makefile.in: Regenerated. + 2006-05-08 J"orn Rennecke <joern.rennecke@st.com> * libc/machine/sh/Makefile.am (AM_CCASFLAGS): Add $(CFLAGS). diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am index ab2ff99e9..1f6f49cee 100644 --- a/newlib/libc/machine/arm/Makefile.am +++ b/newlib/libc/machine/arm/Makefile.am @@ -10,7 +10,7 @@ noinst_LIBRARIES = lib.a lib_a_SOURCES = setjmp.S access.c lib_a_CCASFLAGS=$(AM_CCASFLAGS) -lib_a_CFLAGS-$(AM_CFLAGS) +lib_a_CFLAGS = $(AM_CFLAGS) ACLOCAL_AMFLAGS = -I ../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in index a81cdc9a2..7b1a9018e 100644 --- a/newlib/libc/machine/arm/Makefile.in +++ b/newlib/libc/machine/arm/Makefile.in @@ -41,7 +41,8 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../../../../config.guess \ $(srcdir)/../../../../config.sub $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs + $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs \ + $(srcdir)/../../../../compile subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \ @@ -56,7 +57,7 @@ LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru lib_a_AR = $(AR) $(ARFLAGS) lib_a_LIBADD = -am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) access.$(OBJEXT) +am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-access.$(OBJEXT) lib_a_OBJECTS = $(am_lib_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = @@ -181,6 +182,7 @@ AM_CCASFLAGS = $(INCLUDES) noinst_LIBRARIES = lib.a lib_a_SOURCES = setjmp.S access.c lib_a_CCASFLAGS = $(AM_CCASFLAGS) +lib_a_CFLAGS = $(AM_CFLAGS) ACLOCAL_AMFLAGS = -I ../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am @@ -251,6 +253,12 @@ lib_a-setjmp.obj: setjmp.S .c.obj: $(COMPILE) -c `$(CYGPATH_W) '$<'` + +lib_a-access.o: access.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.o `test -f 'access.c' || echo '$(srcdir)/'`access.c + +lib_a-access.obj: access.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.obj `if test -f 'access.c'; then $(CYGPATH_W) 'access.c'; else $(CYGPATH_W) '$(srcdir)/access.c'; fi` uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -389,7 +397,6 @@ uninstall-am: mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-info-am -lib_a_CFLAGS-$(AM_CFLAGS) # 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: |