From 5fa147949dc75b98a52ccfa1a585b91fd0026bb5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 10 Jan 2000 14:31:16 +0000 Subject: Patch rtems-rc-20000104-11.diff from Ralf Corsepius that converts the i386 directory to automake. NOTE: Ralf is unable to build any i386 BSPs. This was true before and after this patch and appears (to Joel) to be a tool issue unrelated since others can build i386 BSPs. --- c/src/lib/libbsp/i386/ts_386ex/Makefile.am | 22 +++++++++++++ c/src/lib/libbsp/i386/ts_386ex/Makefile.in | 31 ------------------ c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in | 4 +-- c/src/lib/libbsp/i386/ts_386ex/configure.in | 38 ++++++++++++++++++++++ c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in | 4 +-- c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in | 4 +-- c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in | 4 +-- c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in | 4 +-- c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in | 4 +-- c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in | 4 +-- c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in | 4 +-- 11 files changed, 76 insertions(+), 47 deletions(-) create mode 100644 c/src/lib/libbsp/i386/ts_386ex/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/Makefile.in create mode 100644 c/src/lib/libbsp/i386/ts_386ex/configure.in (limited to 'c/src/lib/libbsp/i386/ts_386ex') diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am new file mode 100644 index 0000000000..5abfad9cfa --- /dev/null +++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am @@ -0,0 +1,22 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +if HAS_NETWORKING +# We only build the Network library if HAS_NETWORKING was defined +NETWORK = network +endif + +# wrapup is the one that actually builds and installs the library +# from the individual .rel files built in other directories +SUBDIRS = . include tools start startup clock console timer $(NETWORK) wrapup + +include $(top_srcdir)/../../bsp.am + +EXTRA_DIST = bsp_specs + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in deleted file mode 100644 index e6522ac857..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = i386/ts_386ex - -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@ - -# We only build the Network library if HAS_NETWORKING was defined -NETWORK_yes_V = network -NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) - -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = include tools start startup clock console timer $(NETWORK) 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/i386/ts_386ex/clock/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in index c98a0f5389..01309dab96 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/ts_386ex/configure.in b/c/src/lib/libbsp/i386/ts_386ex/configure.in new file mode 100644 index 0000000000..3bf08ccc7d --- /dev/null +++ b/c/src/lib/libbsp/i386/ts_386ex/configure.in @@ -0,0 +1,38 @@ +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-i386-ts_i386ex,$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") + +AC_CONFIG_SUBDIRS(tools) + +# Explicitly list all Makefile here +AC_OUTPUT( +Makefile +clock/Makefile +console/Makefile +include/Makefile +start/Makefile +startup/Makefile +timer/Makefile +network/Makefile +timer/Makefile +wrapup/Makefile) diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in index faba3a452a..5b4af61582 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in index 505293692d..65150dbcfa 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in index 2d38881715..79ec429d67 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/network +top_builddir = .. +subdir = network RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in index d86617bfa3..781d04584f 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in index 60a4177838..bf1c733f24 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in index 5b9371127f..b49fe27e61 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in index 601eef0a65..f8d5c70292 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/ts_386ex/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -- cgit v1.2.3