diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:48:30 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:48:30 +0000 |
| commit | 2cb41804900790173fa58ae2ae7423f1a5e6033d (patch) | |
| tree | a44d03138e2dbbeb742fcdd99e092baf745712e4 /framework | |
| parent | 4305c90926ba88429ad3116ce62c33f0549fc4b3 (diff) | |
INTEGRATION: CWS langstatusbar (1.111.2); FILE MERGED
2007/10/22 10:01:24 tl 1.111.2.4: #i77208# language status bar control
2007/10/01 18:39:03 tl 1.111.2.3: RESYNC: (1.111-1.115); FILE MERGED
2007/08/10 09:33:23 cd 1.111.2.2: #i77208# Popup menu controller for tools - language menu
2007/06/13 13:44:09 cd 1.111.2.1: #i77208# Language selection status bar control added
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/util/makefile.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 10dbc07f563d..e98b5ddf740d 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.115 $ +# $Revision: 1.116 $ # -# last change: $Author: obo $ $Date: 2007-07-17 13:26:27 $ +# last change: $Author: ihi $ $Date: 2007-11-23 16:48:30 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -328,9 +328,11 @@ SHL4OBJS= \ $(SLO)$/dropdownboxtoolbarcontroller.obj \ $(SLO)$/uriabbreviation.obj \ $(SLO)$/popupmenudispatcher.obj \ - $(SLO)$/windowcommanddispatch.obj \ - $(SLO)$/menubarmerger.obj \ - $(SLO)$/toolbarmerger.obj + $(SLO)$/windowcommanddispatch.obj \ + $(SLO)$/menubarmerger.obj \ + $(SLO)$/toolbarmerger.obj \ + $(SLO)$/langselectionstatusbarcontroller.obj \ + $(SLO)$/langselectionmenucontroller.obj SHL4STDLIBS= \ $(FWILIB) \ @@ -347,7 +349,8 @@ SHL4STDLIBS= \ $(CPPULIB) \ $(VOSLIB) \ $(SALLIB) \ - $(UCBHELPERLIB) + $(UCBHELPERLIB) \ + $(I18NISOLANGLIB) SHL4DEF= $(MISC)$/$(SHL4TARGET).def SHL4DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN) |