diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:43:24 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:43:24 +0000 |
| commit | f417b9b3a99fc1d013b7aaf46dee22e735f56edd (patch) | |
| tree | d1b12156eaf34d0420f2991e837aff1e46aa517a /desktop/util/makefile.mk | |
| parent | 58614b3a4d39177e127f2eb9ac47e5ccc6c58112 (diff) | |
INTEGRATION: CWS mav4 (1.27.2); FILE MERGED
2003/04/15 09:05:30 as 1.27.2.1: #108892# establish backing component on startup if no command line parameter exists
Diffstat (limited to 'desktop/util/makefile.mk')
| -rw-r--r-- | desktop/util/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index bbfb949732..d3223526fb 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.30 $ # -# last change: $Author: vg $ $Date: 2003-04-23 11:03:54 $ +# last change: $Author: rt $ $Date: 2003-04-24 13:43:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -129,6 +129,7 @@ APP1STDLIBS= \ $(VOSLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ + $(TKLIB) \ $(SALLIB) # $(APP1_STDPRE) \ @@ -228,6 +229,7 @@ APP5STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ + $(TKLIB) \ $(SVTOOLLIB) # $(APP1_STDPRE) \ @@ -282,8 +284,8 @@ ALLTAR: $(BIN)$/$(TARGET).exe.manifest # create a manifest file with the same name as the # office executable file soffice.exe.manifest $(BIN)$/$(TARGET).exe.manifest: template.manifest - +$(COPY) $< $@ - + +$(COPY) $< $@ + $(MISCX)$/$(APP1TARGET).def : makefile.mk echo NAME soffice >$@ echo DESCRIPTION 'StarDesktop Version 5' >>$@ |