diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-08 13:37:15 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-08 13:37:15 +0000 |
| commit | e777b843e0a73331d71eb14d0749ade7cd7969b8 (patch) | |
| tree | 7248cd06c5ff0447110f5623dd64d28781a56273 | |
| parent | fb7749d2e7ec34e4504af05d5ae4d6e6bc3f964a (diff) | |
| download | ATCD-e777b843e0a73331d71eb14d0749ade7cd7969b8.tar.gz | |
ChangeLogTag: Mon Jan 8 13:36:37 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tests/TransportCurrent/IIOP/IIOP.mpc | 30 | ||||
| -rw-r--r-- | TAO/tests/TransportCurrent/IIOP/Makefile.am | 23 |
3 files changed, 36 insertions, 25 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ac54c0ed282..87d45c80018 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 8 13:36:37 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * tests/TransportCurrent/IIOP/IIOP.mpc: + * tests/TransportCurrent/IIOP/Makefile.am: + + Modified the MPC file to work with automake and updated the + Makefile.am accordingly. + Mon Jan 8 10:52:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Invocation_Base.cpp (exception): diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc index 47b3b4eb256..49b2d839f38 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc +++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc @@ -2,13 +2,16 @@ // $Id$ project(*Server): taoserver, tc_iiop, pi_server { - after += Curren_Test_Lib_Client Current_Test_Lib_Server - - includes += . ../lib - - libs += Current_Test_Lib_Client Current_Test_Lib_Server - libpaths += ../lib + libs += Current_Test_Lib_Client Current_Test_Lib_Server + + specific (automake) { + includes += $(srcdir) $(srcdir)/../lib + libpaths += $(srcdir)/../lib + } else { + includes += . ../lib + libpaths += ../lib + } Source_Files { server.cpp @@ -23,13 +26,16 @@ project(*Server): taoserver, tc_iiop, pi_server { } project(*Client): taoclient, tc_iiop, dynamicinterface { - after += *Server Current_Test_Lib_Client Current_Test_Lib_Server - - includes += . ../lib - - libs += Current_Test_Lib_Client Current_Test_Lib_Server - libpaths += ../lib + libs += Current_Test_Lib_Client Current_Test_Lib_Server + + specific (automake) { + includes += $(srcdir) $(srcdir)/../lib + libpaths += $(srcdir)/../lib + } else { + includes += . ../lib + libpaths += ../lib + } Source_Files { client.cpp diff --git a/TAO/tests/TransportCurrent/IIOP/Makefile.am b/TAO/tests/TransportCurrent/IIOP/Makefile.am index d6307796c55..52938e5c082 100644 --- a/TAO/tests/TransportCurrent/IIOP/Makefile.am +++ b/TAO/tests/TransportCurrent/IIOP/Makefile.am @@ -27,8 +27,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I. \ - -I../lib + -I$(srcdir) \ + -I$(srcdir)/../lib server_SOURCES = \ Current_Test_Impl.cpp \ @@ -38,15 +38,15 @@ server_SOURCES = \ server.cpp \ IIOP_Server_Request_Interceptor.h -../lib: - mkdir -p ../lib +$(srcdir)/../lib: + mkdir -p $(srcdir)/../lib server_DEPENDENCIES = \ - ../lib + $(srcdir)/../lib server_LDFLAGS = \ - -L../lib + -L$(srcdir)/../lib server_LDADD = \ $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ @@ -77,23 +77,20 @@ client_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I. \ - -I../lib + -I$(srcdir) \ + -I$(srcdir)/../lib client_SOURCES = \ IIOP_Tester.cpp \ client.cpp \ IIOP_Server_Request_Interceptor.h -../lib: - mkdir -p ../lib - client_DEPENDENCIES = \ - ../lib + $(srcdir)/../lib client_LDFLAGS = \ - -L../lib + -L$(srcdir)/../lib client_LDADD = \ $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ |