ChangeLogTag:Sat Jul 28 14:58:30 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

15 files changed, 54 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index f8cae1aba20..183e20e7552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Sat Jul 28 14:58:30 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* netsvcs/clients/Tokens/collection/Makefile,
+	  netsvcs/clients/Tokens/deadlock/Makefile,
+	  netsvcs/clients/Tokens/invariant/Makefile,
+	  netsvcs/clients/Tokens/mutex/Makefile,
+	  netsvcs/clients/Tokens/rw_lock/Makefile,
+	  examples/ASX/CCM_App/Makefile,
+	  examples/Logger/Acceptor-server/Makefile,
+	  examples/Reactor/Multicast/Makefile,
+	  examples/Reactor/Ntalker/Makefile,
+	  examples/Shared_Malloc/Makefile,
+	  performance-tests/TCP/Makefile,
+	  performance-tests/UDP/Makefile: Removed the line 
+	  include $(ACE_ROOT)/include/makeinclude/rules.LIB.GNU
+	  so that these projects will build correctly on VxWorks with
+	  Make 3.79.1.  Thanks to Frank Wolf for reporting this.
+
 Fri Jul 27 11:24:50 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 	* ace/Svc_Conf.y: Allow quoted strings as the pathname.  Thanks
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f8cae1aba20..183e20e7552 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+Sat Jul 28 14:58:30 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* netsvcs/clients/Tokens/collection/Makefile,
+	  netsvcs/clients/Tokens/deadlock/Makefile,
+	  netsvcs/clients/Tokens/invariant/Makefile,
+	  netsvcs/clients/Tokens/mutex/Makefile,
+	  netsvcs/clients/Tokens/rw_lock/Makefile,
+	  examples/ASX/CCM_App/Makefile,
+	  examples/Logger/Acceptor-server/Makefile,
+	  examples/Reactor/Multicast/Makefile,
+	  examples/Reactor/Ntalker/Makefile,
+	  examples/Shared_Malloc/Makefile,
+	  performance-tests/TCP/Makefile,
+	  performance-tests/UDP/Makefile: Removed the line 
+	  include $(ACE_ROOT)/include/makeinclude/rules.LIB.GNU
+	  so that these projects will build correctly on VxWorks with
+	  Make 3.79.1.  Thanks to Frank Wolf for reporting this.
+
 Fri Jul 27 11:24:50 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 	* ace/Svc_Conf.y: Allow quoted strings as the pathname.  Thanks
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f8cae1aba20..183e20e7552 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,21 @@
+Sat Jul 28 14:58:30 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* netsvcs/clients/Tokens/collection/Makefile,
+	  netsvcs/clients/Tokens/deadlock/Makefile,
+	  netsvcs/clients/Tokens/invariant/Makefile,
+	  netsvcs/clients/Tokens/mutex/Makefile,
+	  netsvcs/clients/Tokens/rw_lock/Makefile,
+	  examples/ASX/CCM_App/Makefile,
+	  examples/Logger/Acceptor-server/Makefile,
+	  examples/Reactor/Multicast/Makefile,
+	  examples/Reactor/Ntalker/Makefile,
+	  examples/Shared_Malloc/Makefile,
+	  performance-tests/TCP/Makefile,
+	  performance-tests/UDP/Makefile: Removed the line 
+	  include $(ACE_ROOT)/include/makeinclude/rules.LIB.GNU
+	  so that these projects will build correctly on VxWorks with
+	  Make 3.79.1.  Thanks to Frank Wolf for reporting this.
+
 Fri Jul 27 11:24:50 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 	* ace/Svc_Conf.y: Allow quoted strings as the pathname.  Thanks
diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile
index 321db333eec..bdce9698f0a 100644
--- a/examples/ASX/CCM_App/Makefile
+++ b/examples/ASX/CCM_App/Makefile
@@ -29,7 +29,6 @@ include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/examples/Logger/Acceptor-server/Makefile b/examples/Logger/Acceptor-server/Makefile
index 54251a79c75..62fb6819649 100644
--- a/examples/Logger/Acceptor-server/Makefile
+++ b/examples/Logger/Acceptor-server/Makefile
@@ -24,7 +24,6 @@ include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile
index 19c68d62aa3..e98015dc4d3 100644
--- a/examples/Reactor/Multicast/Makefile
+++ b/examples/Reactor/Multicast/Makefile
@@ -26,7 +26,6 @@ include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include		$(ACE_ROOT)/include/makeinclude/macros.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile
index 7098252d624..a098a3e7921 100644
--- a/examples/Reactor/Ntalker/Makefile
+++ b/examples/Reactor/Ntalker/Makefile
@@ -25,7 +25,6 @@ include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include		$(ACE_ROOT)/include/makeinclude/macros.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile
index 2f353102cb8..24ad98f0296 100644
--- a/examples/Shared_Malloc/Makefile
+++ b/examples/Shared_Malloc/Makefile
@@ -30,7 +30,6 @@ include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile
index bebdf613ac4..e3289e1e2b3 100644
--- a/netsvcs/clients/Tokens/collection/Makefile
+++ b/netsvcs/clients/Tokens/collection/Makefile
@@ -31,7 +31,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile
index f3561dfaa0d..f030b5ea3d3 100644
--- a/netsvcs/clients/Tokens/deadlock/Makefile
+++ b/netsvcs/clients/Tokens/deadlock/Makefile
@@ -31,7 +31,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile
index b9446e4b032..09ac1d82c4d 100644
--- a/netsvcs/clients/Tokens/invariant/Makefile
+++ b/netsvcs/clients/Tokens/invariant/Makefile
@@ -31,7 +31,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile
index f8efc5f1a8e..50558fd9d03 100644
--- a/netsvcs/clients/Tokens/mutex/Makefile
+++ b/netsvcs/clients/Tokens/mutex/Makefile
@@ -31,7 +31,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile
index 15e6b29976b..9195b540e7d 100644
--- a/netsvcs/clients/Tokens/rw_lock/Makefile
+++ b/netsvcs/clients/Tokens/rw_lock/Makefile
@@ -31,7 +31,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/performance-tests/TCP/Makefile b/performance-tests/TCP/Makefile
index 95ffd0f250e..d68f5ea6660 100644
--- a/performance-tests/TCP/Makefile
+++ b/performance-tests/TCP/Makefile
@@ -24,7 +24,6 @@ include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/performance-tests/UDP/Makefile b/performance-tests/UDP/Makefile
index b1c54da3d87..ee2f68041b9 100644
--- a/performance-tests/UDP/Makefile
+++ b/performance-tests/UDP/Makefile
@@ -24,7 +24,6 @@ include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU