diff options
Diffstat (limited to 'TAO/rules.tao.GNU')
| -rw-r--r-- | TAO/rules.tao.GNU | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 87199e80a69..6242f60c692 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -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 @@ -184,9 +190,9 @@ CPPFLAGS += \ #### Build rules. #### IDL_EXT_MINUS=$(IDL_CLIENT_INL_EXT) $(IDL_CLIENT_SRC_EXT) \ - $(IDL_SERVER_HDR_EXT) $(IDL_SERVER_INL_EXT) \ - $(IDL_SERVER_SRC_EXT) $(IDL_SERVER_THDR_EXT) \ - $(IDL_SERVER_TINL_EXT) $(IDL_SERVER_TSRC_EXT) + $(IDL_SERVER_HDR_EXT) $(IDL_SERVER_INL_EXT) \ + $(IDL_SERVER_SRC_EXT) $(IDL_SERVER_THDR_EXT) \ + $(IDL_SERVER_TINL_EXT) $(IDL_SERVER_TSRC_EXT) IDL_EXT=$(IDL_CLIENT_HDR_EXT) $(IDL_EXT_MINUS) IDL_EXT2_MINUS=Cli.i Cli.cpp Ser.h Ser.i Ser.cpp Ser_T.h Ser_T.i Ser_T.cpp IDL_EXT2=Cli.h $(IDL_EXT2_MINUS) @@ -195,19 +201,19 @@ IDL_EXT2=Cli.h $(IDL_EXT2_MINUS) ifneq ($(use_flick),1) $(foreach ext, $(IDL_EXT_MINUS), %$(ext)): %$(IDL_CLIENT_HDR_EXT) - @ + @ ifneq ($(tao_dont_use_idl_make_rule),1) %C.h: %.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $< + $(TAO_IDL) $(TAO_IDLFLAGS) $< endif $(foreach ext, $(IDL_EXT2_MINUS), %$(ext)): %Cli.h - @ + @ ifneq ($(tao_dont_use_idl_make_rule),1) %Cli.h: %.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $< + $(TAO_IDL) $(TAO_IDLFLAGS) $< endif else @@ -228,14 +234,14 @@ CORBA_BE=$(FLICK_OBJDIR)/bin/flick-c-pbe-iiopxx ifneq ($(tao_dont_use_idl_make_rule),1) $(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl - $(CORBA_FE) $< && \ - $(CORBA_PG) -c -o $*-client.prc $*.aoi && \ - $(CORBA_BE) $*-client.prc -o $*$(IDL_CLIENT_SRC_EXT) -h $*$(IDL_CLIENT_HDR_EXT) -f $*$(IDL_SERVER_HDR_EXT) --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \ - echo > $*$(IDL_CLIENT_INL_EXT) - $(CORBA_FE) $< && \ - $(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) && \ + $(CORBA_FE) $< && \ + $(CORBA_PG) -c -o $*-client.prc $*.aoi && \ + $(CORBA_BE) $*-client.prc -o $*$(IDL_CLIENT_SRC_EXT) -h $*$(IDL_CLIENT_HDR_EXT) -f $*$(IDL_SERVER_HDR_EXT) --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \ + echo > $*$(IDL_CLIENT_INL_EXT) + $(CORBA_FE) $< && \ + $(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) |