From 9608320702e8dba9947987cd34001824638c434e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Nov 1999 13:41:11 +0000 Subject: Patch rtems-rc-19991117-4.diff from Ralf Corsepius : .. 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. --- c/src/lib/libcpu/Makefile.in | 2 +- c/src/lib/libcpu/hppa1.1/Makefile.in | 2 +- c/src/lib/libcpu/m68k/Makefile.in | 2 +- c/src/lib/libcpu/m68k/m68040/Makefile.in | 2 +- c/src/lib/libcpu/mips64orion/Makefile.in | 2 +- c/src/lib/libcpu/powerpc/Makefile.in | 2 +- c/src/lib/libcpu/powerpc/mpc505/Makefile.in | 2 +- c/src/lib/libcpu/powerpc/mpc750/Makefile.in | 2 +- c/src/lib/libcpu/powerpc/mpc821/Makefile.in | 2 +- c/src/lib/libcpu/powerpc/mpc860/Makefile.in | 2 +- c/src/lib/libcpu/powerpc/ppc403/Makefile.in | 2 +- c/src/lib/libcpu/sh/Makefile.in | 2 +- c/src/lib/libcpu/sh/sh7032/Makefile.in | 2 +- c/src/lib/libcpu/sh/sh7045/Makefile.in | 2 +- c/src/lib/libcpu/sparc/Makefile.in | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/Makefile.in b/c/src/lib/libcpu/Makefile.in index 4135a868b7..d527af8dc8 100644 --- a/c/src/lib/libcpu/Makefile.in +++ b/c/src/lib/libcpu/Makefile.in @@ -17,7 +17,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = $(wildcard $(RTEMS_CPU)) +SUBDIRS = $(wildcard $(RTEMS_CPU)) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/hppa1.1/Makefile.in b/c/src/lib/libcpu/hppa1.1/Makefile.in index eb644522f5..8b73347802 100644 --- a/c/src/lib/libcpu/hppa1.1/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = include milli clock timer semaphore +SUBDIRS = include milli clock timer semaphore Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/m68k/Makefile.in b/c/src/lib/libcpu/m68k/Makefile.in index 4285a7aac4..ecde9c968a 100644 --- a/c/src/lib/libcpu/m68k/Makefile.in +++ b/c/src/lib/libcpu/m68k/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = $(wildcard $(RTEMS_CPU_MODEL)) +SUBDIRS = $(wildcard $(RTEMS_CPU_MODEL)) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/m68k/m68040/Makefile.in b/c/src/lib/libcpu/m68k/m68040/Makefile.in index 8dc72bda00..de08bfc38b 100644 --- a/c/src/lib/libcpu/m68k/m68040/Makefile.in +++ b/c/src/lib/libcpu/m68k/m68040/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = fpsp +SUBDIRS = fpsp Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/mips64orion/Makefile.in b/c/src/lib/libcpu/mips64orion/Makefile.in index 5bf03d9e16..1d1d660d04 100644 --- a/c/src/lib/libcpu/mips64orion/Makefile.in +++ b/c/src/lib/libcpu/mips64orion/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = include clock timer +SUBDIRS = include clock timer Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/powerpc/Makefile.in b/c/src/lib/libcpu/powerpc/Makefile.in index 6535e4d110..c1df8aea49 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.in +++ b/c/src/lib/libcpu/powerpc/Makefile.in @@ -22,7 +22,7 @@ ifeq ($(wildcard $(RTEMS_CPU_MODEL)),$(RTEMS_CPU_MODEL)) SHARED_LIB = shared endif -SUB_DIRS = $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup +SUBDIRS = $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/powerpc/mpc505/Makefile.in b/c/src/lib/libcpu/powerpc/mpc505/Makefile.in index 4184042b59..476b8c069b 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc505/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = vectors timer wrapup +SUBDIRS = vectors timer wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/powerpc/mpc750/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/Makefile.in index 499a88ce34..f0775991fc 100644 --- a/c/src/lib/libcpu/powerpc/mpc750/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc750/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 = exceptions mmu clock wrapup +SUBDIRS = exceptions mmu clock wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/powerpc/mpc821/Makefile.in b/c/src/lib/libcpu/powerpc/mpc821/Makefile.in index 6d150607c6..d1d021704f 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc821/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = include console-generic clock timer vectors +SUBDIRS = include console-generic clock timer vectors Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/powerpc/mpc860/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/Makefile.in index 73e5969bca..84cb046849 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc860/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = include console-generic clock timer vectors +SUBDIRS = include console-generic clock timer vectors Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/Makefile.in index 50d7bf55f4..eb7b4f529b 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.in +++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = include console clock timer vectors ictrl +SUBDIRS = include console clock timer vectors ictrl Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/sh/Makefile.in b/c/src/lib/libcpu/sh/Makefile.in index a331d64ac1..896972d6c1 100644 --- a/c/src/lib/libcpu/sh/Makefile.in +++ b/c/src/lib/libcpu/sh/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = $(wildcard $(RTEMS_CPU_MODEL)) +SUBDIRS = $(wildcard $(RTEMS_CPU_MODEL)) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.in b/c/src/lib/libcpu/sh/sh7032/Makefile.in index 34e6494f8b..d9daeceb66 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.in +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = include clock timer null sci delay +SUBDIRS = include clock timer null sci delay Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.in b/c/src/lib/libcpu/sh/sh7045/Makefile.in index 411ccb9f7e..b99c954d00 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.in +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = include clock sci timer null +SUBDIRS = include clock sci timer null Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/sparc/Makefile.in b/c/src/lib/libcpu/sparc/Makefile.in index b87538e15e..87b946d064 100644 --- a/c/src/lib/libcpu/sparc/Makefile.in +++ b/c/src/lib/libcpu/sparc/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = reg_win syscall +SUBDIRS = reg_win syscall Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ -- cgit v1.2.3