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/pc386/3c509/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/Makefile.am | 23 ++++++++++++++ c/src/lib/libbsp/i386/pc386/Makefile.in | 32 -------------------- c/src/lib/libbsp/i386/pc386/clock/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/configure.in | 40 +++++++++++++++++++++++++ c/src/lib/libbsp/i386/pc386/console/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/include/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/start/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/startup/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/timer/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in | 4 +-- c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in | 8 ++--- 13 files changed, 83 insertions(+), 56 deletions(-) create mode 100644 c/src/lib/libbsp/i386/pc386/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/pc386/Makefile.in create mode 100644 c/src/lib/libbsp/i386/pc386/configure.in (limited to 'c/src/lib/libbsp/i386/pc386') diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in index 2093bdd4ec..eb570c134f 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/3c509 +top_builddir = .. +subdir = 3c509 RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am new file mode 100644 index 0000000000..66d4dd9e23 --- /dev/null +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -0,0 +1,23 @@ +## +## $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 +# dec21140 is supported via libchip +NETWORK = ne2000 wd8003 3c509 +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 = HOWTO README.dec21140 STATUS bsp_specs times_i486dx times_p5 + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.in b/c/src/lib/libbsp/i386/pc386/Makefile.in deleted file mode 100644 index d0cf7af343..0000000000 --- a/c/src/lib/libbsp/i386/pc386/Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = i386/pc386 - -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 -# dec21140 is supported via libchip -NETWORK_yes_V = ne2000 wd8003 3c509 -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/pc386/clock/Makefile.in b/c/src/lib/libbsp/i386/pc386/clock/Makefile.in index 5074506592..f18adedd97 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/configure.in b/c/src/lib/libbsp/i386/pc386/configure.in new file mode 100644 index 0000000000..7fadd4dcaf --- /dev/null +++ b/c/src/lib/libbsp/i386/pc386/configure.in @@ -0,0 +1,40 @@ +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-pc386,$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 +3c509/Makefile +ne2000/Makefile +timer/Makefile +wd8003/Makefile +wrapup/Makefile) diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.in b/c/src/lib/libbsp/i386/pc386/console/Makefile.in index 0278490c24..e2fa5b5859 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.in b/c/src/lib/libbsp/i386/pc386/include/Makefile.in index 8a30801a4c..9aa7e20e26 100644 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in index a9ff7825ef..b1aafa58d5 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/ne2000 +top_builddir = .. +subdir = ne2000 RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.in b/c/src/lib/libbsp/i386/pc386/start/Makefile.in index e702cc3353..4fbe83b4c8 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.in b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in index 834202fd61..4369d24fb6 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.in b/c/src/lib/libbsp/i386/pc386/timer/Makefile.in index 02de8471a2..c8101fae5a 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in index 4f2c135291..9b3764f07b 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/wd8003 +top_builddir = .. +subdir = wd8003 RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in index 07622b8569..06d40ca9b3 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i386/pc386/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -30,7 +30,6 @@ LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg -INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs @@ -73,9 +72,6 @@ all: preinstall ${ARCH} $(SRCS) $(LIB) preinstall: $(INSTALLDIRS) $(mkinstalldirs) $(INSTALLDIRS) -$(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