From 7068e2465b84ff1561ae556a597efed94c86ec2e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 10 Jan 2000 14:29:44 +0000 Subject: Patch rtems-rc-20000104-10.diff from Ralf Corsepius that converts the m68k directory to automake. NOTE: This one is fully tested by building *all* bsps with ../../rtems-rc-20000104/configure \ --target=m68k-rtems \ --prefix=/tmp/rtems \ --enable-cxx \ --disable-posix \ --enable-rdbg \ --disable-networking \ --enable-maintainer-mode \ --enable-multiprocessing \ --disable-tests make --- c/src/lib/libbsp/m68k/efi332/Makefile.am | 17 ++++++++++++ c/src/lib/libbsp/m68k/efi332/Makefile.in | 27 ------------------- c/src/lib/libbsp/m68k/efi332/clock/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/efi332/configure.in | 33 +++++++++++++++++++++++ c/src/lib/libbsp/m68k/efi332/console/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/efi332/include/Makefile.in | 6 ++--- c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/efi332/start/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/efi332/startup/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/efi332/timer/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in | 7 ++--- 11 files changed, 67 insertions(+), 47 deletions(-) create mode 100644 c/src/lib/libbsp/m68k/efi332/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/efi332/Makefile.in create mode 100644 c/src/lib/libbsp/m68k/efi332/configure.in (limited to 'c/src/lib/libbsp/m68k/efi332') diff --git a/c/src/lib/libbsp/m68k/efi332/Makefile.am b/c/src/lib/libbsp/m68k/efi332/Makefile.am new file mode 100644 index 0000000000..06ae4c41ab --- /dev/null +++ b/c/src/lib/libbsp/m68k/efi332/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 clock console spurious timer 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/m68k/efi332/Makefile.in b/c/src/lib/libbsp/m68k/efi332/Makefile.in deleted file mode 100644 index c033337d27..0000000000 --- a/c/src/lib/libbsp/m68k/efi332/Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = m68k/efi332 - -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@ - -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = include start startup clock console spurious timer 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/m68k/efi332/clock/Makefile.in b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in index 1244181e86..e64c3e92bb 100644 --- a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/efi332/configure.in b/c/src/lib/libbsp/m68k/efi332/configure.in new file mode 100644 index 0000000000..8152a5aad9 --- /dev/null +++ b/c/src/lib/libbsp/m68k/efi332/configure.in @@ -0,0 +1,33 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(bsp_specs) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-efi332,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENV_RTEMSBSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +# Explicitly list a Makefile here +AC_OUTPUT( +Makefile +clock/Makefile +console/Makefile +include/Makefile +spurious/Makefile +start/Makefile +startup/Makefile +timer/Makefile +wrapup/Makefile) diff --git a/c/src/lib/libbsp/m68k/efi332/console/Makefile.in b/c/src/lib/libbsp/m68k/efi332/console/Makefile.in index 8f21f63ae4..810a0a40a1 100644 --- a/c/src/lib/libbsp/m68k/efi332/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/efi332/include/Makefile.in b/c/src/lib/libbsp/m68k/efi332/include/Makefile.in index 4b69a1e33a..fec576e254 100644 --- a/c/src/lib/libbsp/m68k/efi332/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -14,7 +14,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ H_FILES = $(srcdir)/bsp.h $(srcdir)/../../../shared/include/coverhd.h \ - $(srcdir)/efi332.h + $(srcdir)/efi332.h # # Equate files are for including from assembly preprocessed by diff --git a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in index 4e33f0b9d3..a3d30580d0 100644 --- a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/spurious +top_builddir = .. +subdir = spurious RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in b/c/src/lib/libbsp/m68k/efi332/start/Makefile.in index a56cf21278..ad7cbc6a6d 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in index df0eaf8680..af4a634cc6 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in index 6521d2e53f..0ce07f5aad 100644 --- a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in index cc812c8bc8..94398773f8 100644 --- a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/efi332/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -56,9 +56,6 @@ $(LIB): ${OBJS} all: ${ARCH} $(SRCS) $(LIB) $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs - $(INSTALL_DATA) $< $@ - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- cgit v1.2.3