diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 02:05:21 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 02:05:21 +0000 |
| commit | 5fbf08dd2bc7d6b97f133bc2dbc1e17a7d82296c (patch) | |
| tree | da0efdbcbadb3ffb1f4eddb5ab46f9a0941d88b3 /bridges | |
| parent | 2120f1d5a6d6da31bbdca63c49afa53b0252249d (diff) | |
INTEGRATION: CWS sb18 (1.4.100); FILE MERGED
2004/05/07 15:25:53 sb 1.4.100.1: #i21150# javamaker now directly generates .class files.
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/test/java_uno/any/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk index 3a803203b9b3..28c8711cac06 100644 --- a/bridges/test/java_uno/any/makefile.mk +++ b/bridges/test/java_uno/any/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: vg $ $Date: 2003-05-22 08:41:04 $ +# last change: $Author: obo $ $Date: 2004-06-04 03:05:21 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -73,8 +73,6 @@ GIVE_EXEC_RIGHTS = @echo GIVE_EXEC_RIGHTS = chmod +x .ENDIF -JAVAFLAGS += -sourcepath $(OUT)$/misc$/java$/test - JAVAFILES = \ $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) @@ -156,5 +154,5 @@ $(BIN)$/test_java_uno_anytest.rdb : types.idl $(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 $(OUT)$/misc$/java$/test -X $(SOLARBINDIR)$/udkapi.rdb $? + +javamaker -nD -BUCR -O $(CLASSDIR) -X $(SOLARBINDIR)$/udkapi.rdb $? +$(TOUCH) $@ |