diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-27 09:28:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-27 09:28:40 +0000 |
| commit | fbf7c0ad62001993a6409f0f4d835907070d6f39 (patch) | |
| tree | 798d6032e20ee6838afb7744af4a56e5f8b6de57 /desktop/util | |
| parent | f097529635e533c9c839b27ee458ba2358141563 (diff) | |
INTEGRATION: CWS reglater2_DEV300 (1.74.48.1.14); FILE MERGED
2008/02/22 12:00:05 pb 1.74.48.1.14.1: fix: #i85445# pages.obj is needed
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index a0147874690a..736cbaa09b9a 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.77 $ +# $Revision: 1.78 $ # -# last change: $Author: rt $ $Date: 2008-01-29 16:31:48 $ +# last change: $Author: obo $ $Date: 2008-02-27 10:28:40 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,9 +67,11 @@ TARGETOBJS= \ $(OBJ)$/cmdlinehelp.obj \ $(OBJ)$/langselect.obj \ $(OBJ)$/userinstall.obj \ - $(OBJ)$/desktopcontext.obj - - + $(OBJ)$/desktopcontext.obj \ + $(SLO)$/pages.obj \ + $(SLO)$/wizard.obj \ + $(SLO)$/migration.obj \ + $(SLO)$/cfgfilter.obj # --- Resourcen ---------------------------------------------------- @@ -123,7 +125,7 @@ APP1NOSAL=TRUE APP1STDLIBS= \ $(VCLLIB) \ $(SVLLIB) \ - $(SVTOOLLIB) \ + $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ @@ -133,8 +135,8 @@ APP1STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(TKLIB) \ - $(SALLIB) - + $(SALLIB) \ + $(SFXLIB) APP1OBJS=$(TARGETOBJS) APP1OBJS += $(OBJ)$/copyright_ascii_sun.obj @@ -178,7 +180,8 @@ APP5STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ - $(TKLIB) + $(TKLIB) \ + $(SFXLIB) APP5OBJS=$(TARGETOBJS) APP5OBJS += $(OBJ)$/copyright_ascii_ooo.obj |