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/gen68360/Makefile.am | 23 ++++++++++++++ c/src/lib/libbsp/m68k/gen68360/Makefile.in | 36 ---------------------- c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/gen68360/configure.in | 35 +++++++++++++++++++++ c/src/lib/libbsp/m68k/gen68360/console/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/gen68360/include/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/gen68360/network/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/gen68360/start/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in | 4 +-- c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in | 7 ++--- 11 files changed, 74 insertions(+), 55 deletions(-) create mode 100644 c/src/lib/libbsp/m68k/gen68360/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/gen68360/Makefile.in create mode 100644 c/src/lib/libbsp/m68k/gen68360/configure.in (limited to 'c/src/lib/libbsp/m68k/gen68360') diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am new file mode 100644 index 0000000000..b3f8cceb8a --- /dev/null +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -0,0 +1,23 @@ +## +## $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 + +if HAS_NETWORKING +NETWORKING_DRIVER = network +endif + +SUBDIRS = . include start startup clock console timer $(NETWORKING_DRIVER) \ + 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/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in deleted file mode 100644 index 572e812c5a..0000000000 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = m68k/gen68360 - -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 - -# We only build the networking device driver if HAS_NETWORKING was defined -NETWORKING_DRIVER_yes_V = network -NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) - -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 clock console timer $(NETWORKING_DRIVER) \ - 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/gen68360/clock/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in index a5eaf45fdf..e64c3e92bb 100644 --- a/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.in b/c/src/lib/libbsp/m68k/gen68360/configure.in new file mode 100644 index 0000000000..2681e04884 --- /dev/null +++ b/c/src/lib/libbsp/m68k/gen68360/configure.in @@ -0,0 +1,35 @@ +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-dmv152,$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_CHECK_NETWORKING +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT +AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") + +# Explicitly list a Makefile here +AC_OUTPUT( +Makefile +clock/Makefile +console/Makefile +include/Makefile +network/Makefile +start/Makefile +startup/Makefile +timer/Makefile +wrapup/Makefile) diff --git a/c/src/lib/libbsp/m68k/gen68360/console/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/console/Makefile.in index 979b89f866..4c2f58e76d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in index 468e2cadc2..9b7dc2e987 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in index 6f623a6859..15506dfd03 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/network +top_builddir = .. +subdir = network RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in index 67c1ca887b..a005f67ba9 100644 --- a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in index 1c2c376f4d..602d11b39c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in index 225750ee5f..0ce07f5aad 100644 --- a/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in index 31f6480819..a1143f6fc4 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/gen68360/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -65,9 +65,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