diff options
20 files changed, 53 insertions, 398 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3c8075f1706..48903a21384 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,32 @@ +Sun May 18 21:48:39 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Makefile.am: + + Hand-tweak for ZLIB/ZZIP support, as we want to defer this + decision from MPC to configure. + + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am + * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am: + * orbsvcs/tests/Event/Basic/Makefile.am: + * orbsvcs/tests/Event/Performance/Makefile.am: + * orbsvcs/tests/Event/Mcast/Complex/Makefile.am: + * orbsvcs/tests/Event/Mcast/Simple/Makefile.am: + * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am: + * orbsvcs/tests/CosEvent/Basic/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am: + * docs/tutorials/Quoter/Naming_Service/Makefile.am: + * docs/tutorials/Quoter/Simple/Persistent/Makefile.am: + * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am: + Hand tweak generated makefiles to avoid make warnings. We'll + update the MPC configuration so this isn't needed in a future + release. + Sun May 18 12:12:36 UTC 2008 Chad Elliott <elliott_c@ociweb.com> * tests/HandleExhaustion/server.cpp: diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am index 8394c1b3c7c..8a775425861 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am @@ -36,13 +36,6 @@ client_SOURCES = \ Stock_Factory_i.h \ Stock_i.h -../idl: - mkdir -p ../idl - - -client_DEPENDENCIES = \ - ../idl - client_LDFLAGS = \ -L../idl @@ -79,13 +72,6 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h -../idl: - mkdir -p ../idl - - -server_DEPENDENCIES = \ - ../idl - server_LDFLAGS = \ -L../idl diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am index c14574aaf45..98e25eb9335 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am @@ -37,13 +37,6 @@ client_SOURCES = \ Stock_Factory_i.h \ Stock_i.h -../../idl: - mkdir -p ../../idl - - -client_DEPENDENCIES = \ - ../../idl - client_LDFLAGS = \ -L../../idl @@ -88,13 +81,6 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h -../../idl: - mkdir -p ../../idl - - -server_DEPENDENCIES = \ - ../../idl - server_LDFLAGS = \ -L../../idl diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am index 1841d03ab75..a6eb2dcc9a5 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am @@ -34,13 +34,6 @@ client_SOURCES = \ Stock_Factory_i.h \ Stock_i.h -../../idl: - mkdir -p ../../idl - - -client_DEPENDENCIES = \ - ../../idl - client_LDFLAGS = \ -L../../idl @@ -74,13 +67,6 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h -../../idl: - mkdir -p ../../idl - - -server_DEPENDENCIES = \ - ../../idl - server_LDFLAGS = \ -L../../idl diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am index 2d756fe5425..5a2ed914e7b 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am @@ -36,13 +36,6 @@ RtEC_Based_CosEC_SOURCES = \ RtEC_Based_CosEC.cpp \ RtEC_Based_CosEC.h -../lib: - mkdir -p ../lib - - -RtEC_Based_CosEC_DEPENDENCIES = \ - ../lib - RtEC_Based_CosEC_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index d7dd1b5b472..3fc791bde41 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -2449,7 +2449,6 @@ endif BUILD_EXCEPTIONS if BUILD_ACEXML if BUILD_EXCEPTIONS -if BUILD_ZLIB if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_CosNotification_Persist.la @@ -2463,17 +2462,31 @@ libTAO_CosNotification_Persist_la_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(ACE_ROOT)/ACEXML/common \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) \ -DTAO_NOTIFY_PERSIST_BUILD_DLL +if BUILD_ZLIB +if BUILD_ZZIP +libTAO_CosNotification_Persist_la_CPPFLAGS += \ + $(ACE_ZZIP_CPPFLAGS) \ + $(ACE_ZLIB_CPPFLAGS) +endif BUILD_ZZIP +endif BUILD_ZLIB + libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Loader.cpp \ Notify/XML_Saver.cpp \ Notify/XML_Topology_Factory.cpp libTAO_CosNotification_Persist_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +if BUILD_ZLIB +if BUILD_ZZIP +libTAO_CosNotification_Persist_la_LDFLAGS += \ + $(ACE_ZZIP_LDFLAGS) \ + $(ACE_ZLIB_LDFLAGS) +endif BUILD_ZZIP +endif BUILD_ZLIB libTAO_CosNotification_Persist_la_LIBADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ @@ -2492,9 +2505,15 @@ libTAO_CosNotification_Persist_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +if BUILD_ZLIB +if BUILD_ZZIP +libTAO_CosNotification_Persist_la_LIBADD += \ $(ACE_ZZIP_LIBS) \ $(ACE_ZLIB_LIBS) +endif BUILD_ZZIP +endif BUILD_ZLIB nobase_include_HEADERS += \ Notify/XML_Loader.h \ @@ -2503,7 +2522,6 @@ nobase_include_HEADERS += \ Notify/notify_persist_export.h endif !BUILD_ACE_FOR_TAO -endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_ACEXML diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am index c473cb41830..efd385b5a93 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am @@ -35,13 +35,6 @@ driver_CPPFLAGS = \ driver_SOURCES = \ driver.cpp -../lib: - mkdir -p ../lib - - -driver_DEPENDENCIES = \ - ../lib - driver_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am index 96a862b4783..42b93750990 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am @@ -37,13 +37,6 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp -../lib: - mkdir -p ../lib - - -client_DEPENDENCIES = \ - ../lib - client_LDFLAGS = \ -L../lib @@ -94,13 +87,6 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp -../lib: - mkdir -p ../lib - - -server_DEPENDENCIES = \ - ../lib - server_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index 172e2c42a8d..108c246a6f3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -79,13 +79,6 @@ client_SOURCES = \ client.cpp \ Roundtrip.h -../lib: - mkdir -p ../lib - - -client_DEPENDENCIES = \ - ../lib - client_LDFLAGS = \ -L../lib @@ -139,13 +132,6 @@ server_SOURCES = \ server.cpp \ Roundtrip.h -../lib: - mkdir -p ../lib - - -server_DEPENDENCIES = \ - ../lib - server_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index d7182a8766f..7a62dd7f71c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -81,13 +81,6 @@ client_SOURCES = \ client.cpp \ Callback.h -../lib: - mkdir -p ../lib - - -client_DEPENDENCIES = \ - ../lib - client_LDFLAGS = \ -L../lib @@ -143,13 +136,6 @@ server_SOURCES = \ Session.h \ Session_Factory.h -../lib: - mkdir -p ../lib - - -server_DEPENDENCIES = \ - ../lib - server_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am index 6fa30ddd4ae..c8810abaa5c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am @@ -36,13 +36,6 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp -../lib: - mkdir -p ../lib - - -client_DEPENDENCIES = \ - ../lib - client_LDFLAGS = \ -L../lib @@ -92,13 +85,6 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp -../lib: - mkdir -p ../lib - - -server_DEPENDENCIES = \ - ../lib - server_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am index c6251c11c6d..ad9acd52f05 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am @@ -36,13 +36,6 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp -../lib: - mkdir -p ../lib - - -client_DEPENDENCIES = \ - ../lib - client_LDFLAGS = \ -L../lib @@ -92,13 +85,6 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp -../lib: - mkdir -p ../lib - - -server_DEPENDENCIES = \ - ../lib - server_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am index dd41786c289..eaef4a840af 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am @@ -37,13 +37,6 @@ Disconnect_SOURCES = \ MT_Disconnect.h \ Random.h -../lib: - mkdir -p ../lib - - -Disconnect_DEPENDENCIES = \ - ../lib - Disconnect_LDFLAGS = \ -L../lib @@ -90,13 +83,6 @@ MT_Disconnect_SOURCES = \ MT_Disconnect.cpp \ MT_Disconnect.h -../lib: - mkdir -p ../lib - - -MT_Disconnect_DEPENDENCIES = \ - ../lib - MT_Disconnect_LDFLAGS = \ -L../lib @@ -144,13 +130,6 @@ Pull_Push_Event_SOURCES = \ MT_Disconnect.h \ Random.h -../lib: - mkdir -p ../lib - - -Pull_Push_Event_DEPENDENCIES = \ - ../lib - Pull_Push_Event_LDFLAGS = \ -L../lib @@ -198,13 +177,6 @@ Push_Event_SOURCES = \ MT_Disconnect.h \ Random.h -../lib: - mkdir -p ../lib - - -Push_Event_DEPENDENCIES = \ - ../lib - Push_Event_LDFLAGS = \ -L../lib @@ -251,13 +223,6 @@ Random_SOURCES = \ Random.cpp \ Random.h -../lib: - mkdir -p ../lib - - -Random_DEPENDENCIES = \ - ../lib - Random_LDFLAGS = \ -L../lib @@ -305,13 +270,6 @@ Shutdown_SOURCES = \ MT_Disconnect.h \ Random.h -../lib: - mkdir -p ../lib - - -Shutdown_DEPENDENCIES = \ - ../lib - Shutdown_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index 09c1f9fc976..eb08fabc9ac 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -36,13 +36,6 @@ Atomic_Reconnect_SOURCES = \ Atomic_Reconnect.cpp \ Atomic_Reconnect.h -../lib: - mkdir -p ../lib - - -Atomic_Reconnect_DEPENDENCIES = \ - ../lib - Atomic_Reconnect_LDFLAGS = \ -L../lib @@ -88,13 +81,6 @@ BCast_SOURCES = \ BCast.cpp \ BCast.h -../lib: - mkdir -p ../lib - - -BCast_DEPENDENCIES = \ - ../lib - BCast_LDFLAGS = \ -L../lib @@ -148,13 +134,6 @@ Bitmask_SOURCES = \ Schedule.h \ Shutdown.h -../lib: - mkdir -p ../lib - - -Bitmask_DEPENDENCIES = \ - ../lib - Bitmask_LDFLAGS = \ -L../lib @@ -208,13 +187,6 @@ Complex_SOURCES = \ Schedule.h \ Shutdown.h -../lib: - mkdir -p ../lib - - -Complex_DEPENDENCIES = \ - ../lib - Complex_LDFLAGS = \ -L../lib @@ -260,13 +232,6 @@ Control_SOURCES = \ Control.cpp \ Control.h -../lib: - mkdir -p ../lib - - -Control_DEPENDENCIES = \ - ../lib - Control_LDFLAGS = \ -L../lib @@ -320,13 +285,6 @@ Disconnect_SOURCES = \ Schedule.h \ Shutdown.h -../lib: - mkdir -p ../lib - - -Disconnect_DEPENDENCIES = \ - ../lib - Disconnect_LDFLAGS = \ -L../lib @@ -380,13 +338,6 @@ Gateway_SOURCES = \ Schedule.h \ Shutdown.h -../lib: - mkdir -p ../lib - - -Gateway_DEPENDENCIES = \ - ../lib - Gateway_LDFLAGS = \ -L../lib @@ -432,13 +383,6 @@ MT_Disconnect_SOURCES = \ MT_Disconnect.cpp \ MT_Disconnect.h -../lib: - mkdir -p ../lib - - -MT_Disconnect_DEPENDENCIES = \ - ../lib - MT_Disconnect_LDFLAGS = \ -L../lib @@ -492,13 +436,6 @@ Negation_SOURCES = \ Schedule.h \ Shutdown.h -../lib: - mkdir -p ../lib - - -Negation_DEPENDENCIES = \ - ../lib - Negation_LDFLAGS = \ -L../lib @@ -544,13 +481,6 @@ Observer_SOURCES = \ Observer.cpp \ Observer.h -../lib: - mkdir -p ../lib - - -Observer_DEPENDENCIES = \ - ../lib - Observer_LDFLAGS = \ -L../lib @@ -596,13 +526,6 @@ Random_SOURCES = \ Random.cpp \ Random.h -../lib: - mkdir -p ../lib - - -Random_DEPENDENCIES = \ - ../lib - Random_LDFLAGS = \ -L../lib @@ -648,13 +571,6 @@ Reconnect_SOURCES = \ Reconnect.cpp \ Reconnect.h -../lib: - mkdir -p ../lib - - -Reconnect_DEPENDENCIES = \ - ../lib - Reconnect_LDFLAGS = \ -L../lib @@ -700,13 +616,6 @@ Shutdown_SOURCES = \ Shutdown.cpp \ Shutdown.h -../lib: - mkdir -p ../lib - - -Shutdown_DEPENDENCIES = \ - ../lib - Shutdown_LDFLAGS = \ -L../lib @@ -760,13 +669,6 @@ Timeout_SOURCES = \ Schedule.h \ Shutdown.h -../lib: - mkdir -p ../lib - - -Timeout_DEPENDENCIES = \ - ../lib - Timeout_LDFLAGS = \ -L../lib @@ -820,13 +722,6 @@ Wildcard_SOURCES = \ Schedule.h \ Shutdown.h -../lib: - mkdir -p ../lib - - -Wildcard_DEPENDENCIES = \ - ../lib - Wildcard_LDFLAGS = \ -L../lib diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index b465ea41207..9f8acb43baf 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -36,13 +36,6 @@ consumer_SOURCES = \ consumer.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -consumer_DEPENDENCIES = \ - ../Common - consumer_LDFLAGS = \ -L../Common @@ -87,13 +80,6 @@ gateway_ec_SOURCES = \ gateway-ec.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -gateway_ec_DEPENDENCIES = \ - ../Common - gateway_ec_LDFLAGS = \ -L../Common @@ -138,13 +124,6 @@ supplier_SOURCES = \ supplier.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -supplier_DEPENDENCIES = \ - ../Common - supplier_LDFLAGS = \ -L../Common diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index ac30a4b6417..86f05f9504a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -36,13 +36,6 @@ consumer_SOURCES = \ consumer.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -consumer_DEPENDENCIES = \ - ../Common - consumer_LDFLAGS = \ -L../Common @@ -87,13 +80,6 @@ gateway_ec_SOURCES = \ gateway-ec.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -gateway_ec_DEPENDENCIES = \ - ../Common - gateway_ec_LDFLAGS = \ -L../Common @@ -138,13 +124,6 @@ supplier_SOURCES = \ supplier.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -supplier_DEPENDENCIES = \ - ../Common - supplier_LDFLAGS = \ -L../Common diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index c68725149fa..48cbe92f4b6 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -36,13 +36,6 @@ application_SOURCES = \ application.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -application_DEPENDENCIES = \ - ../Common - application_LDFLAGS = \ -L../Common @@ -87,13 +80,6 @@ gateway_ec_SOURCES = \ gateway-ec.cpp \ Constants.h -../Common: - mkdir -p ../Common - - -gateway_ec_DEPENDENCIES = \ - ../Common - gateway_ec_LDFLAGS = \ -L../Common diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index f12a1c355ef..1b5ed68fe9b 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -36,13 +36,6 @@ Connect_SOURCES = \ Connect.cpp \ Connect.h -../lib: - mkdir -p ../lib - - -Connect_DEPENDENCIES = \ - ../lib - Connect_LDFLAGS = \ -L../lib @@ -88,13 +81,6 @@ Inversion_SOURCES = \ Inversion.cpp \ Inversion.h -../lib: - mkdir -p ../lib - - -Inversion_DEPENDENCIES = \ - ../lib - Inversion_LDFLAGS = \ -L../lib @@ -140,13 +126,6 @@ Latency_SOURCES = \ Latency.cpp \ Latency.h -../lib: - mkdir -p ../lib - - -Latency_DEPENDENCIES = \ - ../lib - Latency_LDFLAGS = \ -L../lib @@ -196,13 +175,6 @@ Latency_Server_SOURCES = \ Latency.h \ Throughput.h -../lib: - mkdir -p ../lib - - -Latency_Server_DEPENDENCIES = \ - ../lib - Latency_Server_LDFLAGS = \ -L../lib @@ -249,13 +221,6 @@ Throughput_SOURCES = \ Throughput.cpp \ Throughput.h -../lib: - mkdir -p ../lib - - -Throughput_DEPENDENCIES = \ - ../lib - Throughput_LDFLAGS = \ -L../lib diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am index c700b48ed6c..42650063c05 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am @@ -33,13 +33,6 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp -../Common: - mkdir -p ../Common - - -client_DEPENDENCIES = \ - ../Common - client_LDFLAGS = \ -L../Common @@ -75,13 +68,6 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp -../Common: - mkdir -p ../Common - - -server_DEPENDENCIES = \ - ../Common - server_LDFLAGS = \ -L../Common diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am index 0f0f51dffce..55a4cc3991a 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am @@ -33,13 +33,6 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp -../Common: - mkdir -p ../Common - - -client_DEPENDENCIES = \ - ../Common - client_LDFLAGS = \ -L../Common @@ -75,13 +68,6 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp -../Common: - mkdir -p ../Common - - -server_DEPENDENCIES = \ - ../Common - server_LDFLAGS = \ -L../Common |