diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:33:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:33:50 +0000 |
| commit | fab06bbb8df9cb6026ad80fdcdba34b43fc8ee2d (patch) | |
| tree | 7103fda916cbc7c64fd38f9de924f24040d9381c | |
| parent | 8ebc3c4af39f11cf6a7c81e0bb0de93e7e02c08e (diff) | |
INTEGRATION: CWS ause069 (1.31.12); FILE MERGED
2007/01/10 19:17:53 hjs 1.31.12.2: RESYNC: (1.31-1.32); FILE MERGED
2006/11/24 14:50:21 hjs 1.31.12.1: #i70359# remove forced shell calls
| -rw-r--r-- | cppu/test/makefile.mk | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cppu/test/makefile.mk b/cppu/test/makefile.mk index 6f38a9075036..7d6cd957e4dd 100644 --- a/cppu/test/makefile.mk +++ b/cppu/test/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.32 $ +# $Revision: 1.33 $ # -# last change: $Author: rt $ $Date: 2006-12-01 17:26:55 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:33:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -42,9 +42,7 @@ NO_BSYMBOLIC=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # --- Files -------------------------------------------------------- @@ -152,15 +150,15 @@ TYPES:= -Ttest.XLanguageBindingTest \ -Tcom.sun.star.uno.XCurrentContext $(BIN)$/testcppu.rdb: $(ALLIDLFILES) - +idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $? - +regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} - +regmerge $@ / $(UNOUCRRDB) + idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $? + regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} + regmerge $@ / $(UNOUCRRDB) touch $@ -# +regcomp -register -r $@ -c javaloader.dll -# +regcomp -register -r $@ -c jen.dll +# regcomp -register -r $@ -c javaloader.dll +# regcomp -register -r $@ -c jen.dll unoheader: $(BIN)$/testcppu.rdb - +cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/testcppu.rdb -# +cunomaker -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/testcppu.rdb + cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/testcppu.rdb +# cunomaker -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/testcppu.rdb |