diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 14:02:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 14:02:58 +0000 |
| commit | 7fc1b3490bc18eb8cd82172656038ef77b6470fa (patch) | |
| tree | 467dce3eadf1aeb7480529d92617f2dff6c6562b /dbaccess/util | |
| parent | f6316f1e685cc8037b7c819b2951d206fe6d2758 (diff) | |
INTEGRATION: CWS titles02 (1.32.10); FILE MERGED
2008/02/29 11:01:14 as 1.32.10.2: RESYNC: (1.32-1.33); FILE MERGED
2007/12/10 11:37:34 oj 1.32.10.1: #i45909# #i45617# #i71469# change title handling
Diffstat (limited to 'dbaccess/util')
| -rw-r--r-- | dbaccess/util/makefile.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index c562ce1584bc..d619cc4af92d 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.35 $ +# $Revision: 1.36 $ # -# last change: $Author: obo $ $Date: 2008-03-25 14:14:39 $ +# last change: $Author: kz $ $Date: 2008-04-04 15:02:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -75,7 +75,11 @@ SHL1STDLIBS= \ $(VOSLIB) \ $(SALLIB) \ $(SFXLIB) \ +<<<<<<< makefile.mk $(BASICLIB) \ +======= + $(FWELIB) \ +>>>>>>> 1.32.10.2 $(SALHELPERLIB) SHL1LIBS=$(LIB1TARGET) @@ -114,6 +118,7 @@ SHL2STDLIBS= \ $(SFXLIB) \ $(BASICLIB) \ $(SVTOOLLIB) \ + $(FWELIB) \ $(TKLIB) \ $(VCLLIB) \ $(GOODIESLIB) \ |