diff options
| -rw-r--r-- | TAO/ChangeLog-99c | 9 | ||||
| -rw-r--r-- | TAO/examples/POA/Makefile | 22 | ||||
| -rw-r--r-- | TAO/orbsvcs/Makefile | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Makefile | 45 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/Makefile | 22 | ||||
| -rw-r--r-- | TAO/performance-tests/Makefile | 30 | ||||
| -rw-r--r-- | TAO/tests/Makefile | 22 |
8 files changed, 82 insertions, 74 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 4991b30a290..c1287f82fdc 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,12 @@ +Thu Dec 30 14:30:40 1999 David L. Levine <levine@cs.wustl.edu> + + * examples/POA/Makefile,orbsvcs/orbsvcs/Makefile, + orbsvcs/tests/Makefile,orbsvcs/Makefile, + performance-tests/Cubit/TAO/Makefile,performance-tests/Makefile, + tests/Makefile: moved include of rules.tao.GNU before first + use of $(minimum_corba), so that it is defined before that + use. Thanks to Nanbor for diagnosing this problem. + Wed Dec 29 15:38:05 1999 David L. Levine <levine@cs.wustl.edu> * orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.cpp (open): diff --git a/TAO/examples/POA/Makefile b/TAO/examples/POA/Makefile index bba3d8d11d5..230c1a4c26b 100644 --- a/TAO/examples/POA/Makefile +++ b/TAO/examples/POA/Makefile @@ -7,27 +7,28 @@ #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- DIRS = Generic_Servant \ - RootPOA \ - Reference_Counted_Servant + RootPOA \ + Reference_Counted_Servant # The following test hasn't been updated yet # Demux_Test -#### Does not compile on UNIX: Forwarding \ +#### Does not compile on UNIX: Forwarding \ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU ifeq ($(minimum_corba),0) @@ -58,8 +59,7 @@ ifeq ($(minimum_corba),0) endif # minimum_corba -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile index 94a29c6bcd3..497ab5c13f0 100644 --- a/TAO/orbsvcs/Makefile +++ b/TAO/orbsvcs/Makefile @@ -24,7 +24,7 @@ DIRS = orbsvcs \ ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO + TAO_ROOT = $(ACE_ROOT)/TAO endif #---------------------------------------------------------------------------- @@ -32,6 +32,7 @@ endif #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU ifeq ($(minimum_corba),0) @@ -47,7 +48,6 @@ ifeq ($(minimum_corba),0) endif # minimum_corba include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index 94c3eefbe41..b37eef76707 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -21,6 +21,7 @@ ACE_SHLIBS = -lTAO -lACE #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU # On non-Windows environment, we should at least define # the export_include IDL flag. @@ -338,7 +339,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BUILD += ORBSVCS_COMPONENTS include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile index fb0aee0e8f2..6b50eddb73d 100644 --- a/TAO/orbsvcs/tests/Makefile +++ b/TAO/orbsvcs/tests/Makefile @@ -5,35 +5,36 @@ #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -DIRS = Simple_Naming \ - Event_Latency \ - EC_Multiple \ - EC_Throughput \ - EC_Mcast \ - EC_Custom_Marshal \ - EC_Basic \ - Property \ - CosEC_Basic \ - CosEC_Multiple \ - Sched_Conf \ - Time \ - Event +DIRS = Simple_Naming \ + Event_Latency \ + EC_Multiple \ + EC_Throughput \ + EC_Mcast \ + EC_Custom_Marshal \ + EC_Basic \ + Property \ + CosEC_Basic \ + CosEC_Multiple \ + Sched_Conf \ + Time \ + Event # Not compiled by default -# Concurrency \ +# Concurrency \ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU ifeq ($(minimum_corba),0) @@ -49,9 +50,7 @@ ifeq ($(minimum_corba),0) endif # minimum_corba - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/performance-tests/Cubit/TAO/Makefile b/TAO/performance-tests/Cubit/TAO/Makefile index 28943745aa0..10f3df337ed 100644 --- a/TAO/performance-tests/Cubit/TAO/Makefile +++ b/TAO/performance-tests/Cubit/TAO/Makefile @@ -1,26 +1,27 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for the TAO Cubit tests +# Makefile for the TAO Cubit tests #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- # Currently, IDL_Cubit *must* come before the IDL_Cubit tests. DIRS = IDL_Cubit \ - MT_Cubit + MT_Cubit ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU ifeq ($(minimum_corba),0) @@ -29,8 +30,7 @@ ifeq ($(minimum_corba),0) endif # minimum_corba -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/performance-tests/Makefile b/TAO/performance-tests/Makefile index cfb280f2d4a..694cd3c13cc 100644 --- a/TAO/performance-tests/Makefile +++ b/TAO/performance-tests/Makefile @@ -1,33 +1,34 @@ #---------------------------------------------------------------------------- # -# $Id$ +# $Id$ # -# Makefile for the TAO performance-tests +# Makefile for the TAO performance-tests # #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- DIRS = Cubit \ - POA \ - Pluggable \ - Thruput \ - RTCorba + POA \ + Pluggable \ + Thruput \ + RTCorba # The following tests have not been updated yet -# Demux +# Demux ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU ifeq ($(minimum_corba),0) @@ -36,8 +37,7 @@ ifeq ($(minimum_corba),0) endif # minimum_corba -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 86cbe267711..bfbb024b959 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -11,19 +11,19 @@ #---------------------------------------------------------------------------- DIRS = CDR \ - IDL_Test \ + IDL_Test \ OctetSeq \ InterOp-Naming \ NestedUpcall \ Multiple_Inheritance \ - MT_Client \ - MT_Server \ - FL_Cube \ - POA \ - IORManipulation \ - Connection_Purging \ - ORB_init \ - Smart_Proxies + MT_Client \ + MT_Server \ + FL_Cube \ + POA \ + IORManipulation \ + Connection_Purging \ + ORB_init \ + Smart_Proxies ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO @@ -34,6 +34,7 @@ endif #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU ifeq ($(minimum_corba),0) @@ -42,7 +43,7 @@ ifeq ($(minimum_corba),0) # No NVList and Context in minimum CORBA DIRS += Param_Test \ - DSI_Gateway + DSI_Gateway # No Implicit activation in minimum CORBA DIRS += Faults @@ -64,7 +65,6 @@ ifeq ($(corba_messaging),1) endif # corba_messaging include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU |