2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros. Switch to GNU canonicalization.
2025-12-05 15:15:44 +00:00 · 2000-10-27 13:57:21 +00:00
parent 6e0c3c49c2
commit 0134f4fbdf
33 changed files with 114 additions and 26 deletions
--- 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,
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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_*.
--- 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

--- 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)
--- 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.
--- 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

--- 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.
--- 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
--- 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)
--- 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.
--- 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

--- 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
--- 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
--- 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)
--- 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.
--- 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

--- 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
--- 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

--- 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)
--- 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.
--- 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
--- 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

--- 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,
--- 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
--- 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)
--- 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,
--- 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
--- 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)