From a9d77e01ae8d8a4946be06d0ccbfd957ddaefc16 Mon Sep 17 00:00:00 2001 From: jtc Date: Fri, 24 Nov 2006 13:23:48 +0000 Subject: ChangeLogTag: Fri Nov 24 13:19:24 UTC 2006 J.T. Conklin --- TAO/ChangeLog | 12 ++++++++++++ TAO/tao/Makefile.am | 49 +++++++++++++++++++++---------------------------- TAO/tao/Strategies.mpc | 1 - 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4a603a48d08..0f302a503fb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Fri Nov 24 13:19:24 UTC 2006 J.T. Conklin + + * tao/Makefile.am: + + Regenerated. + + * tao/Strategies.mpc: + + Clear PIDL_Files section as the Strategies *.pidl files are + processed within the IDL_Files section, and this results in + duplicate entries. + Fri Nov 24 09:32:12 UTC 2006 Johnny Willemsen * tao/Bounded_Basic_String_Sequence_T.h: diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 406b1350039..a543b2f5d6f 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -606,27 +606,6 @@ StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/StringSeq.pidl @touch $@ -BUILT_SOURCES += \ - AnyTypeCode/ULongLongSeqA.cpp \ - AnyTypeCode/ULongLongSeqA.h \ - ULongLongSeqC.cpp \ - ULongLongSeqC.h \ - ULongLongSeqS.h - -CLEANFILES += \ - ULongLongSeq-stamp \ - AnyTypeCode/ULongLongSeqA.cpp \ - AnyTypeCode/ULongLongSeqA.h \ - ULongLongSeqC.cpp \ - ULongLongSeqC.h \ - ULongLongSeqS.h - -AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp - -ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongLongSeq.pidl - @touch $@ - BUILT_SOURCES += \ AnyTypeCode/ULongSeqA.cpp \ AnyTypeCode/ULongSeqA.h \ @@ -711,6 +690,27 @@ WStringSeq-stamp: $(srcdir)/WStringSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WStringSeq.pidl @touch $@ +BUILT_SOURCES += \ + AnyTypeCode/ULongLongSeqA.cpp \ + AnyTypeCode/ULongLongSeqA.h \ + ULongLongSeqC.cpp \ + ULongLongSeqC.h \ + ULongLongSeqS.h + +CLEANFILES += \ + ULongLongSeq-stamp \ + AnyTypeCode/ULongLongSeqA.cpp \ + AnyTypeCode/ULongLongSeqA.h \ + ULongLongSeqC.cpp \ + ULongLongSeqC.h \ + ULongLongSeqS.h + +AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp + +ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ULongLongSeq.pidl + @touch $@ + lib_LTLIBRARIES += libTAO.la libTAO_la_CPPFLAGS = \ @@ -1039,10 +1039,8 @@ nobase_include_HEADERS = \ Bounded_Object_Reference_Sequence_T.h \ Bounded_Reference_Allocation_Traits_T.h \ Bounded_Sequence_CDR_T.h \ - Bounded_String_Sequence_T.h \ Bounded_Value_Allocation_Traits_T.h \ Bounded_Value_Sequence_T.h \ - Bounded_Wstring_Sequence_T.h \ Buffer_Allocator_T.cpp \ Buffer_Allocator_T.h \ Buffering_Constraint_Policy.h \ @@ -1469,10 +1467,8 @@ nobase_include_HEADERS = \ Unbounded_Octet_Sequence_T.h \ Unbounded_Reference_Allocation_Traits_T.h \ Unbounded_Sequence_CDR_T.h \ - Unbounded_String_Sequence_T.h \ Unbounded_Value_Allocation_Traits_T.h \ Unbounded_Value_Sequence_T.h \ - Unbounded_Wstring_Sequence_T.h \ UserException.h \ UserException.inl \ Value_Traits_T.h \ @@ -5490,7 +5486,6 @@ nobase_include_HEADERS += \ Strategies/COIOP_Endpoint.h \ Strategies/COIOP_Endpoint.inl \ Strategies/COIOP_Endpoints.pidl \ - Strategies/COIOP_Endpoints.pidl \ Strategies/COIOP_EndpointsC.h \ Strategies/COIOP_EndpointsS.h \ Strategies/COIOP_Factory.h \ @@ -5542,12 +5537,10 @@ nobase_include_HEADERS += \ Strategies/UIOP_Transport.h \ Strategies/advanced_resource.h \ Strategies/sciop_endpoints.pidl \ - Strategies/sciop_endpoints.pidl \ Strategies/sciop_endpointsC.h \ Strategies/sciop_endpointsS.h \ Strategies/strategies_export.h \ Strategies/uiop_endpoints.pidl \ - Strategies/uiop_endpoints.pidl \ Strategies/uiop_endpointsC.h \ Strategies/uiop_endpointsS.h diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index c4fcd13826b..0085c0e009e 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -25,7 +25,6 @@ project : taolib, core, core_anytypecode, core_strategies, tao_versioning_idl_de } PIDL_Files { - Strategies } IDL_Files { -- cgit v1.2.1