diff options
Diffstat (limited to 'TAO/rules.tao.GNU')
| -rw-r--r-- | TAO/rules.tao.GNU | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 87199e80a69..e12c7465be5 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -36,7 +36,7 @@ ifdef COMSPEC TAO_IDL_PREPROCESSOR := $(shell type $(CXX) | sed 's/.* is //') else TAO_IDL_PREPROCESSOR := \ - $(shell cygpath -w $(shell type $(CXX) | sed 's/.* is //')) + $(shell cygpath -w $(shell type $(CXX) | sed 's/.* is //')) endif # !mingw32 endif # ! TAO_IDL_PREPROCESSOR endif # COMSPEC @@ -46,7 +46,7 @@ endif # COMSPEC #### TAO_BASE_LIBS=-lTAO $(ACELIB) $(LIBS) RT_TAO_BASE_LIBS=-lTAO_RTCORBA $(TAO_BASE_LIBS) -TAO_SRVR_LIBS=-lTAO_PortableServer $(TAO_BASE_LIBS) +TAO_SRVR_LIBS=-lTAO_PortableServer $(TAO_BASE_LIBS) RT_TAO_SRVR_LIBS=-lTAO_RTPortableServer -lTAO_PortableServer $(RT_TAO_BASE_LIBS) TAO_CLNT_LIBS= $(TAO_BASE_LIBS) RT_TAO_CLNT_LIBS= $(RT_TAO_BASE_LIBS) @@ -63,6 +63,12 @@ ifeq ($(findstring g++,$(CXX)),g++) endif # g++ < 2.8 endif # g++ +ifeq ($(exceptions),1) + ifeq ($(include_env),1) + CPPFLAGS += -DTAO_ENV_BKWD_COMPAT + endif +endif + ifeq ($(minimum_corba),1) ifndef rt_corba rt_corba = 0 @@ -171,14 +177,14 @@ ifneq ($(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS),) endif TAO_IDLFLAGS += \ - $(TAO_LACKS_EVENT_CHANNEL_ANY) \ - $(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE) \ - $(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS) + $(TAO_LACKS_EVENT_CHANNEL_ANY) \ + $(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE) \ + $(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS) CPPFLAGS += \ - $(TAO_LACKS_EVENT_CHANNEL_ANY) \ - $(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE) \ - $(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS) + $(TAO_LACKS_EVENT_CHANNEL_ANY) \ + $(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE) \ + $(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS) #### #### Build rules. @@ -236,9 +242,9 @@ $(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl $(CORBA_PG) -s -o $*-server.prc $*.aoi && \ $(CORBA_BE) $*-server.prc --no_mu_stubs -o $*$(IDL_SERVER_SRC_EXT) -h $*$(IDL_SERVER_HDR_EXT) -F $*$(IDL_CLIENT_HDR_EXT) --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \ echo > $*$(IDL_SERVER_INL_EXT) && \ - echo > $*$(IDL_SERVER_THDR_EXT) && \ - echo > $*$(IDL_SERVER_TINL_EXT) && \ - echo > $*$(IDL_SERVER_TSRC_EXT) + echo > $*$(IDL_SERVER_THDR_EXT) && \ + echo > $*$(IDL_SERVER_TINL_EXT) && \ + echo > $*$(IDL_SERVER_TSRC_EXT) endif # tao_dont_use_idl_make_rule endif # use_flick = 1 |