diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 19:19:29 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 19:19:29 +0000 |
| commit | ba2c74103a8d751bfcde61cff2fc8e198d860400 (patch) | |
| tree | 54abf20b687a500e19f3abaeebc431d2e2a1ad3c /offapi | |
| parent | ad3b0ff4049f97d6d20a5a8ca8115ef6f269adbf (diff) | |
| parent | 40ab64211cc89ec112e5baf8c7ff78ad4680b7a3 (diff) | |
koheidatapilot03: merge with DEV300_m63
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/util/makefile.mk | 12 | ||||
| -rw-r--r-- | offapi/util/target.pmk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk index b0fa7a30cf46..d3157dac31df 100644 --- a/offapi/util/makefile.mk +++ b/offapi/util/makefile.mk @@ -164,14 +164,14 @@ ALLTAR : $(UCR)$/types.db \ $(UNOTYPE_STATISTICS) $(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb - -$(RM) $(REGISTRYCHECKFLAG) - $(GNUCOPY) -f $(UCR)$/offapi.db $@ - $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb + @-$(RM) $(REGISTRYCHECKFLAG) + @$(GNUCOPY) -f $(UCR)$/offapi.db $@ + $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb - -$(RM) $(REGISTRYCHECKFLAG) - $(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@ - $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb + @-$(RM) $(REGISTRYCHECKFLAG) + @$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@ + $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb #JSC: The type library has changed, all temporary not checked types are removed # and will be check from now on. diff --git a/offapi/util/target.pmk b/offapi/util/target.pmk index 08912b011857..63804f3e554a 100644 --- a/offapi/util/target.pmk +++ b/offapi/util/target.pmk @@ -30,8 +30,8 @@ #************************************************************************* $(OUT)$/misc$/$(TARGET).idls: makefile.mk - -$(RM) $@ - $(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@ + $(COMMAND_ECHO)-$(RM) $@ + $(COMMAND_ECHO)$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@ ALLTAR: $(OUT)$/misc$/$(TARGET).idls |