summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-27 13:57:21 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-27 13:57:21 +0000
commit0134f4fbdf9f1ff0c09033b2a37a54ddef03a22a (patch)
tree3962014d67696fdbc7e110644ee6eb622c6cd98d /c/src
parent6e0c3c49c261010bd8926aa42c8e2c486b4bdd08 (diff)
downloadrtems-0134f4fbdf9f1ff0c09033b2a37a54ddef03a22a.tar.bz2
2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros. Switch to GNU canonicalization.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog5
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am2
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/configure.in4
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/ChangeLog5
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/Makefile.am2
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/configure.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog5
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/configure.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tools/ChangeLog5
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am2
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/pc386/Makefile.am2
-rw-r--r--c/src/lib/libbsp/i386/pc386/configure.in4
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/Makefile.am2
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/Makefile.am2
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/configure.in4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am2
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/Makefile.am4
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/configure.in4
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog7
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am9
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/configure.in11
-rw-r--r--c/src/lib/libbsp/powerpc/psim/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/psim/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/psim/configure.in4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/ChangeLog5
-rw-r--r--c/src/lib/libbsp/sparc/erc32/Makefile.am2
-rw-r--r--c/src/lib/libbsp/sparc/erc32/configure.in4
33 files changed, 114 insertions, 26 deletions
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog
index 28f2b7bfee..7e64a0a99a 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am, console/Makefile.am, irq/Makefile.am,
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am
index 8a885f6201..af358040f4 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/configure.in b/c/src/lib/libbsp/arm/arm_bare_bsp/configure.in
index 6ef0a39cc3..545628bce3 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/configure.in
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/configure.in
@@ -26,7 +26,7 @@ AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
AC_SUBST(RTEMS_BSP)
@@ -41,3 +41,5 @@ irq/Makefile
start/Makefile
startup/Makefile
wrapup/Makefile)
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
index 20bf3d64dc..6e883f4d43 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
+++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-09-22 Joel Sherrill <joel@OARcorp.com>
* startup/linkcmds: Use default object format to avoid name
diff --git a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
index b0ba3532c5..0c8f1358f6 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
diff --git a/c/src/lib/libbsp/c4x/c4xsim/configure.in b/c/src/lib/libbsp/c4x/c4xsim/configure.in
index c5e0f5558a..4390616aee 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/configure.in
+++ b/c/src/lib/libbsp/c4x/c4xsim/configure.in
@@ -19,7 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CANONICAL_HOST
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
RTEMS_PROJECT_ROOT
@@ -33,3 +33,5 @@ start/Makefile
startup/Makefile
timer/Makefile
wrapup/Makefile)
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
index 25381915eb..aa523168c9 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-09-25 Joel Sherrill <joel@OARcorp.com>
* include/bsp.h: tty_* renamed to console_*.
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am
index 94c02e2a0e..bdac0b131d 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am
@@ -3,11 +3,11 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = include start startup tty shmsupp wrapup
+SUBDIRS = include start startup tty shmsupp wrapup tools
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
index ae75ab151e..20c77ba5ff 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
@@ -22,7 +22,7 @@ RTEMS_CANONICAL_HOST
AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
RTEMS_PROJECT_ROOT
@@ -35,3 +35,5 @@ start/Makefile
startup/Makefile
tty/Makefile
wrapup/Makefile)
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/ChangeLog b/c/src/lib/libbsp/hppa1.1/simhppa/tools/ChangeLog
index 101734ce64..8199a41af9 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/ChangeLog
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am
index 360cb68d5c..9357054376 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
noinst_PROGRAMS = print_dump
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index b6c9f7a3cf..6973b45ac3 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-10-23 Joel Sherrill <joel@OARcorp.com>
* console/serial_mouse.c: Fixed typos introduced by removal of CR/LF.
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 5b350eb638..74127587b4 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
diff --git a/c/src/lib/libbsp/i386/pc386/configure.in b/c/src/lib/libbsp/i386/pc386/configure.in
index 7d07b85e60..938d2b7247 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.in
+++ b/c/src/lib/libbsp/i386/pc386/configure.in
@@ -26,7 +26,7 @@ AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
AC_SUBST(RTEMS_BSP)
@@ -46,3 +46,5 @@ ne2000/Makefile
timer/Makefile
wd8003/Makefile
wrapup/Makefile)
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
diff --git a/c/src/lib/libbsp/i386/pc386/tools/ChangeLog b/c/src/lib/libbsp/i386/pc386/tools/ChangeLog
index 101734ce64..8199a41af9 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/tools/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/i386/pc386/tools/Makefile.am b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am
index e6ce930223..d35bf26b44 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
EXTRA_DIST = Spec.doc
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 608602f29b..1ffe85a46c 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-10-19 Joel Sherrill <joel@OARcorp.com>
* console/console.c: Invoke BSP_uart_init() with all arguments
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
index 7b03a80d2d..7f75071359 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
diff --git a/c/src/lib/libbsp/i386/ts_386ex/configure.in b/c/src/lib/libbsp/i386/ts_386ex/configure.in
index 86aecd6b0c..bb9dde0b99 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/configure.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/configure.in
@@ -26,7 +26,7 @@ AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
RTEMS_PROJECT_ROOT
@@ -42,3 +42,5 @@ timer/Makefile
network/Makefile
timer/Makefile
wrapup/Makefile)
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog
index 101734ce64..8199a41af9 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am
index c6210593d0..8b8b05086d 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
noinst_SCRIPTS = coff2bin elf2exe
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index 95e56d1471..f3a801dc1f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-09-29 Charles-Antoine Gauthier <charles.gauthier@nrc.ca>
* startup/linkcmds: Added lines so DWARF debug information
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index e5105c8bce..ea58485da9 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# consolex is a predecessor of the termios and libchip concepts.
# It is no longer being compiled into the source.
@@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = . include start startup clock console timer tod network wrapup
+SUBDIRS = . include start startup clock console timer tod network wrapup tools
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.in b/c/src/lib/libbsp/m68k/mvme162/configure.in
index 7297bb9d96..d9dc688066 100644
--- a/c/src/lib/libbsp/m68k/mvme162/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme162/configure.in
@@ -20,7 +20,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CHECK_NETWORKING
RTEMS_CANONICAL_HOST
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
@@ -40,3 +40,5 @@ tod/Makefile
wrapup/Makefile)
## consolex/Makefile
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog
index 101734ce64..a264a66f5b 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization, conditionalize building sload.
+ * configure.in: Add checks to build sload, conditionalize building
+ sload.
+
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
index 3eb08bee2d..f5a241305f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
@@ -3,15 +3,16 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-
-noinst_PROGRAMS = sload
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
sload_SOURCES = sload.c
+if SLOAD_BUILDABLE
+noinst_PROGRAMS = sload
+
## HACK: install to build-tree
install-exec-local: $(PROGRAMS)
$(mkinstalldirs) $(PROJECT_ROOT)/mvme162/bin
$(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/mvme162/bin
-
+endif
include $(top_srcdir)/../../../../../../../automake/host.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
index 514451c0bd..f96edd3650 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
@@ -14,10 +14,19 @@ AC_EXEEXT
AC_PROG_CC
+## FIXME: The checks below are probably incorrect and will not work for
+## those actually having sys/vme.h
+## Please report any errors related to it, otherwise we will not be able
+## to fix building/configuring sload
AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(unistd.h sys/vme.h)
AC_FUNC_MMAP
+AM_CONDITIONAL(SLOAD_BUILDABLE,
+test "$ac_cv_header_sys_vme_h" = "yes" \
+-a "$ac_cv_header_unistd_h" = "yes" \
+-a "$ac_cv_header_stdc" = "yes" )
+
RTEMS_PROJECT_ROOT
RTEMS_TOOLPATHS
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index bb0e690027..53e5f55609 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am,
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 318781378e..65292d2f93 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.in b/c/src/lib/libbsp/powerpc/psim/configure.in
index 9364127215..1fd26fc766 100644
--- a/c/src/lib/libbsp/powerpc/psim/configure.in
+++ b/c/src/lib/libbsp/powerpc/psim/configure.in
@@ -22,7 +22,7 @@ RTEMS_CANONICAL_HOST
AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
RTEMS_PROJECT_ROOT
@@ -38,3 +38,5 @@ startup/Makefile
timer/Makefile
vectors/Makefile
wrapup/Makefile)
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog
index ace755637b..d2bf56f5a8 100644
--- a/c/src/lib/libbsp/sparc/erc32/ChangeLog
+++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization.
+
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am, console/Makefile.am, gnatsupp/Makefile.am,
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index f3c5602470..435d71078b 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
diff --git a/c/src/lib/libbsp/sparc/erc32/configure.in b/c/src/lib/libbsp/sparc/erc32/configure.in
index b22e8f88d0..89a5e0693c 100644
--- a/c/src/lib/libbsp/sparc/erc32/configure.in
+++ b/c/src/lib/libbsp/sparc/erc32/configure.in
@@ -19,7 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CANONICAL_HOST
-AC_CONFIG_SUBDIRS(tools)
+RTEMS_CONFIG_BUILD_SUBDIRS(tools)
RTEMS_PROJECT_ROOT
@@ -34,3 +34,5 @@ start/Makefile
startup/Makefile
timer/Makefile
wrapup/Makefile)
+
+RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)