diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-28 03:48:18 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-28 03:48:18 +0000 |
| commit | 6c1c19de6b0868be4f10ee1f440e21efdf76600e (patch) | |
| tree | 179534df04b83c310a322865d0e18101a29e7c8a /include/makeinclude/wrapper_macros.GNU | |
| parent | 3eb60816d8f20e2c8870fd24f69e2c4cb27feee1 (diff) | |
| download | ATCD-6c1c19de6b0868be4f10ee1f440e21efdf76600e.tar.gz | |
ChangeLogTag:Tue Mar 27 19:43:39 2001 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'include/makeinclude/wrapper_macros.GNU')
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 47 |
1 files changed, 43 insertions, 4 deletions
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 891187c3831..9d5e88d1548 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -182,8 +182,41 @@ include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU #---------------------------------------------------------------------------- CPPFLAGS += $(DEFFLAGS) $(INCLDIRS) + +# Define default extentions for IDL-generated files +ifeq ($(IDL_CLIENT_HDR_EXT),) +IDL_CLIENT_HDR_EXT = C.h +endif +ifeq ($(IDL_CLIENT_INL_EXT),) +IDL_CLIENT_INL_EXT = C.i +endif +ifeq ($(IDL_CLIENT_SRC_EXT),) +IDL_CLIENT_SRC_EXT = C.cpp +endif +ifeq ($(IDL_SERVER_HDR_EXT),) +IDL_SERVER_HDR_EXT = S.h +endif +ifeq ($(IDL_SERVER_INL_EXT),) +IDL_SERVER_INL_EXT = S.i +endif +ifeq ($(IDL_SERVER_SRC_EXT),) +IDL_SERVER_SRC_EXT = S.cpp +endif +ifeq ($(IDL_SERVER_THDR_EXT),) +IDL_SERVER_THDR_EXT = S_T.h +endif +ifeq ($(IDL_SERVER_TINL_EXT),) +IDL_SERVER_TINL_EXT = S_T.i +endif +ifeq ($(IDL_SERVER_TSRC_EXT),) +IDL_SERVER_TSRC_EXT = S_T.cpp +endif + +# This is for Orbix support, not related to TAO's IDL compiler. +# It is probably obsolete by now, if it works at all. IDL = idl -IDLFLAGS = -A -B -s S.cpp -c C.cpp +IDLFLAGS = -A -B -s $(IDL_SERVER_SRC_EXT) -c $(IDL_CLIENT_SRC_EXT) + ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS))) INCLDIRS += -I$(ACE_ROOT) endif @@ -215,13 +248,19 @@ ACE_NUL_STDERR = 2>$(ACE_NUL) || true PCFLAGS += #### set in platform_macros.GNU file, e.g., -p PCCFLAGS += #### set in platform_macros.GNU file, e.g., -p VAR = + +# Let users override the default VDIR directories +ifndef VDIR VDIR = .obj/ -ifndef ACELIB - ACELIB = -lACE -endif +endif # VDIR ifndef VSHDIR VSHDIR = .shobj/ endif # VSHDIR + +ifndef ACELIB + ACELIB = -lACE +endif + # NOTE: VLDLIBS is defined below, in case it is overridden for static- # or shared-only builds. YACC = yacc |