INTEGRATION: CWS docking1 (1.76.4); FILE MERGED

2004/06/20 19:54:36 cd 1.76.4.9: #i30169# Added files for image manager
2004/06/17 20:53:00 cd 1.76.4.8: #i30169# Create commandimagelist file for images.zip packing
2004/06/16 13:46:58 cd 1.76.4.7: #i30169# Trace code added for startup performance measuring
2004/05/31 04:23:37 cd 1.76.4.6: RESYNC: (1.77-1.78); FILE MERGED
2004/05/12 08:27:23 cd 1.76.4.5: #i25117# Support toggle visibility of toolbar buttons
2004/05/02 00:44:43 cd 1.76.4.4: RESYNC: (1.76-1.77); FILE MERGED
2004/04/21 07:24:33 cd 1.76.4.3: #i24937# Additional classes
2004/04/05 08:09:35 cd 1.76.4.2: #i24937# Programmatic control of toolbar items
2004/03/08 06:41:10 cd 1.76.4.1: #i24937# Programmatic control of toolbar items
This commit is contained in:
Oliver Bolte 2004-07-06 17:04:02 +00:00
parent dd7a3ae562
commit 77e20f4a10

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.79 $
# $Revision: 1.80 $
#
# last change: $Author: kz $ $Date: 2004-06-10 13:25:09 $
# last change: $Author: obo $ $Date: 2004-07-06 18:04:02 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -292,8 +292,22 @@ SHL4OBJS= \
$(SLO)$/contenthandler.obj \
$(SLO)$/containerquery.obj \
$(SLO)$/loadenv.obj \
$(SLO)$/targethelper.obj \
$(SLO)$/license.obj
$(SLO)$/targethelper.obj \
$(SLO)$/windowstateconfiguration.obj \
$(SLO)$/toolboxfactory.obj \
$(SLO)$/addonstoolboxfactory.obj \
$(SLO)$/toolbarwrapper.obj \
$(SLO)$/toolbarmanager.obj \
$(SLO)$/generictoolbarcontroller.obj \
$(SLO)$/toolbar.obj \
$(SLO)$/addonstoolbarwrapper.obj \
$(SLO)$/addonstoolbarmanager.obj \
$(SLO)$/toolbarsmenucontroller.obj \
$(SLO)$/toolbarcontrollerfactory.obj\
$(SLO)$/moduleimagemanager.obj \
$(SLO)$/imagemanager.obj \
$(SLO)$/graphicnameaccess.obj
SHL4STDLIBS= \
$(FWILIB) \
@ -322,6 +336,17 @@ 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: $@