diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:31:30 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:31:30 +0000 |
| commit | 0577c6c89c57360f772738541055a64d02a3ba82 (patch) | |
| tree | 0cf85a5253b464eb971a850e06a55f6b54051edb /bridges/test/java_uno | |
| parent | 4dd18dadd3f3f0e2e2d137e7912439ac836af227 (diff) | |
INTEGRATION: CWS ause069 (1.9.4); FILE MERGED
2006/11/28 11:48:43 hjs 1.9.4.1: #i70359# remove forced shell calls; a bit cleanup
Diffstat (limited to 'bridges/test/java_uno')
| -rw-r--r-- | bridges/test/java_uno/any/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk index 4c9eedaecce6..814541643c7a 100644 --- a/bridges/test/java_uno/any/makefile.mk +++ b/bridges/test/java_uno/any/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2006-10-05 10:42:59 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:31:30 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -124,11 +124,11 @@ $(OUT)$/bin$/TestJni$(SCRIPTEXT) : $(JAVACLASSFILES) $(GIVE_EXEC_RIGHTS) $@ $(BIN)$/test_java_uno_anytest.rdb : types.idl - +idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $? - +regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} + $(IDLC) -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $? + $(REGMERGE) $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} $(MISC)$/gen_files.flag : $(BIN)$/test_java_uno_anytest.rdb - +cppumaker -C -BUCR -O $(OUT)$/inc$/test -X $(SOLARBINDIR)$/udkapi.rdb $? - +cppumaker -C -BUCR -O $(OUT)$/inc$/test -T com.sun.star.uno.XInterface $(SOLARBINDIR)$/udkapi.rdb - +javamaker -nD -BUCR -O $(CLASSDIR) -X $(SOLARBINDIR)$/udkapi.rdb $? - +$(TOUCH) $@ + $(CPPUMAKER) -C -BUCR -O $(OUT)$/inc$/test -X $(SOLARBINDIR)$/udkapi.rdb $? + $(CPPUMAKER) -C -BUCR -O $(OUT)$/inc$/test -T com.sun.star.uno.XInterface $(SOLARBINDIR)$/udkapi.rdb + $(JAVAMAKER) -nD -BUCR -O $(CLASSDIR) -X $(SOLARBINDIR)$/udkapi.rdb $? + $(TOUCH) $@ |