strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS os2port01 (1.63.14); FILE MERGED

Browse source 
2007/09/05 07:29:00 obr 1.63.14.3: RESYNC: (1.71-1.72); FILE MERGED
2007/08/10 09:08:11 obr 1.63.14.2: RESYNC: (1.63-1.71); FILE MERGED
2006/12/28 14:54:21 ydario 1.63.14.1: OS/2 initial import.
This commit is contained in:
Vladimir Glazounov 2007-09-20 14:38:13 +00:00
parent 1bc18884b9
commit b39f7f18f4
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
desktop/util/makefile.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.72 $
# $Revision: 1.73 $
#
# last change: $Author: obo $ $Date: 2007-07-18 08:03:40 $
# last change: $Author: vg $ $Date: 2007-09-20 15:38:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -75,6 +75,9 @@ TARGETOBJS= \
.IF "$(GUI)" == "WNT"
RCFILES=verinfo.rc
.ENDIF
.IF "$(GUI)" == "OS2"
RCFILES=ooverinfo2.rc
.ENDIF
# --- Linking of static libs ---------------------------------------
@ -113,6 +116,7 @@ RESLIB1IMAGES= $(PRJ)$/res
RESLIB1SRSFILES= $(SRS)$/desktop.srs \
$(SRS)$/wizard.srs
.IF "$(GUI)" != "OS2"
APP1TARGET=so$/$(TARGET)
APP1NOSAL=TRUE
APP1STDLIBS= \
@ -156,6 +160,8 @@ APP1STACK=10000000
.ENDIF # WNT
.ENDIF # "$(GUI)" != "OS2"
APP5TARGET=soffice
APP5NOSAL=TRUE
APP5STDLIBS= \
@ -191,6 +197,14 @@ APP5LINKRES=$(MISC)$/ooffice5.res
APP5STACK=10000000
.ENDIF # WNT
.IF "$(GUI)" == "OS2"
APP5DEF= # automatic
APP5RES= $(RES)$/oodesktop.res
APP5ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
APP5VERINFO=ooverinfo2.rc
APP5LINKRES=$(MISC)$/ooffice.res
.ENDIF # OS2
.IF "$(GUI)" == "WNT"
APP6TARGET=so$/officeloader
APP6RES=$(RES)$/soloader.res
@ -238,14 +252,21 @@ ALLTAR: $(BIN)$/$(TARGET).bin
ALLTAR: $(BIN)$/so$/$(TARGET).bin
.ENDIF # WNT
.IF "$(GUI)" == "OS2"
ALLTAR: $(BIN)$/$(TARGET).bin
.ENDIF # OS2
$(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN)
$(COPY) $< $@
.IF "$(GUI)" != "OS2"
$(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
$(COPY) $< $@
ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST)
.ENDIF
.IF "$(GUI)" == "WNT"
@ -283,5 +304,10 @@ $(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST)
.ENDIF # WNT
.IF "$(GUI)" == "OS2"
$(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST)
$(COPY) $< $@
.ENDIF # OS2
$(MISC)$/binso_created.flg :
@@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@