Rework.

testsuites/libtests/rtems++/Makefile.am

@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 MANAGERS = event io msg sem signal timer rate_monotonic
 
 if HAS_CXX
@@ -10,9 +9,11 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
 endif
 
-DOCS = rtems++.scn rtems++.doc
-
-
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = rtems++.scn
+docdir = $(testsdir)
+dist_doc_DATA = rtems++.doc
 
 PGM = ${ARCH}/rtems++.exe
 
@@ -20,36 +21,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
+if HAS_CXX
+LD_LIBS = -lrtems++
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/rtems++.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/rtems++.exe
+tests_SCRIPTS = $(PGM)
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-LD_LIBS = -lrtems++
-
-if HAS_CXX
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-cxx-exe)
-
-all-local: $(TMPINSTALL_FILES)
-else
-all-local:
 endif
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am