diff options
Diffstat (limited to 'TAO/TAO_IDL/Makefile')
| -rw-r--r-- | TAO/TAO_IDL/Makefile | 148 |
1 files changed, 72 insertions, 76 deletions
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile index d99bdfbcc6e..3e841a98d6b 100644 --- a/TAO/TAO_IDL/Makefile +++ b/TAO/TAO_IDL/Makefile @@ -177,19 +177,15 @@ else # ! CROSS-COMPILE CCFLAGS += -Wno-switch endif # g++ - CPPFLAGS += -Iinclude -Ibe_include -Ife - ifeq ($(CPP_LOCATION),) - CPPFLAGS += -DCPP_LOCATION=\"$(strip $(CXX))\" - else - CPPFLAGS += -DCPP_LOCATION=\"$(CPP_LOCATION)\" - endif # !def CPP_LOCATION + CPPFLAGS += -Iinclude -Ibe_include -Ife \ + -DCPP_LOCATION=\"$(strip $(CXX))\" realclean: - $(RM) tao_idl TAGS + $(RM) -f tao_idl TAGS endif # ! CROSS-COMPILE fe/fe_lookup.cpp: fe/keywords.dat - $(RM) fe/fe_lookup.cpp + $(RM) -f fe/fe_lookup.cpp echo "// \$$Id\$$" > fe/fe_lookup.cpp echo "#include \"idl.h\"" >> fe/fe_lookup.cpp echo "#include \"idl_extern.h\"" >> fe/fe_lookup.cpp @@ -229,28 +225,24 @@ fe/y.tab.cpp: fe/idl.yy y.tab: fe/idl.yy $(YACC) -d fe/idl.yy - sed -e 's/char \*getenv/char *ace_foo/g' \ - -e 's/= getenv/= ACE_OS::getenv/g' \ - -e 's/int yynew_state,/int,/g' \ - -e 's/int yyold_state,/int,/g' \ - -e 's/int yyrule_num,/int,/g' \ - -e 's/\(YYDEBUG_DISCARD_TOKEN.*int\) yytoken_num/\1/g' \ - -e 's/yynewerror://g' \ - -e 's/yy/tao_yy/g' \ - -e 's/YY/TAO_YY/g' \ - -e 's/y\.tab\.c/y.tab.cpp/g' \ - -e 's%\(#pragma ident\)%// \1%' < y.tab.c > /tmp/$(USER).Y - sed -e 's/yy/tao_yy/g' \ - -e 's/YY/TAO_YY/g' < y.tab.h > /tmp/$(USER).YH + sed -e "s/char \*getenv/char *ace_foo/g" \ + -e "s/= getenv/= ACE_OS::getenv/g" \ + -e "s/yynewerror://g" \ + -e "s/yy/tao_yy/g" \ + -e "s/YY/TAO_YY/g" \ + -e "s/y\.tab\.c/y.tab.cpp/g" \ + -e "s%\(#pragma ident\)%// \1%" < y.tab.c > /tmp/$(USER).Y + sed -e "s/yy/tao_yy/g" \ + -e "s/YY/TAO_YY/g" < y.tab.h > /tmp/$(USER).YH echo '// $$I''d$$' > fe/y.tab.cpp cat /tmp/$(USER).Y >> fe/y.tab.cpp echo '// $$I''d$$' > fe/y.tab.h cat /tmp/$(USER).YH >> fe/y.tab.h - $(RM) /tmp/$(USER).Y /tmp/$(USER).YH y.tab.c y.tab.h + $(RM) -f /tmp/$(USER).Y /tmp/$(USER).YH y.tab.c y.tab.h (cd fe ; patch < y.tab.cpp.diff) tags: - $(RM) TAGS + $(RM) -f TAGS find . -name "*.h" -print | etags -a --c++ - find . -name "*.cpp" -print | etags -a - @@ -873,9 +865,7 @@ tags: $(ACE_ROOT)/ace/Process_Manager.i \ $(ACE_ROOT)/ace/Env_Value_T.h \ $(ACE_ROOT)/ace/Env_Value_T.i \ - $(ACE_ROOT)/ace/Env_Value_T.cpp \ - $(ACE_ROOT)/ace/ARGV.h \ - $(ACE_ROOT)/ace/ARGV.i + $(ACE_ROOT)/ace/Env_Value_T.cpp .obj/fe_declarator.o .obj/fe_declarator.so .shobj/fe_declarator.o .shobj/fe_declarator.so: fe/fe_declarator.cpp include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -6340,10 +6330,6 @@ tags: include/ast_extern.h include/nr_extern.h include/global_extern.h \ be_include/be_visitor_interface.h be_include/be_visitor_scope.h \ be_include/be_visitor.h be_include/be_visitor_decl.h \ - be_include/be_codegen.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ be_include/be_visitor_interface/interface.h \ be_include/be_visitor_interface/interface_ch.h \ be_include/be_visitor_interface/interface_ci.h \ @@ -6353,10 +6339,8 @@ tags: be_include/be_visitor_interface/interface_si.h \ be_include/be_visitor_interface/interface_ss.h \ be_include/be_visitor_interface/interface_is.h \ - be_include/be_visitor_interface/thru_poa_collocated_sh.h \ - be_include/be_visitor_interface/thru_poa_collocated_ss.h \ - be_include/be_visitor_interface/direct_collocated_sh.h \ - be_include/be_visitor_interface/direct_collocated_ss.h \ + be_include/be_visitor_interface/collocated_sh.h \ + be_include/be_visitor_interface/collocated_ss.h \ be_include/be_visitor_interface/any_op_ch.h \ be_include/be_visitor_interface/any_op_cs.h \ be_include/be_visitor_interface/cdr_op_ch.h \ @@ -6366,7 +6350,14 @@ tags: be_include/be_visitor_interface/tie_si.h \ be_include/be_visitor_interface/ami_handler_fwd_ch.h \ be_include/be_visitor_interface/ami_handler_fwd_ci.h \ - be_include/be_visitor_interface/ami_handler_ch.h be_include/be.h \ + be_include/be_visitor_interface/ami_handler_servant_ch.h \ + be_include/be_visitor_interface/ami_handler_stub_ch.h \ + be_include/be_visitor_interface/ami_handler_stub_cs.h \ + be_include/be_visitor_interface/collocated_ami_handler_ch.h \ + be_include/be.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Process.h \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ @@ -6382,8 +6373,9 @@ tags: be_include/be_enum_val.h be_include/be_array.h \ be_include/be_sequence.h be_include/be_string.h \ be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \ - be_include/be_helper.h be_include/be_stream_factory.h \ - be_include/be_visitor_factory.h be_include/be_visitor_context.h + be_include/be_helper.h be_include/be_codegen.h \ + be_include/be_stream_factory.h be_include/be_visitor_factory.h \ + be_include/be_visitor_context.h .obj/be_interface_fwd.o .obj/be_interface_fwd.so .shobj/be_interface_fwd.o .shobj/be_interface_fwd.so: be/be_interface_fwd.cpp include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -9226,6 +9218,7 @@ tags: be_include/be_visitor_argument/pre_invoke_cs.h \ be_include/be_visitor_argument/ami_arglist.h \ be_include/be_visitor_argument/ami_handler_arglist.h \ + be_include/be_visitor_argument/ami_handler_result_arg.h \ be_include/be_visitor_array.h be_include/be_visitor_array/array.h \ be_include/be_visitor_array/array_ch.h \ be_include/be_visitor_array/array_ci.h \ @@ -9273,10 +9266,8 @@ tags: be_include/be_visitor_interface/interface_si.h \ be_include/be_visitor_interface/interface_ss.h \ be_include/be_visitor_interface/interface_is.h \ - be_include/be_visitor_interface/thru_poa_collocated_sh.h \ - be_include/be_visitor_interface/thru_poa_collocated_ss.h \ - be_include/be_visitor_interface/direct_collocated_sh.h \ - be_include/be_visitor_interface/direct_collocated_ss.h \ + be_include/be_visitor_interface/collocated_sh.h \ + be_include/be_visitor_interface/collocated_ss.h \ be_include/be_visitor_interface/any_op_ch.h \ be_include/be_visitor_interface/any_op_cs.h \ be_include/be_visitor_interface/cdr_op_ch.h \ @@ -9286,7 +9277,10 @@ tags: be_include/be_visitor_interface/tie_si.h \ be_include/be_visitor_interface/ami_handler_fwd_ch.h \ be_include/be_visitor_interface/ami_handler_fwd_ci.h \ - be_include/be_visitor_interface/ami_handler_ch.h \ + be_include/be_visitor_interface/ami_handler_servant_ch.h \ + be_include/be_visitor_interface/ami_handler_stub_ch.h \ + be_include/be_visitor_interface/ami_handler_stub_cs.h \ + be_include/be_visitor_interface/collocated_ami_handler_ch.h \ be_include/be_visitor_interface_fwd.h \ be_include/be_visitor_interface_fwd/interface_fwd_ch.h \ be_include/be_visitor_interface_fwd/interface_fwd_ci.h \ @@ -9327,10 +9321,8 @@ tags: be_include/be_visitor_operation/operation_is.h \ be_include/be_visitor_operation/tie_sh.h \ be_include/be_visitor_operation/tie_si.h \ - be_include/be_visitor_operation/thru_poa_collocated_sh.h \ - be_include/be_visitor_operation/thru_poa_collocated_ss.h \ - be_include/be_visitor_operation/direct_collocated_sh.h \ - be_include/be_visitor_operation/direct_collocated_ss.h \ + be_include/be_visitor_operation/collocated_sh.h \ + be_include/be_visitor_operation/collocated_ss.h \ be_include/be_visitor_operation/arglist.h \ be_include/be_visitor_operation/rettype.h \ be_include/be_visitor_operation/rettype_is.h \ @@ -9354,6 +9346,7 @@ tags: be_include/be_visitor_operation/ami_arglist.h \ be_include/be_visitor_operation/ami_handler_operation_ch.h \ be_include/be_visitor_operation/ami_handler_arglist.h \ + be_include/be_visitor_operation/ami_handler_operation_cs.h \ be_include/be_visitor_root.h be_include/be_visitor_root/root.h \ be_include/be_visitor_root/root_ch.h \ be_include/be_visitor_root/root_ci.h \ @@ -9643,6 +9636,7 @@ tags: be_include/be_visitor_argument/pre_invoke_cs.h \ be_include/be_visitor_argument/ami_arglist.h \ be_include/be_visitor_argument/ami_handler_arglist.h \ + be_include/be_visitor_argument/ami_handler_result_arg.h \ be/be_visitor_argument/arglist.cpp \ be/be_visitor_argument/argument.cpp \ be/be_visitor_argument/docall_cs.cpp \ @@ -9659,7 +9653,8 @@ tags: be/be_visitor_argument/compiled_marshal_ss.cpp \ be/be_visitor_argument/pre_invoke_cs.cpp \ be/be_visitor_argument/ami_arglist.cpp \ - be/be_visitor_argument/ami_handler_arglist.cpp + be/be_visitor_argument/ami_handler_arglist.cpp \ + be/be_visitor_argument/ami_handler_result_arg.cpp .obj/be_visitor_array.o .obj/be_visitor_array.so .shobj/be_visitor_array.o .shobj/be_visitor_array.so: be/be_visitor_array.cpp include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -10681,10 +10676,8 @@ tags: be_include/be_visitor_interface/interface_si.h \ be_include/be_visitor_interface/interface_ss.h \ be_include/be_visitor_interface/interface_is.h \ - be_include/be_visitor_interface/thru_poa_collocated_sh.h \ - be_include/be_visitor_interface/thru_poa_collocated_ss.h \ - be_include/be_visitor_interface/direct_collocated_sh.h \ - be_include/be_visitor_interface/direct_collocated_ss.h \ + be_include/be_visitor_interface/collocated_sh.h \ + be_include/be_visitor_interface/collocated_ss.h \ be_include/be_visitor_interface/any_op_ch.h \ be_include/be_visitor_interface/any_op_cs.h \ be_include/be_visitor_interface/cdr_op_ch.h \ @@ -10694,7 +10687,10 @@ tags: be_include/be_visitor_interface/tie_si.h \ be_include/be_visitor_interface/ami_handler_fwd_ch.h \ be_include/be_visitor_interface/ami_handler_fwd_ci.h \ - be_include/be_visitor_interface/ami_handler_ch.h \ + be_include/be_visitor_interface/ami_handler_servant_ch.h \ + be_include/be_visitor_interface/ami_handler_stub_ch.h \ + be_include/be_visitor_interface/ami_handler_stub_cs.h \ + be_include/be_visitor_interface/collocated_ami_handler_ch.h \ be/be_visitor_interface/interface.cpp \ be/be_visitor_interface/interface_ch.cpp \ be/be_visitor_interface/interface_ci.cpp \ @@ -10704,10 +10700,8 @@ tags: be/be_visitor_interface/interface_si.cpp \ be/be_visitor_interface/interface_ss.cpp \ be/be_visitor_interface/interface_is.cpp \ - be/be_visitor_interface/thru_poa_collocated_sh.cpp \ - be/be_visitor_interface/thru_poa_collocated_ss.cpp \ - be/be_visitor_interface/direct_collocated_sh.cpp \ - be/be_visitor_interface/direct_collocated_ss.cpp \ + be/be_visitor_interface/collocated_sh.cpp \ + be/be_visitor_interface/collocated_ss.cpp \ be/be_visitor_interface/tie_sh.cpp be/be_visitor_interface/tie_si.cpp \ be/be_visitor_interface/any_op_ch.cpp \ be/be_visitor_interface/any_op_cs.cpp \ @@ -10720,10 +10714,12 @@ tags: be_include/be_visitor_interface_fwd/interface_fwd_ci.h \ be_include/be_visitor_interface_fwd/cdr_op_ci.h \ be/be_visitor_interface/ami_handler_fwd_ci.cpp \ - be/be_visitor_interface/ami_handler_ch.cpp + be/be_visitor_interface/ami_handler_servant_ch.cpp \ + be/be_visitor_interface/ami_handler_stub_ch.cpp \ + be/be_visitor_interface/ami_handler_stub_cs.cpp \ + be/be_visitor_interface/collocated_ami_handler_ch.cpp .obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be/be_visitor_interface_fwd.cpp \ - include/idl.h \ - $(ACE_ROOT)/ace/ACE.h \ + include/idl.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -10975,10 +10971,8 @@ tags: be_include/be_visitor_operation/operation_is.h \ be_include/be_visitor_operation/tie_sh.h \ be_include/be_visitor_operation/tie_si.h \ - be_include/be_visitor_operation/thru_poa_collocated_sh.h \ - be_include/be_visitor_operation/thru_poa_collocated_ss.h \ - be_include/be_visitor_operation/direct_collocated_sh.h \ - be_include/be_visitor_operation/direct_collocated_ss.h \ + be_include/be_visitor_operation/collocated_sh.h \ + be_include/be_visitor_operation/collocated_ss.h \ be_include/be_visitor_operation/arglist.h \ be_include/be_visitor_operation/rettype.h \ be_include/be_visitor_operation/rettype_is.h \ @@ -11002,6 +10996,7 @@ tags: be_include/be_visitor_operation/ami_arglist.h \ be_include/be_visitor_operation/ami_handler_operation_ch.h \ be_include/be_visitor_operation/ami_handler_arglist.h \ + be_include/be_visitor_operation/ami_handler_operation_cs.h \ be/be_visitor_valuetype/field_ch.cpp \ be/be_visitor_valuetype/field_cs.cpp \ be/be_visitor_valuetype/field_cdr_ci.cpp \ @@ -11013,8 +11008,7 @@ tags: be_include/be_visitor_field/cdr_op_cs.h \ be/be_visitor_valuetype/obv_module.cpp .obj/be_visitor_valuetype_fwd.o .obj/be_visitor_valuetype_fwd.so .shobj/be_visitor_valuetype_fwd.o .shobj/be_visitor_valuetype_fwd.so: be/be_visitor_valuetype_fwd.cpp \ - include/idl.h \ - $(ACE_ROOT)/ace/ACE.h \ + include/idl.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -11351,10 +11345,8 @@ tags: be_include/be_visitor_operation/operation_is.h \ be_include/be_visitor_operation/tie_sh.h \ be_include/be_visitor_operation/tie_si.h \ - be_include/be_visitor_operation/thru_poa_collocated_sh.h \ - be_include/be_visitor_operation/thru_poa_collocated_ss.h \ - be_include/be_visitor_operation/direct_collocated_sh.h \ - be_include/be_visitor_operation/direct_collocated_ss.h \ + be_include/be_visitor_operation/collocated_sh.h \ + be_include/be_visitor_operation/collocated_ss.h \ be_include/be_visitor_operation/arglist.h \ be_include/be_visitor_operation/rettype.h \ be_include/be_visitor_operation/rettype_is.h \ @@ -11378,15 +11370,14 @@ tags: be_include/be_visitor_operation/ami_arglist.h \ be_include/be_visitor_operation/ami_handler_operation_ch.h \ be_include/be_visitor_operation/ami_handler_arglist.h \ + be_include/be_visitor_operation/ami_handler_operation_cs.h \ be/be_visitor_operation/operation.cpp \ be/be_visitor_operation/arglist.cpp \ be/be_visitor_operation/argument.cpp \ be/be_visitor_operation/argument_invoke.cpp \ be/be_visitor_operation/argument_marshal.cpp \ - be/be_visitor_operation/thru_poa_collocated_sh.cpp \ - be/be_visitor_operation/thru_poa_collocated_ss.cpp \ - be/be_visitor_operation/direct_collocated_sh.cpp \ - be/be_visitor_operation/direct_collocated_ss.cpp \ + be/be_visitor_operation/collocated_sh.cpp \ + be/be_visitor_operation/collocated_ss.cpp \ be/be_visitor_operation/exceptlist_cs.cpp \ be/be_visitor_operation/operation_ch.cpp \ be/be_visitor_operation/operation_cs.cpp \ @@ -11411,6 +11402,7 @@ tags: be_include/be_visitor_argument/pre_invoke_cs.h \ be_include/be_visitor_argument/ami_arglist.h \ be_include/be_visitor_argument/ami_handler_arglist.h \ + be_include/be_visitor_argument/ami_handler_result_arg.h \ be/be_visitor_operation/operation_is.cpp \ be/be_visitor_operation/rettype.cpp \ be/be_visitor_operation/rettype_is.cpp \ @@ -11429,7 +11421,8 @@ tags: be/be_visitor_operation/ami_ch.cpp be/be_visitor_operation/ami_cs.cpp \ be/be_visitor_operation/ami_arglist.cpp \ be/be_visitor_operation/ami_handler_operation_ch.cpp \ - be/be_visitor_operation/ami_handler_arglist.cpp + be/be_visitor_operation/ami_handler_arglist.cpp \ + be/be_visitor_operation/ami_handler_operation_cs.cpp .obj/be_visitor_root.o .obj/be_visitor_root.so .shobj/be_visitor_root.o .shobj/be_visitor_root.so: be/be_visitor_root.cpp include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -11788,11 +11781,15 @@ tags: be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp \ be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp \ be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp \ + be/be_visitor_sequence/gen_object_manager_ch.cpp \ + be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp \ be/be_visitor_sequence/gen_bounded_sequence_ci.cpp \ be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp \ be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp \ be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp \ + be/be_visitor_sequence/gen_object_manager_ci.cpp \ be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp \ + be/be_visitor_sequence/gen_bounded_sequence_cs.cpp \ be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp \ be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp \ be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp @@ -12284,8 +12281,7 @@ tags: be/be_visitor_union/any_op_cs.cpp be/be_visitor_union/cdr_op_ch.cpp \ be/be_visitor_union/cdr_op_ci.cpp be/be_visitor_union/cdr_op_cs.cpp .obj/be_visitor_union_branch.o .obj/be_visitor_union_branch.so .shobj/be_visitor_union_branch.o .shobj/be_visitor_union_branch.so: be/be_visitor_union_branch.cpp \ - include/idl.h \ - $(ACE_ROOT)/ace/ACE.h \ + include/idl.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ |