diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-19 08:42:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-19 08:42:52 +0000 |
| commit | 52b0f4a19100e6a762237a5fb05ec75e946ecb2d (patch) | |
| tree | b1ec09a18333f4fc1a9f60d06f1fe0b911212912 /framework/util | |
| parent | 22de08e319ff2daac5ec11b5e8cf6c9d34a3021f (diff) | |
INTEGRATION: CWS oooicons (1.85.6); FILE MERGED
2004/11/03 12:08:05 hjs 1.85.6.3: #i33610# removed commandimagelist.ilst generation here
2004/10/22 10:03:20 cd 1.85.6.2: #i35193# Fixed replacement
2004/10/08 12:37:41 hjs 1.85.6.1: #i35193# adapt to changed ilst
Diffstat (limited to 'framework/util')
| -rw-r--r-- | framework/util/makefile.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 4686a4c1e000..767313756337 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.87 $ +# $Revision: 1.88 $ # -# last change: $Author: obo $ $Date: 2004-11-17 14:59:27 $ +# last change: $Author: obo $ $Date: 2004-11-19 09:42:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -355,17 +355,6 @@ SHL4VERSIONMAP= exports.map .INCLUDE : target.mk -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/commandimagelist.ilst - -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/commandimagelist.ilst .PHONY : - +-$(RM) $@ $@.$(INPATH) -.IF "$(use_shell)"!="4nt" - $(FIND) $(SOLARSRC)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)#%GLOBAL%#" > $@.$(INPATH) -.ELSE # "$(use_shell)"!="4nt" - $(FIND) $(SOLARSRC)/res/commandimagelist -name "*.png" | sed "s/$(SOLARSRC:s/\/\\/)/%%GLOBAL%%/" > $@.$(INPATH) -.ENDIF # "$(use_shell)"!="4nt" - +$(RENAME) $@.$(INPATH) $@ - $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo ------------------------------ @echo Making: $@ |