diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-01-14 21:07:35 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-01-14 21:07:35 +0000 |
| commit | eb6d23187375faf26614bf1e51cb5701e5ea09a5 (patch) | |
| tree | 3939e2df355530237301960ad118a6ed77b0febe | |
| parent | 44ebf665f0da4065795d7a995179054b6ecc44d7 (diff) | |
| download | ATCD-eb6d23187375faf26614bf1e51cb5701e5ea09a5.tar.gz | |
ChangeLogTag: Tue Jan 14 16:13:09 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.IFR_Service | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c6924b1e41f..fff293c8826 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 14 16:13:09 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * orbsvcs/IFR_Service/Makefile.IFR_Service: Added a check for + TAO_IFRService library before going head to actually compile + stuff. + Tue Jan 14 07:05:21 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * tao/DynamicAny/Makefile: diff --git a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service index 16b6fc557da..ff2549d3c3a 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service +++ b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service @@ -28,7 +28,7 @@ IFR_SVR_OBJS = \ IFR_Server.o \ IFR_Service.o -BIN = IFR_Service +BIN2 = IFR_Service #---------------------------------------------------------------------------- # Include macros and targets @@ -37,6 +37,12 @@ BIN = IFR_Service 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 (IFRService,$(findstring IFRService,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # IFRService include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU |