Starting to do the "real" ACE+autoconf integration.

15 files changed, 398 insertions, 0 deletions

diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am
new file mode 100644
index 00000000000..d631bb6b7bc
--- /dev/null
+++ b/netsvcs/Makefile.am
@@ -0,0 +1,21 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the ACE network services
+##
+##---------------------------------------------------------------------------
+
+##
+##  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 = lib \
+          clients \
+          servers
+
+EXTRA_DIST = ACE-netsvcs.html
+
diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am
new file mode 100644
index 00000000000..f8099722c3e
--- /dev/null
+++ b/netsvcs/clients/Logger/Makefile.am
@@ -0,0 +1,29 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for client logging applications
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+## LDFLAGS = 
+## Libtool will automatically link against the "proper" library.
+## Do not change the "libACE.la."  It is not a typographical error!
+LDADD = $(top_builddir)/ace/libACE.la
+
+noinst_PROGRAMS = \
+         direct_logging \
+         indirect_logging
+
+
+direct_logging_SOURCES = direct_logging.cpp
+
+indirect_logging_SOURCES = indirect_logging.cpp
diff --git a/netsvcs/clients/Makefile.am b/netsvcs/clients/Makefile.am
new file mode 100644
index 00000000000..dcce3830dc8
--- /dev/null
+++ b/netsvcs/clients/Makefile.am
@@ -0,0 +1,18 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the client programs that test the ACE network services
+##----------------------------------------------------------------------------
+
+##
+##  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
diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am
new file mode 100644
index 00000000000..0d8935062de
--- /dev/null
+++ b/netsvcs/clients/Naming/Client/Makefile.am
@@ -0,0 +1,32 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the client programs that test the ACE network services
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_LIBRARIES = libClient_Test.a
+
+libClient_Test_a_SOURCES = Client_Test.cpp Client_Test.h
+
+
+noinst_PROGRAMS = \
+         main
+
+main_SOURCES = main.cpp
+main_LDADD = $(top_builddir)/netsvcs/clients/Naming/Client/libClient_Test.a \
+             $(top_builddir)/ace/libACE.la
+
+noinst_DATA = svc.conf svc2.conf
+
+EXTRA_DIST = $(noinst_DATA)
+
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
new file mode 100644
index 00000000000..85703366ece
--- /dev/null
+++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
@@ -0,0 +1,33 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the ACE Dump-Restore Name_Server utility
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_LIBRARIES = \
+         libDump_Restore.a
+
+libDump_Restore_a_SOURCES = Dump_Restore.cpp Dump_Restore.h
+
+
+noinst_PROGRAMS = \
+         main
+
+main_SOURCES = main.cpp
+main_LDADD = \
+      $(top_builddir)/netsvcs/clients/Naming/Dump_Restore/libDump_Restore.a \
+      $(top_builddir)/ace/libACE.la
+
+## ACE currently doesn't build this so we don't build it with automake either.
+EXTRA_DIST = createfile.cpp
+
diff --git a/netsvcs/clients/Naming/Makefile.am b/netsvcs/clients/Naming/Makefile.am
new file mode 100644
index 00000000000..09924790da5
--- /dev/null
+++ b/netsvcs/clients/Naming/Makefile.am
@@ -0,0 +1,19 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the Name Server test applications
+##
+##---------------------------------------------------------------------------
+
+##
+##  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 = \
+         Client \
+         Dump_Restore
+
diff --git a/netsvcs/clients/Tokens/Makefile.am b/netsvcs/clients/Tokens/Makefile.am
new file mode 100644
index 00000000000..0dc39ce47bd
--- /dev/null
+++ b/netsvcs/clients/Tokens/Makefile.am
@@ -0,0 +1,22 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the Token tests
+##----------------------------------------------------------------------------
+
+##
+##  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
+
diff --git a/netsvcs/clients/Tokens/collection/Makefile.am b/netsvcs/clients/Tokens/collection/Makefile.am
new file mode 100644
index 00000000000..99f4fba0ba7
--- /dev/null
+++ b/netsvcs/clients/Tokens/collection/Makefile.am
@@ -0,0 +1,23 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for repeating token client application
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_PROGRAMS = \
+         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
new file mode 100644
index 00000000000..0b50b13195d
--- /dev/null
+++ b/netsvcs/clients/Tokens/deadlock/Makefile.am
@@ -0,0 +1,24 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for repeating token client application
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_PROGRAMS = \
+         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
new file mode 100644
index 00000000000..7e137109fa2
--- /dev/null
+++ b/netsvcs/clients/Tokens/invariant/Makefile.am
@@ -0,0 +1,24 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for repeating token client application
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_PROGRAMS = \
+         invariant
+
+invariant_SOURCES = invariant.cpp
+invariant_LDADD = \
+                 $(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
new file mode 100644
index 00000000000..01b4b3427fe
--- /dev/null
+++ b/netsvcs/clients/Tokens/manual/Makefile.am
@@ -0,0 +1,25 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for repeating token client application
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_PROGRAMS = \
+         manual
+
+manual_SOURCES = manual.cpp
+manual_LDADD = \
+              $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+              $(top_builddir)/ace/libACE.la
+
+
diff --git a/netsvcs/clients/Tokens/mutex/Makefile.am b/netsvcs/clients/Tokens/mutex/Makefile.am
new file mode 100644
index 00000000000..a62805fafb4
--- /dev/null
+++ b/netsvcs/clients/Tokens/mutex/Makefile.am
@@ -0,0 +1,25 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for repeating token client application
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_PROGRAMS = \
+         test_mutex
+
+test_mutex_SOURCES = test_mutex.cpp
+test_mutex_LDADD = \
+                 $(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
new file mode 100644
index 00000000000..f95e991bb24
--- /dev/null
+++ b/netsvcs/clients/Tokens/rw_lock/Makefile.am
@@ -0,0 +1,24 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for repeating token client application
+##----------------------------------------------------------------------------
+
+##
+##  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)
+
+noinst_PROGRAMS = \
+         rw_locks
+
+rw_locks_SOURCES = rw_locks.cpp
+rw_locks_LDADD = \
+                $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+                $(top_builddir)/ace/libACE.la
+
diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am
new file mode 100644
index 00000000000..00f0a13bf5b
--- /dev/null
+++ b/netsvcs/lib/Makefile.am
@@ -0,0 +1,53 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the server-side ACE network services
+##
+##---------------------------------------------------------------------------
+
+##
+##  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)
+
+lib_LTLIBRARIES = libnetsvcs.la
+
+libnetsvcs_la_SOURCES = \
+         Base_Optimizer.cpp  \
+         Client_Logging_Handler.cpp  \
+         Log_Message_Receiver.cpp  \
+         Logging_Strategy.cpp  \
+         Name_Handler.cpp  \
+         Server_Logging_Handler.cpp  \
+         Server_Logging_Handler_T.cpp  \
+         TS_Clerk_Handler.cpp  \
+         TS_Server_Handler.cpp  \
+         Token_Handler.cpp
+
+libnetsvcs_la_LDFLAGS = \
+         -version-info @ACE_CURRENT@:@ACE_REVISION@:@ACE_AGE@
+
+noinst_HEADERS = \
+         Base_Optimizer.h  \
+         Client_Logging_Handler.h  \
+         Log_Message_Receiver.h  \
+         Logging_Strategy.h  \
+         Name_Handler.h  \
+         Server_Logging_Handler.h  \
+         Server_Logging_Handler_T.h  \
+         TS_Clerk_Handler.h  \
+         TS_Server_Handler.h  \
+         Token_Handler.h
+
+## What do we about the below?  It was in the original libnetsvcs Makefile.
+##  ifeq ($(SUPPRESS_DASH_G),1)
+##  #### Build this target without -g on some platforms.
+##  $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT):
+##          $(COMPILE-NO_DASH_G.cc) -o $@ $<
+##  endif # SUPPRESS_DASH_G
+
diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am
new file mode 100644
index 00000000000..5a9dc555fed
--- /dev/null
+++ b/netsvcs/servers/Makefile.am
@@ -0,0 +1,26 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the netsvcs server example
+##----------------------------------------------------------------------------
+
+##
+##  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
+
+noinst_PROGRAMS = main
+
+main_SOURCES = main.cpp
+main_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+             $(top_builddir)/ace/libACE.la
+
+noinst_DATA = svc.conf
+
+EXTRA_DIST = $(noinst_DATA)
+