From 304cdca20697caf6e7fcfe003e3a9dfcc5baec9a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Aug 2002 10:04:45 +0000 Subject: 2002-08-21 Ralf Corsepius * include/Makefile.am: Remove. * Makefile.am: Merge in former include/Makefile.am. * configure.ac: Reflect changes above. Take out unnecessary autoconf macros. --- c/src/tests/support/ChangeLog | 8 ++++++++ c/src/tests/support/Makefile.am | 19 +++++++++++++++++-- c/src/tests/support/configure.ac | 12 ------------ c/src/tests/support/include/Makefile.am | 26 -------------------------- 4 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 c/src/tests/support/include/Makefile.am (limited to 'c') diff --git a/c/src/tests/support/ChangeLog b/c/src/tests/support/ChangeLog index 2a235939b3..b332f2008d 100644 --- a/c/src/tests/support/ChangeLog +++ b/c/src/tests/support/ChangeLog @@ -1,3 +1,10 @@ +2002-08-21 Ralf Corsepius + + * include/Makefile.am: Remove. + * Makefile.am: Merge in former include/Makefile.am. + * configure.ac: Reflect changes above. + Take out unnecessary autoconf macros. + 2002-08-01 Joel Sherrill * Per PR47 add support for buffered test output. This involved @@ -8,6 +15,7 @@ the standard test macro .h file (pmacros.h or tmacros.h) to enable this support. * include/buffer_test_io.h: New file. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/c/src/tests/support/Makefile.am b/c/src/tests/support/Makefile.am index bb79a6c15c..0cd6acdc57 100644 --- a/c/src/tests/support/Makefile.am +++ b/c/src/tests/support/Makefile.am @@ -4,7 +4,22 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = include +project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@ + +noinst_HEADERS = include/tmacros.h include/buffer_test_io.h + +TMPINSTALLFILES = $(project_bspdir)/lib/include \ + $(project_bspdir)/lib/include/tmacros.h \ + $(project_bspdir)/lib/include/buffer_test_io.h + +$(project_bspdir)/lib/include: + $(mkinstalldirs) $@ +$(project_bspdir)/lib/include/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +CLEANFILES = $(project_bspdir)/lib/include/tmacros.h \ + $(project_bspdir)/lib/include/buffer_test_io.h + +all-local: $(TMPINSTALLFILES) -include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/support/configure.ac b/c/src/tests/support/configure.ac index 017831d28b..c2ba9c306d 100644 --- a/c/src/tests/support/configure.ac +++ b/c/src/tests/support/configure.ac @@ -14,22 +14,10 @@ AM_INIT_AUTOMAKE([no-define foreign 1.6]) AM_MAINTAINER_MODE RTEMS_ENV_RTEMSBSP -RTEMS_CHECK_CPU -RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) -RTEMS_CANONICALIZE_TOOLS - -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) - -AC_SUBST(BARE_CPU_CFLAGS) -AC_SUBST(BARE_CPU_MODEL) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -include/Makefile ]) AC_OUTPUT diff --git a/c/src/tests/support/include/Makefile.am b/c/src/tests/support/include/Makefile.am deleted file mode 100644 index 6d031fcb3b..0000000000 --- a/c/src/tests/support/include/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - - -project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@ - -noinst_HEADERS = tmacros.h - -TMPINSTALLFILES = $(project_bspdir)/lib/include \ - $(project_bspdir)/lib/include/tmacros.h \ - $(project_bspdir)/lib/include/buffer_test_io.h - -$(project_bspdir)/lib/include: - $(mkinstalldirs) $@ -$(project_bspdir)/lib/include/tmacros.h: tmacros.h - $(INSTALL_DATA) $< $@ -$(project_bspdir)/lib/include/buffer_test_io.h: buffer_test_io.h - $(INSTALL_DATA) $< $@ - -CLEANFILES = $(project_bspdir)/lib/include/tmacros.h \ - $(project_bspdir)/lib/include/buffer_test_io.h - -all-local: $(TMPINSTALLFILES) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3