ChangeLogTag:Wed Jan 7 17:34:26 2004 Steve Huston <shuston@riverace.com>

23 files changed, 92 insertions, 5 deletions

diff --git a/ACEXML/Makefile b/ACEXML/Makefile
index 4ad38f77a62..1f3c83d7ba7 100644
--- a/ACEXML/Makefile
+++ b/ACEXML/Makefile
@@ -17,5 +17,6 @@ MFILES = \
 
 $(TARGETS_NESTED):
 	@for file in $(MFILES); do \
+	$(RM) -rf `dirname $$file`/tempinc ;\
 	$(MAKE) -f `basename $$file` -C `dirname $$file` $(@); \
 	done
diff --git a/ChangeLog b/ChangeLog
index 94aea1d2514..d580e25169f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+Wed Jan  7 17:34:26 2004  Steve Huston  <shuston@riverace.com>
+
+	* examples/APG/Proactor/HA_Proactive_Status.cpp: Added #include
+	  "ace/Log_Msg.h" to find LM_DEBUG, et al.
+
+	* examples/APG/Processes/Process_Manager_Spawn.cpp:
+	* examples/APG/Processes/Process_Mutex.cpp:
+	* examples/APG/Processes/Spawn.cpp:
+	* examples/APG/Reactor/HAStatus.cpp:
+	* examples/APG/Reactor/HAStatus-AC.cpp:
+	* examples/APG/Shared_Memory/Hash_Map.cpp:
+	* examples/APG/Shared_Memory/Malloc.cpp:
+	* examples/APG/Shared_Memory/PI_Malloc.cpp:
+	* examples/APG/Shared_Memory/Pool_Growth.cpp:
+	* examples/APG/Timers/Alarm.cpp:
+	* examples/APG/Timers/Task.cpp:
+	* examples/APG/Timers/Upcall.cpp: Added missing includes
+	  for "ace/OS_NS_*.h".
+
+	* examples/APG/Reactor/Client.h:
+	* examples/APG/Reactor/ClientService.h" Add #include
+	  "ace/Synch_Traits.h", "ace/Null_Condition.h", and "ace/Null_Mutex.h"
+	  for Visual Age C++ to see when compiling templates.
+
+	* ACEXML/Makefile:
+	* examples/APG/Svc_Config/Makefile:
+	* examples/APG/Timers/Makefile: Move the rm tempinc up to before
+	  the sub-make runs to avoid whacking it while a subsequent sub-make
+	  is running.
+
+	* examples/APG/Svc_Config/Makefile.dynamic: Add LIBS += $(ACELIB)
+
+	* tests/Makefile: Add .NOTPARALLEL for Visual Age C++ to avoid
+	  squashing tempinc randomly, resulting in missing templates.
+
+	* tests/Makefile.tests: Moved the DIRS_PARALLEL setting down to after
+	  wrapper_macros.GNU is included and only set it for non-Visual Age C++
+	  builds. The tempinc directory getting mashed in parallel builds
+	  makes mysterious build errors happen on AIX, Visual Age C++.
+
 Wed Jan  7 16:33:14 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
         * ace/config-tandem-nsk-mips-v2.h:
diff --git a/examples/APG/Proactor/HA_Proactive_Status.cpp b/examples/APG/Proactor/HA_Proactive_Status.cpp
index 454215bc625..ed5d9a2c81b 100644
--- a/examples/APG/Proactor/HA_Proactive_Status.cpp
+++ b/examples/APG/Proactor/HA_Proactive_Status.cpp
@@ -6,6 +6,7 @@
 */
 
 #include "HA_Proactive_Status.h"
+#include "ace/Log_Msg.h"
 #include "ace/Proactor.h"
 #include "ace/os_include/arpa/os_inet.h"
 
diff --git a/examples/APG/Processes/Process_Manager_Spawn.cpp b/examples/APG/Processes/Process_Manager_Spawn.cpp
index 73b32f30c25..dd61ae9bae8 100644
--- a/examples/APG/Processes/Process_Manager_Spawn.cpp
+++ b/examples/APG/Processes/Process_Manager_Spawn.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_unistd.h"
 #include "ace/Log_Msg.h"
 // Listing 0 code/ch10
 #include "ace/Process_Manager.h"
diff --git a/examples/APG/Processes/Process_Mutex.cpp b/examples/APG/Processes/Process_Mutex.cpp
index 3d85426f5e7..a10078ad2ac 100644
--- a/examples/APG/Processes/Process_Mutex.cpp
+++ b/examples/APG/Processes/Process_Mutex.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_unistd.h"
 #include "ace/Log_Msg.h"
 #include "ace/Process.h"
 #include "ace/Process_Mutex.h"
diff --git a/examples/APG/Processes/Spawn.cpp b/examples/APG/Processes/Spawn.cpp
index 5ddf84cb8e1..a8a3e76e6f6 100644
--- a/examples/APG/Processes/Spawn.cpp
+++ b/examples/APG/Processes/Spawn.cpp
@@ -1,10 +1,14 @@
 // $Id$
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_fcntl.h"
+#include "ace/OS_NS_pwd.h"
+#include "ace/os_include/os_pwd.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/Process.h"
 #include "ace/Log_Msg.h"
-#include "ace/os_include/os_pwd.h"
-#include "ace/OS_NS_pwd.h"
 
 // Listing 1 code/ch10
 class Manager : public ACE_Process
diff --git a/examples/APG/Reactor/Client.cpp b/examples/APG/Reactor/Client.cpp
index d95ffd8fb3c..7dc453d9627 100644
--- a/examples/APG/Reactor/Client.cpp
+++ b/examples/APG/Reactor/Client.cpp
@@ -4,6 +4,9 @@
  * A simple client program using ACE_Svc_Handler and ACE_Connector.
  */
 
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_sys_time.h"
 #include "Client.h"
 
 // Listing 2 code/ch07
diff --git a/examples/APG/Reactor/Client.h b/examples/APG/Reactor/Client.h
index 956ae566eaa..9aba262151a 100644
--- a/examples/APG/Reactor/Client.h
+++ b/examples/APG/Reactor/Client.h
@@ -8,6 +8,10 @@
 #ifndef __CLIENT_H_
 #define __CLIENT_H_
 
+#include "ace/Synch_Traits.h"
+#include "ace/Null_Condition.h"
+#include "ace/Null_Mutex.h"
+
 // Listing 1 code/ch07
 #include "ace/Reactor.h"
 #include "ace/INET_Addr.h"
diff --git a/examples/APG/Reactor/ClientService.h b/examples/APG/Reactor/ClientService.h
index 55b75e19b61..f6ac96e9286 100644
--- a/examples/APG/Reactor/ClientService.h
+++ b/examples/APG/Reactor/ClientService.h
@@ -8,6 +8,10 @@
 #ifndef __CLIENTSERVICE_H_
 #define __CLIENTSERVICE_H_
 
+#include "ace/Synch_Traits.h"
+#include "ace/Null_Condition.h"
+#include "ace/Null_Mutex.h"
+
 // Listing 3 code/ch07
 #include "ace/Message_Block.h"
 #include "ace/SOCK_Stream.h"
diff --git a/examples/APG/Reactor/HAStatus-AC.cpp b/examples/APG/Reactor/HAStatus-AC.cpp
index 37907f6fec2..586985a484a 100644
--- a/examples/APG/Reactor/HAStatus-AC.cpp
+++ b/examples/APG/Reactor/HAStatus-AC.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_sys_time.h"
 #include "ace/os_include/os_netdb.h"
 #include "ClientService.h"
 
diff --git a/examples/APG/Reactor/HAStatus.cpp b/examples/APG/Reactor/HAStatus.cpp
index 775f2e8f478..920d45f3836 100644
--- a/examples/APG/Reactor/HAStatus.cpp
+++ b/examples/APG/Reactor/HAStatus.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_sys_time.h"
 #include "ace/os_include/os_netdb.h"
 
 // Listing 1 code/ch07
diff --git a/examples/APG/Shared_Memory/Hash_Map.cpp b/examples/APG/Shared_Memory/Hash_Map.cpp
index 69047145b8d..b48351e37ce 100644
--- a/examples/APG/Shared_Memory/Hash_Map.cpp
+++ b/examples/APG/Shared_Memory/Hash_Map.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/OS_NS_stdio.h"
+
 // Listing 1 code/ch17
 #include "ace/Hash_Map_With_Allocator_T.h"
 #include "ace/Malloc_T.h"
diff --git a/examples/APG/Shared_Memory/Malloc.cpp b/examples/APG/Shared_Memory/Malloc.cpp
index aaef3ece54a..e070b783740 100644
--- a/examples/APG/Shared_Memory/Malloc.cpp
+++ b/examples/APG/Shared_Memory/Malloc.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+
 // Listing 1 code/ch17
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
diff --git a/examples/APG/Shared_Memory/PI_Malloc.cpp b/examples/APG/Shared_Memory/PI_Malloc.cpp
index 8ec010aca6b..689bcb75d0a 100644
--- a/examples/APG/Shared_Memory/PI_Malloc.cpp
+++ b/examples/APG/Shared_Memory/PI_Malloc.cpp
@@ -1,5 +1,8 @@
 // $Id$
 
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+
 // Listing 1 code/ch17
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
diff --git a/examples/APG/Shared_Memory/Pool_Growth.cpp b/examples/APG/Shared_Memory/Pool_Growth.cpp
index 610628d1ccd..0835413dd9d 100644
--- a/examples/APG/Shared_Memory/Pool_Growth.cpp
+++ b/examples/APG/Shared_Memory/Pool_Growth.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_stdio.h"
 #include "ace/Malloc.h"
 #include "ace/PI_Malloc.h"
 #include "ace/Process_Mutex.h"
diff --git a/examples/APG/Svc_Config/Makefile b/examples/APG/Svc_Config/Makefile
index 4400726a162..9f53ce0ec17 100644
--- a/examples/APG/Svc_Config/Makefile
+++ b/examples/APG/Svc_Config/Makefile
@@ -16,8 +16,8 @@ MKLIST = Makefile.static \
 ## up tempinc when needed for AIX Visual Age C++.
 %.mkfile: %
 	@echo $(MAKE) -f $< $(MKFILE_TARGET)
-	@$(MAKE) -f $< $(MKFILE_TARGET)
 	-@$(RM) -rf tempinc
+	@$(MAKE) -f $< $(MKFILE_TARGET)
 
 # This rule invokes make again with the list of .mkfile targets as a
 # parameter.  For example, if the all target is being made, make is invoked
diff --git a/examples/APG/Svc_Config/Makefile.dynamic b/examples/APG/Svc_Config/Makefile.dynamic
index ccde6b2acef..5717344c078 100644
--- a/examples/APG/Svc_Config/Makefile.dynamic
+++ b/examples/APG/Svc_Config/Makefile.dynamic
@@ -11,6 +11,8 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 LOBJ	= $(addsuffix .o,$(FILES))
 SHOBJ	= $(addsuffix .so,$(FILES))
 
+LIBS   += $(ACELIB)
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/examples/APG/Timers/Alarm.cpp b/examples/APG/Timers/Alarm.cpp
index 08203d247af..2f38397a099 100644
--- a/examples/APG/Timers/Alarm.cpp
+++ b/examples/APG/Timers/Alarm.cpp
@@ -1,5 +1,8 @@
 // $Id$
 
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_sys_time.h"
+
 // Listing 1 code/ch20
 #include "ace/Timer_Queue_Adapters.h"
 #include "ace/Timer_Heap.h"
diff --git a/examples/APG/Timers/Makefile b/examples/APG/Timers/Makefile
index 37590afa196..c31b53667d7 100644
--- a/examples/APG/Timers/Makefile
+++ b/examples/APG/Timers/Makefile
@@ -17,8 +17,8 @@ MKLIST = Makefile.singles \
 ## up tempinc when needed for AIX Visual Age C++.
 %.mkfile: %
 	@echo $(MAKE) -f $< $(MKFILE_TARGET)
-	@$(MAKE) -f $< $(MKFILE_TARGET)
 	-@$(RM) -rf tempinc
+	@$(MAKE) -f $< $(MKFILE_TARGET)
 
 # This rule invokes make again with the list of .mkfile targets as a
 # parameter.  For example, if the all target is being made, make is invoked
diff --git a/examples/APG/Timers/Task.cpp b/examples/APG/Timers/Task.cpp
index f7ebad28e5b..e18aaa4785d 100644
--- a/examples/APG/Timers/Task.cpp
+++ b/examples/APG/Timers/Task.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/OS_NS_sys_time.h"
+
 // Listing 1 code/ch20
 #include "ace/Timer_Queue_Adapters.h"
 #include "ace/Timer_Heap.h"
diff --git a/examples/APG/Timers/Upcall.cpp b/examples/APG/Timers/Upcall.cpp
index 514838be1f4..efa5cfff941 100644
--- a/examples/APG/Timers/Upcall.cpp
+++ b/examples/APG/Timers/Upcall.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_sys_time.h"
 #include "ace/Log_Msg.h"
 #include "Upcall.h"
 #include "PTimerDispatcher.h"
diff --git a/tests/Makefile b/tests/Makefile
index a585c044960..5e0ca907a2a 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -12,6 +12,12 @@
 	@$(MAKE) -f Makefile.tests $@
 	@$(MAKE) -f Makefile.dirs SUBDIR_MAKEFILE=Makefile $@
 
+# Visual Age C++ needs to run strictly sequentially to avoid squashing
+# the tempinc directory on parallel makes.
+ifdef TEMPINCDIR
+.NOTPARALLEL:
+endif
+
 # Invoke Makefile.libs first to build the libTest_Output and the other
 # libraries, then invoke Makefile.tests and Makefile.dirs to recurse
 # through subdirectories
diff --git a/tests/Makefile.tests b/tests/Makefile.tests
index 479f573ec56..71ae766044a 100644
--- a/tests/Makefile.tests
+++ b/tests/Makefile.tests
@@ -10,7 +10,6 @@ MAKEFILE = Makefile.tests
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
-DIRS_PARALLEL = 1
 
 BIN =   \
         aix_hack_for_main \
@@ -208,6 +207,10 @@ else
   BIN2 += Framework_Component_Test
 endif  # shared_libs
 
+ifndef TEMPINCDIR
+DIRS_PARALLEL = 1
+endif
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU