diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-10 18:52:48 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-10 18:52:48 +0000 |
commit | 983c684fa09456764111acee2b4d85abb33ffa1a (patch) | |
tree | c29c092d0ea4c637b39424e741ccf6c64960c069 | |
parent | 9fe68ba2160a19ca31eedbc3f979b5219dc3389f (diff) | |
download | ATCD-983c684fa09456764111acee2b4d85abb33ffa1a.tar.gz |
ChangeLogTag: Mon Feb 10 18:48:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | ChangeLog | 52 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 52 | ||||
-rw-r--r-- | ace/ATM_Acceptor.h | 7 | ||||
-rw-r--r-- | ace/Arg_Shifter.h | 6 | ||||
-rw-r--r-- | ace/Configuration.cpp | 4 | ||||
-rw-r--r-- | ace/Notification_Strategy.h | 2 | ||||
-rw-r--r-- | ace/Notification_Strategy.inl | 2 | ||||
-rw-r--r-- | ace/config-win32.h | 2 | ||||
-rw-r--r-- | bin/MakeProjectCreator/templates/bor.mpd | 2 | ||||
-rw-r--r-- | examples/Service_Configurator/Misc/Makefile | 301 | ||||
-rw-r--r-- | examples/Service_Configurator/Misc/Makefile.Timer | 38 | ||||
-rw-r--r-- | examples/Service_Configurator/Misc/Makefile.main | 36 | ||||
-rw-r--r-- | include/makeinclude/ace_flags.bor | 3 | ||||
-rw-r--r-- | include/makeinclude/build_dll.bor | 4 | ||||
-rw-r--r-- | include/makeinclude/build_exe.bor | 4 |
15 files changed, 224 insertions, 291 deletions
diff --git a/ChangeLog b/ChangeLog index 921afeb5495..d68d61246ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,55 @@ +Mon Feb 10 19:42:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ATM_Acceptor.h: + Converted old style documentation to doxygen style + + * ace/Arg_Shifter.h: + Added private declaration of copy constructor and assignment + operator. Instances of these class can not be copied using the + default ones. Also fixes a MSVC6 level 4 warning. + + * ace/Configuration.cpp: + Removed not needed MingW ifdef, the normal code also compiles with + MingW + + * ace/config-win32.h: + Removed cygwin from this file. For cygwin the config-cygwin32.h + must be included directly in config.h + + * ace/Notification_Strategy.h: + * ace/Notification_Strategy.inl: + Made mask() method const + + * include/makeinclude/ace_flags.bor: + If TAO_ROOT isn't defined, define it as $(ACE_ROOT)/TAO + + * bin/MakeProjectCreator/templates/bor.mpd: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + Thanks for Christopher Kohlhoff <chris@kohlhoff.com> for providing + a fix for the singleton template with Borland. The problem is that + with a singleton template the code is implicitly generated into + every object file that references it. The linker then strips out + all but a single copy of the code. When linking an exe that refers + to a singleton template in a dll, the linker would choose one + of the template code instances in the exe's .obj files, and completely + ignore the instance that was exported by the dll. + + The key to the solution is that it appears that the borland linker + chooses the first instance of the template symbols that it sees. The + linker will let you list the .lib files in the place normally used + for object files. By listing the library files before any of the + object files, it resolves the template code against the dll exports. + + * examples/Service_Configurator/Misc/Makefile: + * examples/Service_Configurator/Misc/Makefile.Timer: + * examples/Service_Configurator/Misc/Makefile.main: + Splitted the original GNU makefile in multiple files, one for the + shared library and one for the exe and one to trigger the other + two. This fixes the compile errors with this example with Cygwin + and MingW. Thanks for Vince Mounts <vince@mounts.cc> for making + these makefiles. + Mon Feb 10 09:22:04 2003 Phil Mesnier <mesnier_p@ociweb.com> * ace/SPIPE_Stream.i: Added a special case for win32 platforms to diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 921afeb5495..d68d61246ab 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,55 @@ +Mon Feb 10 19:42:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ATM_Acceptor.h: + Converted old style documentation to doxygen style + + * ace/Arg_Shifter.h: + Added private declaration of copy constructor and assignment + operator. Instances of these class can not be copied using the + default ones. Also fixes a MSVC6 level 4 warning. + + * ace/Configuration.cpp: + Removed not needed MingW ifdef, the normal code also compiles with + MingW + + * ace/config-win32.h: + Removed cygwin from this file. For cygwin the config-cygwin32.h + must be included directly in config.h + + * ace/Notification_Strategy.h: + * ace/Notification_Strategy.inl: + Made mask() method const + + * include/makeinclude/ace_flags.bor: + If TAO_ROOT isn't defined, define it as $(ACE_ROOT)/TAO + + * bin/MakeProjectCreator/templates/bor.mpd: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + Thanks for Christopher Kohlhoff <chris@kohlhoff.com> for providing + a fix for the singleton template with Borland. The problem is that + with a singleton template the code is implicitly generated into + every object file that references it. The linker then strips out + all but a single copy of the code. When linking an exe that refers + to a singleton template in a dll, the linker would choose one + of the template code instances in the exe's .obj files, and completely + ignore the instance that was exported by the dll. + + The key to the solution is that it appears that the borland linker + chooses the first instance of the template symbols that it sees. The + linker will let you list the .lib files in the place normally used + for object files. By listing the library files before any of the + object files, it resolves the template code against the dll exports. + + * examples/Service_Configurator/Misc/Makefile: + * examples/Service_Configurator/Misc/Makefile.Timer: + * examples/Service_Configurator/Misc/Makefile.main: + Splitted the original GNU makefile in multiple files, one for the + shared library and one for the exe and one to trigger the other + two. This fixes the compile errors with this example with Cygwin + and MingW. Thanks for Vince Mounts <vince@mounts.cc> for making + these makefiles. + Mon Feb 10 09:22:04 2003 Phil Mesnier <mesnier_p@ociweb.com> * ace/SPIPE_Stream.i: Added a special case for win32 platforms to diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h index d78890da7ea..11dcc7698fb 100644 --- a/ace/ATM_Acceptor.h +++ b/ace/ATM_Acceptor.h @@ -73,6 +73,9 @@ public: // = Passive connection acceptance method. + /// Accept a new data transfer connection. A <timeout> of 0 means + /// block forever, a <timeout> of {0, 0} means poll. <restart> == 1 + /// means "restart if interrupted." int accept (ACE_ATM_Stream &new_sap, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, @@ -81,10 +84,6 @@ public: ACE_ATM_Params params = ACE_ATM_Params(), ACE_ATM_QoS qos = ACE_ATM_QoS()); - // Accept a new data transfer connection. A <timeout> of 0 means - // block forever, a <timeout> of {0, 0} means poll. <restart> == 1 - // means "restart if interrupted." - /// Get the local address currently listening on int get_local_addr( ACE_ATM_Addr &local_addr ); diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h index 44bb9266937..2e58b471043 100644 --- a/ace/Arg_Shifter.h +++ b/ace/Arg_Shifter.h @@ -166,6 +166,12 @@ public: int num_ignored_args (void) const; private: + /// Copy Constructor should not be used. + ACE_Arg_Shifter (const ACE_Arg_Shifter&); + + /// Assignment '=' operator should not be used. + ACE_Arg_Shifter operator= (const ACE_Arg_Shifter&); + /// Refactor the constructor logic. void init (void); diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index a81e8692b59..3b8e9a6164b 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -550,11 +550,7 @@ ACE_Configuration_Win32Registry::open_section (const ACE_Configuration_Section_K KEY_ALL_ACCESS, 0, &result_key, -#if defined (__MINGW32__) - (PDWORD) 0 -#else 0 -#endif /* __MINGW32__ */ ) != ERROR_SUCCESS) return -1; } diff --git a/ace/Notification_Strategy.h b/ace/Notification_Strategy.h index 78c40f2e825..5ac5d304978 100644 --- a/ace/Notification_Strategy.h +++ b/ace/Notification_Strategy.h @@ -51,7 +51,7 @@ public: void event_handler (ACE_Event_Handler *eh); /// Get the reactor mask. - ACE_Reactor_Mask mask (void); + ACE_Reactor_Mask mask (void) const; /// Set the reactor mask. void mask (ACE_Reactor_Mask m); diff --git a/ace/Notification_Strategy.inl b/ace/Notification_Strategy.inl index aa89acddcbb..fac4b0cd3b6 100644 --- a/ace/Notification_Strategy.inl +++ b/ace/Notification_Strategy.inl @@ -14,7 +14,7 @@ ACE_Notification_Strategy::event_handler (ACE_Event_Handler *eh) } ACE_INLINE ACE_Reactor_Mask -ACE_Notification_Strategy::mask (void) +ACE_Notification_Strategy::mask (void) const { return mask_; } diff --git a/ace/config-win32.h b/ace/config-win32.h index f193d5078bd..68d1e9d93ef 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -48,8 +48,6 @@ # include "ace/config-win32-ghs.h" #elif defined (__MINGW32__) # include "ace/config-win32-mingw.h" -#elif defined (__CYGWIN32__) -# include "ace/config-cygwin32.h" #else # error Compiler is not supported #endif diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd index 3a29a655c0c..257e0c01978 100644 --- a/bin/MakeProjectCreator/templates/bor.mpd +++ b/bin/MakeProjectCreator/templates/bor.mpd @@ -28,8 +28,10 @@ EXTERNAL_LIBS = LFLAGS = \ <%foreach(libpaths)%> + -j<%libpath%>\$(CONFIG_SUBDIR) -j<%libpath%> \ -L<%libpath%>\$(CONFIG_SUBDIR) -L<%libpath%> \ <%endfor%> + -j$(CORE_BINDIR) \ -L$(CORE_BINDIR) LIBFILES = \ diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index 1a5cab41a58..fadebfa1b09 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -1,5 +1,4 @@ #---------------------------------------------------------------------------- -# # $Id$ # # Makefile for a test of the miscellaneous Service_Config examples @@ -9,291 +8,43 @@ # Local macros #---------------------------------------------------------------------------- -BIN = main -LIB = libTimer.a -SHLIB = libTimer.$(SOEXT) - -FILES = Timer_Service - -PSRC = $(addsuffix .cpp,$(BIN)) -LSRC = $(addsuffix .cpp,$(FILES)) +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- +MAKEFILE=Makefile -LDLIBS = +# These examples don't require SSL support... those that do are below. +MKLIST = Makefile.Timer \ + Makefile.main -ACE_SHLIBS += $(ACELIB) -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) +## Ensure that Makefiles in MKLIST are executed in sequence during a +## parallel build because we share some files between multiple libraries. +.NOTPARALLEL: -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- +## Makefile.Timer.mkfile is a dummy target which will cause +## $(MAKE) -f Makefile.Timer to be invoked, then it cleans +## up tempinc when needed for AIX Visual Age C++. +%.mkfile: % + @echo $(MAKE) -f $< $(MKFILE_TARGET) + @$(MAKE) -f $< $(MKFILE_TARGET) + -@$(RM) -rf tempinc -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 -#---------------------------------------------------------------------------- +# 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 +# as follows: +# +# make -f Makefile MKFILE_TARGET=all Makefile.Reactive_Logging_Server_Ex -ifeq ($(static_libs_only),1) -$(VBIN): $(VLIB) -else -$(VBIN): $(VSHLIB) +all clean depend realclean: +ifneq ($(MKLIST),) + @echo $(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) + @$(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) endif -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Timer_Service.o .obj/Timer_Service.so .shobj/Timer_Service.o .shobj/Timer_Service.so: Timer_Service.cpp Timer_Service.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(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/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/svc_export.h - -.obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(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/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/ARGV.h \ - $(ACE_ROOT)/ace/ARGV.i \ - Timer_Service.h \ - $(ACE_ROOT)/ace/svc_export.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Service_Configurator/Misc/Makefile.Timer b/examples/Service_Configurator/Misc/Makefile.Timer new file mode 100644 index 00000000000..3b6fe958731 --- /dev/null +++ b/examples/Service_Configurator/Misc/Makefile.Timer @@ -0,0 +1,38 @@ +#---------------------------------------------------------------------------- +# $Id$ +# +# Makefile for the Timer library. Part of misc Service_Configurator examples +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +SHLIB = libTimer.$(SOEXT) +FILES = Timer_Service +LSRC = $(addsuffix .cpp,$(FILES)) + +LIBS += $(ACELIB) + +BUILD = $(VSHLIB) + +#---------------------------------------------------------------------------- +# 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.local.GNU + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DACE_BUILD_SVC_DLL +endif +endif diff --git a/examples/Service_Configurator/Misc/Makefile.main b/examples/Service_Configurator/Misc/Makefile.main new file mode 100644 index 00000000000..45b30c3d30c --- /dev/null +++ b/examples/Service_Configurator/Misc/Makefile.main @@ -0,0 +1,36 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +# Makefile for executable main. Part of misc Service_Configurator examples +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +BIN = main + +FILES = main + +SRC = $(addsuffix .cpp,$(FILES)) +OBJ = $(addsuffix .o,$(FILES)) + +LDLIBS += -lTimer + +BUILD = $(VBIN) + +#---------------------------------------------------------------------------- +# 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 + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index 7114ac7cbfb..533b2f9b98a 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -17,6 +17,9 @@ DLL_NAME=dll !ifdef SSL_ROOT SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1 !endif +!ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)\TAO +!endif ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) ACE_XML_CFLAGS = -I$(ACE_ROOT) -DACEXML_HAS_DLL=$(DLL_FLAG) ACE_XML_PARSER_CFLAGS = -I$(ACE_ROOT) -DACEXML_PARSER_HAS_DLL=$(DLL_FLAG) diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor index 151668abb0d..dd4ed2ab3d7 100644 --- a/include/makeinclude/build_dll.bor +++ b/include/makeinclude/build_dll.bor @@ -50,9 +50,9 @@ $(TARGET): $(OBJFILES) $(RESOURCE) @$(MAKE_BINDIR) $(LD) @&&! $(COMMON_LFLAGS) $(DLL_LFLAGS) $(LFLAGS) + - $(DLL_STARTUP_OBJ) $(OBJFILES), + + $(DLL_STARTUP_OBJ) $(LIBFILES) $(OBJFILES), + $(TARGET),, + - $(COMMON_LIBS) $(LIBFILES),, + + $(COMMON_LIBS),, + $(RESOURCE) ! !ifndef DEBUG diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor index 09f2f0d569d..3153a38b6e5 100644 --- a/include/makeinclude/build_exe.bor +++ b/include/makeinclude/build_exe.bor @@ -46,9 +46,9 @@ $(TARGET): $(OBJFILES) $(RESOURCE) @$(MAKE_BINDIR) $(LD) @&&! $(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) + - $(EXE_STARTUP_OBJ) $(OBJFILES), + + $(EXE_STARTUP_OBJ) $(LIBFILES) $(OBJFILES), + $(TARGET),, + - $(COMMON_LIBS) $(LIBFILES),, + + $(COMMON_LIBS),, + $(RESOURCE) ! !ifndef DEBUG |