diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:30:24 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:30:24 +0000 |
| commit | 2dfc9baf6901d9cf20b0c8e8ebc379e3535e6d04 (patch) | |
| tree | f52f2eb404449c462d6e19adbbdd87a1206a9ece /desktop/util | |
| parent | 994a0be2f865ced21e39c0e30a357e2ea5572e56 (diff) | |
INTEGRATION: CWS valgrind02 (1.48.10); FILE MERGED
2004/10/18 17:48:43 mhu 1.48.10.2: #i35209# With own main() function, we have no need for VCLs salmain.obj.
2004/10/08 16:56:21 mhu 1.48.10.1: #i35209# Added main.cxx using SAL_IMPLEMENT_MAIN() as recommended.
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 94c1fe8c4658..6227c4b0696c 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.48 $ +# $Revision: 1.49 $ # -# last change: $Author: rt $ $Date: 2004-08-20 14:13:37 $ +# last change: $Author: rt $ $Date: 2004-10-28 16:30:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,7 +74,9 @@ GEN_HID_OTHER=TRUE VERINFONAME=verinfo -TARGETOBJS= $(OBJ)$/app.obj \ +TARGETOBJS= \ + $(OBJ)$/main.obj \ + $(OBJ)$/app.obj \ $(OBJ)$/lockfile.obj \ $(OBJ)$/lockfile2.obj \ $(OBJ)$/intro.obj \ @@ -124,6 +126,7 @@ RESLIB1IMAGES= $(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/desktop.srs APP1TARGET=so$/$(TARGET) +APP1NOSAL=TRUE APP1STDLIBS= \ $(VCLLIB) \ $(SVLLIB) \ @@ -227,6 +230,7 @@ APP4LINKRES=$(MISC)$/$(APP4TARGET).res APP5TARGET=soffice +APP5NOSAL=TRUE APP5STDLIBS= \ $(VCLLIB) \ $(SVLLIB) \ @@ -239,7 +243,7 @@ APP5STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ - $(TKLIB) \ + $(TKLIB) \ $(JVMFWKLIB) APP5OBJS=$(TARGETOBJS) |