instead of always running a recursive make to build libDLL_Test.so, only do that if it needs to be built

2 files changed, 153 insertions, 108 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 1c47c7889fc..67fcc34835a 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,99 +2,97 @@
 #
 # $Id$
 #
-#	Makefile for all the ACE ``one-button' tests
+#       Makefile for all the ACE ``one-button' tests
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
 BIN =   Aio_Platform_Test \
-	Atomic_Op_Test \
-	Barrier_Test \
-	Basic_Types_Test \
-	Buffer_Stream_Test \
+        Atomic_Op_Test \
+        Barrier_Test \
+        Basic_Types_Test \
+        Buffer_Stream_Test \
         CDR_Test \
-	Collection_Test \
-	Conn_Test \
-	DLList_Test \
-	DLL_Test\
-	Enum_Interfaces_Test \
-	Env_Value_Test \
-	Future_Test \
-	Handle_Set_Test \
-	High_Res_Timer_Test \
-	OrdMultiSet_Test \
-	Hash_Map_Manager_Test \
-	IOStream_Test \
-	Map_Test \
-	Map_Manager_Test \
-	Mem_Map_Test \
-	MM_Shared_Memory_Test \
-	MT_Reactor_Timer_Test \
-	MT_SOCK_Test \
-	Message_Block_Test \
-	Message_Queue_Test \
-	Message_Queue_Notifications_Test \
-	Naming_Test \
-	Notify_Performance_Test \
-	Process_Mutex_Test \
-	Process_Strategy_Test \
-	Priority_Buffer_Test \
-	Dynamic_Priority_Test \
-	Priority_Task_Test \
-	Priority_Reactor_Test \
-	Pipe_Test \
-	RB_Tree_Test \
-	Reactors_Test \
-	Reactor_Exceptions_Test \
-	Reactor_Notify_Test \
-	Reactor_Performance_Test \
-	Reactor_Timer_Test \
-	Reader_Writer_Test \
-	Recursive_Mutex_Test \
-	Semaphore_Test \
-	Service_Config_Test \
-	Sigset_Ops_Test \
-	Simple_Message_Block_Test \
-	SOCK_Test \
-	SOCK_Connector_Test \
-	SPIPE_Test \
-	SString_Test \
-	SV_Shared_Memory_Test \
-	Task_Test \
-	Thread_Manager_Test \
-	Thread_Mutex_Test \
-	Thread_Pool_Reactor_Test \
-	Thread_Pool_Test \
-	Timeprobe_Test \
-	Time_Service_Test \
-	Time_Value_Test \
-	Timer_Queue_Test \
-	Tokens_Test \
-	TSS_Test \
-	UPIPE_SAP_Test \
-	Upgradable_RW_Test \
-	XtReactor_Test 
-
-FILES = DLL_Test
-
-LSRC   = $(addsuffix .cpp,$(BIN))
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#BUILD = $(VBIN) Had to remove this as it was necessary to
-#                produce a libDLL_Test.so for DLL_Test
+        Collection_Test \
+        Conn_Test \
+        DLList_Test \
+        DLL_Test\
+        Enum_Interfaces_Test \
+        Env_Value_Test \
+        Future_Test \
+        Handle_Set_Test \
+        High_Res_Timer_Test \
+        OrdMultiSet_Test \
+        Hash_Map_Manager_Test \
+        IOStream_Test \
+        Map_Test \
+        Map_Manager_Test \
+        Mem_Map_Test \
+        MM_Shared_Memory_Test \
+        MT_Reactor_Timer_Test \
+        MT_SOCK_Test \
+        Message_Block_Test \
+        Message_Queue_Test \
+        Message_Queue_Notifications_Test \
+        Naming_Test \
+        Notify_Performance_Test \
+        Process_Mutex_Test \
+        Process_Strategy_Test \
+        Priority_Buffer_Test \
+        Dynamic_Priority_Test \
+        Priority_Task_Test \
+        Priority_Reactor_Test \
+        Pipe_Test \
+        RB_Tree_Test \
+        Reactors_Test \
+        Reactor_Exceptions_Test \
+        Reactor_Notify_Test \
+        Reactor_Performance_Test \
+        Reactor_Timer_Test \
+        Reader_Writer_Test \
+        Recursive_Mutex_Test \
+        Semaphore_Test \
+        Service_Config_Test \
+        Sigset_Ops_Test \
+        Simple_Message_Block_Test \
+        SOCK_Test \
+        SOCK_Connector_Test \
+        SPIPE_Test \
+        SString_Test \
+        SV_Shared_Memory_Test \
+        Task_Test \
+        Thread_Manager_Test \
+        Thread_Mutex_Test \
+        Thread_Pool_Reactor_Test \
+        Thread_Pool_Test \
+        Timeprobe_Test \
+        Time_Service_Test \
+        Time_Value_Test \
+        Timer_Queue_Test \
+        Tokens_Test \
+        TSS_Test \
+        UPIPE_SAP_Test \
+        Upgradable_RW_Test \
+        XtReactor_Test
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
-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.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+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.bin.GNU
+
+ifndef SOEXT
+  SOEXT=so
+endif
+BUILD += libDLL_Test.$(SOEXT)
+
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # To build multiple executables in the same directory on AIX, it works
 # best to wipe out any previously-created tempinc directory.
@@ -104,14 +102,17 @@ COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
 endif
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
-DLL_TEST:
-	$(MAKE) -f Makefile.DLL
 
-all: $(VBIN) DLL_TEST
+libDLL_Test.$(SOEXT): DLL_Test.cpp
+	@$(MAKE) -f Makefile.DLL
+
+realclean: clean
+	-/bin/rm -rf libDLL_Test.$(SOEXT)
+
 #----------------------------------------------------------------------------
-#	Dependencies
+#       Dependencies
 #----------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/tests/Makefile.DLL b/tests/Makefile.DLL
index ec532abc314..a090724413b 100644
--- a/tests/Makefile.DLL
+++ b/tests/Makefile.DLL
@@ -1,42 +1,86 @@
 #----------------------------------------------------------------------------
-#	$Id$
+#       $Id$
 #
-#	Makefile for the DLL library in the DLL_Test example
+#       Makefile for the DLL library in the DLL_Test example
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
-SHLIB	= libDLL_Test.$(SOEXT) 
-	 
-FILES 	= DLL_Test
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-
+SHLIB   = libDLL_Test.$(SOEXT)
+FILES   = DLL_Test
+LSRC    = $(addsuffix .cpp,$(FILES))
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
-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
 
-realclean: clean
-	-/bin/rm -rf libDLL_Test.$(SOEXT)
+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
+
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Dependencies
+#       Dependencies
 #----------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
+.obj/DLL_Test.o .obj/DLL_Test.so .shobj/DLL_Test.o .shobj/DLL_Test.so: DLL_Test.cpp test_config.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY