diff options
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/Makefile.am | 328 |
2 files changed, 164 insertions, 170 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6ebc15b17d6..d7cf8d8b207 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Feb 15 18:09:46 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * TAO_IDL/Makefile.am: + + Regenerated. + Tue Feb 15 14:10:33 2005 Chad Elliott <elliott_c@ociweb.com> * TAOACE.mwc: diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am index 16475309829..d9e2db55e41 100644 --- a/TAO/TAO_IDL/Makefile.am +++ b/TAO/TAO_IDL/Makefile.am @@ -1,37 +1,27 @@ ## Process this file with automake to create Makefile.in -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) ## Makefile.TAO_IDL_FE.am lib_LTLIBRARIES = libTAO_IDL_FE.la libTAO_IDL_FE_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/include \ - -I$(srcdir)/fe \ - -DTAO_IDL_FE_BUILD_DLL \ - $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH) + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(srcdir)/include \ + -I$(srcdir)/fe \ + -DTAO_IDL_FE_BUILD_DLL libTAO_IDL_FE_la_SOURCES = \ - fe/fe_declarator.cpp \ - fe/fe_interface_header.cpp \ - fe/fe_extern.cpp \ - fe/fe_global.cpp \ - fe/fe_init.cpp \ - fe/fe_lookup.cpp \ - fe/fe_private.cpp \ - fe/fe_tmplinst.cpp \ - fe/lex.yy.cpp \ - fe/y.tab.cpp \ ast/ast_argument.cpp \ - ast/ast_attribute.cpp \ ast/ast_array.cpp \ - ast/ast_component.cpp \ + ast/ast_attribute.cpp \ ast/ast_check.cpp \ - ast/ast_interface_fwd.cpp \ + ast/ast_component.cpp \ ast/ast_component_fwd.cpp \ ast/ast_concrete_type.cpp \ ast/ast_constant.cpp \ @@ -47,10 +37,10 @@ libTAO_IDL_FE_la_SOURCES = \ ast/ast_generator.cpp \ ast/ast_home.cpp \ ast/ast_interface.cpp \ - ast/ast_operation.cpp \ + ast/ast_interface_fwd.cpp \ ast/ast_module.cpp \ ast/ast_native.cpp \ - ast/ast_union_branch.cpp \ + ast/ast_operation.cpp \ ast/ast_predefined_type.cpp \ ast/ast_recursive.cpp \ ast/ast_redef.cpp \ @@ -62,42 +52,51 @@ libTAO_IDL_FE_la_SOURCES = \ ast/ast_type.cpp \ ast/ast_typedef.cpp \ ast/ast_union.cpp \ - ast/ast_valuetype_fwd.cpp \ + ast/ast_union_branch.cpp \ ast/ast_union_fwd.cpp \ ast/ast_union_label.cpp \ ast/ast_valuetype.cpp \ + ast/ast_valuetype_fwd.cpp \ ast/ast_visitor.cpp \ - util/utl_exceptlist.cpp \ + fe/fe_declarator.cpp \ + fe/fe_extern.cpp \ + fe/fe_global.cpp \ + fe/fe_init.cpp \ + fe/fe_interface_header.cpp \ + fe/fe_lookup.cpp \ + fe/fe_private.cpp \ + fe/fe_tmplinst.cpp \ + fe/lex.yy.cpp \ + fe/y.tab.cpp \ + narrow/narrow.cpp \ + util/utl_decllist.cpp \ util/utl_err.cpp \ - util/utl_identifier.cpp \ + util/utl_exceptlist.cpp \ util/utl_exprlist.cpp \ util/utl_global.cpp \ - util/utl_labellist.cpp \ + util/utl_identifier.cpp \ util/utl_idlist.cpp \ util/utl_indenter.cpp \ - util/utl_namelist.cpp \ + util/utl_labellist.cpp \ util/utl_list.cpp \ + util/utl_namelist.cpp \ util/utl_scope.cpp \ util/utl_stack.cpp \ util/utl_string.cpp \ - util/utl_strlist.cpp \ - util/utl_decllist.cpp \ - narrow/narrow.cpp - -libTAO_IDL_FE_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + util/utl_strlist.cpp libTAO_IDL_FE_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la + ${ACE_BUILDDIR}/ace/libACE.la noinst_HEADERS = \ - include/ast_argument.h \ + fe/y.tab.h \ + include/TAO_IDL_FE_Export.h \ include/ast.h \ - include/ast_attribute.h \ + include/ast_argument.h \ include/ast_array.h \ - include/ast_component_fwd.h \ + include/ast_attribute.h \ include/ast_component.h \ - include/ast_factory.h \ + include/ast_component_fwd.h \ include/ast_concrete_type.h \ include/ast_constant.h \ include/ast_decl.h \ @@ -108,126 +107,94 @@ noinst_HEADERS = \ include/ast_exception.h \ include/ast_expression.h \ include/ast_extern.h \ - include/ast_generator.h \ + include/ast_factory.h \ include/ast_field.h \ - include/ast_interface.h \ + include/ast_generator.h \ include/ast_home.h \ - include/ast_predefined_type.h \ + include/ast_interface.h \ include/ast_interface_fwd.h \ include/ast_module.h \ include/ast_native.h \ include/ast_operation.h \ - include/ast_sequence.h \ + include/ast_predefined_type.h \ include/ast_root.h \ - include/ast_structure.h \ + include/ast_sequence.h \ include/ast_string.h \ - include/fe_interface_header.h \ - include/utl_idlist.h \ + include/ast_structure.h \ include/ast_structure_fwd.h \ include/ast_type.h \ include/ast_typedef.h \ include/ast_union.h \ include/ast_union_branch.h \ include/ast_union_fwd.h \ - include/ast_valuetype.h \ - include/fe_extern.h \ include/ast_union_label.h \ + include/ast_valuetype.h \ include/ast_valuetype_fwd.h \ include/ast_visitor.h \ include/drv_extern.h \ include/fe_declarator.h \ - include/global_extern.h \ + include/fe_extern.h \ + include/fe_interface_header.h \ include/fe_private.h \ - include/idl_defines.h \ + include/global_extern.h \ include/idl_bool.h \ - include/utl_decllist.h \ + include/idl_defines.h \ include/idl_global.h \ include/idl_narrow.h \ + include/idl_uns_long.h \ include/nr_extern.h \ - include/utl_exceptlist.h \ + include/utl_decllist.h \ include/utl_err.h \ - include/utl_scoped_name.h \ + include/utl_exceptlist.h \ include/utl_exprlist.h \ include/utl_identifier.h \ + include/utl_idlist.h \ include/utl_indenter.h \ include/utl_labellist.h \ include/utl_list.h \ include/utl_namelist.h \ include/utl_scope.h \ - include/utl_strlist.h \ + include/utl_scoped_name.h \ include/utl_stack.h \ include/utl_string.h \ - include/TAO_IDL_FE_Export.h \ - fe/y.tab.h - + include/utl_strlist.h ## Makefile.TAO_IDL_BE.am lib_LTLIBRARIES += libTAO_IDL_BE.la libTAO_IDL_BE_la_CPPFLAGS = \ - -I$(ACE_ROOT) -I$(ACE_BUILDDIR) \ - -I$(srcdir)/include \ - -I$(srcdir)/be_include \ - -I$(srcdir)/fe \ - -DTAO_IDL_BE_BUILD_DLL \ - $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH) + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(srcdir)/include \ + -I$(srcdir)/be_include \ + -I$(srcdir)/fe \ + -DTAO_IDL_BE_BUILD_DLL libTAO_IDL_BE_la_SOURCES = \ - be/be_visitor_component_fwd.cpp \ - be/be_visitor_constant.cpp \ - be/be_visitor_context.cpp \ - be/be_visitor_decl.cpp \ - be/be_visitor_enum.cpp \ - be/be_visitor_eventtype.cpp \ - be/be_visitor_eventtype_fwd.cpp \ - be/be_visitor_exception.cpp \ - be/be_visitor_factory.cpp \ - be/be_visitor_field.cpp \ - be/be_visitor_home.cpp \ - be/be_visitor_interface.cpp \ - be/be_visitor_interface_fwd.cpp \ - be/be_visitor_module.cpp \ - be/be_visitor_operation.cpp \ - be/be_visitor_root.cpp \ - be/be_visitor_scope.cpp \ - be/be_visitor_sequence.cpp \ - be/be_visitor_structure.cpp \ - be/be_visitor_structure_fwd.cpp \ - be/be_visitor_tmplinst.cpp \ - be/be_visitor_traits.cpp \ - be/be_visitor_typecode.cpp \ - be/be_visitor_typedef.cpp \ - be/be_visitor_union.cpp \ - be/be_visitor_union_branch.cpp \ - be/be_visitor_union_fwd.cpp \ - be/be_visitor_valuetype.cpp \ - be/be_visitor_valuetype_fwd.cpp \ - be/be_init.cpp \ be/be_argument.cpp \ - be/be_attribute.cpp \ be/be_array.cpp \ - be/be_component_fwd.cpp \ + be/be_attribute.cpp \ be/be_codegen.cpp \ be/be_component.cpp \ - be/be_eventtype_fwd.cpp \ + be/be_component_fwd.cpp \ be/be_constant.cpp \ be/be_decl.cpp \ be/be_enum.cpp \ be/be_enum_val.cpp \ - be/be_factory.cpp \ be/be_eventtype.cpp \ - be/be_expression.cpp \ + be/be_eventtype_fwd.cpp \ be/be_exception.cpp \ - be/be_interface_fwd.cpp \ + be/be_expression.cpp \ + be/be_factory.cpp \ be/be_field.cpp \ - be/be_home.cpp \ be/be_generator.cpp \ be/be_global.cpp \ be/be_helper.cpp \ + be/be_home.cpp \ + be/be_init.cpp \ be/be_interface.cpp \ - be/be_root.cpp \ - be/be_structure_fwd.cpp \ + be/be_interface_fwd.cpp \ be/be_interface_strategy.cpp \ be/be_module.cpp \ be/be_native.cpp \ @@ -235,99 +202,93 @@ libTAO_IDL_BE_la_SOURCES = \ be/be_operation_strategy.cpp \ be/be_predefined_type.cpp \ be/be_produce.cpp \ - be/be_type.cpp \ + be/be_root.cpp \ be/be_scope.cpp \ be/be_sequence.cpp \ be/be_stream_factory.cpp \ be/be_string.cpp \ be/be_structure.cpp \ - be/be_union_branch.cpp \ + be/be_structure_fwd.cpp \ be/be_sunsoft.cpp \ be/be_tmplinst.cpp \ + be/be_type.cpp \ be/be_typedef.cpp \ be/be_union.cpp \ - be/be_union_label.cpp \ + be/be_union_branch.cpp \ be/be_union_fwd.cpp \ - be/be_valuetype_fwd.cpp \ + be/be_union_label.cpp \ be/be_valuetype.cpp \ - be/be_visitor_argument.cpp \ + be/be_valuetype_fwd.cpp \ be/be_visitor.cpp \ be/be_visitor_amh_pre_proc.cpp \ be/be_visitor_ami_pre_proc.cpp \ be/be_visitor_arg_traits.cpp \ + be/be_visitor_argument.cpp \ be/be_visitor_array.cpp \ be/be_visitor_attribute.cpp \ be/be_visitor_ccm_pre_proc.cpp \ - be/be_visitor_component.cpp - -libTAO_IDL_BE_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + be/be_visitor_component.cpp \ + be/be_visitor_component_fwd.cpp \ + be/be_visitor_constant.cpp \ + be/be_visitor_context.cpp \ + be/be_visitor_decl.cpp \ + be/be_visitor_enum.cpp \ + be/be_visitor_exception.cpp \ + be/be_visitor_factory.cpp \ + be/be_visitor_field.cpp \ + be/be_visitor_home.cpp \ + be/be_visitor_interface.cpp \ + be/be_visitor_interface_fwd.cpp \ + be/be_visitor_module.cpp \ + be/be_visitor_operation.cpp \ + be/be_visitor_root.cpp \ + be/be_visitor_scope.cpp \ + be/be_visitor_sequence.cpp \ + be/be_visitor_structure.cpp \ + be/be_visitor_structure_fwd.cpp \ + be/be_visitor_tmplinst.cpp \ + be/be_visitor_traits.cpp \ + be/be_visitor_typecode.cpp \ + be/be_visitor_typedef.cpp \ + be/be_visitor_union.cpp \ + be/be_visitor_union_branch.cpp \ + be/be_visitor_union_fwd.cpp \ + be/be_visitor_valuetype.cpp \ + be/be_visitor_valuetype_fwd.cpp libTAO_IDL_BE_la_LIBADD = \ - libTAO_IDL_FE.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_IDL_FE.la \ + ${ACE_BUILDDIR}/ace/libACE.la noinst_HEADERS += \ - be_include/be_visitor_component.h \ - be_include/be_visitor_component_fwd.h \ - be_include/be_visitor_constant.h \ - be_include/be_visitor_context.h \ - be_include/be_visitor_decl.h \ - be_include/be_visitor_enum.h \ - be_include/be_visitor_eventtype.h \ - be_include/be_visitor_eventtype_fwd.h \ - be_include/be_visitor_exception.h \ - be_include/be_visitor_factory.h \ - be_include/be_visitor_field.h \ - be_include/be_visitor_home.h \ - be_include/be_visitor_interface_fwd.h \ - be_include/be_visitor_module.h \ - be_include/be_visitor_operation.h \ - be_include/be_visitor_root.h \ - be_include/be_visitor_scope.h \ - be_include/be_visitor_sequence.h \ - be_include/be_visitor_structure.h \ - be_include/be_visitor_structure_fwd.h \ - be_include/be_visitor_tmplinst.h \ - be_include/be_visitor_traits.h \ - be_include/be_visitor_typecode.h \ - be_include/be_visitor_typedef.h \ - be_include/be_visitor_union.h \ - be_include/be_visitor_union_branch.h \ - be_include/be_visitor_union_fwd.h \ - be_include/be_visitor_valuetype.h \ - be_include/be_visitor_valuetype_fwd.h \ - be_include/be_visitor_interface.h \ be_include/TAO_IDL_BE_Export.h \ - be_include/be_component_fwd.h \ be_include/be_argument.h \ be_include/be_array.h \ be_include/be_attribute.h \ be_include/be_codegen.h \ be_include/be_component.h \ - be_include/be_eventtype_fwd.h \ + be_include/be_component_fwd.h \ be_include/be_constant.h \ be_include/be_decl.h \ be_include/be_enum.h \ be_include/be_enum_val.h \ be_include/be_eventtype.h \ - be_include/be_generator.h \ + be_include/be_eventtype_fwd.h \ be_include/be_exception.h \ be_include/be_expression.h \ be_include/be_extern.h \ be_include/be_factory.h \ be_include/be_field.h \ - be_include/be_interface.h \ + be_include/be_generator.h \ be_include/be_global.h \ be_include/be_helper.h \ be_include/be_home.h \ - be_include/be_interface_strategy.h \ + be_include/be_interface.h \ be_include/be_interface_fwd.h \ - be_include/be_operation.h \ + be_include/be_interface_strategy.h \ be_include/be_module.h \ be_include/be_native.h \ - be_include/be_union_branch.h \ - be_include/be_sunsoft.h \ + be_include/be_operation.h \ be_include/be_operation_strategy.h \ be_include/be_predefined_type.h \ be_include/be_root.h \ @@ -337,50 +298,77 @@ noinst_HEADERS += \ be_include/be_string.h \ be_include/be_structure.h \ be_include/be_structure_fwd.h \ + be_include/be_sunsoft.h \ be_include/be_type.h \ be_include/be_typedef.h \ be_include/be_union.h \ - be_include/be_valuetype_fwd.h \ + be_include/be_union_branch.h \ be_include/be_union_fwd.h \ be_include/be_union_label.h \ be_include/be_valuetype.h \ - be_include/be_visitor_array.h \ + be_include/be_valuetype_fwd.h \ be_include/be_visitor.h \ be_include/be_visitor_amh_pre_proc.h \ be_include/be_visitor_ami_pre_proc.h \ be_include/be_visitor_arg_traits.h \ be_include/be_visitor_argument.h \ + be_include/be_visitor_array.h \ be_include/be_visitor_attribute.h \ - be_include/be_visitor_ccm_pre_proc.h - + be_include/be_visitor_ccm_pre_proc.h \ + be_include/be_visitor_component.h \ + be_include/be_visitor_component_fwd.h \ + be_include/be_visitor_constant.h \ + be_include/be_visitor_context.h \ + be_include/be_visitor_decl.h \ + be_include/be_visitor_enum.h \ + be_include/be_visitor_exception.h \ + be_include/be_visitor_factory.h \ + be_include/be_visitor_field.h \ + be_include/be_visitor_home.h \ + be_include/be_visitor_interface.h \ + be_include/be_visitor_interface_fwd.h \ + be_include/be_visitor_module.h \ + be_include/be_visitor_operation.h \ + be_include/be_visitor_root.h \ + be_include/be_visitor_scope.h \ + be_include/be_visitor_sequence.h \ + be_include/be_visitor_structure.h \ + be_include/be_visitor_structure_fwd.h \ + be_include/be_visitor_tmplinst.h \ + be_include/be_visitor_traits.h \ + be_include/be_visitor_typecode.h \ + be_include/be_visitor_typedef.h \ + be_include/be_visitor_union.h \ + be_include/be_visitor_union_branch.h \ + be_include/be_visitor_union_fwd.h \ + be_include/be_visitor_valuetype.h \ + be_include/be_visitor_valuetype_fwd.h ## Makefile.TAO_IDL_EXE.am - bin_PROGRAMS = tao_idl tao_idl_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/include \ - -I$(srcdir)/be_include \ - -I$(srcdir)/fe \ - $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH) + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(srcdir)/include \ + -I$(srcdir)/be_include \ + -I$(srcdir)/fe tao_idl_SOURCES = \ driver/drv_args.cpp \ driver/drv_preproc.cpp \ - tao_idl.cpp + tao_idl.cpp \ + include/drv_extern.h tao_idl_LDADD = \ - libTAO_IDL_BE.la \ - libTAO_IDL_FE.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -noinst_HEADERS += \ - include/drv_extern.h + libTAO_IDL_BE.la \ + libTAO_IDL_FE.la \ + ${ACE_BUILDDIR}/ace/libACE.la ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB |