From 682c7fd272391162bd71e25f22ae3c70041c89c7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 19 Sep 2001 17:20:39 +0000 Subject: 2001-09-19 Ralf Corsepius * malloctest/Makefile.am: include leaf.am instead of leaf.cfg. * monitor/Makefile.am: include leaf.am instead of leaf.cfg. * termios/Makefile.am: include leaf.am instead of leaf.cfg. * putenvtest/Makefile.am: include leaf.am instead of leaf.cfg. * rtems++/Makefile.am: include leaf.am instead of leaf.cfg, use make-cxx-exe. * stackchk/Makefile.am: include leaf.am instead of leaf.cfg. * rtmonuse/Makefile.am: include leaf.am instead of leaf.cfg. * cpuuse/Makefile.am: include leaf.am instead of leaf.cfg. --- c/src/tests/libtests/ChangeLog | 12 ++++++++++++ c/src/tests/libtests/cpuuse/Makefile.am | 2 +- c/src/tests/libtests/malloctest/Makefile.am | 2 +- c/src/tests/libtests/monitor/Makefile.am | 2 +- c/src/tests/libtests/putenvtest/Makefile.am | 2 +- c/src/tests/libtests/rtems++/Makefile.am | 4 ++-- c/src/tests/libtests/rtmonuse/Makefile.am | 2 +- c/src/tests/libtests/stackchk/Makefile.am | 2 +- c/src/tests/libtests/termios/Makefile.am | 2 +- 9 files changed, 21 insertions(+), 9 deletions(-) (limited to 'c/src/tests/libtests') diff --git a/c/src/tests/libtests/ChangeLog b/c/src/tests/libtests/ChangeLog index 0816d7b586..0442b9ba8a 100644 --- a/c/src/tests/libtests/ChangeLog +++ b/c/src/tests/libtests/ChangeLog @@ -1,3 +1,15 @@ +2001-09-19 Ralf Corsepius + + * malloctest/Makefile.am: include leaf.am instead of leaf.cfg. + * monitor/Makefile.am: include leaf.am instead of leaf.cfg. + * termios/Makefile.am: include leaf.am instead of leaf.cfg. + * putenvtest/Makefile.am: include leaf.am instead of leaf.cfg. + * rtems++/Makefile.am: include leaf.am instead of leaf.cfg, use + make-cxx-exe. + * stackchk/Makefile.am: include leaf.am instead of leaf.cfg. + * rtmonuse/Makefile.am: include leaf.am instead of leaf.cfg. + * cpuuse/Makefile.am: include leaf.am instead of leaf.cfg. + 2001-05-10 Ralf Corsepius * configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]). diff --git a/c/src/tests/libtests/cpuuse/Makefile.am b/c/src/tests/libtests/cpuuse/Makefile.am index e3cbf5b3c0..a7c4d465c1 100644 --- a/c/src/tests/libtests/cpuuse/Makefile.am +++ b/c/src/tests/libtests/cpuuse/Makefile.am @@ -26,7 +26,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # diff --git a/c/src/tests/libtests/malloctest/Makefile.am b/c/src/tests/libtests/malloctest/Makefile.am index 3943f08236..c2f71c8ad1 100644 --- a/c/src/tests/libtests/malloctest/Makefile.am +++ b/c/src/tests/libtests/malloctest/Makefile.am @@ -26,7 +26,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # diff --git a/c/src/tests/libtests/monitor/Makefile.am b/c/src/tests/libtests/monitor/Makefile.am index f5593e6ee5..5797ccbff2 100644 --- a/c/src/tests/libtests/monitor/Makefile.am +++ b/c/src/tests/libtests/monitor/Makefile.am @@ -27,7 +27,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # diff --git a/c/src/tests/libtests/putenvtest/Makefile.am b/c/src/tests/libtests/putenvtest/Makefile.am index 6d45adb641..cba00779a1 100644 --- a/c/src/tests/libtests/putenvtest/Makefile.am +++ b/c/src/tests/libtests/putenvtest/Makefile.am @@ -26,7 +26,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # diff --git a/c/src/tests/libtests/rtems++/Makefile.am b/c/src/tests/libtests/rtems++/Makefile.am index d7df9b90d6..e51cca36f7 100644 --- a/c/src/tests/libtests/rtems++/Makefile.am +++ b/c/src/tests/libtests/rtems++/Makefile.am @@ -26,7 +26,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # @@ -37,7 +37,7 @@ LD_LIBS += $(CPLUS_LD_LIBS) if HAS_CXX ${PGM}: $(OBJS) $(LINK_FILES) - $(make-exe) + $(make-cxx-exe) all-local: $(ARCH) $(TMPINSTALL_FILES) else diff --git a/c/src/tests/libtests/rtmonuse/Makefile.am b/c/src/tests/libtests/rtmonuse/Makefile.am index b8b3c5782a..cba0a3be78 100644 --- a/c/src/tests/libtests/rtmonuse/Makefile.am +++ b/c/src/tests/libtests/rtmonuse/Makefile.am @@ -26,7 +26,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # diff --git a/c/src/tests/libtests/stackchk/Makefile.am b/c/src/tests/libtests/stackchk/Makefile.am index a80eb8e04f..ba7fafb22d 100644 --- a/c/src/tests/libtests/stackchk/Makefile.am +++ b/c/src/tests/libtests/stackchk/Makefile.am @@ -26,7 +26,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # diff --git a/c/src/tests/libtests/termios/Makefile.am b/c/src/tests/libtests/termios/Makefile.am index 28ce2051d4..c59829c8e5 100644 --- a/c/src/tests/libtests/termios/Makefile.am +++ b/c/src/tests/libtests/termios/Makefile.am @@ -26,7 +26,7 @@ PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../automake/leaf.am include $(top_srcdir)/libtests.am # -- cgit v1.2.3