From 82f1f6dd8d09ae29f1a4f173c4945918f6b5e07e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 10 Jan 2000 14:06:59 +0000 Subject: Patch rtems-rc-20000104-6.diff from Ralf Corsepius that converts the mips64orion directory to automake. Ralf's Note: This patch demonstrates another kind of supporting the new style of configuration, which avoids having to port all Makefile.ins to automake, but to keep using most old style Makefile.ins. --- c/src/lib/libbsp/mips/Makefile.am | 12 +++++++++ c/src/lib/libbsp/mips/p4000/Makefile.am | 17 ++++++++++++ c/src/lib/libbsp/mips64orion/Makefile.am | 12 +++++++++ c/src/lib/libbsp/mips64orion/Makefile.in | 26 ------------------ c/src/lib/libbsp/mips64orion/p4000/Makefile.am | 17 ++++++++++++ c/src/lib/libbsp/mips64orion/p4000/Makefile.in | 31 ---------------------- .../libbsp/mips64orion/p4000/console/Makefile.in | 4 +-- .../libbsp/mips64orion/p4000/include/Makefile.in | 4 +-- .../libbsp/mips64orion/p4000/liblnk/Makefile.in | 4 +-- .../lib/libbsp/mips64orion/p4000/start/Makefile.in | 4 +-- 10 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 c/src/lib/libbsp/mips/Makefile.am create mode 100644 c/src/lib/libbsp/mips/p4000/Makefile.am create mode 100644 c/src/lib/libbsp/mips64orion/Makefile.am delete mode 100644 c/src/lib/libbsp/mips64orion/Makefile.in create mode 100644 c/src/lib/libbsp/mips64orion/p4000/Makefile.am delete mode 100644 c/src/lib/libbsp/mips64orion/p4000/Makefile.in diff --git a/c/src/lib/libbsp/mips/Makefile.am b/c/src/lib/libbsp/mips/Makefile.am new file mode 100644 index 0000000000..c8c799c0b4 --- /dev/null +++ b/c/src/lib/libbsp/mips/Makefile.am @@ -0,0 +1,12 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +## Descend into the $(RTEMS_BSP_FAMILY) directory +SUBDIRS = $(RTEMS_BSP_FAMILY) + +include $(top_srcdir)/../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/p4000/Makefile.am b/c/src/lib/libbsp/mips/p4000/Makefile.am new file mode 100644 index 0000000000..9d6732d969 --- /dev/null +++ b/c/src/lib/libbsp/mips/p4000/Makefile.am @@ -0,0 +1,17 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/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 + +include $(top_srcdir)/../../bsp.am + +EXTRA_DIST = bsp_specs times + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips64orion/Makefile.am b/c/src/lib/libbsp/mips64orion/Makefile.am new file mode 100644 index 0000000000..c8c799c0b4 --- /dev/null +++ b/c/src/lib/libbsp/mips64orion/Makefile.am @@ -0,0 +1,12 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +## Descend into the $(RTEMS_BSP_FAMILY) directory +SUBDIRS = $(RTEMS_BSP_FAMILY) + +include $(top_srcdir)/../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips64orion/Makefile.in b/c/src/lib/libbsp/mips64orion/Makefile.in deleted file mode 100644 index cf6974056e..0000000000 --- a/c/src/lib/libbsp/mips64orion/Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = mips64orion - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# Descend into the $(RTEMS_BSP_FAMILY) directory -SUBDIRS = $(RTEMS_BSP_FAMILY) - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/mips64orion/p4000/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/Makefile.am new file mode 100644 index 0000000000..9d6732d969 --- /dev/null +++ b/c/src/lib/libbsp/mips64orion/p4000/Makefile.am @@ -0,0 +1,17 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/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 + +include $(top_srcdir)/../../bsp.am + +EXTRA_DIST = bsp_specs times + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips64orion/p4000/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/Makefile.in deleted file mode 100644 index 6d92ded33a..0000000000 --- a/c/src/lib/libbsp/mips64orion/p4000/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = mips64orion/p4000 - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SRCS = README - -all: $(SRCS) - -# 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 - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in index 7609cdbe40..91bf65f8c4 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = mips64orion/p4000/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in index f0a08c165f..9b7dc2e987 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = mips64orion/p4000/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in index 58b3378333..fb55c4b8d8 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = mips64orion/p4000/liblnk +top_builddir = .. +subdir = liblnk RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in index 1421998c5d..722a6ed21b 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = mips64orion/p4000/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -- cgit v1.2.3