From 0134f4fbdf9f1ff0c09033b2a37a54ddef03a22a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 27 Oct 2000 13:57:21 +0000 Subject: 2000-10-27 Ralf Corsepius * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros. Switch to GNU canonicalization. --- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mvme162/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme162/configure.in | 4 +++- c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog | 7 +++++++ c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am | 9 +++++---- c/src/lib/libbsp/m68k/mvme162/tools/configure.in | 11 ++++++++++- 6 files changed, 32 insertions(+), 8 deletions(-) (limited to 'c/src/lib/libbsp/m68k') 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 + + * configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros. + Switch to GNU canonicalization. + 2000-09-29 Charles-Antoine Gauthier * 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 + + * 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 * 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 -- cgit v1.2.3