diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 16:13:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 16:13:56 +0000 |
| commit | 28ad88000f36cd4dc64bbb75ebe73091b5be0f3b (patch) | |
| tree | 0ec0af8e02dddefb3fb2a9844fa610a2d9cfd0c5 /desktop/util/makefile.mk | |
| parent | f589f54b0ce37eeca8607143b03d08f41ffe04d6 (diff) | |
INTEGRATION: CWS sfxcleanup (1.61.38); FILE MERGED
2006/04/28 13:45:54 mba 1.61.38.2: RESYNC: (1.61-1.62); FILE MERGED
2006/02/27 15:18:34 mba 1.61.38.1: #132394#: remove superfluous code
Diffstat (limited to 'desktop/util/makefile.mk')
| -rw-r--r-- | desktop/util/makefile.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 338491adb30a..40ed8ae36be0 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.62 $ +# $Revision: 1.63 $ # -# last change: $Author: vg $ $Date: 2006-04-07 14:48:10 $ +# last change: $Author: rt $ $Date: 2006-05-02 17:13:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,7 +66,7 @@ TARGETOBJS= \ $(OBJ)$/cmdlinehelp.obj \ $(OBJ)$/langselect.obj \ $(OBJ)$/userinstall.obj \ - $(OBJ)$/desktopcontext.obj + $(OBJ)$/desktopcontext.obj @@ -101,7 +101,7 @@ LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//) # winXX is handled like solaris for now APP1_STDPRE= APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \ - $(VOSLIB) $(SALLIB) + $(VOSLIB) $(SALLIB) .ELSE APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \ $(CPPUHELPERLIB) @@ -128,8 +128,7 @@ APP1STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(TKLIB) \ - $(SALLIB) \ - $(SVXLIB) + $(SALLIB) # $(APP1_STDPRE) \ |