diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 14:19:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 14:19:57 +0000 |
| commit | 8e4ebd3616df8d0058e6270152e69b5bdebd6903 (patch) | |
| tree | 2c0330a575a88e94d33cdab0caa3968c36ca2054 /framework/util | |
| parent | e3ff59f5d4f51c0d91b6293c92d2bd836599a50d (diff) | |
INTEGRATION: CWS tbcontrols (1.102.10); FILE MERGED
2006/04/27 16:11:13 cd 1.102.10.2: #i64501# Added simple button without status updates (supporting fast startup)
2006/04/27 07:50:06 cd 1.102.10.1: #i64501# Enhancements to support complex toolbar controllers
Diffstat (limited to 'framework/util')
| -rw-r--r-- | framework/util/makefile.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 744c712da017..41c6f827fd0b 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.102 $ +# $Revision: 1.103 $ # -# last change: $Author: vg $ $Date: 2006-04-07 14:22:43 $ +# last change: $Author: hr $ $Date: 2006-05-08 15:19:57 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -151,7 +151,8 @@ SHL2LIBS= $(LIB2TARGET) SHL2STDLIBS= \ $(FWILIB) \ $(VCLLIB) \ - $(SVLLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ $(COMPHELPERLIB) \ @@ -313,10 +314,15 @@ SHL4OBJS= \ $(SLO)$/wakeupthread.obj \ $(SLO)$/sessionlistener.obj \ $(SLO)$/newmenucontroller.obj \ - $(SLO)$/logoimagestatusbarcontroller.obj \ - $(SLO)$/logotextstatusbarcontroller.obj \ - $(SLO)$/globalsettings.obj \ - $(SLO)$/simpletextstatusbarcontroller.obj + $(SLO)$/logoimagestatusbarcontroller.obj \ + $(SLO)$/logotextstatusbarcontroller.obj \ + $(SLO)$/globalsettings.obj \ + $(SLO)$/simpletextstatusbarcontroller.obj \ + $(SLO)$/complextoolbarcontroller.obj \ + $(SLO)$/comboboxtoolbarcontroller.obj \ + $(SLO)$/imagebuttontoolbarcontroller.obj \ + $(SLO)$/togglebuttontoolbarcontroller.obj \ + $(SLO)$/buttontoolbarcontroller.obj SHL4STDLIBS= \ $(FWILIB) \ |