From b58e3f390ff843af45c408464f432baca8c79162 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 11:50:05 +0000 Subject: 2003-09-29 Ralf Corsepius * Makefile.am: Merge-in include/Makefile.am. Reflect changes to bsp.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above. * start/start.S: Comment out string after #endif. --- c/src/lib/libbsp/mips/p4000/ChangeLog | 8 ++++++++ c/src/lib/libbsp/mips/p4000/Makefile.am | 14 +++++++++++--- c/src/lib/libbsp/mips/p4000/configure.ac | 3 --- c/src/lib/libbsp/mips/p4000/include/Makefile.am | 18 ------------------ c/src/lib/libbsp/mips/p4000/start/start.S | 2 +- 5 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 c/src/lib/libbsp/mips/p4000/include/Makefile.am diff --git a/c/src/lib/libbsp/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog index f372b0200b..441e3ca909 100644 --- a/c/src/lib/libbsp/mips/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips/p4000/ChangeLog @@ -1,3 +1,11 @@ +2003-09-29 Ralf Corsepius + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + * start/start.S: Comment out string after #endif. + 2003-09-08 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/mips/p4000/Makefile.am b/c/src/lib/libbsp/mips/p4000/Makefile.am index 2d93f819b8..22ebbab452 100644 --- a/c/src/lib/libbsp/mips/p4000/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/Makefile.am @@ -5,12 +5,20 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = include start startup console liblnk wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup console liblnk wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/p4000/configure.ac b/c/src/lib/libbsp/mips/p4000/configure.ac index 51f241078e..b7d863db83 100644 --- a/c/src/lib/libbsp/mips/p4000/configure.ac +++ b/c/src/lib/libbsp/mips/p4000/configure.ac @@ -14,12 +14,9 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS - - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile console/Makefile -include/Makefile liblnk/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/mips/p4000/include/Makefile.am b/c/src/lib/libbsp/mips/p4000/include/Makefile.am deleted file mode 100644 index abbccfd9f7..0000000000 --- a/c/src/lib/libbsp/mips/p4000/include/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/p4000/start/start.S b/c/src/lib/libbsp/mips/p4000/start/start.S index bf36c452fe..4effbfc493 100644 --- a/c/src/lib/libbsp/mips/p4000/start/start.S +++ b/c/src/lib/libbsp/mips/p4000/start/start.S @@ -95,7 +95,7 @@ FRAME(start,sp,0,ra) /* 4650: Need fr to be set anyway */ #else li v0,SR_CU1|SR_DE /* initally clear ERL, enable FPA 32bit regs*/ -#endif mips3 +#endif /* mips3 */ #endif mtc0 v0,C0_SR /* clr IntMsks/ kernel/disabled mode */ -- cgit v1.2.3