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/powerpc | |
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/powerpc')
-rw-r--r-- | c/src/lib/libbsp/powerpc/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/dmv177/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/eth_comm/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/helas403/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mcp750/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme2307/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/papyrus/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/Makefile.in | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/Makefile.in index 820d4b70a6..25b0558fb0 100644 --- a/c/src/lib/libbsp/powerpc/Makefile.in +++ b/c/src/lib/libbsp/powerpc/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/powerpc/dmv177/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in index ce25b30772..9297d39f94 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/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 clock console startup start timer scv64 tod \ +SUBDIRS = include clock console startup start timer scv64 tod \ $(NETWORKING_DRIVER) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in index 16bbb5a982..ad67de8883 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/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 start canbus console $(NETWORKING_DRIVER) wrapup +SUBDIRS = include startup start canbus console $(NETWORKING_DRIVER) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/Makefile.in index d0387aced0..9866c145a9 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.in +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.in @@ -24,7 +24,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 dlentry flashentry startup wrapup +SUBDIRS = include dlentry flashentry startup wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/powerpc/mcp750/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/Makefile.in index 0e4a0923d5..4cd8161f04 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mcp750/Makefile.in @@ -28,7 +28,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 = clock console include pci residual openpic irq vectors \ +SUBDIRS = clock console include pci residual openpic irq vectors \ start startup bootloader $(NETWORK) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in index 0e4a0923d5..4cd8161f04 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in @@ -28,7 +28,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 = clock console include pci residual openpic irq vectors \ +SUBDIRS = clock console include pci residual openpic irq vectors \ start startup bootloader $(NETWORK) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in b/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in index 3241e1acce..d9fb6223b5 100644 --- a/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in @@ -28,7 +28,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 clock console startup boot \ +SUBDIRS=include clock console startup boot \ nvram timer pci $(NETWORK) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/Makefile.in index 06d063a575..c76b1658da 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in +++ b/c/src/lib/libbsp/powerpc/papyrus/Makefile.in @@ -24,7 +24,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 dlentry flashentry startup wrapup +SUBDIRS = include dlentry flashentry startup wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in index e2c5274bcd..570c1b0386 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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 clock console startup start timer tod $(NETWORK_DRIVER) \ +SUBDIRS = include clock console startup start timer tod $(NETWORK_DRIVER) \ universe pci nvram vectors wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/Makefile.in index 861c6003f2..49e9ace7d7 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.in +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.in @@ -24,7 +24,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 clock console startup start timer tod PCI_bus vectors \ +SUBDIRS = include clock console startup start timer tod PCI_bus vectors \ wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |