summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/Naming_Service
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-09-24 17:01:04 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-09-24 17:01:04 +0000
commit3a33d999b4d1b2bc7500710e6cb543d000fe2b25 (patch)
tree51fc0d67ba508c96d1df9856f34b97c9937a7fc9 /TAO/orbsvcs/Naming_Service
parent83a9f5e534993ccf1b353aca99a04185d52b875a (diff)
downloadATCD-3a33d999b4d1b2bc7500710e6cb543d000fe2b25.tar.gz
ChangeLogTag:Fri Sep 24 11:57:21 1999 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/Naming_Service')
-rw-r--r--TAO/orbsvcs/Naming_Service/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index ae088a30218..07d42543aeb 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -8,6 +8,10 @@
# Local macros
#----------------------------------------------------------------------------
+ifndef TAO_ROOT
+ TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
SRC = Naming_Server.cpp Naming_Service.cpp
LDLIBS = -lorbsvcs -lTAO
@@ -21,17 +25,13 @@ ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
BIN = $(BIN2)
endif # Naming
-ifndef TAO_ROOT
- TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
#----------------------------------------------------------------------------
# Include macros and targets
#----------------------------------------------------------------------------
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.bin.GNU