Eliminate _exe_/.exe.

15 files changed, 106 insertions, 106 deletions

diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index ebe4b7770b..4c5afde775 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = base_mp-node1.exe
-base_mp_node1_exe_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node1
+base_mp_node1_SOURCES = ../init.c ../apptask.c ../system.h
 
 dist_rtems_tests_DATA = base_mp-node1.scn
 dist_rtems_tests_DATA += base_mp-node1.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_mp_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+base_mp_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I.
 
-LINK_OBJS = $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_LDADD)
-LINK_LIBS = $(base_mp_node1_exe_LDLIBS)
+LINK_OBJS = $(base_mp_node1_OBJECTS) $(base_mp_node1_LDADD)
+LINK_LIBS = $(base_mp_node1_LDLIBS)
 
-base_mp-node1.exe$(EXEEXT): $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_DEPENDENCIES)
-	@rm -f base_mp-node1.exe$(EXEEXT)
+base_mp-node1$(EXEEXT): $(base_mp_node1_OBJECTS) $(base_mp_node1_DEPENDENCIES)
+	@rm -f base_mp-node1$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index a67e6c3a5d..d540845955 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = base_mp-node2.exe
-base_mp_node2_exe_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node2
+base_mp_node2_SOURCES = ../init.c ../apptask.c ../system.h
 
 dist_rtems_tests_DATA = base_mp-node2.scn
 dist_rtems_tests_DATA += base_mp-node2.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_mp_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+base_mp_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I.
 
-LINK_OBJS = $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_LDADD)
-LINK_LIBS = $(base_mp_node2_exe_LDLIBS)
+LINK_OBJS = $(base_mp_node2_OBJECTS) $(base_mp_node2_LDADD)
+LINK_LIBS = $(base_mp_node2_LDLIBS)
 
-base_mp-node2.exe$(EXEEXT): $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_DEPENDENCIES)
-	@rm -f base_mp-node2.exe$(EXEEXT)
+base_mp-node2$(EXEEXT): $(base_mp_node2_OBJECTS) $(base_mp_node2_DEPENDENCIES)
+	@rm -f base_mp-node2$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 2a324114ae..9b573a6ed8 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = base_sp.exe
-base_sp_exe_SOURCES = init.c apptask.c system.h
+rtems_tests_PROGRAMS = base_sp
+base_sp_SOURCES = init.c apptask.c system.h
 
 dist_rtems_tests_DATA = base_sp.scn
 dist_rtems_tests_DATA += base_sp.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_sp_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+base_sp_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(base_sp_exe_OBJECTS) $(base_sp_exe_LDADD)
-LINK_LIBS = $(base_sp_exe_LDLIBS)
+LINK_OBJS = $(base_sp_OBJECTS) $(base_sp_LDADD)
+LINK_LIBS = $(base_sp_LDLIBS)
 
-base_sp.exe$(EXEEXT): $(base_sp_exe_OBJECTS) $(base_sp_exe_DEPENDENCIES)
-	@rm -f base_sp.exe$(EXEEXT)
+base_sp$(EXEEXT): $(base_sp_OBJECTS) $(base_sp_DEPENDENCIES)
+	@rm -f base_sp$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/capture/Makefile.am b/testsuites/samples/capture/Makefile.am
index 75b95ad901..4b79faadba 100644
--- a/testsuites/samples/capture/Makefile.am
+++ b/testsuites/samples/capture/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = capture.exe
-capture_exe_SOURCES = init.c test1.c system.h
+rtems_tests_PROGRAMS = capture
+capture_SOURCES = init.c test1.c system.h
 
 dist_rtems_tests_DATA = capture.scn
 dist_rtems_tests_DATA += capture.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-capture_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+capture_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(capture_exe_OBJECTS) $(capture_exe_LDADD)
-LINK_LIBS = $(capture_exe_LDLIBS)
+LINK_OBJS = $(capture_OBJECTS) $(capture_LDADD)
+LINK_LIBS = $(capture_LDLIBS)
 
-capture.exe$(EXEEXT): $(capture_exe_OBJECTS) $(capture_exe_DEPENDENCIES)
-	@rm -f capture.exe$(EXEEXT)
+capture$(EXEEXT): $(capture_OBJECTS) $(capture_DEPENDENCIES)
+	@rm -f capture$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 598a12c1ff..738b95c7e1 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = cdtest.exe
-cdtest_exe_SOURCES = init.c main.cc system.h
+rtems_tests_PROGRAMS = cdtest
+cdtest_SOURCES = init.c main.cc system.h
 
 dist_rtems_tests_DATA = cdtest.scn
 
@@ -13,17 +13,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-cdtest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+cdtest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(cdtest_exe_OBJECTS) $(cdtest_exe_LDADD)
-LINK_LIBS = $(cdtest_exe_LDLIBS)
+LINK_OBJS = $(cdtest_OBJECTS) $(cdtest_LDADD)
+LINK_LIBS = $(cdtest_LDLIBS)
 
-cdtest.exe$(EXEEXT): $(cdtest_exe_OBJECTS) $(cdtest_exe_DEPENDENCIES)
-	@rm -f cdtest.exe$(EXEEXT)
+cdtest$(EXEEXT): $(cdtest_OBJECTS) $(cdtest_DEPENDENCIES)
+	@rm -f cdtest$(EXEEXT)
 	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 71e2805c77..e6cae04b6a 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -6,8 +6,8 @@ MANAGERS = io message semaphore
 
 if LIBCHIP
 
-rtems_tests_PROGRAMS = fileio.exe
-fileio_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = fileio
+fileio_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = fileio.doc
 endif
@@ -17,13 +17,13 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 if LIBCHIP
-fileio_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+fileio_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(fileio_exe_OBJECTS) $(fileio_exe_LDADD)
-LINK_LIBS = $(fileio_exe_LDLIBS)
+LINK_OBJS = $(fileio_OBJECTS) $(fileio_LDADD)
+LINK_LIBS = $(fileio_LDLIBS)
 
-fileio.exe$(EXEEXT): $(fileio_exe_OBJECTS) $(fileio_exe_DEPENDENCIES)
-	@rm -f fileio.exe$(EXEEXT)
+fileio$(EXEEXT): $(fileio_OBJECTS) $(fileio_DEPENDENCIES)
+	@rm -f fileio$(EXEEXT)
 	$(make-exe)
 endif
 
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index e1aa159fc8..7a1a2d0587 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = hello.exe
-hello_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = hello
+hello_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = hello.scn
 dist_rtems_tests_DATA += hello.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-hello_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+hello_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(hello_exe_OBJECTS) $(hello_exe_LDADD)
-LINK_LIBS = $(hello_exe_LDLIBS)
+LINK_OBJS = $(hello_OBJECTS) $(hello_LDADD)
+LINK_LIBS = $(hello_LDLIBS)
 
-hello.exe$(EXEEXT): $(hello_exe_OBJECTS) $(hello_exe_DEPENDENCIES)
-	@rm -f hello.exe$(EXEEXT)
+hello$(EXEEXT): $(hello_OBJECTS) $(hello_DEPENDENCIES)
+	@rm -f hello$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index db49fe8495..d47caccdf0 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = cxx_iostream.exe
-cxx_iostream_exe_SOURCES = init.cc system.h
+rtems_tests_PROGRAMS = cxx_iostream
+cxx_iostream_SOURCES = init.cc system.h
 
 dist_rtems_tests_DATA = iostream.scn
 dist_rtems_tests_DATA += iostream.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-cxx_iostream_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+cxx_iostream_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(cxx_iostream_exe_OBJECTS) $(cxx_iostream_exe_LDADD)
-LINK_LIBS = $(cxx_iostream_exe_LDLIBS)
+LINK_OBJS = $(cxx_iostream_OBJECTS) $(cxx_iostream_LDADD)
+LINK_LIBS = $(cxx_iostream_LDLIBS)
 
-cxx_iostream.exe$(EXEEXT): $(cxx_iostream_exe_OBJECTS) $(cxx_iostream_exe_DEPENDENCIES)
-	@rm -f cxx_iostream.exe$(EXEEXT)
+cxx_iostream$(EXEEXT): $(cxx_iostream_OBJECTS) $(cxx_iostream_DEPENDENCIES)
+	@rm -f cxx_iostream$(EXEEXT)
 	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 26a7249467..761735ff33 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = loopback.exe
-loopback_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = loopback
+loopback_SOURCES = init.c
 
 dist_rtems_tests_DATA = loopback.scn
 
@@ -13,13 +13,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-loopback_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+loopback_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(loopback_exe_OBJECTS) $(loopback_exe_LDADD)
-LINK_LIBS = $(loopback_exe_LDLIBS)
+LINK_OBJS = $(loopback_OBJECTS) $(loopback_LDADD)
+LINK_LIBS = $(loopback_LDLIBS)
 
-loopback.exe$(EXEEXT): $(loopback_exe_OBJECTS) $(loopback_exe_DEPENDENCIES)
-	@rm -f loopback.exe$(EXEEXT)
+loopback$(EXEEXT): $(loopback_OBJECTS) $(loopback_DEPENDENCIES)
+	@rm -f loopback$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index e846b3bfe3..f850d1f81b 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = 
 
-rtems_tests_PROGRAMS = minimum.exe
-minimum_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = minimum
+minimum_SOURCES = init.c
 
 dist_rtems_tests_DATA = minimum.scn
 dist_rtems_tests_DATA += minimum.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-minimum_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+minimum_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # 	This test should not be executed
 
-LINK_OBJS = $(minimum_exe_OBJECTS) $(minimum_exe_LDADD)
-LINK_LIBS = $(minimum_exe_LDLIBS)
+LINK_OBJS = $(minimum_OBJECTS) $(minimum_LDADD)
+LINK_LIBS = $(minimum_LDLIBS)
 
-minimum.exe$(EXEEXT): $(minimum_exe_OBJECTS) $(minimum_exe_DEPENDENCIES)
-	@rm -f minimum.exe$(EXEEXT)
+minimum$(EXEEXT): $(minimum_OBJECTS) $(minimum_DEPENDENCIES)
+	@rm -f minimum$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/nsecs/Makefile.am b/testsuites/samples/nsecs/Makefile.am
index 73fd791be8..af8ee148ee 100644
--- a/testsuites/samples/nsecs/Makefile.am
+++ b/testsuites/samples/nsecs/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = nsecs.exe
-nsecs_exe_SOURCES = init.c empty.c
+rtems_tests_PROGRAMS = nsecs
+nsecs_SOURCES = init.c empty.c
 
 dist_rtems_tests_DATA = nsecs.scn
 dist_rtems_tests_DATA += nsecs.doc
@@ -14,11 +14,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-LINK_OBJS = $(nsecs_exe_OBJECTS) $(nsecs_exe_LDADD)
-LINK_LIBS = $(nsecs_exe_LDLIBS)
+LINK_OBJS = $(nsecs_OBJECTS) $(nsecs_LDADD)
+LINK_LIBS = $(nsecs_LDLIBS)
 
-nsecs.exe$(EXEEXT): $(nsecs_exe_OBJECTS) $(nsecs_exe_DEPENDENCIES)
-	@rm -f nsecs.exe$(EXEEXT)
+nsecs$(EXEEXT): $(nsecs_OBJECTS) $(nsecs_DEPENDENCIES)
+	@rm -f nsecs$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index f8858747c7..959fc6cf37 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = paranoia.exe
-paranoia_exe_SOURCES = init.c paranoia.c system.h
+rtems_tests_PROGRAMS = paranoia
+paranoia_SOURCES = init.c paranoia.c system.h
 
 dist_rtems_tests_DATA = paranoia.doc
 
@@ -13,18 +13,18 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-paranoia_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+paranoia_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 #  -DCYGNUS   turns on more verbose msgs
 AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
 
-paranoia_exe_LDLIBS = -lm
+paranoia_LDLIBS = -lm
 
-LINK_OBJS = $(paranoia_exe_OBJECTS) $(paranoia_exe_LDADD)
-LINK_LIBS = $(paranoia_exe_LDLIBS)
+LINK_OBJS = $(paranoia_OBJECTS) $(paranoia_LDADD)
+LINK_LIBS = $(paranoia_LDLIBS)
 
-paranoia.exe$(EXEEXT): $(paranoia_exe_OBJECTS) $(paranoia_exe_DEPENDENCIES)
-	@rm -f paranoia.exe$(EXEEXT)
+paranoia$(EXEEXT): $(paranoia_OBJECTS) $(paranoia_DEPENDENCIES)
+	@rm -f paranoia$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index b35817d081..1d448afa65 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -4,22 +4,22 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = pppd.exe
-pppd_exe_SOURCES = init.c pppdapp.c netconfig.h system.h
+rtems_tests_PROGRAMS = pppd
+pppd_SOURCES = init.c pppdapp.c netconfig.h system.h
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-pppd_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+pppd_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-pppd_exe_LDLIBS = -lpppd
+pppd_LDLIBS = -lpppd
 
-LINK_OBJS = $(pppd_exe_OBJECTS) $(pppd_exe_LDADD)
-LINK_LIBS = $(pppd_exe_LDLIBS)
+LINK_OBJS = $(pppd_OBJECTS) $(pppd_LDADD)
+LINK_LIBS = $(pppd_LDLIBS)
 
-pppd.exe$(EXEEXT): $(pppd_exe_OBJECTS) $(pppd_exe_DEPENDENCIES)
-	@rm -f pppd.exe$(EXEEXT)
+pppd$(EXEEXT): $(pppd_OBJECTS) $(pppd_DEPENDENCIES)
+	@rm -f pppd$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index d8e4a2bf0e..30f8ce4396 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = ticker.exe
-ticker_exe_SOURCES = init.c tasks.c system.h
+rtems_tests_PROGRAMS = ticker
+ticker_SOURCES = init.c tasks.c system.h
 
 dist_rtems_tests_DATA = ticker.scn
 dist_rtems_tests_DATA += ticker.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-ticker_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+ticker_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(ticker_exe_OBJECTS) $(ticker_exe_LDADD)
-LINK_LIBS = $(ticker_exe_LDLIBS)
+LINK_OBJS = $(ticker_OBJECTS) $(ticker_LDADD)
+LINK_LIBS = $(ticker_LDLIBS)
 
-ticker.exe$(EXEEXT): $(ticker_exe_OBJECTS) $(ticker_exe_DEPENDENCIES)
-	@rm -f ticker.exe$(EXEEXT)
+ticker$(EXEEXT): $(ticker_OBJECTS) $(ticker_DEPENDENCIES)
+	@rm -f ticker$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 3b681cf2bb..024f74e883 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event semaphore
 
-rtems_tests_PROGRAMS = unlimited.exe
-unlimited_exe_SOURCES = init.c test1.c test2.c test3.c system.h
+rtems_tests_PROGRAMS = unlimited
+unlimited_SOURCES = init.c test1.c test2.c test3.c system.h
 
 dist_rtems_tests_DATA = unlimited.scn
 dist_rtems_tests_DATA += unlimited.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-unlimited_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+unlimited_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(unlimited_exe_OBJECTS) $(unlimited_exe_LDADD)
-LINK_LIBS = $(unlimited_exe_LDLIBS)
+LINK_OBJS = $(unlimited_OBJECTS) $(unlimited_LDADD)
+LINK_LIBS = $(unlimited_LDLIBS)
 
-unlimited.exe$(EXEEXT): $(unlimited_exe_OBJECTS) $(unlimited_exe_DEPENDENCIES)
-	@rm -f unlimited.exe$(EXEEXT)
+unlimited$(EXEEXT): $(unlimited_OBJECTS) $(unlimited_DEPENDENCIES)
+	@rm -f unlimited$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am