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

11 files changed, 34 insertions, 85 deletions

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