diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-13 16:27:50 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-13 16:27:50 +0200 |
| commit | e224ac0e3172b1d3360461e1e67a5a235b349824 (patch) | |
| tree | 10e36996d44ae7e02747e4b6f6858e3f480d0534 /cppu | |
| parent | 7249ab61220c1cccf717abb36d3de12c2aae3961 (diff) | |
use rm -f to not complain about attempting to remove nonexisting file
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/qa/cppumaker/makefile.mk | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk index 6d3a2d7191d2..accda46fce3f 100644 --- a/cppu/qa/cppumaker/makefile.mk +++ b/cppu/qa/cppumaker/makefile.mk @@ -25,7 +25,7 @@ # #************************************************************************* -PRJ := ..$/.. +PRJ := ../.. PRJNAME := cppu TARGET := test_cppumaker @@ -35,17 +35,17 @@ ENABLE_EXCEPTIONS := TRUE .IF "$(CROSS_COMPILING)"=="YES" all: - @echo Nothing done when cross-compiling + @echo Nothing done when cross-compiling .ENDIF CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files -INCPRE += $(MISC)$/$(TARGET)$/inc +INCPRE += $(MISC)/$(TARGET)/inc SHL1TARGET = $(TARGET) -SHL1OBJS = $(SLO)$/test_cppumaker.obj +SHL1OBJS = $(SLO)/test_cppumaker.obj SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) @@ -57,21 +57,21 @@ SLOFILES = $(SHL1OBJS) ALLTAR: test -$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag +$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag -$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb - - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc - $(CPPUMAKER) \ - -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< $(SOLARBINDIR)$/udkapi.rdb - $(TOUCH) $@ +$(MISC)/$(TARGET).cppumaker.flag: $(MISC)/$(TARGET).rdb + - $(MKDIRHIER) $(MISC)/$(TARGET)/inc + $(CPPUMAKER) \ + -O$(MISC)/$(TARGET)/inc -BUCR -C $< $(SOLARBINDIR)/udkapi.rdb + $(TOUCH) $@ -$(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd - - rm $@ - $(REGMERGE) $@ /UCR $< +$(MISC)/$(TARGET).rdb: $(MISC)/$(TARGET)/types.urd + - rm -f $@ + $(REGMERGE) $@ /UCR $< -$(MISC)$/$(TARGET)$/types.urd: types.idl - - $(MKDIR) $(MISC)$/$(TARGET) - $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< +$(MISC)/$(TARGET)/types.urd: types.idl + - $(MKDIR) $(MISC)/$(TARGET) + $(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< test .PHONY: $(SHL1TARGETN) - $(CPPUNITTESTER) $< + $(CPPUNITTESTER) $< |