From e6594aec2dd83c3ee5fae8b7f541d8d426a98fb9 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 5 Dec 2003 17:52:07 +0000 Subject: 2003-12-05 Ralf Corsepius * mptests/mp01/Makefile.am: Cosmetics. * samples/Makefile.am: Cosmetics. * samples/base_mp/Makefile.am: Cosmetics. * samples/base_sp/Makefile.am: Cosmetics. * samples/hello/Makefile.am: Cosmetics. * samples/ticker/Makefile.am: Cosmetics. * support/Makefile.am: Cosmetics. * tmtests/tmoverhd/Makefile.am: Cosmetics. --- c/src/ada-tests/ChangeLog | 11 +++++++++++ c/src/ada-tests/mptests/mp01/Makefile.am | 2 +- c/src/ada-tests/samples/Makefile.am | 1 - c/src/ada-tests/samples/base_mp/Makefile.am | 2 +- c/src/ada-tests/samples/base_sp/Makefile.am | 3 +-- c/src/ada-tests/samples/hello/Makefile.am | 3 +-- c/src/ada-tests/samples/ticker/Makefile.am | 3 +-- c/src/ada-tests/support/Makefile.am | 1 - c/src/ada-tests/tmtests/tmoverhd/Makefile.am | 5 ++--- 9 files changed, 18 insertions(+), 13 deletions(-) diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog index 30edf8f412..80322b38c2 100644 --- a/c/src/ada-tests/ChangeLog +++ b/c/src/ada-tests/ChangeLog @@ -1,3 +1,14 @@ +2003-12-05 Ralf Corsepius + + * mptests/mp01/Makefile.am: Cosmetics. + * samples/Makefile.am: Cosmetics. + * samples/base_mp/Makefile.am: Cosmetics. + * samples/base_sp/Makefile.am: Cosmetics. + * samples/hello/Makefile.am: Cosmetics. + * samples/ticker/Makefile.am: Cosmetics. + * support/Makefile.am: Cosmetics. + * tmtests/tmoverhd/Makefile.am: Cosmetics. + 2003-11-11 Ralf Corsepius * Makefile.am: Reflect having moved tests/. diff --git a/c/src/ada-tests/mptests/mp01/Makefile.am b/c/src/ada-tests/mptests/mp01/Makefile.am index ddb46b81b2..4daed69967 100644 --- a/c/src/ada-tests/mptests/mp01/Makefile.am +++ b/c/src/ada-tests/mptests/mp01/Makefile.am @@ -2,8 +2,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../testsuites/automake/compile.am -include $(top_srcdir)/../../../testsuites/automake/subdirs.am SUBDIRS = node1 node2 +include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/samples/Makefile.am b/c/src/ada-tests/samples/Makefile.am index 409adf53d0..fee449b143 100644 --- a/c/src/ada-tests/samples/Makefile.am +++ b/c/src/ada-tests/samples/Makefile.am @@ -6,6 +6,5 @@ if HAS_MP SUBDIRS += base_mp endif - include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/c/src/ada-tests/samples/base_mp/Makefile.am index f3a3073209..7342ffd9b2 100644 --- a/c/src/ada-tests/samples/base_mp/Makefile.am +++ b/c/src/ada-tests/samples/base_mp/Makefile.am @@ -2,7 +2,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../testsuites/automake/compile.am -include $(top_srcdir)/../../../testsuites/automake/subdirs.am SUBDIRS = node1 node2 #include $(top_srcdir)/ada.am @@ -22,4 +21,5 @@ SUBDIRS = node1 node2 #EXTRA_DIST += node2/base_mp.scn #EXTRA_DIST += node2/mptest-per_node_configuration.adb +include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/c/src/ada-tests/samples/base_sp/Makefile.am index c34cc3cfa4..ffb30f08a1 100644 --- a/c/src/ada-tests/samples/base_sp/Makefile.am +++ b/c/src/ada-tests/samples/base_sp/Makefile.am @@ -13,8 +13,7 @@ init.$(OBJEXT): ../../support/init.c noinst_PROGRAMS = base_sp -base_sp_SOURCES = base_sp.adb \ -config.h sptest.adb sptest.ads +base_sp_SOURCES = base_sp.adb config.h sptest.adb sptest.ads EXTRA_DIST = base_sp.scn diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/c/src/ada-tests/samples/hello/Makefile.am index d49ed60d1a..8ffd8e46be 100644 --- a/c/src/ada-tests/samples/hello/Makefile.am +++ b/c/src/ada-tests/samples/hello/Makefile.am @@ -13,8 +13,7 @@ init.$(OBJEXT): ../../support/init.c noinst_PROGRAMS = hello -hello_SOURCES = hello.adb \ -config.h sptest.adb sptest.ads +hello_SOURCES = hello.adb config.h sptest.adb sptest.ads EXTRA_DIST = hello.scn diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/c/src/ada-tests/samples/ticker/Makefile.am index a9abc82fde..2b27abba7b 100644 --- a/c/src/ada-tests/samples/ticker/Makefile.am +++ b/c/src/ada-tests/samples/ticker/Makefile.am @@ -13,8 +13,7 @@ init.$(OBJEXT): ../../support/init.c noinst_PROGRAMS = ticker -ticker_SOURCES = ticker.adb \ -config.h sptest.adb sptest.ads +ticker_SOURCES = ticker.adb config.h sptest.adb sptest.ads EXTRA_DIST = ticker.scn diff --git a/c/src/ada-tests/support/Makefile.am b/c/src/ada-tests/support/Makefile.am index 0191a256ae..d0c160c1cb 100644 --- a/c/src/ada-tests/support/Makefile.am +++ b/c/src/ada-tests/support/Makefile.am @@ -18,4 +18,3 @@ EXTRA_DIST += timer_driver.ads EXTRA_DIST += unsigned32_io.ads include $(top_srcdir)/../../../testsuites/automake/local.am - diff --git a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am index d522442e4a..9150a7ea16 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am +++ b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am @@ -6,9 +6,8 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am noinst_PROGRAMS = tmoverhd -tmoverhd_SOURCES = tmoverhd.adb config.h \ -tmtest.adb tmtest.ads \ -dummy_rtems.adb dummy_rtems.ads +tmoverhd_SOURCES = tmoverhd.adb config.h tmtest.adb tmtest.ads \ + dummy_rtems.adb dummy_rtems.ads tmoverhd_SOURCES += ../../support/init.c tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT) -- cgit v1.2.3