diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 08:16:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 08:16:39 +0000 |
| commit | 4f64dabe34ccea03a30ba57e4cd39943f715a50f (patch) | |
| tree | fee294a7288d5506bac620f7615a93e48daade33 /testtools | |
| parent | 005deacacaeb3acfd23de2e3e5d15a7966f261c1 (diff) | |
INTEGRATION: CWS sb21 (1.3.2); FILE MERGED
2004/08/04 15:23:05 sb 1.3.2.1: #i32281# Made testtools buildable again.
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/idl/makefile.mk | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk index 5652578b177c..17a1efd1f268 100644 --- a/testtools/source/bridgetest/idl/makefile.mk +++ b/testtools/source/bridgetest/idl/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2004-07-12 13:03:19 $ +# last change: $Author: rt $ $Date: 2004-08-20 09:16:39 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,15 +66,7 @@ TARGET := bridgetest_idl .INCLUDE: settings.mk .INCLUDE: target.mk - -CLIMAKERFLAGS = -.IF "$(debug)" != "" -CLIMAKERFLAGS += --verbose -.ENDIF - -ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \ - $(MISC)$/$(TARGET).javamaker.done \ - $(BIN)$/cli_types_bridgetest.dll +ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done $(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb $(CPPUMAKER) -O$(INCCOM) -BUCR $< -X$(SOLARBINDIR)/types.rdb @@ -84,15 +76,25 @@ $(MISC)$/$(TARGET).javamaker.done: $(BIN)$/bridgetest.rdb $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $< $(TOUCH) $@ -$(BIN)$/cli_types_bridgetest.dll : $(BIN)$/bridgetest.rdb - $(CLIMAKER) $(CLIMAKERFLAGS) \ - --out $@ \ - -r $(SOLARBINDIR)$/cli_types.dll \ - -X $(SOLARBINDIR)$/types.rdb \ - $< - $(TOUCH) $@ - $(BIN)$/bridgetest.rdb: bridgetest.idl $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< + $(RM) $@ $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/bridgetest.urd + +.IF "$(GUI)" == "WNT" + +CLIMAKERFLAGS = +.IF "$(debug)" != "" +CLIMAKERFLAGS += --verbose +.ENDIF + +ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \ + $(MISC)$/$(TARGET).javamaker.done \ + $(BIN)$/cli_types_bridgetest.dll + +$(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb + $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_types.dll \ + -X $(SOLARBINDIR)$/types.rdb $< + $(TOUCH) $@ + +.ENDIF # GUI, WNT |