diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-29 00:10:04 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-29 00:10:04 +0000 |
| commit | 4921631796c61ab7692ab2d61f5d46e22cfe09dd (patch) | |
| tree | c36e2ce1157689fdf8bb6c1697f0322f2974b43c /TAO/orbsvcs/examples/CosEC/Factory/Makefile | |
| parent | 20d4fb3332a09fa5ee02d074c068ab103e3e44c4 (diff) | |
| download | ATCD-4921631796c61ab7692ab2d61f5d46e22cfe09dd.tar.gz | |
ChangeLogTag:Tue Nov 28 15:56:01 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/Factory/Makefile')
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/Factory/Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile index 6a121fa068d..9741cad783e 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile @@ -40,22 +40,25 @@ CLIENT_OBJS = \ BIN2 = factory \ factoryclient +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU + #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) + ifneq ($(ACE_HAS_GNUG_PRE_2_8),1) + BIN = $(BIN2) + endif # ACE_HAS_GNUG_PRE_2_8 endif # Naming endif # CosEvent -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -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.local.GNU |