diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-05-02 12:22:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-05-02 12:22:10 +0000 |
| commit | 9248a316eb82dea76ba2c1fc0f1607b86d1c84d0 (patch) | |
| tree | 75d11b422a76f6574104ee7a772277e78163ca38 /desktop | |
| parent | 9e678d5a96fecc07b503dcc68c91b2b1833e154b (diff) | |
INTEGRATION: CWS hrobeta2 (1.55.36); FILE MERGED
2005/04/26 12:12:55 hro 1.55.36.1: #118794# Copy soffice.exe to soffice.bin to support checksum matching of binaries
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/util/makefile.mk | 56 |
1 files changed, 10 insertions, 46 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 6199346b376b..d39bbd07cd57 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.55 $ +# $Revision: 1.56 $ # -# last change: $Author: vg $ $Date: 2005-03-11 10:51:54 $ +# last change: $Author: obo $ $Date: 2005-05-02 13:22:10 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -182,50 +182,6 @@ APP1STACK=10000000 .ENDIF # WNT -.IF "$(GUI)" == "WNT" - -APP2DEPN= $(APP2RES) verinfo.rc -APP2NOSAL=TRUE -APP2TARGET=sowrapper -APP2STDLIBS+=shell32.lib -APP2OBJS= $(OBJ)$/sowrapper.obj \ - $(OBJ)$/wrapperw.obj \ - $(OBJ)$/wrappera.obj -APP2RES= $(RES)$/$(APP2TARGET).res -APP2ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico -APP2VERINFO=verinfo.rc -APP2LINKRES=$(MISC)$/$(APP2TARGET).res - - -APP3DEPN= $(APP3RES) verinfo.rc -APP3NOSAL=TRUE -APP3TARGET=solocal -APP3STDLIBS+=shell32.lib -APP3OBJS= \ - $(OBJ)$/sowrapper.obj \ - $(OBJ)$/lwrapw.obj \ - $(OBJ)$/lwrapa.obj -APP3RES= $(RES)$/$(APP3TARGET).res -APP3ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico -APP3VERINFO=verinfo.rc -APP3LINKRES=$(MISC)$/$(APP3TARGET).res - -APP4DEPN= $(APP4RES) verinfo.rc -APP4NOSAL=TRUE -APP4TARGET=soremote -APP4STDLIBS+=shell32.lib -APP4OBJS= \ - $(OBJ)$/sowrapper.obj \ - $(OBJ)$/rwrapw.obj \ - $(OBJ)$/rwrapa.obj - -APP4RES= $(RES)$/$(APP4TARGET).res -APP4ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico -APP4VERINFO=verinfo.rc -APP4LINKRES=$(MISC)$/$(APP4TARGET).res -.ENDIF # "$(GUI)" == "WNT" - - APP5TARGET=soffice APP5NOSAL=TRUE APP5STDLIBS= \ @@ -302,6 +258,8 @@ $(APP1TARGETN) : $(BIN)$/so .IF "$(GUI)" == "WNT" ALLTAR: $(BIN)$/$(TARGET).exe.manifest +ALLTAR: $(BIN)$/$(TARGET).bin +ALLTAR: $(BIN)$/so$/$(TARGET).bin .ENDIF # WNT $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN) @@ -320,6 +278,12 @@ ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) $(BIN)$/$(TARGET).exe.manifest: template.manifest +$(COPY) $< $@ +$(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST) + +$(COPY) $< $@ + +$(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST) + +$(COPY) $< $@ + $(MISCX)$/$(APP1TARGET).def : makefile.mk echo NAME soffice >$@ echo DESCRIPTION 'StarDesktop Version 5' >>$@ |