ChangeLogTag:Wed Jan 21 22:06:34 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

18 files changed, 118 insertions, 117 deletions

diff --git a/ChangeLog b/ChangeLog
index 97443359ea9..ac99439795b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+Wed Jan 21 22:06:34 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* configure.ac (AC_CONFIG_FILES):
+
+	  Added missing `netsvcs' Makefiles to the files generated by the
+	  configure script.
+
+	* netsvcs/Makefile.am:
+
+	  Reverted a series of changes that somehow left this file in an
+	  inconsistent state in our CVS repository, and unparsable by
+	  Automake.  In particular, it incorrectly contained
+	  Borland-specific Makefile code.
+
+	  Updated to our latest Makefile.am conventions.
+
+	* netsvcs/clients/Makefile.am:
+	* netsvcs/clients/Logger/Makefile.am:
+	* netsvcs/clients/Naming/Client/Makefile.am:
+	* netsvcs/clients/Naming/Dump_Restore/Makefile.am:
+	* netsvcs/clients/Tokens/Makefile.am:
+	* netsvcs/clients/Tokens/collection/Makefile.am:
+	* netsvcs/clients/Tokens/deadlock/Makefile.am:
+	* netsvcs/clients/Tokens/invariant/Makefile.am:
+	* netsvcs/clients/Tokens/manual/Makefile.am:
+	* netsvcs/clients/Tokens/mutex/Makefile.am:
+	* netsvcs/clients/Tokens/rw_lock/Makefile.am:
+	* netsvcs/lib/Makefile.am:
+	* netsvcs/servers/Makefile.am:
+
+	  Updated to our latest Makefile.am conventions.
+
+	* tests/Makefile.am:
+
+	  Added more missing header files to appropriate source file
+	  lists.  Missing files were made evident when running a "make
+	  distcheck".
+
 Wed Jan 21 20:12:38 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* configure.ac (ACE_CONFIG_COMMANDS):
diff --git a/Makefile.am b/Makefile.am
index e9cddbdb30a..2c3f67511d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,8 @@ man_MANS = ace-config.1
 SUBDIRS = \
   ace \
   apps \
+  netsvcs \
   tests
-##  netsvcs \
 ##  man
 
 ##SUBDIRS = \
diff --git a/configure.ac b/configure.ac
index 8f1812a1cdd..c332d5ace68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7376,6 +7376,21 @@ AC_CONFIG_FILES([
   apps/Makefile
   apps/gperf/Makefile
   apps/gperf/src/Makefile
+  netsvcs/Makefile
+  netsvcs/lib/Makefile
+  netsvcs/clients/Makefile
+  netsvcs/clients/Logger/Makefile
+  netsvcs/clients/Naming/Makefile
+  netsvcs/clients/Naming/Client/Makefile
+  netsvcs/clients/Naming/Dump_Restore/Makefile
+  netsvcs/clients/Tokens/Makefile
+  netsvcs/clients/Tokens/collection/Makefile
+  netsvcs/clients/Tokens/deadlock/Makefile
+  netsvcs/clients/Tokens/invariant/Makefile
+  netsvcs/clients/Tokens/manual/Makefile
+  netsvcs/clients/Tokens/mutex/Makefile
+  netsvcs/clients/Tokens/rw_lock/Makefile
+  netsvcs/servers/Makefile
   tests/Makefile
   tests/SSL/Makefile
 ])
diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am
index 72036c408fc..5bebeb4ea44 100644
--- a/netsvcs/Makefile.am
+++ b/netsvcs/Makefile.am
@@ -1,16 +1,17 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the ACE network services
+##
+##---------------------------------------------------------------------------
 
-!ifndef CFLAGS
-CFLAGS=$(ACE_CFLAGS)
-!endif
+##
+##  Process this file with automake to create Makefile.in
+##
 
-!ifndef CPPDIR
-CPPDIR=.
-!endif
-
-!ifndef LIBFILES
-LIBFILES= $(ACE_LIB)
-!endif
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+SUBDIRS = \
+  lib \
+  clients \
+  servers
 
+EXTRA_DIST = ACE-netsvcs.html
diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am
index f8099722c3e..70449c5e220 100644
--- a/netsvcs/clients/Logger/Makefile.am
+++ b/netsvcs/clients/Logger/Makefile.am
@@ -8,11 +8,7 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 ## LDFLAGS = 
 ## Libtool will automatically link against the "proper" library.
@@ -20,9 +16,8 @@ INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 LDADD = $(top_builddir)/ace/libACE.la
 
 noinst_PROGRAMS = \
-         direct_logging \
-         indirect_logging
-
+ direct_logging \
+ indirect_logging
 
 direct_logging_SOURCES = direct_logging.cpp
 
diff --git a/netsvcs/clients/Makefile.am b/netsvcs/clients/Makefile.am
index dcce3830dc8..6edac17be3d 100644
--- a/netsvcs/clients/Makefile.am
+++ b/netsvcs/clients/Makefile.am
@@ -8,11 +8,7 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
 SUBDIRS = \
-        Logger \
-        Naming \
-        Tokens
+  Logger \
+  Naming \
+  Tokens
diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am
index b4a397b58d8..8a97e90f04e 100644
--- a/netsvcs/clients/Naming/Client/Makefile.am
+++ b/netsvcs/clients/Naming/Client/Makefile.am
@@ -8,19 +8,14 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_LIBRARIES = libClient_Test.a
 
 libClient_Test_a_SOURCES = Client_Test.cpp Client_Test.h
 
-
 noinst_PROGRAMS = \
-         main
+  main
 
 main_SOURCES = main.cpp
 main_LDADD = $(top_builddir)/netsvcs/clients/Naming/Client/libClient_Test.a \
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
index 85703366ece..d38bbe426f4 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am
+++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
@@ -8,18 +8,13 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_LIBRARIES = \
          libDump_Restore.a
 
 libDump_Restore_a_SOURCES = Dump_Restore.cpp Dump_Restore.h
 
-
 noinst_PROGRAMS = \
          main
 
@@ -30,4 +25,3 @@ main_LDADD = \
 
 ## ACE currently doesn't build this so we don't build it with automake either.
 EXTRA_DIST = createfile.cpp
-
diff --git a/netsvcs/clients/Tokens/Makefile.am b/netsvcs/clients/Tokens/Makefile.am
index 0dc39ce47bd..37d4b007538 100644
--- a/netsvcs/clients/Tokens/Makefile.am
+++ b/netsvcs/clients/Tokens/Makefile.am
@@ -8,15 +8,10 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
 SUBDIRS = \
-         collection  \
-         deadlock  \
-         invariant  \
-         manual  \
-         mutex  \
-         rw_lock
-
+  collection  \
+  deadlock  \
+  invariant  \
+  manual  \
+  mutex  \
+  rw_lock
diff --git a/netsvcs/clients/Tokens/collection/Makefile.am b/netsvcs/clients/Tokens/collection/Makefile.am
index 99f4fba0ba7..9d3fbcc5ddd 100644
--- a/netsvcs/clients/Tokens/collection/Makefile.am
+++ b/netsvcs/clients/Tokens/collection/Makefile.am
@@ -8,16 +8,11 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_PROGRAMS = \
-         collection
+  collection
 
 collection_SOURCES = collection.cpp
 collection_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \
                    $(top_builddir)/ace/libACE.la
-
diff --git a/netsvcs/clients/Tokens/deadlock/Makefile.am b/netsvcs/clients/Tokens/deadlock/Makefile.am
index 0b50b13195d..d995e71620b 100644
--- a/netsvcs/clients/Tokens/deadlock/Makefile.am
+++ b/netsvcs/clients/Tokens/deadlock/Makefile.am
@@ -8,17 +8,12 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_PROGRAMS = \
-         deadlock_detection_test
+  deadlock_detection_test
 
 deadlock_detection_test_SOURCES = deadlock_detection_test.cpp
 deadlock_detection_test_LDADD = \
                    $(top_builddir)/netsvcs/lib/libnetsvcs.la \
                    $(top_builddir)/ace/libACE.la
-
diff --git a/netsvcs/clients/Tokens/invariant/Makefile.am b/netsvcs/clients/Tokens/invariant/Makefile.am
index 7e137109fa2..37817911015 100644
--- a/netsvcs/clients/Tokens/invariant/Makefile.am
+++ b/netsvcs/clients/Tokens/invariant/Makefile.am
@@ -8,17 +8,13 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_PROGRAMS = \
          invariant
 
 invariant_SOURCES = invariant.cpp
 invariant_LDADD = \
-                 $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                 $(top_builddir)/ace/libACE.la
+  $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+  $(top_builddir)/ace/libACE.la
 
diff --git a/netsvcs/clients/Tokens/manual/Makefile.am b/netsvcs/clients/Tokens/manual/Makefile.am
index 7f2b227464e..b2945a96bd3 100644
--- a/netsvcs/clients/Tokens/manual/Makefile.am
+++ b/netsvcs/clients/Tokens/manual/Makefile.am
@@ -8,19 +8,15 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_PROGRAMS = \
-         manual
+  manual
 
 manual_SOURCES = manual.cpp
 manual_LDADD = \
-              $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-              $(top_builddir)/ace/libACE.la
+  $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+  $(top_builddir)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/netsvcs/clients/Tokens/mutex/Makefile.am b/netsvcs/clients/Tokens/mutex/Makefile.am
index a62805fafb4..63d02af7d97 100644
--- a/netsvcs/clients/Tokens/mutex/Makefile.am
+++ b/netsvcs/clients/Tokens/mutex/Makefile.am
@@ -8,18 +8,14 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_PROGRAMS = \
-         test_mutex
+  test_mutex
 
 test_mutex_SOURCES = test_mutex.cpp
 test_mutex_LDADD = \
-                 $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                 $(top_builddir)/ace/libACE.la
+  $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+  $(top_builddir)/ace/libACE.la
 
 
diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile.am b/netsvcs/clients/Tokens/rw_lock/Makefile.am
index f95e991bb24..265a3a09558 100644
--- a/netsvcs/clients/Tokens/rw_lock/Makefile.am
+++ b/netsvcs/clients/Tokens/rw_lock/Makefile.am
@@ -8,17 +8,13 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_PROGRAMS = \
-         rw_locks
+  rw_locks
 
 rw_locks_SOURCES = rw_locks.cpp
 rw_locks_LDADD = \
-                $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                $(top_builddir)/ace/libACE.la
+  $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+  $(top_builddir)/ace/libACE.la
 
diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am
index 09d075ee7f0..a527f3ef54b 100644
--- a/netsvcs/lib/Makefile.am
+++ b/netsvcs/lib/Makefile.am
@@ -9,11 +9,7 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4 
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 lib_LTLIBRARIES = libnetsvcs.la
 
@@ -29,7 +25,7 @@ libnetsvcs_la_SOURCES = \
          Token_Handler.cpp
 
 libnetsvcs_la_LDFLAGS = \
-         -version-info @ACE_CURRENT@:@ACE_REVISION@:@ACE_AGE@
+         -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 noinst_HEADERS = \
          Base_Optimizer.h  \
diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am
index 5a9dc555fed..6e1c58949a2 100644
--- a/netsvcs/servers/Makefile.am
+++ b/netsvcs/servers/Makefile.am
@@ -8,11 +8,7 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/netsvcs/lib
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/netsvcs/lib
 
 noinst_PROGRAMS = main
 
@@ -23,4 +19,3 @@ main_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \
 noinst_DATA = svc.conf
 
 EXTRA_DIST = $(noinst_DATA)
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e6843d21665..170b96dc704 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -267,7 +267,7 @@ Barrier_Test_SOURCES = Barrier_Test.cpp
 
 Basic_Types_Test_SOURCES = Basic_Types_Test.cpp
 
-Bound_Ptr_Test_SOURCES = Bound_Ptr_Test.cpp
+Bound_Ptr_Test_SOURCES = Bound_Ptr_Test.cpp Bound_Ptr_Test.h
 
 Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
 
@@ -391,7 +391,8 @@ Multihomed_INET_Addr_Test_SOURCES = Multihomed_INET_Addr_Test.cpp
 
 Naming_Test_SOURCES = Naming_Test.cpp
 
-NonBlocking_Conn_Test_SOURCES = NonBlocking_Conn_Test.cpp
+NonBlocking_Conn_Test_SOURCES = \
+  NonBlocking_Conn_Test.cpp NonBlocking_Conn_Test.h
 
 Notify_Performance_Test_SOURCES = Notify_Performance_Test.cpp
 
@@ -490,15 +491,19 @@ TSS_Static_Test_SOURCES = TSS_Static_Test.cpp
 
 Task_Test_SOURCES = Task_Test.cpp
 
-Task_Ex_Test_SOURCES = Task_Ex_Test.cpp
+Task_Ex_Test_SOURCES = Task_Ex_Test.cpp Task_Ex_Test.h
 
 Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp
 
 Thread_Mutex_Test_SOURCES = Thread_Mutex_Test.cpp
 
-Thread_Pool_Reactor_Test_SOURCES = Thread_Pool_Reactor_Test.cpp
+Thread_Pool_Reactor_Test_SOURCES = \
+  Thread_Pool_Reactor_Test.cpp \
+  Thread_Pool_Reactor_Test.h
 
-Thread_Pool_Reactor_Resume_Test_SOURCES = Thread_Pool_Reactor_Resume_Test.cpp
+Thread_Pool_Reactor_Resume_Test_SOURCES = \
+  Thread_Pool_Reactor_Resume_Test.cpp \
+  Thread_Pool_Reactor_Resume_Test.h
 
 Thread_Pool_Test_SOURCES = Thread_Pool_Test.cpp
 
@@ -526,7 +531,9 @@ UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
 Upgradable_RW_Test_SOURCES = Upgradable_RW_Test.cpp \
                              Upgradable_RW_Test.h
 
-Unbounded_Set_Test_Ex_SOURCES = Unbounded_Set_Test_Ex.cpp
+Unbounded_Set_Test_Ex_SOURCES = \
+  Unbounded_Set_Test_Ex.cpp \
+  Unbounded_Set_Test_Ex.h
 
 Vector_Test_SOURCES = Vector_Test.cpp