diff options
| author | Daniel Boelzle <dbo@openoffice.org> | 2001-11-08 15:21:44 +0000 |
|---|---|---|
| committer | Daniel Boelzle <dbo@openoffice.org> | 2001-11-08 15:21:44 +0000 |
| commit | 758fd0c1990579ba71eb61a96630e395edeec42a (patch) | |
| tree | fc9e0e54d0134e3de64aca00d62f8f2ff35559d1 /cppu | |
| parent | 277a30ee144b7c9e9c72a48bf290362c63b8bb05 (diff) | |
*** empty log message ***
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/test/alignment/makefile.mk | 18 | ||||
| -rw-r--r-- | cppu/test/makefile.mk | 26 |
2 files changed, 26 insertions, 18 deletions
diff --git a/cppu/test/alignment/makefile.mk b/cppu/test/alignment/makefile.mk index c0ec48c96072..f2605350bd31 100644 --- a/cppu/test/alignment/makefile.mk +++ b/cppu/test/alignment/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: dbo $ $Date: 2001-10-17 12:40:31 $ +# last change: $Author: dbo $ $Date: 2001-11-08 16:21:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -61,14 +61,13 @@ #************************************************************************* # -# build /test first, then /test/alignment_tests +# build /test first, then /test/alignment # PRJ=..$/.. PRJNAME=cppu TARGET=alignment LIBTARGET=NO -TARGETTYPE=CUI ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE @@ -85,6 +84,12 @@ UNOUCRRDB=$(BIN)$/testcppu.rdb UNOUCROUT=$(INCCOM)$/test$/alignment INCPRE+=$(INCCOM)$/test -I$(INCCOM)$/test$/alignment -I$(PRJ)$/test$/alignment +.IF "$(src_env)" == "" +merge_rdb=$(SOLARBINDIR)$/udkapi.rdb +.ELSE +merge_rdb=$(SOLARBINDIR)$/applicat.rdb +.ENDIF + DEPOBJFILES= \ $(OBJ)$/pass1.obj \ $(OBJ)$/pass2.obj @@ -100,14 +105,15 @@ APP2TARGET = pass2 # --- Targets ------------------------------------------------------ .IF "$(depend)" == "" -ALLTAR: execute_pass2 +ALLTAR: execute_pass2 .ELSE -ALL: ALLDEP +ALL: ALLDEP .ENDIF .INCLUDE : target.mk $(MISC)$/pass2.cxx: $(APP1TARGETN) + +regmerge $(UNOUCRRDB) / $(merge_rdb) +cppumaker @$(mktmp $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) $(foreach,c,$(shell $(APP1TARGETN) -env:UNO_TYPES={$(subst,\,\\ $(UNOUCRRDB))} $(subst,\,\\ $(MISC)$/pass2.cxx) dump_types) -T$c) $(UNOUCRRDB)) execute_pass2: $(APP2TARGETN) diff --git a/cppu/test/makefile.mk b/cppu/test/makefile.mk index 6b26538a664f..32633310e4c7 100644 --- a/cppu/test/makefile.mk +++ b/cppu/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: dbo $ $Date: 2001-10-17 14:04:26 $ +# last change: $Author: dbo $ $Date: 2001-11-08 16:21:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -61,12 +61,11 @@ #************************************************************************* PRJ=.. -PRJNAME= testcppu -TARGET= testcppu -LIBTARGET= NO -TARGETTYPE= CUI +PRJNAME=testcppu +TARGET= testcppu +LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC= TRUE +NO_BSYMBOLIC=TRUE # --- Settings ----------------------------------------------------- @@ -76,10 +75,12 @@ NO_BSYMBOLIC= TRUE # --- Files -------------------------------------------------------- -UNOUCROUT= $(OUT)$/inc$/test -INCPRE+= $(OUT)$/inc$/test +UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb +UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb +UNOUCROUT=$(OUT)$/inc$/test +INCPRE+=$(OUT)$/inc$/test -OBJFILES= \ +OBJFILES= \ $(OBJ)$/testcppu.obj \ $(OBJ)$/test_di.obj \ $(OBJ)$/test_Cincludes.obj @@ -99,9 +100,10 @@ APP1STDLIBS+= \ $(SALHELPERLIB) \ $(SALLIB) -APP1DEF= $(MISC)$/$(APP1TARGET).def +APP1DEF=$(MISC)$/$(APP1TARGET).def -ALLIDLFILES:= cpputest.idl \ +ALLIDLFILES:= \ + cpputest.idl \ language_binding.idl \ alignment.idl |