2002-08-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* include/Makefile.am: Remove.
	* Makefile.am: Merge in former include/Makefile.am.
	* configure.ac: Reflect changes above.
	Take out unnecessary autoconf macros.
This commit is contained in:
Ralf Corsepius
2002-08-21 10:04:45 +00:00
parent 310fee6724
commit 304cdca206
7 changed files with 50 additions and 54 deletions

View File

@@ -1,3 +1,10 @@
2002-08-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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 <joel@OARcorp.com>
* 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 <corsepiu@faw.uni-ulm.de>
* configure.ac:

View File

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

View File

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

View File

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

View File

@@ -1,3 +1,10 @@
2002-08-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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 <joel@OARcorp.com>
* 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 <corsepiu@faw.uni-ulm.de>
* configure.ac:

View File

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

View File

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