From e7c997e797b9b84ace8ccbfd8eb2555d7b011adc Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 29 Jan 2004 01:32:00 +0000 Subject: 2004-01-28 Ralf Corsepius * Makefile.am: Cosmetics. * configure.ac: Add nostdinc to AUTOMAKE_OPTIONS. --- c/src/lib/libbsp/sparc/leon/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/leon/Makefile.am | 9 ++++----- c/src/lib/libbsp/sparc/leon/configure.ac | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog index 7358d5199d..3e6db2a98b 100644 --- a/c/src/lib/libbsp/sparc/leon/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon/ChangeLog @@ -1,3 +1,8 @@ +2004-01-28 Ralf Corsepius + + * Makefile.am: Cosmetics. + * configure.ac: Add nostdinc to AUTOMAKE_OPTIONS. + 2004-01-27 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, leon_open_eth/Makefile.am, diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am index 4f66064992..36219a0d67 100644 --- a/c/src/lib/libbsp/sparc/leon/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/Makefile.am @@ -9,7 +9,6 @@ include $(top_srcdir)/../../bsp.am EXTRA_PROGRAMS = CLEANFILES = -EXTRA_DIST = noinst_DATA = # wrapup is the one that actually builds and installs the library @@ -19,7 +18,7 @@ SUBDIRS = . tools include_HEADERS += include/leon.h include_HEADERS += include/coverhd.h -EXTRA_DIST += ../../sparc/shared/start.S +EXTRA_DIST = ../../sparc/shared/start.S start$(LIB_VARIANT).$(OBJEXT): ../../sparc/shared/start.S ${CCASCOMPILE} -DASM -o $@ -c $< @@ -123,15 +122,15 @@ endif EXTRA_LIBRARIES = libbsp.a CLEANFILES += libbsp.a libbsp_a_SOURCES = -libbsp_a_LDADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ +libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ clock$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel \ gnatsupp$(LIB_VARIANT).rel if HAS_NETWORKING -libbsp_a_LDADD += leon_open_eth$(LIB_VARIANT).rel +libbsp_a_LIBADD += leon_open_eth$(LIB_VARIANT).rel endif -libbsp_a_LDADD += ../../../libcpu/sparc/cache$(LIB_VARIANT).rel \ +libbsp_a_LIBADD += ../../../libcpu/sparc/cache$(LIB_VARIANT).rel \ ../../../libcpu/sparc/reg_win$(LIB_VARIANT).rel \ ../../../libcpu/sparc/syscall$(LIB_VARIANT).rel diff --git a/c/src/lib/libbsp/sparc/leon/configure.ac b/c/src/lib/libbsp/sparc/leon/configure.ac index 0ce8f853e1..3089f25805 100644 --- a/c/src/lib/libbsp/sparc/leon/configure.ac +++ b/c/src/lib/libbsp/sparc/leon/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.8]) +AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.8]) RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) -- cgit v1.2.3