diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index aaafa1ae1f0..20caef1661f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -6,16 +6,20 @@ ## this file will be lost the next time it is generated. ## ## 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 +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Latency_Cntl.am -noinst_PROGRAMS = control +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += control control_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -33,15 +37,21 @@ 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 \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Latency_Ping.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += ping ping_CPPFLAGS = \ @@ -59,15 +69,21 @@ 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 \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Latency_Pong.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += pong pong_CPPFLAGS = \ @@ -85,13 +101,17 @@ 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 \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* |