diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index 12c9344761..7ec9d62992 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog @@ -1,3 +1,8 @@ +2008-09-30 Ralf Corsépius + + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + 2008-09-30 Ralf Corsépius * clock/clock.c: include "../../../shared/clockdrv_shell.h". diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 3298cbe01a..05b3f479c8 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../bsp.am dist_project_lib_DATA = bsp_specs @@ -17,16 +16,15 @@ DISTCLEANFILES = include/bspopts.h include_HEADERS += include/coverhd.h -EXTRA_DIST = start/start.S start/crtnn.s times -crtnn.$(OBJEXT): start/crtnn.s - $(CPPASCOMPILE) -o $@ -c $< -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< +EXTRA_DIST = times +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/crtnn.s +libbspstart_a_SOURCES += start/start.S project_lib_DATA = start.$(OBJEXT) crtnn.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup