diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-22 13:41:11 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-22 13:41:11 +0000 |
commit | 9608320702e8dba9947987cd34001824638c434e (patch) | |
tree | 4352f820543cb2755ff8d6cfa2d9a0e7d0fc7544 /c/src/lib/libbsp/m68k | |
parent | Small patch (rtems-rc-19991117-5.diff) from Ralf Corsepius (diff) | |
download | rtems-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/m68k')
-rw-r--r-- | c/src/lib/libbsp/m68k/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/Makefile.in | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/m68k/Makefile.in b/c/src/lib/libbsp/m68k/Makefile.in index ba6e1136b3..0c6de7ce9b 100644 --- a/c/src/lib/libbsp/m68k/Makefile.in +++ b/c/src/lib/libbsp/m68k/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 = $(RTEMS_BSP_FAMILY) +SUBDIRS = $(RTEMS_BSP_FAMILY) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/Makefile.in index ac339f6f85..b54d5043d2 100644 --- a/c/src/lib/libbsp/m68k/dmv152/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/Makefile.in @@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # 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 spurious timer wrapup +SUBDIRS = include start startup clock console spurious timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.in b/c/src/lib/libbsp/m68k/idp/Makefile.in index b652512eb5..2925a6b748 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/Makefile.in @@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # 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 wrapup +SUBDIRS = include start startup clock console timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/Makefile.in index 01e32499f8..62544e9c52 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.in @@ -24,7 +24,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_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 $(MP_SUPPORT) timer wrapup +SUBDIRS = include start startup clock console $(MP_SUPPORT) timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/Makefile.in index 3090e868c6..be0e77c90a 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.in @@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # 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 wrapup +SUBDIRS = include start startup clock console timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in index c1c83ecaba..8123253d9a 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in @@ -24,7 +24,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_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 $(MP_SUPPORT) wrapup +SUBDIRS = include start startup clock console timer $(MP_SUPPORT) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/Makefile.in index 6789357765..f6d39c301e 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.in @@ -32,7 +32,7 @@ SRCS = README # from the individual .rel files built in other directories # # XXXX add tools -SUB_DIRS = include start startup clock console timer tod wrapup +SUBDIRS = include start startup clock console timer tod wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/Makefile.in index 1af57b3402..1a3b2e82d6 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.in @@ -22,7 +22,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # from the individual .rel files built in other directories # include subdir must be first, otherwise the header files will not # be installed when the other files are compiled. -SUB_DIRS = include start startup clock console fatal timer wrapup +SUBDIRS = include start startup clock console fatal timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ |