diff options
62 files changed, 607 insertions, 757 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index de355367f2d..c93f234feb5 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,15 @@ +Mon Jul 5 11:59:49 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Future.h: Tried rearranging the order in which statics + are defined to workaround a bug with Borland's C++ Builder. + + * Added new Borland Makefiles. Thanks to Christopher Kohlhoff + <chris@kohlhoff.com> for these. + + * include/makeinclude: Added several new platform configuration + files for Borland C++ Builder. Thanks to Christopher Kohlhoff + <chris@kohlhoff.com> for these. + Mon Jul 05 12:14:56 1999 Nanbor Wang <nanbor@cs.wustl.edu> * ace/OS.i: Wchat_t version of strenvdup should only be available diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 089c981aa52..74b61950734 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,8 @@ +Mon Jul 5 12:18:46 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * Added new Borland Makefiles. Thanks to Christopher Kohlhoff + <chris@kohlhoff.com> for these. + Mon Jul 5 11:07:04 1999 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/be/be_sunsoft.cpp: diff --git a/TAO/Makefile.bor b/TAO/Makefile.bor index 784efbd2dd4..39f05f039d5 100644 --- a/TAO/Makefile.bor +++ b/TAO/Makefile.bor @@ -3,45 +3,42 @@ # Makefile for building ACE and TAO # -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> ace_tao: cd $(ACE_ROOT)\ace - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\tao - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\tao_idl - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\apps\gperf\src - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\orbsvcs\orbsvcs - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\orbsvcs\Naming_Service - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\TAO\orbsvcs\Trading_Service + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) examples: cd $(ACE_ROOT)\TAO\examples\simple\echo - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\examples\simple\chat - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\examples\simple\bank - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\examples\simple\grid - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\examples\simple\time - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\TAO\examples\Callback_Quoter - $(MAKE) -f Makefile.bor $(FLAGS) - + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + +utils: + cd $(ACE_ROOT)\tao\utils\catior + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\tao\utils\IOR-parser + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\tao\utils\nslist + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/TAO/TAO_IDL/Makefile.bor b/TAO/TAO_IDL/Makefile.bor index 0e2b718d8cf..55e53f91b20 100644 --- a/TAO/TAO_IDL/Makefile.bor +++ b/TAO/TAO_IDL/Makefile.bor @@ -1,145 +1,146 @@ +# +# Makefile for building the TAO IDL compiler +# NAME = tao_idl OBJFILES = \ - $(OBJDIR)\tao_idl.obj \ - $(OBJDIR)\ast_argument.obj \ - $(OBJDIR)\ast_array.obj \ - $(OBJDIR)\ast_attribute.obj \ - $(OBJDIR)\ast_check.obj \ - $(OBJDIR)\ast_concrete_type.obj \ - $(OBJDIR)\ast_constant.obj \ - $(OBJDIR)\ast_decl.obj \ - $(OBJDIR)\ast_enum.obj \ - $(OBJDIR)\ast_enum_val.obj \ - $(OBJDIR)\ast_exception.obj \ - $(OBJDIR)\ast_expression.obj \ - $(OBJDIR)\ast_field.obj \ - $(OBJDIR)\ast_generator.obj \ - $(OBJDIR)\ast_interface.obj \ - $(OBJDIR)\ast_interface_fwd.obj \ - $(OBJDIR)\ast_module.obj \ - $(OBJDIR)\ast_native.obj \ - $(OBJDIR)\ast_operation.obj \ - $(OBJDIR)\ast_predefined_type.obj \ - $(OBJDIR)\ast_recursive.obj \ - $(OBJDIR)\ast_redef.obj \ - $(OBJDIR)\ast_root.obj \ - $(OBJDIR)\ast_sequence.obj \ - $(OBJDIR)\ast_string.obj \ - $(OBJDIR)\ast_structure.obj \ - $(OBJDIR)\ast_type.obj \ - $(OBJDIR)\ast_typedef.obj \ - $(OBJDIR)\ast_union.obj \ - $(OBJDIR)\ast_union_branch.obj \ - $(OBJDIR)\ast_union_label.obj \ - $(OBJDIR)\be_args.obj \ - $(OBJDIR)\be_argument.obj \ - $(OBJDIR)\be_array.obj \ - $(OBJDIR)\be_attribute.obj \ - $(OBJDIR)\be_codegen.obj \ - $(OBJDIR)\be_constant.obj \ - $(OBJDIR)\be_decl.obj \ - $(OBJDIR)\be_enum.obj \ - $(OBJDIR)\be_enum_val.obj \ - $(OBJDIR)\be_exception.obj \ - $(OBJDIR)\be_expression.obj \ - $(OBJDIR)\be_field.obj \ - $(OBJDIR)\be_generator.obj \ - $(OBJDIR)\be_helper.obj \ - $(OBJDIR)\be_init.obj \ - $(OBJDIR)\be_interface.obj \ - $(OBJDIR)\be_interface_fwd.obj \ - $(OBJDIR)\be_module.obj \ - $(OBJDIR)\be_native.obj \ - $(OBJDIR)\be_operation.obj \ - $(OBJDIR)\be_predefined_type.obj \ - $(OBJDIR)\be_produce.obj \ - $(OBJDIR)\be_root.obj \ - $(OBJDIR)\be_scope.obj \ - $(OBJDIR)\be_sequence.obj \ - $(OBJDIR)\be_stream_factory.obj \ - $(OBJDIR)\be_string.obj \ - $(OBJDIR)\be_structure.obj \ - $(OBJDIR)\be_sunsoft.obj \ - $(OBJDIR)\be_type.obj \ - $(OBJDIR)\be_typedef.obj \ - $(OBJDIR)\be_union.obj \ - $(OBJDIR)\be_union_branch.obj \ - $(OBJDIR)\be_union_label.obj \ - $(OBJDIR)\be_valuetype.obj \ - $(OBJDIR)\be_valuetype_fwd.obj \ - $(OBJDIR)\be_visitor.obj \ - $(OBJDIR)\be_visitor_argument.obj \ - $(OBJDIR)\be_visitor_array.obj \ - $(OBJDIR)\be_visitor_attribute.obj \ - $(OBJDIR)\be_visitor_constant.obj \ - $(OBJDIR)\be_visitor_context.obj \ - $(OBJDIR)\be_visitor_decl.obj \ - $(OBJDIR)\be_visitor_enum.obj \ - $(OBJDIR)\be_visitor_exception.obj \ - $(OBJDIR)\be_visitor_factory.obj \ - $(OBJDIR)\be_visitor_field.obj \ - $(OBJDIR)\be_visitor_interface.obj \ - $(OBJDIR)\be_visitor_interface_fwd.obj \ - $(OBJDIR)\be_visitor_module.obj \ - $(OBJDIR)\be_visitor_operation.obj \ - $(OBJDIR)\be_visitor_root.obj \ - $(OBJDIR)\be_visitor_scope.obj \ - $(OBJDIR)\be_visitor_sequence.obj \ - $(OBJDIR)\be_visitor_structure.obj \ - $(OBJDIR)\be_visitor_typecode.obj \ - $(OBJDIR)\be_visitor_typedef.obj \ - $(OBJDIR)\be_visitor_union.obj \ - $(OBJDIR)\be_visitor_union_branch.obj \ - $(OBJDIR)\be_visitor_valuetype.obj \ - $(OBJDIR)\be_visitor_valuetype_fwd.obj \ - $(OBJDIR)\drv_args.obj \ - $(OBJDIR)\drv_fork.obj \ - $(OBJDIR)\drv_init.obj \ - $(OBJDIR)\drv_link.obj \ - $(OBJDIR)\drv_preproc.obj \ - $(OBJDIR)\drv_private.obj \ - $(OBJDIR)\fe_declarator.obj \ - $(OBJDIR)\fe_extern.obj \ - $(OBJDIR)\fe_init.obj \ - $(OBJDIR)\fe_interface_header.obj \ - $(OBJDIR)\fe_lookup.obj \ - $(OBJDIR)\fe_private.obj \ - $(OBJDIR)\lex.yy.obj \ - $(OBJDIR)\y.tab.obj \ - $(OBJDIR)\narrow.obj \ - $(OBJDIR)\utl_decllist.obj \ - $(OBJDIR)\utl_error.obj \ - $(OBJDIR)\utl_exceptlist.obj \ - $(OBJDIR)\utl_exprlist.obj \ - $(OBJDIR)\utl_global.obj \ - $(OBJDIR)\utl_identifier.obj \ - $(OBJDIR)\utl_idlist.obj \ - $(OBJDIR)\utl_indenter.obj \ - $(OBJDIR)\utl_labellist.obj \ - $(OBJDIR)\utl_list.obj \ - $(OBJDIR)\utl_namelist.obj \ - $(OBJDIR)\utl_scope.obj \ - $(OBJDIR)\utl_stack.obj \ - $(OBJDIR)\utl_string.obj \ - $(OBJDIR)\utl_strlist.obj \ - $(OBJDIR)\utl_decllist.obj \ - $(OBJDIR)\utl_exceptlist.obj \ - $(OBJDIR)\utl_exprlist.obj \ - $(OBJDIR)\utl_idlist.obj \ - $(OBJDIR)\utl_labellist.obj \ - $(OBJDIR)\utl_list.obj \ - $(OBJDIR)\utl_namelist.obj \ - $(OBJDIR)\utl_strlist.obj + $(OBJDIR)\tao_idl.obj \ + $(OBJDIR)\ast_argument.obj \ + $(OBJDIR)\ast_array.obj \ + $(OBJDIR)\ast_attribute.obj \ + $(OBJDIR)\ast_check.obj \ + $(OBJDIR)\ast_concrete_type.obj \ + $(OBJDIR)\ast_constant.obj \ + $(OBJDIR)\ast_decl.obj \ + $(OBJDIR)\ast_enum.obj \ + $(OBJDIR)\ast_enum_val.obj \ + $(OBJDIR)\ast_exception.obj \ + $(OBJDIR)\ast_expression.obj \ + $(OBJDIR)\ast_field.obj \ + $(OBJDIR)\ast_generator.obj \ + $(OBJDIR)\ast_interface.obj \ + $(OBJDIR)\ast_interface_fwd.obj \ + $(OBJDIR)\ast_module.obj \ + $(OBJDIR)\ast_native.obj \ + $(OBJDIR)\ast_operation.obj \ + $(OBJDIR)\ast_predefined_type.obj \ + $(OBJDIR)\ast_recursive.obj \ + $(OBJDIR)\ast_redef.obj \ + $(OBJDIR)\ast_root.obj \ + $(OBJDIR)\ast_sequence.obj \ + $(OBJDIR)\ast_string.obj \ + $(OBJDIR)\ast_structure.obj \ + $(OBJDIR)\ast_type.obj \ + $(OBJDIR)\ast_typedef.obj \ + $(OBJDIR)\ast_union.obj \ + $(OBJDIR)\ast_union_branch.obj \ + $(OBJDIR)\ast_union_label.obj \ + $(OBJDIR)\be_args.obj \ + $(OBJDIR)\be_argument.obj \ + $(OBJDIR)\be_array.obj \ + $(OBJDIR)\be_attribute.obj \ + $(OBJDIR)\be_codegen.obj \ + $(OBJDIR)\be_constant.obj \ + $(OBJDIR)\be_decl.obj \ + $(OBJDIR)\be_enum.obj \ + $(OBJDIR)\be_enum_val.obj \ + $(OBJDIR)\be_exception.obj \ + $(OBJDIR)\be_expression.obj \ + $(OBJDIR)\be_field.obj \ + $(OBJDIR)\be_generator.obj \ + $(OBJDIR)\be_helper.obj \ + $(OBJDIR)\be_init.obj \ + $(OBJDIR)\be_interface.obj \ + $(OBJDIR)\be_interface_fwd.obj \ + $(OBJDIR)\be_module.obj \ + $(OBJDIR)\be_native.obj \ + $(OBJDIR)\be_operation.obj \ + $(OBJDIR)\be_predefined_type.obj \ + $(OBJDIR)\be_produce.obj \ + $(OBJDIR)\be_root.obj \ + $(OBJDIR)\be_scope.obj \ + $(OBJDIR)\be_sequence.obj \ + $(OBJDIR)\be_stream_factory.obj \ + $(OBJDIR)\be_string.obj \ + $(OBJDIR)\be_structure.obj \ + $(OBJDIR)\be_sunsoft.obj \ + $(OBJDIR)\be_type.obj \ + $(OBJDIR)\be_typedef.obj \ + $(OBJDIR)\be_union.obj \ + $(OBJDIR)\be_union_branch.obj \ + $(OBJDIR)\be_union_label.obj \ + $(OBJDIR)\be_valuetype.obj \ + $(OBJDIR)\be_valuetype_fwd.obj \ + $(OBJDIR)\be_visitor.obj \ + $(OBJDIR)\be_visitor_argument.obj \ + $(OBJDIR)\be_visitor_array.obj \ + $(OBJDIR)\be_visitor_attribute.obj \ + $(OBJDIR)\be_visitor_constant.obj \ + $(OBJDIR)\be_visitor_context.obj \ + $(OBJDIR)\be_visitor_decl.obj \ + $(OBJDIR)\be_visitor_enum.obj \ + $(OBJDIR)\be_visitor_exception.obj \ + $(OBJDIR)\be_visitor_factory.obj \ + $(OBJDIR)\be_visitor_field.obj \ + $(OBJDIR)\be_visitor_interface.obj \ + $(OBJDIR)\be_visitor_interface_fwd.obj \ + $(OBJDIR)\be_visitor_module.obj \ + $(OBJDIR)\be_visitor_operation.obj \ + $(OBJDIR)\be_visitor_root.obj \ + $(OBJDIR)\be_visitor_scope.obj \ + $(OBJDIR)\be_visitor_sequence.obj \ + $(OBJDIR)\be_visitor_structure.obj \ + $(OBJDIR)\be_visitor_typecode.obj \ + $(OBJDIR)\be_visitor_typedef.obj \ + $(OBJDIR)\be_visitor_union.obj \ + $(OBJDIR)\be_visitor_union_branch.obj \ + $(OBJDIR)\be_visitor_valuetype.obj \ + $(OBJDIR)\be_visitor_valuetype_fwd.obj \ + $(OBJDIR)\drv_args.obj \ + $(OBJDIR)\drv_fork.obj \ + $(OBJDIR)\drv_init.obj \ + $(OBJDIR)\drv_link.obj \ + $(OBJDIR)\drv_preproc.obj \ + $(OBJDIR)\drv_private.obj \ + $(OBJDIR)\fe_declarator.obj \ + $(OBJDIR)\fe_extern.obj \ + $(OBJDIR)\fe_init.obj \ + $(OBJDIR)\fe_interface_header.obj \ + $(OBJDIR)\fe_lookup.obj \ + $(OBJDIR)\fe_private.obj \ + $(OBJDIR)\lex.yy.obj \ + $(OBJDIR)\y.tab.obj \ + $(OBJDIR)\narrow.obj \ + $(OBJDIR)\utl_decllist.obj \ + $(OBJDIR)\utl_error.obj \ + $(OBJDIR)\utl_exceptlist.obj \ + $(OBJDIR)\utl_exprlist.obj \ + $(OBJDIR)\utl_global.obj \ + $(OBJDIR)\utl_identifier.obj \ + $(OBJDIR)\utl_idlist.obj \ + $(OBJDIR)\utl_indenter.obj \ + $(OBJDIR)\utl_labellist.obj \ + $(OBJDIR)\utl_list.obj \ + $(OBJDIR)\utl_namelist.obj \ + $(OBJDIR)\utl_scope.obj \ + $(OBJDIR)\utl_stack.obj \ + $(OBJDIR)\utl_string.obj \ + $(OBJDIR)\utl_strlist.obj \ + $(OBJDIR)\utl_decllist.obj \ + $(OBJDIR)\utl_exceptlist.obj \ + $(OBJDIR)\utl_exprlist.obj \ + $(OBJDIR)\utl_idlist.obj \ + $(OBJDIR)\utl_labellist.obj \ + $(OBJDIR)\utl_list.obj \ + $(OBJDIR)\utl_namelist.obj \ + $(OBJDIR)\utl_strlist.obj -CFLAGS = -I..\.. -I.. -Ibe_include -Ife -Iinclude -Iutil \ - -DIDL_CFE_VERSION=\"1.3.0\" \ - -DCPP_LOCATION=\"cpp32\" $(ACE_CFLAGS) -LIBFILES = $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib -CPPDIR = .;ast;be;driver;fe;narrow;util -BINDIR=$(ACE_ROOT)\bin -BASE_OBJDIR = .\bor\obj +CFLAGS = -I.. -Ibe_include -Ife -Iinclude -Iutil \ + -DIDL_CFE_VERSION=\"1.3.0\" -DCPP_LOCATION=\"cpp32\" $(ACE_CFLAGS) + +LIBFILES = $(ACE_LIB) -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> +CPPDIR = .;ast;be;driver;fe;narrow;util +!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor> diff --git a/TAO/examples/Borland/ChatClient.bpr b/TAO/examples/Borland/ChatClient.bpr index 743ae72e92a..4016f65fa3b 100644 --- a/TAO/examples/Borland/ChatClient.bpr +++ b/TAO/examples/Borland/ChatClient.bpr @@ -13,7 +13,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.04.04 # --------------------------------------------------------------------------- -PROJECT = ..\..\..\..\bin\ChatClient.exe +PROJECT = ChatClient.exe OBJFILES = obj\ChatClient.obj obj\ChatClientWnd.obj obj\BroadcasterC.obj \ obj\BroadcasterS.obj obj\ReceiverC.obj obj\ReceiverS.obj obj\ReceiverImpl.obj RESFILES = ChatClient.res @@ -35,19 +35,20 @@ RELEASELIBPATH = $(BCB)\lib\release USERDEFINES = WIN32;ACE_HAS_DLL=1;TAO_HAS_DLL=1;TAO_ORBSVCS_HAS_DLL=1;_DLL;ACE_USE_RCSID=0 SYSDEFINES = _RTLDLL;NO_STRICT;USEPACKAGES # --------------------------------------------------------------------------- -CFLAG1 = -I$(BCB)\include;$(BCB)\include\vcl;..\..\..\..;..\..\.. -O2 -Hc \ +CFLAG1 = -I$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.. -O2 -Hc \ -H=obj\ChatClient.csm -Hh=pch.h -w-rvl -w-rch -w-par -w-obs -w-inl -Ve -a8 -k- \ -vi -c -b- -Vx -tW -tWM -D$(SYSDEFINES);$(USERDEFINES) -PFLAGS = -U$(BCB)\lib\obj;$(BCB)\lib;..\..\..\..\bin;$(RELEASELIBPATH) \ - -I$(BCB)\include;$(BCB)\include\vcl;..\..\..\..;..\..\.. -N2obj -N0obj \ +PFLAGS = -U$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release\Pascal;$(RELEASELIBPATH) \ + -I$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.. -N2obj -N0obj \ -DWIN32;ACE_HAS_DLL=1;TAO_HAS_DLL=1;TAO_ORBSVCS_HAS_DLL=1;_DLL;ACE_USE_RCSID=0 \ -$Y- -$L- -$D- -v -JPHNE -M -RFLAGS = -i$(BCB)\include;$(BCB)\include\vcl;..\..\..\..;..\..\.. \ +RFLAGS = -i$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.. \ -DWIN32;ACE_HAS_DLL=1;TAO_HAS_DLL=1;TAO_ORBSVCS_HAS_DLL=1;_DLL;ACE_USE_RCSID=0 -AFLAGS = /i$(BCB)\include /i$(BCB)\include\vcl /i..\..\..\.. /i..\..\.. /dWIN32 \ - /dACE_HAS_DLL=1 /dTAO_HAS_DLL=1 /dTAO_ORBSVCS_HAS_DLL=1 /d_DLL \ - /dACE_USE_RCSID=0 /mx /w2 /zn -LFLAGS = -L$(BCB)\lib\obj;$(BCB)\lib;..\..\..\..\bin;$(RELEASELIBPATH) -aa -Tpe -x -Gn +AFLAGS = /i$(BCB)\include /i$(BCB)\include\vcl /i..\..\.. /i..\.. /dWIN32 \ + /dACE_HAS_DLL=1 /dTAO_HAS_DLL=1 /dTAO_ORBSVCS_HAS_DLL=1 /d_DLL /dACE_USE_RCSID=0 \ + /mx /w2 /zn +LFLAGS = -L$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release\Pascal;$(RELEASELIBPATH) -aa \ + -Tpe -x -Gn # --------------------------------------------------------------------------- ALLOBJ = c0w32.obj Memmgr.Lib $(PACKAGES) sysinit.obj $(OBJFILES) ALLRES = $(RESFILES) @@ -83,12 +84,14 @@ ProductVersion=1.0.0.0 Comments= [HistoryLists\hlIncludePath] -Count=1 -Item0=$(BCB)\include;$(BCB)\include\vcl;..\..\..\..;..\..\.. +Count=2 +Item0=$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.. +Item1=$(BCB)\include;$(BCB)\include\vcl;..\..\..\..;..\..\.. [HistoryLists\hlLibraryPath] -Count=1 -Item0=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\..\bin +Count=2 +Item0=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release +Item1=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\..\bin [HistoryLists\hlDebugSourcePath] Count=1 diff --git a/TAO/examples/Borland/ChatClient.res b/TAO/examples/Borland/ChatClient.res Binary files differindex d38deeac746..eb29262eebf 100644 --- a/TAO/examples/Borland/ChatClient.res +++ b/TAO/examples/Borland/ChatClient.res diff --git a/TAO/examples/Borland/build_idl.bat b/TAO/examples/Borland/build_idl.bat index 9c22257c1a0..66dbd454411 100644 --- a/TAO/examples/Borland/build_idl.bat +++ b/TAO/examples/Borland/build_idl.bat @@ -1,2 +1,2 @@ -%ACE_ROOT%\bin\tao_idl -Ge -g %ACE_ROOT%\bin\gperf.exe -Wb,pch_include=pch.h Broadcaster.idl -%ACE_ROOT%\bin\tao_idl_bp -Ge -g %ACE_ROOT%\bin\gperf_bp.exe -Wb,pch_include=pch.h Receiver.idl +..\..\..\bin\Dynamic\Release\tao_idl -g %ACE_ROOT%\bin\Dynamic\Release\gperf.exe -Wb,pch_include=pch.h Broadcaster.idl +..\..\..\bin\Dynamic\Release\tao_idl -g %ACE_ROOT%\bin\Dynamic\Release\gperf.exe -Wb,pch_include=pch.h Receiver.idl diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor index f89b5fefba0..e7bea862d07 100644 --- a/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor +++ b/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor @@ -16,8 +16,7 @@ OBJFILES = \ $(OBJDIR)\Consumer_i.obj CPPDIR = . -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor index b49d2d30591..d798685200e 100644 --- a/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor +++ b/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor @@ -15,8 +15,7 @@ OBJFILES = \ $(OBJDIR)\Notifier_Input_Handler.obj CPPDIR = . -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor index dc016ae27c1..19d160d2c8b 100644 --- a/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor +++ b/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor @@ -15,8 +15,7 @@ OBJFILES = \ $(OBJDIR)\Consumer_i.obj CPPDIR = . -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Callback_Quoter/Makefile.bor b/TAO/examples/Callback_Quoter/Makefile.bor index f758082e236..b8a062276e4 100644 --- a/TAO/examples/Callback_Quoter/Makefile.bor +++ b/TAO/examples/Callback_Quoter/Makefile.bor @@ -1,20 +1,11 @@ +# +# Makefile for building the Callback Quoter example +# -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - $(MAKE) -f Callback_Quoter_Notifier.bor $(FLAGS) - $(MAKE) -f Callback_Quoter_Consumer.bor $(FLAGS) - $(MAKE) -f Callback_Quoter_Supplier.bor $(FLAGS) + $(MAKE) -f Callback_Quoter_Notifier.bor $(MAKE_FLAGS) + $(MAKE) -f Callback_Quoter_Consumer.bor $(MAKE_FLAGS) + $(MAKE) -f Callback_Quoter_Supplier.bor $(MAKE_FLAGS) diff --git a/TAO/examples/Simple/bank/Bank_Client.bor b/TAO/examples/Simple/bank/Bank_Client.bor index 73de3f74e78..5ac765c1748 100644 --- a/TAO/examples/Simple/bank/Bank_Client.bor +++ b/TAO/examples/Simple/bank/Bank_Client.bor @@ -13,8 +13,7 @@ OBJFILES = \ $(OBJDIR)\client.obj CPPDIR = .;.. -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/bank/Bank_Server.bor b/TAO/examples/Simple/bank/Bank_Server.bor index 64315864b29..cd051fc8ea1 100644 --- a/TAO/examples/Simple/bank/Bank_Server.bor +++ b/TAO/examples/Simple/bank/Bank_Server.bor @@ -14,8 +14,7 @@ OBJFILES = \ $(OBJDIR)\server.obj CPPDIR = .;.. -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/bank/Makefile.bor b/TAO/examples/Simple/bank/Makefile.bor index 13de82d2408..c1449bea116 100644 --- a/TAO/examples/Simple/bank/Makefile.bor +++ b/TAO/examples/Simple/bank/Makefile.bor @@ -3,21 +3,9 @@ # Makefile for building the Bank example # -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - $(MAKE) -f Bank_Client.bor $(FLAGS) - $(MAKE) -f Bank_Server.bor $(FLAGS) + $(MAKE) -f Bank_Client.bor $(MAKE_FLAGS) + $(MAKE) -f Bank_Server.bor $(MAKE_FLAGS) diff --git a/TAO/examples/Simple/chat/Chat_Client.bor b/TAO/examples/Simple/chat/Chat_Client.bor index 442cb0db4a4..e368444e5f2 100644 --- a/TAO/examples/Simple/chat/Chat_Client.bor +++ b/TAO/examples/Simple/chat/Chat_Client.bor @@ -15,8 +15,7 @@ OBJFILES = \ $(OBJDIR)\client.obj CPPDIR = . -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/chat/Chat_Server.bor b/TAO/examples/Simple/chat/Chat_Server.bor index 4d65492755d..e903c00d5da 100644 --- a/TAO/examples/Simple/chat/Chat_Server.bor +++ b/TAO/examples/Simple/chat/Chat_Server.bor @@ -15,8 +15,7 @@ OBJFILES = \ $(OBJDIR)\server.obj CPPDIR = . -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/chat/Makefile.bor b/TAO/examples/Simple/chat/Makefile.bor index 85768eaf416..828f0dc2c93 100644 --- a/TAO/examples/Simple/chat/Makefile.bor +++ b/TAO/examples/Simple/chat/Makefile.bor @@ -2,21 +2,9 @@ # Makefile for building the Chat example # -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - $(MAKE) -f Chat_Client.bor $(FLAGS) - $(MAKE) -f Chat_Server.bor $(FLAGS) + $(MAKE) -f Chat_Client.bor $(MAKE_FLAGS) + $(MAKE) -f Chat_Server.bor $(MAKE_FLAGS) diff --git a/TAO/examples/Simple/echo/Echo_Client.bor b/TAO/examples/Simple/echo/Echo_Client.bor index 46e5cbed125..0c713169e12 100644 --- a/TAO/examples/Simple/echo/Echo_Client.bor +++ b/TAO/examples/Simple/echo/Echo_Client.bor @@ -12,8 +12,7 @@ OBJFILES = \ $(OBJDIR)\client.obj CPPDIR = .;.. -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/echo/Echo_Server.bor b/TAO/examples/Simple/echo/Echo_Server.bor index f24ccc15c15..69cdc42b017 100644 --- a/TAO/examples/Simple/echo/Echo_Server.bor +++ b/TAO/examples/Simple/echo/Echo_Server.bor @@ -12,8 +12,7 @@ OBJFILES = \ $(OBJDIR)\server.obj CPPDIR = .;.. -BINDIR =.\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/echo/Makefile.bor b/TAO/examples/Simple/echo/Makefile.bor index 7d12d4bcc9d..f8514256edc 100644 --- a/TAO/examples/Simple/echo/Makefile.bor +++ b/TAO/examples/Simple/echo/Makefile.bor @@ -3,21 +3,9 @@ # Makefile for building the Echo example # -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - $(MAKE) -f Echo_Client.bor $(FLAGS) - $(MAKE) -f Echo_Server.bor $(FLAGS) + $(MAKE) -f Echo_Client.bor $(MAKE_FLAGS) + $(MAKE) -f Echo_Server.bor $(MAKE_FLAGS) diff --git a/TAO/examples/Simple/grid/Grid_Client.bor b/TAO/examples/Simple/grid/Grid_Client.bor index 41f8a97e821..069a4fda830 100644 --- a/TAO/examples/Simple/grid/Grid_Client.bor +++ b/TAO/examples/Simple/grid/Grid_Client.bor @@ -12,8 +12,7 @@ OBJFILES = \ $(OBJDIR)\client.obj CPPDIR = .;.. -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/grid/Grid_Server.bor b/TAO/examples/Simple/grid/Grid_Server.bor index 017b16ddc20..2143d8e8338 100644 --- a/TAO/examples/Simple/grid/Grid_Server.bor +++ b/TAO/examples/Simple/grid/Grid_Server.bor @@ -12,8 +12,7 @@ OBJFILES = \ $(OBJDIR)\server.obj CPPDIR = .;.. -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/grid/Makefile.bor b/TAO/examples/Simple/grid/Makefile.bor index 526a186c822..928d64225bc 100644 --- a/TAO/examples/Simple/grid/Makefile.bor +++ b/TAO/examples/Simple/grid/Makefile.bor @@ -2,21 +2,9 @@ # Makefile for building the Grid example # -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - $(MAKE) -f Grid_Client.bor $(FLAGS) - $(MAKE) -f Grid_Server.bor $(FLAGS) + $(MAKE) -f Grid_Client.bor $(MAKE_FLAGS) + $(MAKE) -f Grid_Server.bor $(MAKE_FLAGS) diff --git a/TAO/examples/Simple/time/Makefile.bor b/TAO/examples/Simple/time/Makefile.bor index f0088dea8cd..270f4ed8322 100644 --- a/TAO/examples/Simple/time/Makefile.bor +++ b/TAO/examples/Simple/time/Makefile.bor @@ -2,19 +2,7 @@ # Makefile for building the Time example # -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: $(MAKE) -f Time_Client.bor $(FLAGS) diff --git a/TAO/examples/Simple/time/Time_Client.bor b/TAO/examples/Simple/time/Time_Client.bor index 21945d63c88..02c576ca036 100644 --- a/TAO/examples/Simple/time/Time_Client.bor +++ b/TAO/examples/Simple/time/Time_Client.bor @@ -12,8 +12,7 @@ OBJFILES = \ $(OBJDIR)\client.obj CPPDIR = .;.. -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/examples/Simple/time/Time_Server.bor b/TAO/examples/Simple/time/Time_Server.bor index 83fe725257c..75f37ddc927 100644 --- a/TAO/examples/Simple/time/Time_Server.bor +++ b/TAO/examples/Simple/time/Time_Server.bor @@ -12,8 +12,7 @@ OBJFILES = \ $(OBJDIR)\server.obj CPPDIR = .;.. -BINDIR = .\bor\bin -BASE_OBJDIR = .\bor\obj + IDLDIR = . !include <$(ACE_ROOT)\include\makeinclude\build_example.bor> diff --git a/TAO/orbsvcs/Naming_Service/Makefile.bor b/TAO/orbsvcs/Naming_Service/Makefile.bor index 44370121333..7a541087dfb 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.bor +++ b/TAO/orbsvcs/Naming_Service/Makefile.bor @@ -5,19 +5,13 @@ NAME = Naming_Service OBJFILES = \ - $(OBJDIR)\Naming_Service.obj + $(OBJDIR)\Naming_Service.obj -CFLAGS = -I..\..\.. -I..\.. -I.. \ - $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS) +CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS) -LIBFILES = \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib \ - $(ACE_ROOT)\bin\tao$(LIB_DECORATOR).lib \ - $(ACE_ROOT)\bin\orbsvcs$(LIB_DECORATOR).lib +LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB) CPPDIR = . -BINDIR = $(ACE_ROOT)\bin -BASE_OBJDIR = .\bor\obj -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> +!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor> diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor index 66fd41aee6c..bb6ea8f77f9 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.bor +++ b/TAO/orbsvcs/orbsvcs/Makefile.bor @@ -4,14 +4,11 @@ NAME = orbsvcs -TAO_IDL = $(BINDIR)\tao_idl$(DECORATOR) -g \ - $(BINDIR)\gperf$(DECORATOR).exe \ - -I..\.. -Wb,export_macro=TAO_ORBSVCS_Export \ - -Wb,export_include=orbsvcs_export.h +TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \ + -I..\.. -Ge 1 -Wb,export_macro=TAO_ORBSVCS_Export \ + -Wb,export_include=orbsvcs_export.h OBJFILES = \ - $(OBJDIR)\CosConcurrencyControlC.obj \ - $(OBJDIR)\CosConcurrencyControlS.obj \ $(OBJDIR)\CosEventCommC.obj \ $(OBJDIR)\CosEventCommS.obj \ $(OBJDIR)\CosEventChannelAdminC.obj \ @@ -30,14 +27,10 @@ OBJFILES = \ $(OBJDIR)\CosTradingDynamicS.obj \ $(OBJDIR)\CosTradingReposC.obj \ $(OBJDIR)\CosTradingReposS.obj \ - $(OBJDIR)\PingC.obj \ - $(OBJDIR)\PingS.obj \ $(OBJDIR)\ImplRepoC.obj \ $(OBJDIR)\ImplRepoS.obj \ $(OBJDIR)\LifeCycleServiceC.obj \ $(OBJDIR)\LifeCycleServiceS.obj \ - $(OBJDIR)\LoggerC.obj \ - $(OBJDIR)\LoggerS.obj \ $(OBJDIR)\Null_MediaCtrlC.obj \ $(OBJDIR)\Null_MediaCtrlS.obj \ $(OBJDIR)\TimeBaseC.obj \ @@ -54,11 +47,9 @@ OBJFILES = \ $(OBJDIR)\sfpS.obj \ $(OBJDIR)\TimeServiceC.obj \ $(OBJDIR)\TimeServiceS.obj \ + \ $(OBJDIR)\AVStreams_i.obj \ $(OBJDIR)\BCU.obj \ - $(OBJDIR)\CC_LockSet.obj \ - $(OBJDIR)\CC_LockSetFactory.obj \ - $(OBJDIR)\Concurrency_Utils.obj \ $(OBJDIR)\Config_Scheduler.obj \ $(OBJDIR)\Constraint_Interpreter.obj \ $(OBJDIR)\Constraint_l.obj \ @@ -116,8 +107,8 @@ OBJFILES = \ $(OBJDIR)\EventChannel_i.obj \ $(OBJDIR)\Hash_Naming_Context.obj \ $(OBJDIR)\IOR_Multicast.obj \ + $(OBJDIR)\IR_Helper.obj \ $(OBJDIR)\Local_ESTypes.obj \ - $(OBJDIR)\Logger_i.obj \ $(OBJDIR)\Memory_Pools.obj \ $(OBJDIR)\Module_Factory.obj \ $(OBJDIR)\Naming_Context.obj \ @@ -129,6 +120,8 @@ OBJFILES = \ $(OBJDIR)\ProxyPushConsumer_i.obj \ $(OBJDIR)\ProxyPushSupplier_i.obj \ $(OBJDIR)\ReactorTask.obj \ + $(OBJDIR)\Reconfig_Sched_Utils.obj \ + $(OBJDIR)\Reconfig_Scheduler.obj \ $(OBJDIR)\RT_Task.obj \ $(OBJDIR)\Runtime_Scheduler.obj \ $(OBJDIR)\SchedEntry.obj \ @@ -151,19 +144,15 @@ OBJFILES = \ $(OBJDIR)\Trader_Utils.obj \ $(OBJDIR)\Transient_Naming_Context.obj -CFLAGS = -I..\..\.. -I..\.. -I.. $(ACE_CFLAGS) $(TAO_CFLAGS) \ - $(ORBSVCS_BUILD_CFLAGS) $(ORBSVCS_CFLAGS) +CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_BUILD_CFLAGS) $(ORBSVCS_CFLAGS) CPPDIR = .;AV;Event;concurrency;Sched;Trader;Naming;CosEvent;Time;Property;Log -BASE_OBJDIR = .\bor\obj -BINDIR = $(ACE_ROOT)\bin + IDLDIR = . -LIBFILES = \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib \ - $(ACE_ROOT)\bin\tao$(LIB_DECORATOR).lib +LIBFILES = $(ACE_LIB) $(TAO_LIB) -!include <$(ACE_ROOT)\include\makeinclude\build_library.bor> +!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> # # IDL Build rules @@ -172,9 +161,6 @@ LIBFILES = \ $(IDLDIR)\AVStreamsC.cpp $(IDLDIR)\AVStreamsS.cpp: $(IDLDIR)\AVStreams.idl $(TAO_IDL) $** -$(IDLDIR)\CosConcurrencyControlC.cpp $(IDLDIR)\CosConcurrencyControlS.cpp: $(IDLDIR)\CosConcurrencyControl.idl - $(TAO_IDL) $** - $(IDLDIR)\CosEventCommC.cpp $(IDLDIR)\CosEventCommS.cpp: $(IDLDIR)\CosEventComm.idl $(TAO_IDL) $** @@ -199,18 +185,12 @@ $(IDLDIR)\CosTradingDynamicC.cpp $(IDLDIR)\CosTradingDynamicS.cpp: $(IDLDIR)\Cos $(IDLDIR)\CosTradingReposC.cpp $(IDLDIR)\CosTradingReposS.cpp: $(IDLDIR)\CosTradingRepos.idl $(TAO_IDL) $** -$(IDLDIR)\PingC.cpp $(IDLDIR)\PingS.cpp: $(IDLDIR)\Ping.idl - $(TAO_IDL) $** - $(IDLDIR)\ImplRepoC.cpp $(IDLDIR)\ImplRepoS.cpp: $(IDLDIR)\ImplRepo.idl $(TAO_IDL) $** $(IDLDIR)\LifeCycleServiceC.cpp $(IDLDIR)\LifeCycleServiceS.cpp: $(IDLDIR)\LifeCycleService.idl $(TAO_IDL) $** -$(IDLDIR)\LoggerC.cpp $(IDLDIR)\LoggerS.cpp: $(IDLDIR)\Logger.idl - $(TAO_IDL) $** - $(IDLDIR)\Null_MediaCtrlC.cpp $(IDLDIR)\Null_MediaCtrlS.cpp: $(IDLDIR)\Null_MediaCtrl.idl $(TAO_IDL) $** diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index 6b8ed7cb54b..2cbaa9cdeb7 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -1,110 +1,115 @@ +# +# Makefile for building the TAO library +# NAME = tao OBJFILES = \ - $(OBJDIR)\Acceptor_Registry.obj \ - $(OBJDIR)\Active_Object_Map.obj \ - $(OBJDIR)\Any.obj \ - $(OBJDIR)\append.obj \ - $(OBJDIR)\CDR.obj \ - $(OBJDIR)\CDR_Interpreter.obj \ - $(OBJDIR)\Client_Strategy_Factory.obj \ - $(OBJDIR)\Connector_Registry.obj \ - $(OBJDIR)\Context.obj \ - $(OBJDIR)\CONV_FRAMEC.obj \ - $(OBJDIR)\CONV_FRAMES.obj \ - $(OBJDIR)\corbafwd.obj \ - $(OBJDIR)\CurrentC.obj \ - $(OBJDIR)\CurrentS.obj \ - $(OBJDIR)\debug.obj \ - $(OBJDIR)\decode.obj \ - $(OBJDIR)\deep_free.obj \ - $(OBJDIR)\default_client.obj \ - $(OBJDIR)\default_resource.obj \ - $(OBJDIR)\default_server.obj \ - $(OBJDIR)\DomainC.obj \ - $(OBJDIR)\DomainS.obj \ - $(OBJDIR)\DynAny_i.obj \ - $(OBJDIR)\DynAnyC.obj \ - $(OBJDIR)\DynAnyS.obj \ - $(OBJDIR)\DynArray_i.obj \ - $(OBJDIR)\DynEnum_i.obj \ - $(OBJDIR)\DynSequence_i.obj \ - $(OBJDIR)\DynStruct_i.obj \ - $(OBJDIR)\DynUnion_i.obj \ - $(OBJDIR)\encode.obj \ - $(OBJDIR)\Environment.obj \ - $(OBJDIR)\Exception.obj \ - $(OBJDIR)\Forwarding_Servant.obj \ - $(OBJDIR)\GIOP.obj \ - $(OBJDIR)\GIOP_Server_Request.obj \ - $(OBJDIR)\IIOP_Acceptor.obj \ - $(OBJDIR)\IIOP_Connect.obj \ - $(OBJDIR)\IIOP_Connector.obj \ - $(OBJDIR)\IIOP_Factory.obj \ - $(OBJDIR)\IIOP_Profile.obj \ - $(OBJDIR)\IIOP_Transport.obj \ - $(OBJDIR)\IOPC.obj \ - $(OBJDIR)\IOPS.obj \ - $(OBJDIR)\InconsistentTypeCodeC.obj \ - $(OBJDIR)\Invocation.obj \ - $(OBJDIR)\IOR_LookupTable.obj \ - $(OBJDIR)\Key_Adapters.obj \ - $(OBJDIR)\Managed_Types.obj \ - $(OBJDIR)\Marshal.obj \ - $(OBJDIR)\Messaging_Policy_i.obj \ - $(OBJDIR)\MessagingC.obj \ - $(OBJDIR)\MessagingS.obj \ - $(OBJDIR)\MProfile.obj \ - $(OBJDIR)\NVList.obj \ - $(OBJDIR)\Object.obj \ - $(OBJDIR)\Object_Adapter.obj \ - $(OBJDIR)\Object_KeyC.obj \ - $(OBJDIR)\ObjectIDList.obj \ - $(OBJDIR)\Operation_Table.obj \ - $(OBJDIR)\ORB.obj \ - $(OBJDIR)\ORB_Core.obj \ - $(OBJDIR)\params.obj \ - $(OBJDIR)\Pluggable.obj \ - $(OBJDIR)\POA.obj \ - $(OBJDIR)\POAC.obj \ - $(OBJDIR)\POAManager.obj \ - $(OBJDIR)\POAS.obj \ - $(OBJDIR)\Policy_Manager.obj \ - $(OBJDIR)\PolicyC.obj \ - $(OBJDIR)\PolicyS.obj \ - $(OBJDIR)\Principal.obj \ - $(OBJDIR)\Protocol_Factory.obj \ - $(OBJDIR)\Reply_Dispatcher.obj \ - $(OBJDIR)\Request.obj \ - $(OBJDIR)\Resource_Factory.obj \ - $(OBJDIR)\Sequence.obj \ - $(OBJDIR)\Servant_Base.obj \ - $(OBJDIR)\Server_Request.obj \ - $(OBJDIR)\Server_Strategy_Factory.obj \ - $(OBJDIR)\Services.obj \ - $(OBJDIR)\skip.obj \ - $(OBJDIR)\Stub.obj \ - $(OBJDIR)\Tagged_Components.obj \ - $(OBJDIR)\TAO.obj \ - $(OBJDIR)\TAO_Internal.obj \ - $(OBJDIR)\TimeBaseC.obj \ - $(OBJDIR)\TimeBaseS.obj \ - $(OBJDIR)\Transport_Mux_Strategy.obj \ - $(OBJDIR)\Typecode.obj \ - $(OBJDIR)\Typecode_Constants.obj \ - $(OBJDIR)\Union.obj \ - $(OBJDIR)\ValueBase.obj \ - $(OBJDIR)\ValueFactory.obj \ - $(OBJDIR)\ValueFactory_Map.obj \ - $(OBJDIR)\Wait_Strategy.obj \ - $(OBJDIR)\WrongTransactionC.obj + $(OBJDIR)\Acceptor_Registry.obj \ + $(OBJDIR)\Active_Object_Map.obj \ + $(OBJDIR)\Any.obj \ + $(OBJDIR)\append.obj \ + $(OBJDIR)\CDR.obj \ + $(OBJDIR)\CDR_Interpreter.obj \ + $(OBJDIR)\Client_Strategy_Factory.obj \ + $(OBJDIR)\Connector_Registry.obj \ + $(OBJDIR)\Context.obj \ + $(OBJDIR)\CONV_FRAMEC.obj \ + $(OBJDIR)\CONV_FRAMES.obj \ + $(OBJDIR)\corbafwd.obj \ + $(OBJDIR)\CurrentC.obj \ + $(OBJDIR)\CurrentS.obj \ + $(OBJDIR)\debug.obj \ + $(OBJDIR)\decode.obj \ + $(OBJDIR)\deep_free.obj \ + $(OBJDIR)\default_client.obj \ + $(OBJDIR)\default_resource.obj \ + $(OBJDIR)\default_server.obj \ + $(OBJDIR)\DomainC.obj \ + $(OBJDIR)\DomainS.obj \ + $(OBJDIR)\DynAny_i.obj \ + $(OBJDIR)\DynAnyC.obj \ + $(OBJDIR)\DynAnyS.obj \ + $(OBJDIR)\DynArray_i.obj \ + $(OBJDIR)\DynEnum_i.obj \ + $(OBJDIR)\DynSequence_i.obj \ + $(OBJDIR)\DynStruct_i.obj \ + $(OBJDIR)\DynUnion_i.obj \ + $(OBJDIR)\encode.obj \ + $(OBJDIR)\Environment.obj \ + $(OBJDIR)\Exception.obj \ + $(OBJDIR)\Forwarding_Servant.obj \ + $(OBJDIR)\GIOP.obj \ + $(OBJDIR)\GIOP_Server_Request.obj \ + $(OBJDIR)\IIOP_Acceptor.obj \ + $(OBJDIR)\IIOP_Connect.obj \ + $(OBJDIR)\IIOP_Connector.obj \ + $(OBJDIR)\IIOP_Factory.obj \ + $(OBJDIR)\IIOP_Profile.obj \ + $(OBJDIR)\IIOP_Transport.obj \ + $(OBJDIR)\InconsistentTypeCodeC.obj \ + $(OBJDIR)\Invocation.obj \ + $(OBJDIR)\IOPC.obj \ + $(OBJDIR)\IOPS.obj \ + $(OBJDIR)\IOR_LookupTable.obj \ + $(OBJDIR)\IORC.obj \ + $(OBJDIR)\IORManipulation.obj \ + $(OBJDIR)\IORS.obj \ + $(OBJDIR)\Key_Adapters.obj \ + $(OBJDIR)\Managed_Types.obj \ + $(OBJDIR)\Marshal.obj \ + $(OBJDIR)\Messaging_Policy_i.obj \ + $(OBJDIR)\MessagingC.obj \ + $(OBJDIR)\MessagingS.obj \ + $(OBJDIR)\MProfile.obj \ + $(OBJDIR)\NVList.obj \ + $(OBJDIR)\Object.obj \ + $(OBJDIR)\Object_Adapter.obj \ + $(OBJDIR)\Object_KeyC.obj \ + $(OBJDIR)\ObjectIDList.obj \ + $(OBJDIR)\Operation_Table.obj \ + $(OBJDIR)\ORB.obj \ + $(OBJDIR)\ORB_Core.obj \ + $(OBJDIR)\params.obj \ + $(OBJDIR)\Pluggable.obj \ + $(OBJDIR)\POA.obj \ + $(OBJDIR)\POAC.obj \ + $(OBJDIR)\POAManager.obj \ + $(OBJDIR)\POAS.obj \ + $(OBJDIR)\Policy_Manager.obj \ + $(OBJDIR)\PolicyC.obj \ + $(OBJDIR)\PolicyS.obj \ + $(OBJDIR)\Principal.obj \ + $(OBJDIR)\Protocol_Factory.obj \ + $(OBJDIR)\Reply_Dispatcher.obj \ + $(OBJDIR)\Request.obj \ + $(OBJDIR)\Resource_Factory.obj \ + $(OBJDIR)\Sequence.obj \ + $(OBJDIR)\Servant_Base.obj \ + $(OBJDIR)\Server_Request.obj \ + $(OBJDIR)\Server_Strategy_Factory.obj \ + $(OBJDIR)\Services.obj \ + $(OBJDIR)\skip.obj \ + $(OBJDIR)\Stub.obj \ + $(OBJDIR)\Tagged_Components.obj \ + $(OBJDIR)\TAO.obj \ + $(OBJDIR)\TAO_Internal.obj \ + $(OBJDIR)\TimeBaseC.obj \ + $(OBJDIR)\TimeBaseS.obj \ + $(OBJDIR)\Transport_Mux_Strategy.obj \ + $(OBJDIR)\Typecode.obj \ + $(OBJDIR)\Typecode_Constants.obj \ + $(OBJDIR)\Union.obj \ + $(OBJDIR)\ValueBase.obj \ + $(OBJDIR)\ValueFactory.obj \ + $(OBJDIR)\ValueFactory_Map.obj \ + $(OBJDIR)\Wait_Strategy.obj \ + $(OBJDIR)\WrongTransactionC.obj + +CFLAGS = $(ACE_CFLAGS) $(TAO_BUILD_CFLAGS) $(TAO_CFLAGS) -CFLAGS = -I..\.. -I.. $(ACE_CFLAGS) $(TAO_BUILD_CFLAGS) $(TAO_CFLAGS) CPPDIR = . -LIBFILES = $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib -BINDIR= $(ACE_ROOT)\bin -BASE_OBJDIR = .\bor\obj -!include <$(ACE_ROOT)\include\makeinclude\build_library.bor> +LIBFILES = $(ACE_LIB) +!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/TAO/utils/IOR-parser/Makefile.bor b/TAO/utils/IOR-parser/Makefile.bor new file mode 100644 index 00000000000..64bb2b2a5ea --- /dev/null +++ b/TAO/utils/IOR-parser/Makefile.bor @@ -0,0 +1,17 @@ +# +# Makefile for building the ior-parser executable +# + +NAME = ior-parser + +OBJFILES = \ + $(OBJDIR)\ior-parser.obj \ + $(OBJDIR)\ior-handler.obj + +CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) + +LIBFILES = $(ACE_LIB) $(TAO_LIB) + +CPPDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor> diff --git a/TAO/utils/catior/Makefile.bor b/TAO/utils/catior/Makefile.bor new file mode 100644 index 00000000000..ae9c4ea571c --- /dev/null +++ b/TAO/utils/catior/Makefile.bor @@ -0,0 +1,15 @@ +# +# Makefile for building the catior executable +# + +NAME = catior + +OBJFILES = $(OBJDIR)\catior.obj + +CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) + +LIBFILES = $(ACE_LIB) $(TAO_LIB) + +CPPDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor> diff --git a/TAO/utils/nslist/Makefile.bor b/TAO/utils/nslist/Makefile.bor new file mode 100644 index 00000000000..4c5b01ea2d3 --- /dev/null +++ b/TAO/utils/nslist/Makefile.bor @@ -0,0 +1,16 @@ +# +# Makefile for building the nslist executable +# + +NAME = nslist + +OBJFILES = \ + $(OBJDIR)\nslist.obj + +CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS) + +LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB) + +CPPDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor> diff --git a/ace/Future.h b/ace/Future.h index cdde4c0a958..b1f71527f63 100644 --- a/ace/Future.h +++ b/ace/Future.h @@ -97,33 +97,6 @@ class ACE_Future_Rep private: friend class ACE_Future<T>; - // Create, attach, detach and assign encapsulates the reference - // count handling and the object lifetime of ACE_Future_Rep<T> - // instances. - - static ACE_Future_Rep<T> *create (void); - // Create a ACE_Future_Rep<T> and initialize the reference count. - - static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep); - // Increase the reference count and return argument. Uses the - // attribute "value_ready_mutex_" to synchronize reference count - // updating. - // - // Precondition(rep != 0). - - static void detach (ACE_Future_Rep<T> *&rep); - // Decreases the reference count and and deletes rep if there are no - // more references to rep. - // - // Precondition(rep != 0) - - static void assign (ACE_Future_Rep<T> *&rep, - ACE_Future_Rep<T> *new_rep); - // Decreases the rep's reference count and and deletes rep if there - // are no more references to rep. Then assigns new_rep to rep. - // - // Precondition(rep != 0 && new_rep != 0) - int set (const T &r, ACE_Future<T> &caller); // Set the result value. The specified <caller> represents the @@ -164,6 +137,31 @@ private: // separates the error value from the result, and also permits // timeouts. + // = Handle reference counting and object lifetime for ACE_Future_Rep<T>. + + static ACE_Future_Rep<T> *create (void); + // Create a ACE_Future_Rep<T> and initialize the reference count. + + static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep); + // Increase the reference count and return argument. Uses the + // attribute "value_ready_mutex_" to synchronize reference count + // updating. + // + // Precondition(rep != 0). + + static void detach (ACE_Future_Rep<T> *&rep); + // Decreases the reference count and and deletes rep if there are no + // more references to rep. + // + // Precondition(rep != 0) + + static void assign (ACE_Future_Rep<T> *&rep, + ACE_Future_Rep<T> *new_rep); + // Decreases the rep's reference count and and deletes rep if there + // are no more references to rep. Then assigns new_rep to rep. + // + // Precondition(rep != 0 && new_rep != 0) + void dump (void) const; // Dump the state of an object. diff --git a/ace/Makefile.bor b/ace/Makefile.bor index 32179f4205d..e5ab56a2e86 100644 --- a/ace/Makefile.bor +++ b/ace/Makefile.bor @@ -187,9 +187,8 @@ OBJFILES = \ $(OBJDIR)\WIN32_Proactor.obj \ $(OBJDIR)\XtReactor.obj -CFLAGS = -I.. $(ACE_CFLAGS) +CFLAGS = $(ACE_CFLAGS) + CPPDIR = . -BASE_OBJDIR = $(ACE_ROOT)\ace\bor\obj -BINDIR = $(ACE_ROOT)\bin -!include <$(ACE_ROOT)\include\makeinclude\build_library.bor> +!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> @@ -1056,7 +1056,7 @@ public: static const u_long max_ticks; // max number of ticks supported in a single system call private: - // constants for prying info out of the pSOS time encoding + // = Constants for prying info out of the pSOS time encoding. static const u_long year_mask; static const u_long month_mask; static const u_long day_mask; @@ -2614,29 +2614,27 @@ typedef unsigned int size_t; # endif /* IOV_MAX */ # if defined (ACE_PSOS_SNARFS_HEADER_INFO) - - // header information snarfed from compiler provided header files + // Header information snarfed from compiler provided header files // that are not included because there is already an identically - // named file provided with pSOS, which does not have this info - - // from compiler supplied stdio.h - extern FILE *fdopen(int, const char *); - extern int getopt(int, char *const *, const char *); - extern char *tempnam(const char *, const char *); - extern "C" int fileno(FILE *); + // named file provided with pSOS, which does not have this info from + // compiler supplied stdio.h. + extern FILE *fdopen (int, const char *); + extern int getopt (int, char *const *, const char *); + extern char *tempnam (const char *, const char *); + extern "C" int fileno (FILE *); -// #define fileno(stream) ((stream)->_file) +// #define fileno(stream) ((stream)->_file) // from compiler supplied string.h - extern char *strdup(const char *); + extern char *strdup (const char *); // from compiler supplied stat.h - extern mode_t umask(mode_t); - extern int mkfifo(const char *, mode_t); - extern int mkdir(const char *, mode_t); + extern mode_t umask (mode_t); + extern int mkfifo (const char *, mode_t); + extern int mkdir (const char *, mode_t); // from compiler supplied stdlib.h - extern int putenv(char *); + extern int putenv (char *); int isatty (ACE_HANDLE h); @@ -2651,7 +2649,6 @@ typedef unsigned int size_t; # define isdigit iswdigit # endif /* ACE_HAS_WINCE */ - // If the user wants minimum IOStream inclusion, we will just include // the forward declarations # if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) diff --git a/apps/Gateway/Makefile.bor b/apps/Gateway/Makefile.bor index fcce9a54f49..bbe0f9444be 100644 --- a/apps/Gateway/Makefile.bor +++ b/apps/Gateway/Makefile.bor @@ -1,21 +1,9 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: cd $(ACE_ROOT)\apps\Gateway\Gateway - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\apps\Gateway\Peer - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/apps/Gateway/Peer/Makefile.bor b/apps/Gateway/Peer/Makefile.bor index 8aa8af754a7..7d01fd58d4a 100644 --- a/apps/Gateway/Peer/Makefile.bor +++ b/apps/Gateway/Peer/Makefile.bor @@ -5,5 +5,4 @@ OBJFILES = \ $(OBJDIR)\Peer.obj \ $(OBJDIR)\peerd.obj !include <$(ACE_ROOT)\apps\build.bor> -LIBFILES= $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib diff --git a/apps/JAWS/Makefile.bor b/apps/JAWS/Makefile.bor index 13a6c4e5043..f517d4b8872 100644 --- a/apps/JAWS/Makefile.bor +++ b/apps/JAWS/Makefile.bor @@ -1,21 +1,9 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: cd $(ACE_ROOT)\apps\JAWS\clients - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\apps\JAWS\server - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor b/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor index accf9908b48..af27229cef2 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor +++ b/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor @@ -16,18 +16,16 @@ OBJFILES = \ $(OBJDIR)\IO_Acceptor.obj \ $(OBJDIR)\IO_Handler.obj \ $(OBJDIR)\IO.obj \ - $(OBJDIR)\Cache_Hash_T.obj \ - $(OBJDIR)\Cache_Heap_T.obj \ - $(OBJDIR)\Cache_List_T.obj \ - $(OBJDIR)\Cache_Manager_T.obj \ - $(OBJDIR)\Hash_Bucket_T.obj \ - $(OBJDIR)\Pipeline_Handler_T.obj + $(OBJDIR)\Cache_Hash_T.obj \ + $(OBJDIR)\Cache_Heap_T.obj \ + $(OBJDIR)\Cache_List_T.obj \ + $(OBJDIR)\Cache_Manager_T.obj \ + $(OBJDIR)\Hash_Bucket_T.obj \ + $(OBJDIR)\Pipeline_Handler_T.obj CFLAGS = -I$(ACE_ROOT) -I.. -DJAWS_NTRACE=0 -DACE_NLOGGING CPPDIR = . -BASE_OBJDIR = .\bor\obj BINDIR =..\. -LIBFILES = \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib +LIBFILES = $(ACE_LIB) !include <$(ACE_ROOT)\include\makeinclude\build_library.bor> diff --git a/apps/JAWS/PROTOTYPE/Makefile.bor b/apps/JAWS/PROTOTYPE/Makefile.bor index 77230de9988..77f0476e68d 100644 --- a/apps/JAWS/PROTOTYPE/Makefile.bor +++ b/apps/JAWS/PROTOTYPE/Makefile.bor @@ -8,11 +8,11 @@ OBJFILES = \ $(OBJDIR)\HTTP_10_Parse.obj \ $(OBJDIR)\HTTP_10_Write.obj -CFLAGS=-I. -I$(ACE_ROOT) $(ACE_CFLAGS) -DJAWS_HAS_THREAD_SAFE_ACCEPT +CFLAGS=-I. -DJAWS_HAS_THREAD_SAFE_ACCEPT LIBFILES= \ .\HTTPU$(LIB_DECORATOR).lib \ .\JAWS$(LIB_DECORATOR).lib \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib + $(ACE_LIB) !include <$(ACE_ROOT)\apps\build.bor> diff --git a/apps/JAWS/clients/Makefile.bor b/apps/JAWS/clients/Makefile.bor index 06dd3941440..2a119e447a0 100644 --- a/apps/JAWS/clients/Makefile.bor +++ b/apps/JAWS/clients/Makefile.bor @@ -1,21 +1,9 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: cd $(ACE_ROOT)\apps\JAWS\clients\Blobby - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\apps\JAWS\clients\Caching - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/apps/JAWS/server/Makefile.bor b/apps/JAWS/server/Makefile.bor index e8e46b75dd4..037d2b2b8fc 100644 --- a/apps/JAWS/server/Makefile.bor +++ b/apps/JAWS/server/Makefile.bor @@ -11,9 +11,7 @@ OBJFILES = \ $(OBJDIR)\HTTP_Response.obj \ $(OBJDIR)\Parse_Headers.obj \ $(OBJDIR)\IO.obj \ - $(OBJDIR)\main.obj -XXLIBFILES = \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib + $(OBJDIR)\main.obj !include <$(ACE_ROOT)\apps\build.bor> diff --git a/apps/Makefile.bor b/apps/Makefile.bor index 0c8f8000c14..bdc3b24ec5a 100644 --- a/apps/Makefile.bor +++ b/apps/Makefile.bor @@ -1,23 +1,11 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: cd $(ACE_ROOT)\apps\gperf - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\apps\Gateway - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) cd $(ACE_ROOT)\apps\JAWS - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/apps/build.bor b/apps/build.bor index 0b5bbb335a3..b11a02f2ca6 100644 --- a/apps/build.bor +++ b/apps/build.bor @@ -1,34 +1,14 @@ -!ifdef DEBUG -DEBUGFLAG=-DDEBUG -!endif - -!ifdef STATIC -STATICFLAG=-DSTATIC -!endif - -!ifdef PASCAL -PASCALFLAG=-DPASCAL -!endif - !ifndef CFLAGS -CFLAGS=-I$(ACE_ROOT) $(ACE_CFLAGS) +CFLAGS= $(ACE_CFLAGS) !endif !ifndef CPPDIR CPPDIR=. !endif -!ifndef BINDIR -BINDIR=.\bor\bin -!endif - -!ifndef BASE_OBJDIR -BASE_OBJDIR=.\bor\obj -!endif - !ifndef LIBFILES -LIBFILES= $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib +LIBFILES= $(ACE_LIB) !endif !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/apps/gperf/Makefile.bor b/apps/gperf/Makefile.bor index 0105cbd3418..2831e305908 100644 --- a/apps/gperf/Makefile.bor +++ b/apps/gperf/Makefile.bor @@ -1,19 +1,7 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) - +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> + all: cd $(ACE_ROOT)\apps\gperf\src - $(MAKE) -f Makefile.bor $(FLAGS) + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/apps/gperf/src/Makefile.bor b/apps/gperf/src/Makefile.bor index 1dd4621ee90..95b6cf73277 100644 --- a/apps/gperf/src/Makefile.bor +++ b/apps/gperf/src/Makefile.bor @@ -1,5 +1,6 @@ NAME = gperf + OBJFILES = \ $(OBJDIR)\Options.obj \ $(OBJDIR)\Iterator.obj \ @@ -11,6 +12,12 @@ OBJFILES = \ $(OBJDIR)\Vectors.obj \ $(OBJDIR)\Version.obj \ $(OBJDIR)\gperf.obj -BINDIR=$(ACE_ROOT)\bin -!include <$(ACE_ROOT)\apps\build.bor> + +CFLAGS = $(ACE_CFLAGS) + +CPPDIR = . + +LIBFILES = $(ACE_LIB) + +!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor> diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index 7b769952793..13fe42bd0fa 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -3,17 +3,28 @@ # with Borland C++Builder # +# +# Compiler flags +# !ifdef STATIC -ACE_CFLAGS = -DACE_HAS_DLL=0 +ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=0 TAO_BUILD_CFLAGS = -TAO_CFLAGS = -DTAO_HAS_DLL=0 +TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=0 ORBSVCS_BUILD_CFLAGS = -ORBSVCS_CFLAGS = -DTAO_ORBSVCS_HAS_DLL=0 +ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs\orbsvcs -DTAO_ORBSVCS_HAS_DLL=0 !else -ACE_CFLAGS = -DACE_HAS_DLL=1 +ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=1 TAO_BUILD_CFLAGS = -DTAO_BUILD_DLL -TAO_CFLAGS = -DTAO_HAS_DLL=1 +TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=1 ORBSVCS_BUILD_CFLAGS = -DTAO_ORBSVCS_BUILD_DLL=1 -ORBSVCS_CFLAGS = -DTAO_ORBSVCS_HAS_DLL=1 +ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ORBSVCS_HAS_DLL=1 !endif +# +# Libraries +# +ACE_LIB = $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib +NETSVCS_LIB = $(CORE_BINDIR)\netsvcs$(LIB_DECORATOR).lib +TAO_LIB = $(CORE_BINDIR)\tao$(LIB_DECORATOR).lib +ORBSVCS_LIB = $(CORE_BINDIR)\orbsvcs$(LIB_DECORATOR).lib + diff --git a/include/makeinclude/build_core_exe.bor b/include/makeinclude/build_core_exe.bor new file mode 100644 index 00000000000..2fa7fdbac92 --- /dev/null +++ b/include/makeinclude/build_core_exe.bor @@ -0,0 +1,9 @@ +# +# Makefile for building a core executable. A core executable +# is one that would be part of an ACE/TAO distribution. That +# is, you would pick it up and take it to another computer. +# + +BINDIR = $(CORE_BINDIR) + +!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/include/makeinclude/build_core_library.bor b/include/makeinclude/build_core_library.bor new file mode 100644 index 00000000000..c1513abb0c3 --- /dev/null +++ b/include/makeinclude/build_core_library.bor @@ -0,0 +1,9 @@ +# +# Makefile for building a core library. A core library +# is one that would be part of an ACE/TAO distribution. That +# is, you would pick it up and take it to another computer. +# + +BINDIR = $(CORE_BINDIR) + +!include <$(ACE_ROOT)\include\makeinclude\build_library.bor> diff --git a/include/makeinclude/build_example.bor b/include/makeinclude/build_example.bor index de74fa40106..f13206e186d 100644 --- a/include/makeinclude/build_example.bor +++ b/include/makeinclude/build_example.bor @@ -2,16 +2,11 @@ # Makefile for building the example executables # -TAO_IDL = $(ACE_ROOT)\bin\tao_idl -g \ - $(ACE_ROOT)\bin\gperf.exe +TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -CFLAGS = -I$(ACE_ROOT) -I$(ACE_ROOT)\tao -I$(ACE_ROOT)\tao\orbsvcs \ - $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS) +CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS) -LIBFILES = \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib \ - $(ACE_ROOT)\bin\tao$(LIB_DECORATOR).lib \ - $(ACE_ROOT)\bin\orbsvcs$(LIB_DECORATOR).lib +LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB) !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/include/makeinclude/decorator.bor b/include/makeinclude/decorator.bor index da90d9b34bf..0b20bcbdeb5 100644 --- a/include/makeinclude/decorator.bor +++ b/include/makeinclude/decorator.bor @@ -9,14 +9,15 @@ # # Outputs: # ~~~~~~~~ -# DECORATOR - suffix to be added to output file name +# LIB_DECORATOR - suffix to be added to library output file name +# EXE_DECORATOR - suffix to be added to executable output file name # DECO_PREFIX= # If you want decoration for Borland, set this to something like "B" # otherwise, make it blank -BORLAND_DECO=B +BORLAND_DECO=b !ifdef BORLAND_DECO DECO_PREFIX=_ @@ -40,7 +41,7 @@ DEBUG_DECO=d LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO) !ifdef NO_EXE_DECORATION -EXE_DECORATION= +EXE_DECORATOR= !else EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO) !endif diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor new file mode 100644 index 00000000000..e6fe899eb9e --- /dev/null +++ b/include/makeinclude/make_flags.bor @@ -0,0 +1,17 @@ +# +# Makefile flags for recursive invocations of make +# + +!ifdef DEBUG +DEBUG_FLAG = -DDEBUG +!endif + +!ifdef STATIC +STATIC_FLAG = -DSTATIC +!endif + +!ifdef PASCAL +PASCAL_FLAG = -DPASCAL +!endif + +MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor index a718e1a4c5a..fa9e1d49898 100644 --- a/include/makeinclude/outputdir.bor +++ b/include/makeinclude/outputdir.bor @@ -26,17 +26,29 @@ DEBUG_DIR=Debug !else DEBUG_DIR=Release !endif + +!ifdef PASCAL +PASCAL_DIR=Pascal +!else +PASCAL_DIR=. +!endif +# By default binaries are built underneath the current build directory !ifndef BASE_BINDIR -BASE_BINDIR=$(ACE_ROOT)\bin +BASE_BINDIR=. !endif +# By default object files are built underneath the current build directory !ifndef BASE_OBJDIR -BASE_OBJDIR=$(ACE_ROOT)\obj +BASE_OBJDIR=.\obj !endif !ifndef BINDIR -BINDIR=$(BASE_BINDIR)\$(DEBUG_DIR) +BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR) +!endif + +!ifndef CORE_BINDIR +CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR) !endif MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)" @@ -44,4 +56,3 @@ MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)" OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR) MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)" - diff --git a/netsvcs/Makefile.bor b/netsvcs/Makefile.bor index fe2b39ed7f3..5ac8a257adf 100644 --- a/netsvcs/Makefile.bor +++ b/netsvcs/Makefile.bor @@ -2,25 +2,13 @@ # Makefile for building the netsvcs # -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - cd $(ACE_ROOT)\netsvcs\lib - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\servers - $(MAKE) -f Makefile.bor $(FLAGS) + cd $(ACE_ROOT)\netsvcs\lib + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\servers + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/netsvcs/build.bor b/netsvcs/build.bor index a1dd633ab3c..72036c408fc 100644 --- a/netsvcs/build.bor +++ b/netsvcs/build.bor @@ -1,36 +1,16 @@ -!ifdef DEBUG -DEBUGFLAG=-DDEBUG -!endif - -!ifdef STATIC -STATICFLAG=-DSTATIC -!endif - -!ifdef PASCAL -PASCALFLAG=-DPASCAL -!endif - !ifndef CFLAGS -CFLAGS=-I$(ACE_ROOT) $(ACE_CFLAGS) +CFLAGS=$(ACE_CFLAGS) !endif !ifndef CPPDIR CPPDIR=. !endif -!ifndef BINDIR -BINDIR=.\bor\bin -!endif - -!ifndef BASE_OBJDIR -BASE_OBJDIR=.\bor\obj -!endif - !ifndef LIBFILES -LIBFILES= $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib +LIBFILES= $(ACE_LIB) !endif !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> - +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> diff --git a/netsvcs/clients/Logger/Makefile.bor b/netsvcs/clients/Logger/Makefile.bor index 58f395a5496..28ae9437d9c 100644 --- a/netsvcs/clients/Logger/Makefile.bor +++ b/netsvcs/clients/Logger/Makefile.bor @@ -1,13 +1,13 @@ APPS = \ - direct_logging \ - indirect_logging + direct_logging \ + indirect_logging all: $(APPS) $(APPS): - $(MAKE) -f Makefile.bor -DNAME=$@ $(DEBUGFLAG) $(STATICFLAG) \ - $(PASCALFLAG) $(BINDIR)\$@.exe + $(MAKE) -f Makefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe + OBJFILES=$(OBJDIR)\$(NAME).obj !include <$(ACE_ROOT)\netsvcs\build.bor> diff --git a/netsvcs/clients/Makefile.bor b/netsvcs/clients/Makefile.bor index 464745373f4..a91e169e1ee 100644 --- a/netsvcs/clients/Makefile.bor +++ b/netsvcs/clients/Makefile.bor @@ -1,23 +1,11 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - cd $(ACE_ROOT)\netsvcs\clients\Logger - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Naming - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens - $(MAKE) -f Makefile.bor $(FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Logger + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Naming + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Tokens + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/netsvcs/clients/Naming/Makefile.bor b/netsvcs/clients/Naming/Makefile.bor index c793a30e471..81c2f78e587 100644 --- a/netsvcs/clients/Naming/Makefile.bor +++ b/netsvcs/clients/Naming/Makefile.bor @@ -1,21 +1,9 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - cd $(ACE_ROOT)\netsvcs\clients\Naming\Client - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Naming\Dump_Restore - $(MAKE) -f Makefile.bor $(FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Naming\Client + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Naming\Dump_Restore + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/netsvcs/clients/Tokens/Makefile.bor b/netsvcs/clients/Tokens/Makefile.bor index eb684a845f9..4bdc1900fdb 100644 --- a/netsvcs/clients/Tokens/Makefile.bor +++ b/netsvcs/clients/Tokens/Makefile.bor @@ -1,29 +1,17 @@ -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCAL_FLAG = -DPASCAL -!endif - -FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> all: - cd $(ACE_ROOT)\netsvcs\clients\Tokens\collection - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\deadlock - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\invariant - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\manual - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\mutex - $(MAKE) -f Makefile.bor $(FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\rw_lock - $(MAKE) -f Makefile.bor $(FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Tokens\collection + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Tokens\deadlock + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Tokens\invariant + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Tokens\manual + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Tokens\mutex + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) + cd $(ACE_ROOT)\netsvcs\clients\Tokens\rw_lock + $(MAKE) -f Makefile.bor $(MAKE_FLAGS) diff --git a/netsvcs/lib/Makefile.bor b/netsvcs/lib/Makefile.bor index 25773347ea5..7a5de6761b2 100644 --- a/netsvcs/lib/Makefile.bor +++ b/netsvcs/lib/Makefile.bor @@ -12,12 +12,11 @@ OBJFILES = \ $(OBJDIR)\Logging_Strategy.obj \ $(OBJDIR)\Base_Optimizer.obj -CFLAGS = -I$(ACE_ROOT) $(ACE_CFLAGS) +CFLAGS = $(ACE_CFLAGS) + CPPDIR = . -BASE_OBJDIR = .\bor\obj -BINDIR = $(ACE_ROOT)\bin -LIBFILES = \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib -!include <$(ACE_ROOT)\include\makeinclude\build_library.bor> +LIBFILES = $(ACE_LIB) + +!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/netsvcs/servers/Makefile.bor b/netsvcs/servers/Makefile.bor index ed38ae638f6..746ba07d7c2 100644 --- a/netsvcs/servers/Makefile.bor +++ b/netsvcs/servers/Makefile.bor @@ -1,9 +1,7 @@ NAME = main OBJFILES = $(OBJDIRS)\$(NAME).obj -CFLAGS = -I$(ACE_ROOT) -I$(ACE_ROOT)\netsvcs\lib $(ACE_CFLAGS) -LIBFILES = \ - $(ACE_ROOT)\bin\netsvcs$(LIB_DECORATOR).lib \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib +CFLAGS = -I$(ACE_ROOT)\netsvcs\lib $(ACE_CFLAGS) +LIBFILES = $(ACE_LIB) $(NETSVCS_LIB) !include <$(ACE_ROOT)\netsvcs\build.bor> diff --git a/tests/Makefile.bor b/tests/Makefile.bor index 9b111d192e8..d895c168c90 100644 --- a/tests/Makefile.bor +++ b/tests/Makefile.bor @@ -2,6 +2,8 @@ # Makefile for building the ACE tests # +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> + TESTS = \ Aio_Platform_Test \ Atomic_Op_Test \ @@ -78,29 +80,16 @@ TESTS = \ all_tests: $(TESTS) -!ifdef DEBUG -DEBUGFLAG = -DDEBUG -!endif - -!ifdef STATIC -STATICFLAG = -DSTATIC -!endif - -!ifdef PASCAL -PASCALFLAG = -DPASCAL -!endif - $(TESTS): - $(MAKE) -fMakefile.bor -DNAME=$@ $(DEBUGFLAG) $(STATICFLAG) \ - $(PASCALFLAG) $(BINDIR)\$@.exe + $(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe OBJFILES = $(OBJDIR)\$(NAME).obj -CFLAGS = -I.. $(ACE_CFLAGS) + +CFLAGS = $(ACE_CFLAGS) + CPPDIR = . -BINDIR=.\bor\bin -BASE_OBJDIR=.\bor\obj -LIBFILES = \ - $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib + +LIBFILES = $(ACE_LIB) !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> |