diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-01-15 06:08:46 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-01-15 06:08:46 +0000 |
| commit | c71428d97b4555fb3accfdacce2e3b6746b6382f (patch) | |
| tree | 277ed1e489526e7011abc4f63046af6651570137 /TAO/orbsvcs | |
| parent | 405c537d4b54e87c484639a08f808a81c2360423 (diff) | |
| download | ATCD-c71428d97b4555fb3accfdacce2e3b6746b6382f.tar.gz | |
ChangeLogTag: Sun Jan 15 05:44:45 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs')
32 files changed, 690 insertions, 110 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc index 32c594fa4db..f18e0fc5ba6 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, concurrency, naming, utils { +project : orbsvcsexe, core, concurrency_serv, naming, utils { exename = Concurrency_Service } diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am index b1fbdf6f104..44759e6e961 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile.am +++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am @@ -34,8 +34,10 @@ Concurrency_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h new file mode 100644 index 00000000000..fe99ece77aa --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h @@ -0,0 +1,40 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl +// ------------------------------ +#ifndef TAO_CONCURRENCY_SERV_EXPORT_H +#define TAO_CONCURRENCY_SERV_EXPORT_H + +#include "ace/config-all.h" + +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_CONCURRENCY_SERV_HAS_DLL) +# define TAO_CONCURRENCY_SERV_HAS_DLL 0 +# endif /* ! TAO_CONCURRENCY_SERV_HAS_DLL */ +#else +# if !defined (TAO_CONCURRENCY_SERV_HAS_DLL) +# define TAO_CONCURRENCY_SERV_HAS_DLL 1 +# endif /* ! TAO_CONCURRENCY_SERV_HAS_DLL */ +#endif + +#if defined (TAO_CONCURRENCY_SERV_HAS_DLL) && (TAO_CONCURRENCY_SERV_HAS_DLL == 1) +# if defined (TAO_CONCURRENCY_SERV_BUILD_DLL) +# define TAO_Concurrency_Serv_Export ACE_Proper_Export_Flag +# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_CONCURRENCY_SERV_BUILD_DLL */ +# define TAO_Concurrency_Serv_Export ACE_Proper_Import_Flag +# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_CONCURRENCY_SERV_BUILD_DLL */ +#else /* TAO_CONCURRENCY_SERV_HAS_DLL == 1 */ +# define TAO_Concurrency_Serv_Export +# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) +# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_CONCURRENCY_SERV_HAS_DLL == 1 */ + +#endif /* TAO_CONCURRENCY_SERV_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h new file mode 100644 index 00000000000..5894da8e9de --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h @@ -0,0 +1,40 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl +// ------------------------------ +#ifndef TAO_CONCURRENCY_SKEL_EXPORT_H +#define TAO_CONCURRENCY_SKEL_EXPORT_H + +#include "ace/config-all.h" + +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_CONCURRENCY_SKEL_HAS_DLL) +# define TAO_CONCURRENCY_SKEL_HAS_DLL 0 +# endif /* ! TAO_CONCURRENCY_SKEL_HAS_DLL */ +#else +# if !defined (TAO_CONCURRENCY_SKEL_HAS_DLL) +# define TAO_CONCURRENCY_SKEL_HAS_DLL 1 +# endif /* ! TAO_CONCURRENCY_SKEL_HAS_DLL */ +#endif + +#if defined (TAO_CONCURRENCY_SKEL_HAS_DLL) && (TAO_CONCURRENCY_SKEL_HAS_DLL == 1) +# if defined (TAO_CONCURRENCY_SKEL_BUILD_DLL) +# define TAO_Concurrency_Skel_Export ACE_Proper_Export_Flag +# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_CONCURRENCY_SKEL_BUILD_DLL */ +# define TAO_Concurrency_Skel_Export ACE_Proper_Import_Flag +# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_CONCURRENCY_SKEL_BUILD_DLL */ +#else /* TAO_CONCURRENCY_SKEL_HAS_DLL == 1 */ +# define TAO_Concurrency_Skel_Export +# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) +# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_CONCURRENCY_SKEL_HAS_DLL == 1 */ + +#endif /* TAO_CONCURRENCY_SKEL_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 947f7366c29..41ed3243c0d 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -1,26 +1,97 @@ // -*- MPC -*- // $Id$ -project(CosConcurrency) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults { +project(CosConcurrency_IDL): orbsvcslib, core, tao_versioning_idl_defaults { + + custom_only = 1 + + idlflags += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h + + IDL_Files { + CosConcurrencyControl.idl + } +} + +project(CosConcurrency) : orbsvcslib, core { sharedname = TAO_CosConcurrency - idlflags += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h dynamicflags = TAO_CONCURRENCY_BUILD_DLL - tagchecks += Concurrency - pch_header = - pch_source = + + after += CosConcurrency_IDL IDL_Files { - CosConcurrencyControl.idl } Source_Files { CosConcurrencyControlC.cpp + } + + Header_Files { + CosConcurrencyControlC.h + Concurrency/concurrency_export.h + } + + Inline_Files { + CosConcurrencyControlC.inl + } + + Template_Files { + } + + // explicit Resource_Files to avoid including _Skel & _Serv rc files. + Resource_Files { + } + + Pkgconfig_Files { + TAO_CosConcurrency.pc.in + } +} + +project(CosConcurrency_Skel): orbsvcslib, core, concurrency, portableserver { + sharedname = TAO_CosConcurrency_Skel + dynamicflags = TAO_CONCURRENCY_SKEL_BUILD_DLL + + after += CosConcurrency_IDL + + IDL_Files { + } + + Source_Files { CosConcurrencyControlS.cpp + } + + Header_Files { + CosConcurrencyControlS.h + Concurrency/concurrency_skel_export.h + } + + Inline_Files { + CosConcurrencyControlS.inl + } + + Template_Files { + } + + Pkgconfig_Files { + TAO_CosConcurrency_Skel.pc.in + } +} + +project(CosConcurrency_Serv) : orbsvcslib, core, concurrency_skel { + sharedname = TAO_CosConcurrency_Serv + dynamicflags = TAO_CONCURRENCY_SERV_BUILD_DLL + tagchecks += Concurrency + + IDL_Files { + } + + Source_Files { Concurrency } Header_Files { Concurrency + ^Concurrency/concurrency_export.h + ^Concurrency/concurrency_skel_export.h } Inline_Files { @@ -32,6 +103,6 @@ project(CosConcurrency) : orbsvcslib, core, portableserver, tao_versioning_idl_d } Pkgconfig_Files { - TAO_CosConcurrency.pc.in + TAO_CosConcurrency_Serv.pc.in } } diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index d95bad60654..2385e1f68af 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -1,13 +1,11 @@ // -*- MPC -*- // $Id$ -project(CosProperty) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults { - sharedname = TAO_CosProperty - idlflags += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h - dynamicflags = TAO_PROPERTY_BUILD_DLL - tagchecks += Property - pch_header = - pch_source = +project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { + + custom_only = 1 + + idlflags += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h IDL_Files { CosProperty.idl @@ -15,29 +13,70 @@ project(CosProperty) : orbsvcslib, core, portableserver, tao_versioning_idl_defa // This is a wrappper for backwards compatibility CosPropertyService.idl } +} + +project(CosProperty) : orbsvcslib, core { + sharedname = TAO_CosProperty + dynamicflags = TAO_PROPERTY_BUILD_DLL + + after += CosProperty_IDL + + IDL_Files { + } Source_Files { CosPropertyC.cpp - CosPropertyS.cpp CosPropertyServiceC.cpp - CosPropertyServiceS.cpp - Property } Header_Files { CosPropertyC.h - CosPropertyS.h CosPropertyServiceC.h - CosPropertyServiceS.h - Property + Property/property_export.h } Inline_Files { CosPropertyC.inl - CosPropertyS.inl CosPropertyServiceC.inl + } + + Template_Files { + } + + // explicit Resource_Files to avoid including _Skel and _Serv rc files. + Resource_Files { + } + + Pkgconfig_Files { + TAO_CosProperty.pc.in + } +} + +project(CosProperty_Skel) : orbsvcslib, core, property, portableserver { + sharedname = TAO_CosProperty_Skel + dynamicflags = TAO_PROPERTY_SKEL_BUILD_DLL + + IDL_Files { + } + + Source_Files { + CosPropertyS.cpp + CosPropertyServiceS.cpp + } + + Header_Files { + CosPropertyS.h + CosPropertyS_T.h + CosPropertyServiceS.h + CosPropertyServiceS_T.h + Property/property_skel_export.h + } + + Inline_Files { + CosPropertyS.inl + CosPropertyS_T.inl CosPropertyServiceS.inl - Property + CosPropertyServiceS_T.inl } Template_Files { @@ -46,6 +85,37 @@ project(CosProperty) : orbsvcslib, core, portableserver, tao_versioning_idl_defa } Pkgconfig_Files { - TAO_CosProperty.pc.in + TAO_CosProperty_Skel.pc.in + } +} + +project(CosProperty_Serv) : orbsvcslib, core, property_skel { + sharedname = TAO_CosProperty_Serv + dynamicflags = TAO_PROPERTY_SERV_BUILD_DLL + tagchecks += Property + + IDL_Files { + } + + Source_Files { + Property + } + + Header_Files { + Property + ^Property/property_export.h + ^Property/property_skel_export.h + } + + Inline_Files { + Property + } + + Template_Files { + Property + } + + Pkgconfig_Files { + TAO_CosProperty_Serv.pc.in } } diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 318cbd36713..93724a65d21 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -8,7 +8,7 @@ ## MPC Command: ## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc -includedir = @includedir@/orbsvcs +includedir = @includedir@/orbsvcs/orbsvcs pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir)/.. @@ -97,7 +97,7 @@ EXTRA_DIST = \ TAO_CosNaming.pc.in -## Makefile.CosProperty.am +## Makefile.CosProperty_IDL.am BUILT_SOURCES += \ CosPropertyC.cpp \ @@ -125,7 +125,7 @@ CLEANFILES += \ CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl CosPropertyS_T.cpp CosPropertyS_T.h CosPropertyS_T.inl: CosProperty-stamp CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosProperty.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl @touch $@ BUILT_SOURCES += \ @@ -154,9 +154,12 @@ CLEANFILES += \ CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl CosPropertyServiceS_T.cpp CosPropertyServiceS_T.h CosPropertyServiceS_T.inl: CosPropertyService-stamp CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl @touch $@ + +## Makefile.CosProperty.am + lib_LTLIBRARIES += libTAO_CosProperty.la libTAO_CosProperty_la_CPPFLAGS = \ @@ -170,38 +173,21 @@ libTAO_CosProperty_la_CPPFLAGS = \ libTAO_CosProperty_la_SOURCES = \ CosPropertyC.cpp \ - CosPropertyS.cpp \ - CosPropertyServiceC.cpp \ - CosPropertyServiceS.cpp \ - Property/CosPropertyService_i.cpp + CosPropertyServiceC.cpp libTAO_CosProperty_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - CosProperty.idl \ CosPropertyC.h \ CosPropertyC.inl \ - CosPropertyS.h \ - CosPropertyS.inl \ - CosPropertyS_T.cpp \ - CosPropertyS_T.h \ - CosPropertyS_T.inl \ - CosPropertyService.idl \ CosPropertyServiceC.h \ CosPropertyServiceC.inl \ - CosPropertyServiceS.h \ - CosPropertyServiceS.inl \ - CosPropertyServiceS_T.cpp \ - CosPropertyServiceS_T.h \ - CosPropertyServiceS_T.inl \ - Property/CosPropertyService_i.h \ Property/property_export.h pkgconfig_DATA += \ @@ -214,7 +200,6 @@ TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.i ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in EXTRA_DIST += \ - CosProperty.rc \ TAO_CosProperty.pc.in @@ -349,7 +334,6 @@ libTAO_AV_la_LDFLAGS = \ libTAO_AV_la_LIBADD = \ libTAO_CosNaming.la \ libTAO_CosProperty.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -419,7 +403,7 @@ EXTRA_DIST += \ AV.rc -## Makefile.CosConcurrency.am +## Makefile.CosConcurrency_IDL.am BUILT_SOURCES += \ CosConcurrencyControlC.cpp \ @@ -427,7 +411,9 @@ BUILT_SOURCES += \ CosConcurrencyControlC.inl \ CosConcurrencyControlS.cpp \ CosConcurrencyControlS.h \ + CosConcurrencyControlS.inl \ CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS_T.h \ CosConcurrencyControlS_T.inl CLEANFILES += \ @@ -437,15 +423,20 @@ CLEANFILES += \ CosConcurrencyControlC.inl \ CosConcurrencyControlS.cpp \ CosConcurrencyControlS.h \ + CosConcurrencyControlS.inl \ CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS_T.h \ CosConcurrencyControlS_T.inl -CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS_T.cpp CosConcurrencyControlS_T.inl: CosConcurrencyControl-stamp +CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl CosConcurrencyControlS_T.cpp CosConcurrencyControlS_T.h CosConcurrencyControlS_T.inl: CosConcurrencyControl-stamp CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl @touch $@ + +## Makefile.CosConcurrency.am + lib_LTLIBRARIES += libTAO_CosConcurrency.la libTAO_CosConcurrency_la_CPPFLAGS = \ @@ -458,19 +449,105 @@ libTAO_CosConcurrency_la_CPPFLAGS = \ -DTAO_CONCURRENCY_BUILD_DLL libTAO_CosConcurrency_la_SOURCES = \ + CosConcurrencyControlC.cpp + +libTAO_CosConcurrency_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosConcurrency_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.h \ + CosConcurrencyControlC.inl + +pkgconfig_DATA += \ + TAO_CosConcurrency.pc + +CLEANFILES += \ + TAO_CosConcurrency.pc + +TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in + +EXTRA_DIST += \ + TAO_CosConcurrency.pc.in + + +## Makefile.CosConcurrency_Skel.am + +lib_LTLIBRARIES += libTAO_CosConcurrency_Skel.la + +libTAO_CosConcurrency_Skel_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_CONCURRENCY_SKEL_BUILD_DLL + +libTAO_CosConcurrency_Skel_la_SOURCES = \ + CosConcurrencyControlS.cpp + +libTAO_CosConcurrency_Skel_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosConcurrency_Skel_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosConcurrency.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + Concurrency/concurrency_skel_export.h \ + CosConcurrencyControlS.h \ + CosConcurrencyControlS.inl + +pkgconfig_DATA += \ + TAO_CosConcurrency_Skel.pc + +CLEANFILES += \ + TAO_CosConcurrency_Skel.pc + +TAO_CosConcurrency_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Skel.pc.in + +EXTRA_DIST += \ + TAO_CosConcurrency_Skel.pc.in + + +## Makefile.CosConcurrency_Serv.am + +lib_LTLIBRARIES += libTAO_CosConcurrency_Serv.la + +libTAO_CosConcurrency_Serv_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_CONCURRENCY_SERV_BUILD_DLL + +libTAO_CosConcurrency_Serv_la_SOURCES = \ Concurrency/CC_Lock.cpp \ Concurrency/CC_LockSet.cpp \ Concurrency/CC_LockSetFactory.cpp \ Concurrency/Concurrency_Loader.cpp \ - Concurrency/Concurrency_Utils.cpp \ - CosConcurrencyControlC.cpp \ - CosConcurrencyControlS.cpp + Concurrency/Concurrency_Utils.cpp -libTAO_CosConcurrency_la_LDFLAGS = \ +libTAO_CosConcurrency_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosConcurrency_la_LIBADD = \ +libTAO_CosConcurrency_Serv_la_LIBADD = \ + libTAO_CosConcurrency_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosConcurrency.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -481,26 +558,19 @@ nobase_include_HEADERS += \ Concurrency/CC_LockSetFactory.h \ Concurrency/Concurrency_Loader.h \ Concurrency/Concurrency_Utils.h \ - Concurrency/concurrency_export.h \ - CosConcurrencyControl.idl \ - CosConcurrencyControlC.h \ - CosConcurrencyControlC.inl \ - CosConcurrencyControlS.h \ - CosConcurrencyControlS_T.cpp \ - CosConcurrencyControlS_T.inl + Concurrency/concurrency_serv_export.h pkgconfig_DATA += \ - TAO_CosConcurrency.pc + TAO_CosConcurrency_Serv.pc CLEANFILES += \ - TAO_CosConcurrency.pc + TAO_CosConcurrency_Serv.pc -TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in +TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in EXTRA_DIST += \ - CosConcurrency.rc \ - TAO_CosConcurrency.pc.in + TAO_CosConcurrency_Serv.pc.in ## Makefile.CosEvent_IDL.am @@ -2325,6 +2395,103 @@ endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML +## Makefile.CosProperty_Skel.am + +lib_LTLIBRARIES += libTAO_CosProperty_Skel.la + +libTAO_CosProperty_Skel_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_PROPERTY_SKEL_BUILD_DLL + +libTAO_CosProperty_Skel_la_SOURCES = \ + CosPropertyS.cpp \ + CosPropertyServiceS.cpp + +libTAO_CosProperty_Skel_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosProperty_Skel_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + CosPropertyS.h \ + CosPropertyS.inl \ + CosPropertyS_T.cpp \ + CosPropertyS_T.h \ + CosPropertyS_T.inl \ + CosPropertyServiceS.h \ + CosPropertyServiceS.inl \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.inl \ + Property/property_skel_export.h + +pkgconfig_DATA += \ + TAO_CosProperty_Skel.pc + +CLEANFILES += \ + TAO_CosProperty_Skel.pc + +TAO_CosProperty_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Skel.pc.in + +EXTRA_DIST += \ + TAO_CosProperty_Skel.pc.in + + +## Makefile.CosProperty_Serv.am + +lib_LTLIBRARIES += libTAO_CosProperty_Serv.la + +libTAO_CosProperty_Serv_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_PROPERTY_SERV_BUILD_DLL + +libTAO_CosProperty_Serv_la_SOURCES = \ + Property/CosPropertyService_i.cpp + +libTAO_CosProperty_Serv_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosProperty_Serv_la_LIBADD = \ + libTAO_CosProperty_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + Property/CosPropertyService_i.h \ + Property/property_serv_export.h + +pkgconfig_DATA += \ + TAO_CosProperty_Serv.pc + +CLEANFILES += \ + TAO_CosProperty_Serv.pc + +TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in + +EXTRA_DIST += \ + TAO_CosProperty_Serv.pc.in + + ## Makefile.CosTime.am BUILT_SOURCES += \ diff --git a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h new file mode 100644 index 00000000000..593f9bc7d37 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h @@ -0,0 +1,40 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl +// ------------------------------ +#ifndef TAO_PROPERTY_SERV_EXPORT_H +#define TAO_PROPERTY_SERV_EXPORT_H + +#include "ace/config-all.h" + +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_PROPERTY_SERV_HAS_DLL) +# define TAO_PROPERTY_SERV_HAS_DLL 0 +# endif /* ! TAO_PROPERTY_SERV_HAS_DLL */ +#else +# if !defined (TAO_PROPERTY_SERV_HAS_DLL) +# define TAO_PROPERTY_SERV_HAS_DLL 1 +# endif /* ! TAO_PROPERTY_SERV_HAS_DLL */ +#endif + +#if defined (TAO_PROPERTY_SERV_HAS_DLL) && (TAO_PROPERTY_SERV_HAS_DLL == 1) +# if defined (TAO_PROPERTY_SERV_BUILD_DLL) +# define TAO_Property_Serv_Export ACE_Proper_Export_Flag +# define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_PROPERTY_SERV_BUILD_DLL */ +# define TAO_Property_Serv_Export ACE_Proper_Import_Flag +# define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_PROPERTY_SERV_BUILD_DLL */ +#else /* TAO_PROPERTY_SERV_HAS_DLL == 1 */ +# define TAO_Property_Serv_Export +# define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) +# define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_PROPERTY_SERV_HAS_DLL == 1 */ + +#endif /* TAO_PROPERTY_SERV_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h new file mode 100644 index 00000000000..60a4aa4fe46 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h @@ -0,0 +1,40 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl +// ------------------------------ +#ifndef TAO_PROPERTY_SKEL_EXPORT_H +#define TAO_PROPERTY_SKEL_EXPORT_H + +#include "ace/config-all.h" + +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_PROPERTY_SKEL_HAS_DLL) +# define TAO_PROPERTY_SKEL_HAS_DLL 0 +# endif /* ! TAO_PROPERTY_SKEL_HAS_DLL */ +#else +# if !defined (TAO_PROPERTY_SKEL_HAS_DLL) +# define TAO_PROPERTY_SKEL_HAS_DLL 1 +# endif /* ! TAO_PROPERTY_SKEL_HAS_DLL */ +#endif + +#if defined (TAO_PROPERTY_SKEL_HAS_DLL) && (TAO_PROPERTY_SKEL_HAS_DLL == 1) +# if defined (TAO_PROPERTY_SKEL_BUILD_DLL) +# define TAO_Property_Skel_Export ACE_Proper_Export_Flag +# define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_PROPERTY_SKEL_BUILD_DLL */ +# define TAO_Property_Skel_Export ACE_Proper_Import_Flag +# define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_PROPERTY_SKEL_BUILD_DLL */ +#else /* TAO_PROPERTY_SKEL_HAS_DLL == 1 */ +# define TAO_Property_Skel_Export +# define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) +# define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_PROPERTY_SKEL_HAS_DLL == 1 */ + +#endif /* TAO_PROPERTY_SKEL_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in index 8a4f595de8f..d3f639711d0 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: TAO_CosConcurrency -Description: TAO CosConcurrency Library -Requires: TAO_PortableServer, TAO +Description: TAO CosConcurrency Stub Library +Requires: TAO_AnyTypeCode, TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosConcurrency Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in new file mode 100644 index 00000000000..60156a705ca --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: TAO_CosConcurrency_Serv +Description: TAO CosConcurrency Service Library +Requires: TAO_CosConcurrency_Skel +Version: @VERSION@ +Libs: -L${libdir} -lTAO_CosConcurrency_Serv +Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in new file mode 100644 index 00000000000..6a7095e3c5a --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: TAO_CosConcurrency_Skel +Description: TAO CosConcurrency Skeleton Library +Requires: TAO_CosConcurrency, TAO_PortableServer +Version: @VERSION@ +Libs: -L${libdir} -lTAO_CosConcurrency_Skel +Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in index b36f4460953..67038f6d9e6 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: TAO_CosProperty -Description: TAO CosProperty Library -Requires: TAO_PortableServer, TAO +Description: TAO CosProperty Stub Library +Requires: TAO_AnyTypeCode, TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosProperty Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in new file mode 100644 index 00000000000..ae944d6d818 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: TAO_CosProperty_Serv +Description: TAO CosProperty Service Library +Requires: TAO_PortableServer_Skel +Version: @VERSION@ +Libs: -L${libdir} -lTAO_CosProperty_Serv +Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in new file mode 100644 index 00000000000..34cfa1f495f --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: TAO_CosProperty_Skel +Description: TAO CosProperty Skeleton Library +Requires: TAO_CosProperty, TAO_PortableServer +Version: @VERSION@ +Libs: -L${libdir} -lTAO_CosProperty_Skel +Cflags: -I${includedir} diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index 9dc635b53be..77868acd10d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -37,8 +37,10 @@ distributer_SOURCES = \ distributer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -68,8 +70,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -99,8 +103,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index 7ee597a1084..06f802c8525 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -35,8 +35,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index 0a6153e266e..72832a578ea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -38,8 +38,10 @@ distributer_SOURCES = \ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -70,8 +72,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -102,8 +106,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index cd48fe396a9..3a39ca6e868 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -35,8 +35,10 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index 6f69814a386..8b4be4074d8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -37,8 +37,10 @@ control_SOURCES = \ control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -67,8 +69,10 @@ ping_SOURCES = \ ping_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -97,8 +101,10 @@ pong_SOURCES = \ pong_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index 502757b974b..0b3ec579acb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -35,8 +35,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 0f9af2b5926..0a42dd94e5c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -36,8 +36,10 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -66,8 +68,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index 468e10bdf95..e1a5c96ecad 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -35,8 +35,10 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index ec12433370f..a7f239d70c3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -35,8 +35,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index 838906cef47..434d94d23c7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -35,8 +35,10 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index 055e24f14ab..0cfbabf575c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -35,8 +35,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index 0e51fb1619e..910cf77f599 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -35,8 +35,10 @@ distributer_SOURCES = \ distributer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -93,8 +97,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index d245846641f..c41d325d4ae 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -38,8 +38,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -68,8 +70,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am index 8fc32f26b7f..b841c8eb008 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am @@ -35,8 +35,10 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -64,8 +66,10 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am index 76eaee8c0fc..834c31ef87a 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile.am +++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am @@ -43,9 +43,9 @@ CC_client_SOURCES = \ CC_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am index 79d0cf9b4e9..6104bf24eb6 100644 --- a/TAO/orbsvcs/tests/Property/Makefile.am +++ b/TAO/orbsvcs/tests/Property/Makefile.am @@ -33,8 +33,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -60,8 +60,10 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index 53e3baba922..6e8b8e678f8 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, property, utils { +project(*server): namingexe, property_serv, utils { Source_Files { server.cpp } |