summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i386
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 13:41:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 13:41:11 +0000
commit9608320702e8dba9947987cd34001824638c434e (patch)
tree4352f820543cb2755ff8d6cfa2d9a0e7d0fc7544 /c/src/lib/libbsp/i386
parentSmall patch (rtems-rc-19991117-5.diff) from Ralf Corsepius (diff)
downloadrtems-9608320702e8dba9947987cd34001824638c434e.tar.bz2
Patch rtems-rc-19991117-4.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
.. a major configuration cleanup ... major enhancement of automake support. ... and it contains a *major* breakthough: Automake support for libchip and libmisc *LEAF* directories. To implement this I have used several nasty tricks * The basical trick is to wrap an old Makefile.in's contents into a Makefile.am and still continue to use (i.e include) the old *.cfg files. * Replaced each INSTALL_IF_CHANGE and INSTALL_VARIANT with make dependencies * Add a gnu-make ifdef AUTOMAKE to main.cfg to avoid conflicts between automake and RTEMS make rules * Replaced each install:: and preinstall:: rule with make dependencies * Replaced SUB_DIRS with SUBDIRS in all Makefile.ins (Automake convention) * Removed each manually added autoconf substitution which automake performs automatically. This is not yet full automake support, because using the temporary installation directory, preinstallation in general and building variants are in contradiction to automake's basic working principles ... ... the new Makefile.ams work still somewhat clumsy ... nevertheless they work (quite well). WARNING: At first glance this patch is small, but * it affects the whole configuration system. * it opens the road to introducing automake to all Makefile.ins currently not being under automake control. JOEL> Does this remove or add any files? Both, all Makefile.ins below libchip and libmisc get replaced with Makefile.ams.
Diffstat (limited to 'c/src/lib/libbsp/i386')
-rw-r--r--c/src/lib/libbsp/i386/Makefile.in2
-rw-r--r--c/src/lib/libbsp/i386/i386ex/Makefile.in2
-rw-r--r--c/src/lib/libbsp/i386/pc386/Makefile.in2
-rw-r--r--c/src/lib/libbsp/i386/shared/Makefile.in2
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/Makefile.in2
5 files changed, 5 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/i386/Makefile.in b/c/src/lib/libbsp/i386/Makefile.in
index 8d7ade9599..cf53e44676 100644
--- a/c/src/lib/libbsp/i386/Makefile.in
+++ b/c/src/lib/libbsp/i386/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
# Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = shared $(RTEMS_BSP_FAMILY)
+SUBDIRS = shared $(RTEMS_BSP_FAMILY)
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.in b/c/src/lib/libbsp/i386/i386ex/Makefile.in
index 423b048e96..cfd0fff831 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.in
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.in
@@ -24,7 +24,7 @@ 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
-SUB_DIRS = include start startup clock console timer $(NETWORK) wrapup
+SUBDIRS = include start startup clock console timer $(NETWORK) wrapup
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.in b/c/src/lib/libbsp/i386/pc386/Makefile.in
index b0ad405aa2..25ef9e138e 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.in
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.in
@@ -24,7 +24,7 @@ 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
-SUB_DIRS = include tools start startup clock console timer $(NETWORK) wrapup
+SUBDIRS = include tools start startup clock console timer $(NETWORK) wrapup
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/shared/Makefile.in b/c/src/lib/libbsp/i386/shared/Makefile.in
index f21430a2f9..888b54e2a8 100644
--- a/c/src/lib/libbsp/i386/shared/Makefile.in
+++ b/c/src/lib/libbsp/i386/shared/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
# Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = irq io comm pci
+SUBDIRS = irq io comm pci
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
index ed08872031..e6522ac857 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
@@ -24,7 +24,7 @@ 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
-SUB_DIRS = include tools start startup clock console timer $(NETWORK) wrapup
+SUBDIRS = include tools start startup clock console timer $(NETWORK) wrapup
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \