summaryrefslogtreecommitdiff
path: root/TAO/rules.tao.GNU
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-06-02 20:02:17 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-06-02 20:02:17 +0000
commitbe959f3d9b491984ff2fb3efeb90fe8db2172b2d (patch)
treedfb8ce57904209d9f94746664978dca15a49935a /TAO/rules.tao.GNU
parent6d2e23afbf43867d82e4e15f4f48bc8b4b810b2d (diff)
downloadATCD-be959f3d9b491984ff2fb3efeb90fe8db2172b2d.tar.gz
ChangeLogTag:Sat Jun 2 13:05:20 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
Diffstat (limited to 'TAO/rules.tao.GNU')
-rw-r--r--TAO/rules.tao.GNU15
1 files changed, 11 insertions, 4 deletions
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index b8394519db7..8f43b180c58 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Common rules for all of TAO
+# Common Makefile rules for all of TAO
#
#----------------------------------------------------------------------------
@@ -17,6 +17,8 @@ ifndef TAO_IDL
TAO_IDL = $(TAO_ROOT)/TAO_IDL/tao_idl
endif
+TAO_IDL_DEP = $(TAO_IDL)$(EXEEXT)
+
ifndef COMSPEC
ifdef ComSpec
#### ACE+TAO use COMSPEC, but ComSpec is defined.
@@ -30,7 +32,12 @@ ifdef COMSPEC
#### Assume we have Bourne shell and sed. Otherwise, the user
#### should find out here that the TAO_IDL_PREPROCESSOR environment
#### variable must be set explicitly!
- TAO_IDL_PREPROCESSOR := $(shell type $(CXX) | sed 's/.* is //')
+ ifneq ($(mingw32),1)
+ TAO_IDL_PREPROCESSOR := $(shell type $(CXX) | sed 's/.* is //')
+ else
+ TAO_IDL_PREPROCESSOR := \
+ $(shell cygpath -w $(shell type $(CXX) | sed 's/.* is //'))
+ endif # !mingw32
endif # ! TAO_IDL_PREPROCESSOR
endif # COMSPEC
@@ -188,7 +195,7 @@ $(foreach ext, $(IDL_EXT_MINUS), %$(ext)): %$(IDL_CLIENT_HDR_EXT)
@
ifneq ($(tao_dont_use_idl_make_rule),1)
-%C.h: %.idl $(TAO_IDL)
+%C.h: %.idl $(TAO_IDL_DEP)
$(TAO_IDL) $(TAO_IDLFLAGS) $<
endif
@@ -196,7 +203,7 @@ $(foreach ext, $(IDL_EXT2_MINUS), %$(ext)): %Cli.h
@
ifneq ($(tao_dont_use_idl_make_rule),1)
-%Cli.h: %.idl $(TAO_IDL)
+%Cli.h: %.idl $(TAO_IDL_DEP)
$(TAO_IDL) $(TAO_IDLFLAGS) $<
endif