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/unix | |
| 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/unix')
| -rw-r--r-- | c/src/lib/libbsp/unix/Makefile.in | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/unix/posix/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/unix/Makefile.in b/c/src/lib/libbsp/unix/Makefile.in index 36c6f1b976..da6d4b93d8 100644 --- a/c/src/lib/libbsp/unix/Makefile.in +++ b/c/src/lib/libbsp/unix/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/unix/posix/Makefile.in b/c/src/lib/libbsp/unix/posix/Makefile.in index 23f7568a2b..fa4a559df9 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/Makefile.in @@ -28,7 +28,7 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include startup clock console timer $(MP_SUPPORT) wrapup tools +SUBDIRS = include startup clock console timer $(MP_SUPPORT) wrapup tools Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ |