diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2009-03-17 19:28:45 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2009-03-17 19:28:45 +0000 |
| commit | 65ddc54b900c55837e5e747bc54d5c4711932b71 (patch) | |
| tree | 008146ea1eb92528a6d7908f75683d918c43e218 | |
| parent | 14d5308d33ee13b89b1feb03d50fba3d2ebb8be0 (diff) | |
| download | ATCD-65ddc54b900c55837e5e747bc54d5c4711932b71.tar.gz | |
Tue Mar 17 19:28:21 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/Notify/Persistent_Filter/Makefile.am:
Fix library paths for autobuild.
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am | 38 |
2 files changed, 24 insertions, 23 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d2acbdff1d1..6549802d83b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,13 +1,18 @@ +Tue Mar 17 19:28:21 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/Notify/Persistent_Filter/Makefile.am: + Fix library paths for autobuild. + Tue Mar 17 19:09:12 UTC 2009 Marcel Smit <msmit@remedy.nl> * tests/ZIOP/client.cpp: Resolved compiler warning. Tue Mar 17 15:26:12 UTC 2009 Marcel Smit <msmit@remedy.nl> - + * tao/Messaging/Asynch_Reply_Dispatcher.cpp: Corrected misspelled log messages. - + * tests/ZIOP/TestCompressor/TestCompressor.cpp: Resolved compiler warnings on Solaris. diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am index 4533c004fb5..83d7ba78ff8 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /tao_builds/phil/wustl/ACE+TAO+CIAO/ACE_wrappers/build/native/bin/mwc.pl -type automake -noreldefs +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -28,8 +28,6 @@ consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_IPV6 \ - -DACE_HAS_VERSIONED_NAMESPACE=1 \ -DTAO_HAS_TYPED_EVENT_CHANNEL consumer_SOURCES = \ @@ -38,14 +36,14 @@ consumer_SOURCES = \ Filter.h consumer_LDADD = \ - libTAO_CosNaming.la \ - libTAO_CosNotification_Skel.la \ - libTAO_CosEvent_Skel.la \ - libTAO_PortableServer.la \ - libTAO_CosNotification.la \ - libTAO_CosEvent.la \ - libTAO_AnyTypeCode.la \ - libTAO.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS @@ -63,8 +61,6 @@ supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_IPV6 \ - -DACE_HAS_VERSIONED_NAMESPACE=1 \ -DTAO_HAS_TYPED_EVENT_CHANNEL supplier_SOURCES = \ @@ -73,14 +69,14 @@ supplier_SOURCES = \ Filter.h supplier_LDADD = \ - libTAO_CosNaming.la \ - libTAO_CosNotification_Skel.la \ - libTAO_CosEvent_Skel.la \ - libTAO_PortableServer.la \ - libTAO_CosNotification.la \ - libTAO_CosEvent.la \ - libTAO_AnyTypeCode.la \ - libTAO.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS |