ChangeLogTag:Wed Feb 19 17:02:42 2003 Ossama Othman <ossama@uci.edu>

10 files changed, 480 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index a2c7ee373e1..588d9618487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+Wed Feb 19 17:02:42 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac (AC_CONFIG_FILES):
+
+	  Added RMCast, QoS and SSL Makefiles to the list of files to be
+	  generated.
+
+	* Makefile.am (ACLOCAL_AMFLAGS):
+
+	  Define this variable.  It contains options to be passed to
+	  `aclocal' whenever the generated Makefile invokes `aclocal'.
+	  Addresses failed automatic attempts at regenerating the
+	  `configure' script.
+
+	  (CONFIGURE_DEPENDENCIES):
+
+	  Define this variable to include all of the ACE-specific M4 files
+	  in the `m4' directory.  Those files will be included in the list
+	  of dependencies for the `configure' script.  Addresses failed
+	  automatic attempts at regenerating the `configure' script.
+
+	* ace/Makefile.am (DIST_SUBDIRS):
+
+	  Added RMCast, QoS and SSL subdirectories to the list of
+	  directories to include in the ACE distribution.
+
+	  (SUBDIRS):
+
+	  Conditionally build the RMCast, QoS and SSL subdirectories.  The
+	  user may explicitly enable or disable them using the
+	  "--with-rmcast", "--with-qos" and "--with-ssl" configure script
+	  options, respectively.
+
+	  (libACE_la_SOURCES):
+
+	  Added $(libACE_Codecs_la_SOURCES) to the list of ACE library
+	  sources.  Fixes "unresolved symol" link-time errors when
+	  building the `Codecs_Test' one-button test.
+
+	* ace/RMCast/Makefile.am:
+	* ace/QoS/Makefile.am:
+	* ace/SSL/Makefile.am:
+
+	  Added these Automake input files for the ACE_RMCast, ACE_QoS and
+	  ACE_SSL libraries, respectively.
+
+	* m4/ace.m4 (ACE_CONFIGURATION_OPTIONS):
+
+	  Added "--with-rmcast", "--with-qos" and "--with-ssl"
+	  configuration options that allow the user to explicitly enable
+	  or disable the ACE_RMCast, ACE_QoS and ACE_SSL libraries,
+	  respectively.  The ACE_RMCast is enabled by default, while the
+	  ACE_QoS and ACE_SSL libraries are not.
+
+	* tests/Makefile.am:
+
+	  Build CDR_Array_Test, Codecs_Test and Tokens_Test.
+
 Fri Feb 14 10:02:30 2003  Ossama Othman  <ossama@uci.edu>
 
 	* Makefile.am (all-local):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a2c7ee373e1..588d9618487 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,61 @@
+Wed Feb 19 17:02:42 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac (AC_CONFIG_FILES):
+
+	  Added RMCast, QoS and SSL Makefiles to the list of files to be
+	  generated.
+
+	* Makefile.am (ACLOCAL_AMFLAGS):
+
+	  Define this variable.  It contains options to be passed to
+	  `aclocal' whenever the generated Makefile invokes `aclocal'.
+	  Addresses failed automatic attempts at regenerating the
+	  `configure' script.
+
+	  (CONFIGURE_DEPENDENCIES):
+
+	  Define this variable to include all of the ACE-specific M4 files
+	  in the `m4' directory.  Those files will be included in the list
+	  of dependencies for the `configure' script.  Addresses failed
+	  automatic attempts at regenerating the `configure' script.
+
+	* ace/Makefile.am (DIST_SUBDIRS):
+
+	  Added RMCast, QoS and SSL subdirectories to the list of
+	  directories to include in the ACE distribution.
+
+	  (SUBDIRS):
+
+	  Conditionally build the RMCast, QoS and SSL subdirectories.  The
+	  user may explicitly enable or disable them using the
+	  "--with-rmcast", "--with-qos" and "--with-ssl" configure script
+	  options, respectively.
+
+	  (libACE_la_SOURCES):
+
+	  Added $(libACE_Codecs_la_SOURCES) to the list of ACE library
+	  sources.  Fixes "unresolved symol" link-time errors when
+	  building the `Codecs_Test' one-button test.
+
+	* ace/RMCast/Makefile.am:
+	* ace/QoS/Makefile.am:
+	* ace/SSL/Makefile.am:
+
+	  Added these Automake input files for the ACE_RMCast, ACE_QoS and
+	  ACE_SSL libraries, respectively.
+
+	* m4/ace.m4 (ACE_CONFIGURATION_OPTIONS):
+
+	  Added "--with-rmcast", "--with-qos" and "--with-ssl"
+	  configuration options that allow the user to explicitly enable
+	  or disable the ACE_RMCast, ACE_QoS and ACE_SSL libraries,
+	  respectively.  The ACE_RMCast is enabled by default, while the
+	  ACE_QoS and ACE_SSL libraries are not.
+
+	* tests/Makefile.am:
+
+	  Build CDR_Array_Test, Codecs_Test and Tokens_Test.
+
 Fri Feb 14 10:02:30 2003  Ossama Othman  <ossama@uci.edu>
 
 	* Makefile.am (all-local):
diff --git a/Makefile.am b/Makefile.am
index ab8fd3643d3..e6add9fa4d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,23 @@ SUBDIRS = \
 ##          etc \
 ##          includes
 
+## Additional flags to pass to `aclocal' when invoked by the generated
+## Makefile.  In particular, add ACE's `m4' directory to the macro
+## search path.
+ACLOCAL_AMFLAGS = -I m4
+
+## If any of these files are modified, `configure' will be
+## regenerated.
+CONFIGURE_DEPENDENCIES = \
+  m4/ace.m4 \
+  m4/acinclude.m4 \
+  m4/compiler.m4 \
+  m4/config_h.m4 \
+  m4/features.m4 \
+  m4/platform.m4 \
+  m4/subsets.m4 \
+  m4/threads.m4
+
 ## For some reason, automake doesn't include acconfig.h in the distribution
 EXTRA_DIST = \
   ACE-INSTALL.html \
@@ -65,7 +82,7 @@ ACE_EXTRA_DIST = ChangeLogs bin docs m4
 ## Automake recognized target.  Appends these rules to the "all"
 ## target.
 all-local:
-	@test -d bin || ($(LN_S) $(top_srcdir)/bin bin && touch ace-bin-stamp)
+	test -d bin || ($(LN_S) $(top_srcdir)/bin bin && touch ace-bin-stamp)
 
 ## Clean up some additional files/directories possibly created during
 ## the configure script tests.
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 0b0cbc40345..d6fb0508198 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -8,8 +8,47 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
+## These are subdirectories that are always included in the
+## distribution.
+DIST_SUBDIRS = \
+  RMCast \
+  QoS \
+  SSL
+
+## Conditionally built subdirectories.
+
+if BUILD_RMCAST
+RMCAST_DIR = RMCast
+else
+RMCAST_DIR =
+endif
+
+if BUILD_QOS
+QOS_DIR = QoS
+else
+QOS_DIR =
+endif
+
+if BUILD_SSL
+SSL_DIR = SSL
+else
+SSL_DIR =
+endif
+
+## List of conditionally built subdirectories.
+##
+## Note that the "." (current) directory in the below SUBDIRS list is
+## required to make the ACE directory be built prior to the
+## subdirectories.
+##
 ## Disable building of CLASSIX library for now.
 ## SUBDIRS = CLASSIX
+SUBDIRS = \
+  . \
+  $(RMCAST_DIR) \
+  $(QOS_DIR) \
+  $(SSL_DIR)
+
 
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
@@ -420,6 +459,7 @@ libACE_la_SOURCES = \
   $(libACE_Memory_la_SOURCES) \
   $(libACE_Timer_la_SOURCES) \
   $(libACE_Token_la_SOURCES) \
+  $(libACE_Codecs_la_SOURCES) \
   $(libACE_Other_la_SOURCES)
 
 
diff --git a/ace/QoS/Makefile.am b/ace/QoS/Makefile.am
new file mode 100644
index 00000000000..45b79c11eca
--- /dev/null
+++ b/ace/QoS/Makefile.am
@@ -0,0 +1,39 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for ACE_QoS library
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libACE_QoS.la
+
+libACE_QoS_la_SOURCES = \
+  QoS_Decorator.cpp \
+  QoS_Manager.cpp \
+  QoS_Session_Factory.cpp \
+  QoS_Session_Impl.cpp \
+  SOCK_Dgram_Mcast_QoS.cpp
+
+libACE_QoS_la_LIBADD = $(top_builddir)/ace/libACE.la
+
+HEADER_FILES = \
+  ACE_QoS_Export.h \
+  QoS_Decorator.h \
+  QoS_Manager.h \
+  QoS_Session.h \
+  QoS_Session_Factory.h \
+  QoS_Session_Impl.h \
+  SOCK_Dgram_Mcast_QoS.h
+
+INLINE_FILES = \
+  QoS_Session_Impl.i \
+  SOCK_Dgram_Mcast_QoS.i
+
+pkginclude_HEADERS = \
+  $(HEADER_FILES) \
+  $(INLINE_FILES)
diff --git a/ace/RMCast/Makefile.am b/ace/RMCast/Makefile.am
new file mode 100644
index 00000000000..5a183b2e90b
--- /dev/null
+++ b/ace/RMCast/Makefile.am
@@ -0,0 +1,105 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for ACE_RMCast library
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libACE_RMCast.la
+
+libACE_RMCast_la_SOURCES = \
+  RMCast.cpp \
+  RMCast_Ack_Worker.cpp \
+  RMCast_Fork.cpp \
+  RMCast_Fragment.cpp \
+  RMCast_IO_UDP.cpp \
+  RMCast_Membership.cpp \
+  RMCast_Module.cpp \
+  RMCast_Module_Factory.cpp \
+  RMCast_Partial_Message.cpp \
+  RMCast_Proxy.cpp \
+  RMCast_Reassembly.cpp \
+  RMCast_Receiver_Module.cpp \
+  RMCast_Reliable_Factory.cpp \
+  RMCast_Reordering.cpp \
+  RMCast_Resend_Handler.cpp \
+  RMCast_Resend_Worker.cpp \
+  RMCast_Retransmission.cpp \
+  RMCast_Sequencer.cpp \
+  RMCast_Singleton_Factory.cpp \
+  RMCast_UDP_Event_Handler.cpp \
+  RMCast_UDP_Proxy.cpp \
+  RMCast_UDP_Reliable_Receiver.cpp \
+  RMCast_UDP_Reliable_Sender.cpp
+
+libACE_RMCast_la_LIBADD = $(top_builddir)/ace/libACE.la
+
+## These are template source files.
+TEMPLATE_FILES = \
+  RMCast_Copy_On_Write.cpp \
+  RMCast_Worker.cpp
+
+HEADER_FILES = \
+  RMCast.h \
+  RMCast_Ack_Worker.h \
+  RMCast_Copy_On_Write.h \
+  RMCast_Export.h \
+  RMCast_Fork.h \
+  RMCast_Fragment.h \
+  RMCast_IO_UDP.h \
+  RMCast_Membership.h \
+  RMCast_Module.h \
+  RMCast_Module_Factory.h \
+  RMCast_Partial_Message.h \
+  RMCast_Proxy.h \
+  RMCast_Reassembly.h \
+  RMCast_Receiver_Module.h \
+  RMCast_Reliable_Factory.h \
+  RMCast_Reordering.h \
+  RMCast_Resend_Handler.h \
+  RMCast_Resend_Worker.h \
+  RMCast_Retransmission.h \
+  RMCast_Sequencer.h \
+  RMCast_Singleton_Factory.h \
+  RMCast_UDP_Event_Handler.h \
+  RMCast_UDP_Proxy.h \
+  RMCast_UDP_Reliable_Receiver.h \
+  RMCast_UDP_Reliable_Sender.h \
+  RMCast_Worker.h
+
+INLINE_FILES = \
+  RMCast.i \
+  RMCast_Ack_Worker.i \
+  RMCast_Copy_On_Write.i \
+  RMCast_Fork.i \
+  RMCast_Fragment.i \
+  RMCast_IO_UDP.i \
+  RMCast_Membership.i \
+  RMCast_Module.i \
+  RMCast_Module_Factory.i \
+  RMCast_Partial_Message.i \
+  RMCast_Proxy.i \
+  RMCast_Reassembly.i \
+  RMCast_Receiver_Module.i \
+  RMCast_Reliable_Factory.i \
+  RMCast_Reordering.i \
+  RMCast_Resend_Handler.i \
+  RMCast_Resend_Worker.i \
+  RMCast_Retransmission.i \
+  RMCast_Sequencer.i \
+  RMCast_Singleton_Factory.i \
+  RMCast_UDP_Event_Handler.i \
+  RMCast_UDP_Proxy.i \
+  RMCast_UDP_Reliable_Receiver.i \
+  RMCast_UDP_Reliable_Sender.i \
+  RMCast_Worker.i
+
+pkginclude_HEADERS = \
+  $(HEADER_FILES) \
+  $(INLINE_FILES) \
+  $(TEMPLATE_FILES)
diff --git a/ace/SSL/Makefile.am b/ace/SSL/Makefile.am
new file mode 100644
index 00000000000..76dca53c598
--- /dev/null
+++ b/ace/SSL/Makefile.am
@@ -0,0 +1,46 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for ACE_SSL library
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libACE_SSL.la
+
+libACE_SSL_la_SOURCES = \
+  SSL_Asynch_BIO.cpp \
+  SSL_Asynch_Stream.cpp \
+  SSL_Context.cpp \
+  SSL_SOCK.cpp \
+  SSL_SOCK_Acceptor.cpp \
+  SSL_SOCK_Connector.cpp \
+  SSL_SOCK_Stream.cpp
+
+libACE_SSL_la_LIBADD = $(top_builddir)/ace/libACE.la
+
+HEADER_FILES = \
+  SSL_Asynch_BIO.h \
+  SSL_Asynch_Stream.h \
+  SSL_Context.h \
+  SSL_Export.h \
+  SSL_SOCK.h \
+  SSL_SOCK_Acceptor.h \
+  SSL_SOCK_Connector.h \
+  SSL_SOCK_Stream.h \
+  sslconf.h
+
+INLINE_FILES = \
+  SSL_SOCK.i \
+  SSL_SOCK_Acceptor.i \
+  SSL_SOCK_Connector.i \
+  SSL_SOCK_Stream.i \
+  SSL_Context.inl
+
+pkginclude_HEADERS = \
+  $(HEADER_FILES) \
+  $(INLINE_FILES)
diff --git a/configure.ac b/configure.ac
index 7e903b9279b..4e030d496a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,14 +219,14 @@ dnl TAO_CONFIGURATION_OPTIONS
 # called so that the proper values are cached beforehand.  We also do
 # it before any linker flags (LDFLAGS) are set so that C++ specific
 # ones don't break the tests.
-AC_LANG_PUSH([C])
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_POP([C])
+dnl AC_LANG_PUSH([C])
+dnl AC_OBJEXT
+dnl AC_EXEEXT
+dnl AC_LANG_POP([C])
 
 dnl Call ACE_SET_COMPILER_FLAGS before AC_PROG_LIBTOOL and after the
 dnl AC_ARG_ENABLE and AC_ARG_WITH calls.
-dnl ACE_SET_COMPILER_FLAGS
+ACE_SET_COMPILER_FLAGS
 
 
 dnl SECTION 3: check for programs <--- moved before section 2 (Ossama)
@@ -7300,6 +7300,9 @@ AC_CONFIG_FILES([
   aceConf.sh
   Makefile
   ace/Makefile
+  ace/RMCast/Makefile
+  ace/QoS/Makefile
+  ace/SSL/Makefile
   apps/Makefile
   apps/gperf/Makefile
   apps/gperf/src/Makefile
diff --git a/m4/ace.m4 b/m4/ace.m4
index 602c1335650..b731ee793e3 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -249,7 +249,67 @@ dnl line, then "no_x" is set to "yes."
      AC_MSG_WARN([existing gperf may be overwritten during installation])
    fi
   ])
-AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_with_gperf = Xyes])
+ AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_with_gperf = Xyes])
+
+ AC_ARG_WITH([rmcast],
+  AC_HELP_STRING([--with-rmcast],[compile the ACE_RMCast library [[yes]]]),
+  [
+   case "${withval}" in
+    yes)
+      ace_user_with_rmcast=yes
+      ;;
+    no)
+      ace_user_with_rmcast=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${withval} for --with-rmcast])
+      ;;
+   esac
+  ],
+  [
+   ace_user_with_rmcast=yes
+  ])
+ AM_CONDITIONAL([BUILD_RMCAST], [test X$ace_user_with_rmcast = Xyes])
+
+ AC_ARG_WITH([qos],
+  AC_HELP_STRING([--with-qos],[compile the ACE_QoS library [[no]]]),
+  [
+   case "${withval}" in
+    yes)
+      ace_user_with_qos=yes
+      ;;
+    no)
+      ace_user_with_qos=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${withval} for --with-qos])
+      ;;
+   esac
+  ],
+  [
+   ace_user_with_qos=no
+  ])
+ AM_CONDITIONAL([BUILD_QOS], [test X$ace_user_with_qos = Xyes])
+
+ AC_ARG_WITH([ssl],
+  AC_HELP_STRING([--with-ssl],[compile the ACE_SSL library [[no]]]),
+  [
+   case "${withval}" in
+    yes)
+      ace_user_with_ssl=yes
+      ;;
+    no)
+      ace_user_with_ssl=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${withval} for --with-ssl])
+      ;;
+   esac
+  ],
+  [
+   ace_user_with_ssl=no
+  ])
+ AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes])
 
 #AC_ARG_WITH([tao],
 # AC_HELP_STRING([--with-tao],[build TAO (the ACE ORB) [[yes]]]),
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ee67d816895..3fb4da8f71d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,21 +34,47 @@ noinst_SCRIPTS = \
   run_tests.psosim \
   run_tests_remote.sh
 
+
+## @todo Do not build/run this test if running on LynxOS < 3.1.0.
+CDR_ARRAY_TEST = CDR_Array_Test
+
+## @todo Do not build these tests if their corresponding components in
+##       ACE have not been enabled/built.
+##if BUILD_CODECS_FILES
+CODECS_TEST = Codecs_Test
+##else
+##CODECS_TEST =
+##endif
+
+##if BUILD_TOKEN_FILES
+TOKENS_TEST = Tokens_Test
+##else
+##TOKENS_TEST =
+##endif
+
 if COMPILE_XTREACTOR_TEST
 XTREACTOR_TEST = XtReactor_Test
 else
 XTREACTOR_TEST =
 endif
 
+## @todo Make the DLL_Test, Service_Config_Test and
+##       Framework_Component tests conditional on shared library
+##       builds.  Do not build in static library only builds.
+FRAMEWORK_COMPONENT_TEST = Framework_Component_Test
+## FRAMEWORK_COMPONENT_TEST =
+
 ## Build the shared libraries needed for the DLL_Test and the
 ## Service_Config_DLL test. 
-noinst_LTLIBRARIES = libDLL_Test.la libService_Config_DLL.la
+libdir = $(shell pwd)
+lib_LTLIBRARIES = libDLL_Test.la libService_Config_DLL.la
 
-libDLL_Test_la_LDFLAGS = -module
 libDLL_Test_la_SOURCES = DLL_Test_Impl.cpp DLL_Test_Impl.h
+libDLL_Test_la_LDFLAGS = -module
 
-libService_Config_DLL_la_LDFLAGS = -module
 libService_Config_DLL_la_SOURCES = Service_Config_DLL.cpp Service_Config_DLL.h
+libService_Config_DLL_la_LDFLAGS = -module
+libService_Config_DLL_la_LIBADD = $(top_builddir)/ace/libACE.la
 
 ## Build the following test programs when a `make check' is
 ## issued by the user.
@@ -168,7 +194,12 @@ noinst_PROGRAMS = \
   FlReactor_Test \
   Thread_Pool_Reactor_Test \
   Thread_Pool_Reactor_Resume_Test \
-  TkReactor_Test $(XTREACTOR_TEST)
+  TkReactor_Test \
+  $(CDR_ARRAY_TEST) \
+  $(CODECS_TEST) \
+  $(FRAMEWORK_COMPONENT_TEST) \
+  $(TOKENS_TEST) \
+  $(XTREACTOR_TEST)
 
 Aio_Platform_Test_SOURCES = Aio_Platform_Test.cpp
 
@@ -188,6 +219,8 @@ Bound_Ptr_Test_SOURCES = Bound_Ptr_Test.cpp
 
 Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
 
+CDR_Array_Test_SOURCES = CDR_Array_Test.cpp
+
 CDR_Test_SOURCES = CDR_Test.cpp
 
 CDR_File_Test_SOURCES = CDR_File_Test.cpp
@@ -205,6 +238,8 @@ Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp \
 
 Capabilities_Test_SOURCES = Capabilities_Test.cpp
 
+Codecs_Test_SOURCES = Codecs_Test.cpp
+
 Collection_Test_SOURCES = Collection_Test.cpp Collection_Test.h
 
 Config_Test_SOURCES = Config_Test.cpp Config_Test.h
@@ -232,6 +267,9 @@ FIFO_Test_SOURCES = FIFO_Test.cpp
 
 FlReactor_Test_SOURCES = FlReactor_Test.cpp
 
+Framework_Component_Test_SOURCES = Framework_Component_Test.cpp \
+                                   Framework_Component_Test.h
+
 Future_Test_SOURCES = Future_Test.cpp
 
 Future_Set_Test_SOURCES = Future_Set_Test.cpp
@@ -399,9 +437,11 @@ Timeprobe_Test_SOURCES = Timeprobe_Test.cpp
 
 Timer_Queue_Test_SOURCES = Timer_Queue_Test.cpp
 
+TkReactor_Test_SOURCES = TkReactor_Test.cpp
+
 Token_Strategy_Test_SOURCES = Token_Strategy_Test.cpp
 
-TkReactor_Test_SOURCES = TkReactor_Test.cpp
+Tokens_Test_SOURCES = Tokens_Test.cpp
 
 UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
 
@@ -458,10 +498,10 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_DATA)
 ## Automake recognized target.  Appends these rules to the "all"
 ## target.
 all-local:
-	@for p in $(noinst_SCRIPTS) $(noinst_DATA); do \
+	for p in $(noinst_SCRIPTS) $(noinst_DATA); do \
 	  test -f $$p \
 	  || $(LN_S) $(top_srcdir)/tests/$$p $$p; done
-	@touch tests-link-stamp
+	touch tests-link-stamp
 
 ## Clean up template repositories, etc.
 clean-local: