diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-07 08:53:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-07 08:53:26 +0000 |
| commit | e7697bdeb58002071b8d3d3cf222ad95526121b7 (patch) | |
| tree | 02e3d7ee89678bdd4f122e30f967138bdabd4058 /vcl/workben/makefile.mk | |
| parent | b049a21019ba2cced375b465557dd6172dc4e305 (diff) | |
INTEGRATION: CWS sb80 (1.21.54); FILE MERGED
2007/11/15 15:00:52 sb 1.21.54.1: #i81275# Consolidated the platform-specific salmain.cxx into a single platform-independent one; call new tools::extendApplicationEnvironment from main functions.
Diffstat (limited to 'vcl/workben/makefile.mk')
| -rw-r--r-- | vcl/workben/makefile.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/vcl/workben/makefile.mk b/vcl/workben/makefile.mk index 5c3d215cdf9b..34dda8dd2264 100644 --- a/vcl/workben/makefile.mk +++ b/vcl/workben/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: kz $ $Date: 2007-10-09 15:22:30 $ +# last change: $Author: obo $ $Date: 2008-01-07 09:53:26 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -76,13 +76,7 @@ APP1STDLIBS= $(CPPULIB) \ APP2TARGET= outdevgrind APP2OBJS= \ - $(OBJ)$/outdevgrind.obj - -.IF "$(GUI)"!="UNX" - APP2OBJS += $(OBJ)$/salmain.obj -.ELSE - APP2OBJS += $(SLO)$/salmain.obj -.ENDIF + $(OBJ)$/outdevgrind.obj $(OBJ)$/salmain.obj APP2NOSAL= TRUE APP2STDLIBS=$(TOOLSLIB) \ |