diff options
Diffstat (limited to 'TAO/rules.tao.GNU')
-rw-r--r-- | TAO/rules.tao.GNU | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 46bdb3323db..c6d86ae0212 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -50,27 +50,29 @@ $(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl $(TAO_IDL) else #### You can redefine the following in your platform_macros.GNU -ifndef FLICK_SRCDIR - FLICK_SRCDIR = /project/doc/nanbor/mom +ifndef SRCDIR + SRCDIR = /project/doc/nanbor/mom endif -ifndef FLICK_OBJDIR - FLICK_OBJDIR = /project/doc/nanbor/dad +ifndef OBJDIR + OBJDIR = /project/doc/nanbor/dad endif -CCFLAGS += -I$(FLICK_OBJDIR)/runtime/headers -I$(FLICK_SRCDIR)/runtime/headers +CCFLAGS += -I$(OBJDIR)/runtime/headers -I$(SRCDIR)/runtime/headers # -g -CORBA_FE=$(FLICK_OBJDIR)/bin/flick-fe-newcorba -CORBA_PG=$(FLICK_OBJDIR)/bin/flick-c-pfe-corbaxx -CORBA_BE=$(FLICK_OBJDIR)/bin/flick-c-pbe-iiopxx +CORBA_FE=$(OBJDIR)/bin/flick-fe-newcorba +CORBA_PG=$(OBJDIR)/bin/flick-c-pfe-corbaxx +CORBA_BE=$(OBJDIR)/bin/flick-c-pbe-iiopxx -$(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl +%C.h %C.i %C.cpp: %.idl $(CORBA_FE) $< && \ $(CORBA_PG) -c -o $*-client.prc $*.aoi && \ - $(CORBA_BE) $*-client.prc -o $*C.cpp -h $*C.h -f $*S.h --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \ + $(CORBA_BE) $*-client.prc -o $*C.cpp -h $*C.h -f $*S.h && \ echo > $*C.i + +%S.h %S.i %S.cpp: %.idl $(CORBA_FE) $< && \ $(CORBA_PG) -s -o $*-server.prc $*.aoi && \ - $(CORBA_BE) $*-server.prc --no_mu_stubs -o $*S.cpp -h $*S.h -F $*C.h --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \ + $(CORBA_BE) $*-server.prc --no_mu_stubs -o $*S.cpp -h $*S.h -F $*C.h && \ echo > $*S.i && \ echo > $*S_T.h && \ echo > $*S_T.i && \ |