INTEGRATION: CWS ause058 (1.173.4); FILE MERGED
2006/06/26 12:31:01 hjs 1.173.4.7: RESYNC: (1.173-1.174); FILE MERGED 2006/06/16 11:38:08 hjs 1.173.4.6: #i58351# more bash 2006/06/14 11:15:14 hjs 1.173.4.5: #i58351# applied relevant parts of the patch to support bash 2006/06/14 08:26:58 hjs 1.173.4.4: #i66210# remove autoupdate of local (hamburg) environments. more problems than benefit... 2006/06/13 16:21:19 hjs 1.173.4.3: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport 2006/06/12 16:29:21 hjs 1.173.4.2: #i65725# romoving move remains of MULTI* targets; #i63235# useless URD stuff removed 2006/06/09 14:34:13 hjs 1.173.4.1: #i65725# first round
This commit is contained in:
Kurt Zenker
parent
9647a33a15
commit
2e0611f013
1 changed files with 31 additions and 259 deletions
|
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
# $RCSfile: target.mk,v $
|
||||
#
|
||||
# $Revision: 1.175 $
|
||||
# $Revision: 1.176 $
|
||||
#
|
||||
# last change: $Author: ihi $ $Date: 2006-06-29 12:52:02 $
|
||||
# last change: $Author: kz $ $Date: 2006-07-05 22:10:18 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
|
@ -66,6 +66,7 @@ INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:
|
|||
.ELSE # "$(PRJINC)"!=""
|
||||
INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(UNOINCLUDES) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
|
||||
.ENDIF # "$(PRJINC)"!=""
|
||||
INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
|
||||
.EXPORT : LIB
|
||||
# --- Compiler -----------------------------------------------------
|
||||
|
||||
|
|
@ -194,14 +195,8 @@ APP8TARGET=
|
|||
APP9TARGET=
|
||||
.ENDIF
|
||||
|
||||
.IF "$(BUILD_URD_ONLY)" != ""
|
||||
NOURD=
|
||||
URD=TRUE
|
||||
.ENDIF # "$(BUILD_URD_ONLY)" != ""
|
||||
|
||||
.IF "$(IDLFILES)"!=""
|
||||
|
||||
.IF "$(URD)" != ""
|
||||
URDTARGET:=$(MISC)$/urd_$(TARGET).don
|
||||
URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)$/ucr$/$(IDLPACKAGE)$/$i)
|
||||
UNOIDLTARGETS+=$(URDFILES)
|
||||
|
|
@ -220,11 +215,9 @@ LOCALDOCDBTARGET=$(OUT)$/ucrdoc$/$(TARGET).db
|
|||
.ENDIF
|
||||
|
||||
.ENDIF # "$(URDDOC)" != ""
|
||||
.ENDIF # "$(URD)" != ""
|
||||
|
||||
.ENDIF # "$(IDLFILES)"!=""
|
||||
|
||||
.IF "$(NOURD)"==""
|
||||
.IF "$(UNOIDLDBFILES)"!=""
|
||||
UNOIDLDBTARGET=$(OUT)$/ucr$/$(PRJNAME).db
|
||||
.IF "$(URDDOC)" != ""
|
||||
|
|
@ -234,19 +227,7 @@ UNOIDLDBDOCTARGET=$(OUT)$/ucrdoc$/$(PRJNAME)_doc.db
|
|||
UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e))
|
||||
.ENDIF # "$(UNOIDLDBREGS)"!=""
|
||||
.ENDIF # "$(URDDOC)" != ""
|
||||
.IF "$(UPDATER)"!=""
|
||||
# SOLARREGDB=$(SOLARBINDIR)$/registry.db
|
||||
.ENDIF # "$(UPDATER)"!=""
|
||||
.ENDIF # "$(UNOIDLDBFILES)"!=""
|
||||
.ENDIF # "$(NOURD)"==""
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(DOCIDLFILES)"!=""
|
||||
.IF "$(UPDATER)"=="YES"
|
||||
UNODOCTARGET=make_uno_doc
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(IDLFILES)"!=""
|
||||
.IF "$(PACKAGE)"!=""
|
||||
|
|
@ -459,47 +440,38 @@ LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)$/$(i:f:s/_tmpl//))
|
|||
|
||||
.IF "$(SCP1TARGET)"!=""
|
||||
SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP1TARGET)$(SCPPOST))
|
||||
SCP1 ?= TNR!:=1
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP2TARGET)"!=""
|
||||
SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP2TARGET)$(SCPPOST))
|
||||
SCP2 ?= TNR!:=2
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP3TARGET)"!=""
|
||||
SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP3TARGET)$(SCPPOST))
|
||||
SCP3 ?= TNR!:=3
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP4TARGET)"!=""
|
||||
SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP4TARGET)$(SCPPOST))
|
||||
SCP4 ?= TNR!:=4
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP5TARGET)"!=""
|
||||
SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP5TARGET)$(SCPPOST))
|
||||
SCP5 ?= TNR!:=5
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP6TARGET)"!=""
|
||||
SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP6TARGET)$(SCPPOST))
|
||||
SCP6 ?= TNR!:=6
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP7TARGET)"!=""
|
||||
SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP7TARGET)$(SCPPOST))
|
||||
SCP7 ?= TNR!:=7
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP8TARGET)"!=""
|
||||
SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP8TARGET)$(SCPPOST))
|
||||
SCP8 ?= TNR!:=8
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SCP9TARGET)"!=""
|
||||
SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP9TARGET)$(SCPPOST))
|
||||
SCP9 ?= TNR!:=9
|
||||
.ENDIF
|
||||
|
||||
.IF "$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!="$(ZIP1LIST:s/LANGDIR//)$(ZIP2LIST:s/LANGDIR//)$(ZIP3LIST:s/LANGDIR//)$(ZIP4LIST:s/LANGDIR//)$(ZIP5LIST:s/LANGDIR//)$(ZIP6LIST:s/LANGDIR//)$(ZIP7LIST:s/LANGDIR//)$(ZIP8LIST:s/LANGDIR//)$(ZIP9LIST:s/LANGDIR//)"
|
||||
|
|
@ -672,7 +644,6 @@ ZIPDEPFILES+=$(ZIP9DEPFILE)
|
|||
|
||||
.IF "$(APP1TARGET)"!=""
|
||||
APP1TARGETN=$(BIN)$/$(APP1TARGET)$(EXECPOST)
|
||||
APP1 ?= TNR!:=1
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP1BASE)"==""
|
||||
|
|
@ -685,7 +656,6 @@ APP1BASEX=/BASE:$(APP1BASE)
|
|||
|
||||
.IF "$(APP2TARGET)"!=""
|
||||
APP2TARGETN=$(BIN)$/$(APP2TARGET)$(EXECPOST)
|
||||
APP2 ?= TNR!:=2
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP2BASE)"==""
|
||||
|
|
@ -698,7 +668,6 @@ APP2BASEX=/BASE:$(APP2BASE)
|
|||
|
||||
.IF "$(APP3TARGET)"!=""
|
||||
APP3TARGETN=$(BIN)$/$(APP3TARGET)$(EXECPOST)
|
||||
APP3 ?= TNR!:=3
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP3BASE)"==""
|
||||
|
|
@ -711,7 +680,6 @@ APP3BASEX=/BASE:$(APP3BASE)
|
|||
|
||||
.IF "$(APP4TARGET)"!=""
|
||||
APP4TARGETN=$(BIN)$/$(APP4TARGET)$(EXECPOST)
|
||||
APP4 ?= TNR!:=4
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP4BASE)"==""
|
||||
|
|
@ -724,7 +692,6 @@ APP4BASEX=/BASE:$(APP4BASE)
|
|||
|
||||
.IF "$(APP5TARGET)"!=""
|
||||
APP5TARGETN=$(BIN)$/$(APP5TARGET)$(EXECPOST)
|
||||
APP5 ?= TNR!:=5
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP5BASE)"==""
|
||||
|
|
@ -737,7 +704,6 @@ APP5BASEX=/BASE:$(APP5BASE)
|
|||
|
||||
.IF "$(APP6TARGET)"!=""
|
||||
APP6TARGETN=$(BIN)$/$(APP6TARGET)$(EXECPOST)
|
||||
APP6 ?= TNR!:=6
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP6BASE)"==""
|
||||
|
|
@ -750,7 +716,6 @@ APP6BASEX=/BASE:$(APP6BASE)
|
|||
|
||||
.IF "$(APP7TARGET)"!=""
|
||||
APP7TARGETN=$(BIN)$/$(APP7TARGET)$(EXECPOST)
|
||||
APP7 ?= TNR!:=7
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP7BASE)"==""
|
||||
|
|
@ -763,7 +728,6 @@ APP7BASEX=/BASE:$(APP7BASE)
|
|||
|
||||
.IF "$(APP8TARGET)"!=""
|
||||
APP8TARGETN=$(BIN)$/$(APP8TARGET)$(EXECPOST)
|
||||
APP8 ?= TNR!:=8
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP8BASE)"==""
|
||||
|
|
@ -776,7 +740,6 @@ APP8BASEX=/BASE:$(APP8BASE)
|
|||
|
||||
.IF "$(APP9TARGET)"!=""
|
||||
APP9TARGETN=$(BIN)$/$(APP9TARGET)$(EXECPOST)
|
||||
APP9 ?= TNR!:=9
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(APP9BASE)"==""
|
||||
|
|
@ -792,7 +755,6 @@ APP9BASEX=/BASE:$(APP9BASE)
|
|||
SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL1TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL1TARGET)$(DLLPOST)
|
||||
SHL1 ?= TNR!:=1
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL1BASE)"==""
|
||||
|
|
@ -803,16 +765,11 @@ SHL1BASEX=/BASE:$(SHL1BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL1IMPLIB)"!=""
|
||||
SHL1IMP ?= TNR!:=1
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL2TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL2TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL2TARGET)$(DLLPOST)
|
||||
SHL2 ?= TNR!:=2
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL2BASE)"==""
|
||||
|
|
@ -823,16 +780,11 @@ SHL2BASEX=/BASE:$(SHL2BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL2IMPLIB)"!=""
|
||||
SHL2IMP ?= TNR!:=2
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL3TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL3TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL3TARGET)$(DLLPOST)
|
||||
SHL3 ?= TNR!:=3
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL3BASE)"==""
|
||||
|
|
@ -843,16 +795,11 @@ SHL3BASEX=/BASE:$(SHL3BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL3IMPLIB)"!=""
|
||||
SHL3IMP ?= TNR!:=3
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL4TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL4TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL4TARGET)$(DLLPOST)
|
||||
SHL4 ?= TNR!:=4
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL4BASE)"==""
|
||||
|
|
@ -863,16 +810,11 @@ SHL4BASEX=/BASE:$(SHL4BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL4IMPLIB)"!=""
|
||||
SHL4IMP ?= TNR!:=4
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL5TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL5TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL5TARGET)$(DLLPOST)
|
||||
SHL5 ?= TNR!:=5
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL5BASE)"==""
|
||||
|
|
@ -883,16 +825,11 @@ SHL5BASEX=/BASE:$(SHL5BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL5IMPLIB)"!=""
|
||||
SHL5IMP ?= TNR!:=5
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL6TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL6TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL6TARGET)$(DLLPOST)
|
||||
SHL6 ?= TNR!:=6
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL6BASE)"==""
|
||||
|
|
@ -903,16 +840,11 @@ SHL6BASEX=/BASE:$(SHL6BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL6IMPLIB)"!=""
|
||||
SHL6IMP ?= TNR!:=6
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL7TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL7TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL7TARGET)$(DLLPOST)
|
||||
SHL7 ?= TNR!:=7
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL7BASE)"==""
|
||||
|
|
@ -923,16 +855,11 @@ SHL7BASEX=/BASE:$(SHL7BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL7IMPLIB)"!=""
|
||||
SHL7IMP ?= TNR!:=7
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL8TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL8TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL8TARGET)$(DLLPOST)
|
||||
SHL8 ?= TNR!:=8
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL8BASE)"==""
|
||||
|
|
@ -943,16 +870,11 @@ SHL8BASEX=/BASE:$(SHL8BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL8IMPLIB)"!=""
|
||||
SHL8IMP ?= TNR!:=8
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL9TARGET)"!=""
|
||||
.IF "$(WINVERSIONNAMES)"!=""
|
||||
SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
|
||||
.ENDIF # "$(WINVERSIONNAMES)"!=""
|
||||
SHL9TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL9TARGET)$(DLLPOST)
|
||||
SHL9 ?= TNR!:=9
|
||||
.IF "$(BASE)" != ""
|
||||
.IF "$(GUI)"=="WNT"
|
||||
.IF "$(SHL9BASE)"==""
|
||||
|
|
@ -963,10 +885,6 @@ SHL9BASEX=/BASE:$(SHL9BASE)
|
|||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHL9IMPLIB)"!=""
|
||||
SHL9IMP ?= TNR!:=9
|
||||
.ENDIF
|
||||
|
||||
# disable all descriptions
|
||||
.IF "$(NO_SHL_DESCRIPTION)"!=""
|
||||
NO_SHL1DESCRIPTION=TRUE
|
||||
|
|
@ -1081,203 +999,160 @@ UNOUCRTARGET:=$(INCCOM)$/$(TARGET)_headergen.done
|
|||
MAKE_HELPIDS=$(MISC)$/helpids.don
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SHXXFILES)"!=""
|
||||
SHXXTARGETN=$(INCCOM)$/$(TARGET).don
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX1TARGET)"!=""
|
||||
HXX1TARGETN=$(INCCOM)$/$(HXX1TARGET).$(HXX1EXT)
|
||||
HXX1 ?= TNR!:=1
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX2TARGET)"!=""
|
||||
HXX2TARGETN=$(INCCOM)$/$(HXX2TARGET).$(HXX2EXT)
|
||||
HXX2 ?= TNR!:=2
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX3TARGET)"!=""
|
||||
HXX3TARGETN=$(INCCOM)$/$(HXX3TARGET).$(HXX3EXT)
|
||||
HXX3 ?= TNR!:=3
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX4TARGET)"!=""
|
||||
HXX4TARGETN=$(INCCOM)$/$(HXX4TARGET).$(HXX4EXT)
|
||||
HXX4 ?= TNR!:=4
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX5TARGET)"!=""
|
||||
HXX5TARGETN=$(INCCOM)$/$(HXX5TARGET).$(HXX5EXT)
|
||||
HXX5 ?= TNR!:=5
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX6TARGET)"!=""
|
||||
HXX6TARGETN=$(INCCOM)$/$(HXX6TARGET).$(HXX6EXT)
|
||||
HXX6 ?= TNR!:=6
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX7TARGET)"!=""
|
||||
HXX7TARGETN=$(INCCOM)$/$(HXX7TARGET).$(HXX7EXT)
|
||||
HXX7 ?= TNR!:=7
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX8TARGET)"!=""
|
||||
HXX8TARGETN=$(INCCOM)$/$(HXX8TARGET).$(HXX8EXT)
|
||||
HXX8 ?= TNR!:=8
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX9TARGET)"!=""
|
||||
HXX9TARGETN=$(INCCOM)$/$(HXX9TARGET).$(HXX9EXT)
|
||||
HXX9 ?= TNR!:=9
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX10TARGET)"!=""
|
||||
HXX10TARGETN=$(INCCOM)$/$(HXX10TARGET).$(HXX10EXT)
|
||||
HXX10 ?= TNR!:=10
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX11TARGET)"!=""
|
||||
HXX11TARGETN=$(INCCOM)$/$(HXX11TARGET).$(HXX11EXT)
|
||||
HXX11 ?= TNR!:=11
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX12TARGET)"!=""
|
||||
HXX12TARGETN=$(INCCOM)$/$(HXX12TARGET).$(HXX12EXT)
|
||||
HXX12 ?= TNR!:=12
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX13TARGET)"!=""
|
||||
HXX13TARGETN=$(INCCOM)$/$(HXX13TARGET).$(HXX13EXT)
|
||||
HXX13 ?= TNR!:=13
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX14TARGET)"!=""
|
||||
HXX14TARGETN=$(INCCOM)$/$(HXX14TARGET).$(HXX14EXT)
|
||||
HXX14 ?= TNR!:=14
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX15TARGET)"!=""
|
||||
HXX15TARGETN=$(INCCOM)$/$(HXX15TARGET).$(HXX15EXT)
|
||||
HXX15 ?= TNR!:=15
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX16TARGET)"!=""
|
||||
HXX16TARGETN=$(INCCOM)$/$(HXX16TARGET).$(HXX16EXT)
|
||||
HXX16 ?= TNR!:=16
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX17TARGET)"!=""
|
||||
HXX17TARGETN=$(INCCOM)$/$(HXX17TARGET).$(HXX17EXT)
|
||||
HXX17 ?= TNR!:=17
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX18TARGET)"!=""
|
||||
HXX18TARGETN=$(INCCOM)$/$(HXX18TARGET).$(HXX18EXT)
|
||||
HXX18 ?= TNR!:=18
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX19TARGET)"!=""
|
||||
HXX19TARGETN=$(INCCOM)$/$(HXX19TARGET).$(HXX19EXT)
|
||||
HXX19 ?= TNR!:=19
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX20TARGET)"!=""
|
||||
HXX20TARGETN=$(INCCOM)$/$(HXX20TARGET).$(HXX20EXT)
|
||||
HXX20 ?= TNR!:=20
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX21TARGET)"!=""
|
||||
HXX21TARGETN=$(INCCOM)$/$(HXX21TARGET).$(HXX21EXT)
|
||||
HXX21 ?= TNR!:=21
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX22TARGET)"!=""
|
||||
HXX22TARGETN=$(INCCOM)$/$(HXX22TARGET).$(HXX22EXT)
|
||||
HXX22 ?= TNR!:=22
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX23TARGET)"!=""
|
||||
HXX23TARGETN=$(INCCOM)$/$(HXX23TARGET).$(HXX23EXT)
|
||||
HXX23 ?= TNR!:=23
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX24TARGET)"!=""
|
||||
HXX24TARGETN=$(INCCOM)$/$(HXX24TARGET).$(HXX24EXT)
|
||||
HXX24 ?= TNR!:=24
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX25TARGET)"!=""
|
||||
HXX25TARGETN=$(INCCOM)$/$(HXX25TARGET).$(HXX25EXT)
|
||||
HXX25 ?= TNR!:=25
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX26TARGET)"!=""
|
||||
HXX26TARGETN=$(INCCOM)$/$(HXX26TARGET).$(HXX26EXT)
|
||||
HXX26 ?= TNR!:=26
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX27TARGET)"!=""
|
||||
HXX27TARGETN=$(INCCOM)$/$(HXX27TARGET).$(HXX27EXT)
|
||||
HXX27 ?= TNR!:=27
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX28TARGET)"!=""
|
||||
HXX28TARGETN=$(INCCOM)$/$(HXX28TARGET).$(HXX28EXT)
|
||||
HXX28 ?= TNR!:=28
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX29TARGET)"!=""
|
||||
HXX29TARGETN=$(INCCOM)$/$(HXX29TARGET).$(HXX29EXT)
|
||||
HXX29 ?= TNR!:=29
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX30TARGET)"!=""
|
||||
HXX30TARGETN=$(INCCOM)$/$(HXX30TARGET).$(HXX30EXT)
|
||||
HXX30 ?= TNR!:=30
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX31TARGET)"!=""
|
||||
HXX31TARGETN=$(INCCOM)$/$(HXX31TARGET).$(HXX31EXT)
|
||||
HXX31 ?= TNR!:=31
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX32TARGET)"!=""
|
||||
HXX32TARGETN=$(INCCOM)$/$(HXX32TARGET).$(HXX32EXT)
|
||||
HXX32 ?= TNR!:=32
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX33TARGET)"!=""
|
||||
HXX33TARGETN=$(INCCOM)$/$(HXX33TARGET).$(HXX33EXT)
|
||||
HXX33 ?= TNR!:=33
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX34TARGET)"!=""
|
||||
HXX34TARGETN=$(INCCOM)$/$(HXX34TARGET).$(HXX34EXT)
|
||||
HXX34 ?= TNR!:=34
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX35TARGET)"!=""
|
||||
HXX35TARGETN=$(INCCOM)$/$(HXX35TARGET).$(HXX35EXT)
|
||||
HXX35 ?= TNR!:=35
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX36TARGET)"!=""
|
||||
HXX36TARGETN=$(INCCOM)$/$(HXX36TARGET).$(HXX36EXT)
|
||||
HXX36 ?= TNR!:=36
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX37TARGET)"!=""
|
||||
HXX37TARGETN=$(INCCOM)$/$(HXX37TARGET).$(HXX37EXT)
|
||||
HXX37 ?= TNR!:=37
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX38TARGET)"!=""
|
||||
HXX38TARGETN=$(INCCOM)$/$(HXX38TARGET).$(HXX38EXT)
|
||||
HXX38 ?= TNR!:=38
|
||||
.ENDIF
|
||||
|
||||
.IF "$(HXX39TARGET)"!=""
|
||||
HXX39TARGETN=$(INCCOM)$/$(HXX39TARGET).$(HXX39EXT)
|
||||
HXX39 ?= TNR!:=39
|
||||
.ENDIF
|
||||
|
||||
|
||||
|
|
@ -1286,47 +1161,38 @@ HXXCOPYTARGET= copy_hxxcopyfiles
|
|||
.ENDIF
|
||||
|
||||
.IF "$(LIB1TARGET)" != ""
|
||||
LIB1 ?= TNR!:=1
|
||||
LIB1TARGETN=$(LIB1TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB2TARGET)" != ""
|
||||
LIB2 ?= TNR!:=2
|
||||
LIB2TARGETN=$(LIB2TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB3TARGET)" != ""
|
||||
LIB3 ?= TNR!:=3
|
||||
LIB3TARGETN=$(LIB3TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB4TARGET)" != ""
|
||||
LIB4 ?= TNR!:=4
|
||||
LIB4TARGETN=$(LIB4TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB5TARGET)" != ""
|
||||
LIB5 ?= TNR!:=5
|
||||
LIB5TARGETN=$(LIB5TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB6TARGET)" != ""
|
||||
LIB6 ?= TNR!:=6
|
||||
LIB6TARGETN=$(LIB6TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB7TARGET)" != ""
|
||||
LIB7 ?= TNR!:=7
|
||||
LIB7TARGETN=$(LIB7TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB8TARGET)" != ""
|
||||
LIB8 ?= TNR!:=8
|
||||
LIB8TARGETN=$(LIB8TARGET)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(LIB9TARGET)" != ""
|
||||
LIB9 ?= TNR!:=9
|
||||
LIB9TARGETN=$(LIB9TARGET)
|
||||
.ENDIF
|
||||
|
||||
|
|
@ -1343,7 +1209,6 @@ LIB9ARCHIV=
|
|||
.ENDIF # "$(GUI)"=="WNT"
|
||||
|
||||
.IF "$(RESLIB1NAME)" != ""
|
||||
RESLIB1 ?= TNR!:=1
|
||||
.IF "$(RESLIB1NOVERSION)"==""
|
||||
RESLIB1VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB1NOVERSION)"==""
|
||||
|
|
@ -1359,7 +1224,6 @@ RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB2NAME)" != ""
|
||||
RESLIB2 ?= TNR!:=2
|
||||
.IF "$(RESLIB2NOVERSION)"==""
|
||||
RESLIB2VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB2NOVERSION)"==""
|
||||
|
|
@ -1374,7 +1238,6 @@ RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB3NAME)" != ""
|
||||
RESLIB3 ?= TNR!:=3
|
||||
.IF "$(RESLIB3NOVERSION)"==""
|
||||
RESLIB3VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB3NOVERSION)"==""
|
||||
|
|
@ -1389,7 +1252,6 @@ RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB4NAME)" != ""
|
||||
RESLIB4 ?= TNR!:=4
|
||||
.IF "$(RESLIB4NOVERSION)"==""
|
||||
RESLIB4VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB4NOVERSION)"==""
|
||||
|
|
@ -1404,7 +1266,6 @@ RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB5NAME)" != ""
|
||||
RESLIB5 ?= TNR!:=5
|
||||
.IF "$(RESLIB5NOVERSION)"==""
|
||||
RESLIB5VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB5NOVERSION)"==""
|
||||
|
|
@ -1419,7 +1280,6 @@ RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB6NAME)" != ""
|
||||
RESLIB6 ?= TNR!:=6
|
||||
.IF "$(RESLIB6NOVERSION)"==""
|
||||
RESLIB6VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB6NOVERSION)"==""
|
||||
|
|
@ -1434,7 +1294,6 @@ RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB7NAME)" != ""
|
||||
RESLIB7 ?= TNR!:=7
|
||||
.IF "$(RESLIB7NOVERSION)"==""
|
||||
RESLIB7VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB7NOVERSION)"==""
|
||||
|
|
@ -1449,7 +1308,6 @@ RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB8NAME)" != ""
|
||||
RESLIB8 ?= TNR!:=8
|
||||
.IF "$(RESLIB8NOVERSION)"==""
|
||||
RESLIB8VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB8NOVERSION)"==""
|
||||
|
|
@ -1464,7 +1322,6 @@ RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN))
|
|||
.ENDIF
|
||||
|
||||
.IF "$(RESLIB9NAME)" != ""
|
||||
RESLIB9 ?= TNR!:=9
|
||||
.IF "$(RESLIB9NOVERSION)"==""
|
||||
RESLIB9VERSION:=$(UPD)
|
||||
.ENDIF # "$(RESLIB9NOVERSION)"==""
|
||||
|
|
@ -1488,47 +1345,38 @@ RESLIBSPLIT1TARGETN=$(BIN)$/$(RESLIBSPLIT1NAME)$(UPD)$(LANGEXT).dll
|
|||
|
||||
.IF "$(DEF1NAME)"!=""
|
||||
DEF1TARGETN=$(MISC)$/$(DEF1NAME).def
|
||||
DEF1 ?= TNR!:=1
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF2NAME)"!=""
|
||||
DEF2TARGETN=$(MISC)$/$(DEF2NAME).def
|
||||
DEF2 ?= TNR!:=2
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF3NAME)"!=""
|
||||
DEF3TARGETN=$(MISC)$/$(DEF3NAME).def
|
||||
DEF3 ?= TNR!:=3
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF4NAME)"!=""
|
||||
DEF4TARGETN=$(MISC)$/$(DEF4NAME).def
|
||||
DEF4 ?= TNR!:=4
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF5NAME)"!=""
|
||||
DEF5TARGETN=$(MISC)$/$(DEF5NAME).def
|
||||
DEF5 ?= TNR!:=5
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF6NAME)"!=""
|
||||
DEF6TARGETN=$(MISC)$/$(DEF6NAME).def
|
||||
DEF6 ?= TNR!:=6
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF7NAME)"!=""
|
||||
DEF7TARGETN=$(MISC)$/$(DEF7NAME).def
|
||||
DEF7 ?= TNR!:=7
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF8NAME)"!=""
|
||||
DEF8TARGETN=$(MISC)$/$(DEF8NAME).def
|
||||
DEF8 ?= TNR!:=8
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF9NAME)"!=""
|
||||
DEF9TARGETN=$(MISC)$/$(DEF9NAME).def
|
||||
DEF9 ?= TNR!:=9
|
||||
.ENDIF
|
||||
|
||||
# IZ65415 - catch obsolete macro. Can be removed later.
|
||||
|
|
@ -1541,35 +1389,30 @@ NO_SDINAME_allowed
|
|||
.DIRCACHE=no
|
||||
SDI1TARGET=$(MISC)$/$(SDI1NAME).don
|
||||
HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI1NAME)_sid.hid
|
||||
SDI1 ?= TNR!:=1
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SDI2NAME)"!=""
|
||||
.DIRCACHE=no
|
||||
SDI2TARGET=$(MISC)$/$(SDI2NAME).don
|
||||
HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI2NAME)_sid.hid
|
||||
SDI2 ?= TNR!:=2
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SDI3NAME)"!=""
|
||||
.DIRCACHE=no
|
||||
SDI3TARGET=$(MISC)$/$(SDI3NAME).don
|
||||
HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI3NAME)_sid.hid
|
||||
SDI3 ?= TNR!:=3
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SDI4NAME)"!=""
|
||||
.DIRCACHE=no
|
||||
SDI4TARGET=$(MISC)$/$(SDI4NAME).don
|
||||
HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI4NAME)_sid.hid
|
||||
SDI4 ?= TNR!:=4
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SDI5NAME)"!=""
|
||||
.DIRCACHE=no
|
||||
SDI5TARGET=$(MISC)$/$(SDI5NAME).don
|
||||
HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI5NAME)_sid.hid
|
||||
SDI5 ?= TNR!:=5
|
||||
.ENDIF
|
||||
|
||||
.IF "$(XMLPROPERTIES)"!=""
|
||||
|
|
@ -1702,7 +1545,6 @@ ALLTAR: $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR) \
|
|||
$(DPZTARGET) \
|
||||
$(ZIPALL) \
|
||||
$(SDITARGET) \
|
||||
$(UNODOCTARGET) \
|
||||
$(LOCALDBTARGET) \
|
||||
$(LOCALDOCDBTARGET) \
|
||||
$(UNOIDLDBTARGET) \
|
||||
|
|
@ -1720,7 +1562,6 @@ ALLTAR: $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR) \
|
|||
$(IDL4TARGET) $(IDL5TARGET) \
|
||||
$(SDI1TARGET) $(SDI2TARGET) $(SDI3TARGET) \
|
||||
$(SDI4TARGET) $(SDI5TARGET) \
|
||||
$(SHXXTARGETN) \
|
||||
$(HXXALLTARGET) \
|
||||
$(HXXCOPYTARGET) \
|
||||
$(NOLIBOBJTARGET) \
|
||||
|
|
@ -1932,11 +1773,6 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
|
|||
|
||||
.ENDIF # "$(UNIXTEXT)"!=""
|
||||
|
||||
.IF "$(GUI)$(UPDATER)"=="WNTYES"
|
||||
make_uno_doc:
|
||||
# +-$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES)
|
||||
.ENDIF
|
||||
|
||||
makedoc:
|
||||
@+-mkdir $(OUT)$/ucrdoc >& $(NULLDEV)
|
||||
+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
|
||||
|
|
@ -2001,7 +1837,7 @@ COMPVTMP:=$(mktmp iii)
|
|||
@echo COMPATH_STORED:=$(COMPATH) >> $(COMPVTMP)
|
||||
@+-$(RM) $(@)_$(COMPVTMP:b) >& $(NULLDEV)
|
||||
@+$(TYPE) $(COMPVTMP) > $(@)_$(COMPVTMP:b)
|
||||
@+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV)
|
||||
@+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(FI)
|
||||
@+-$(RENAME) $(@)_$(COMPVTMP:b) $@
|
||||
@+-$(RM) $(@)_$(COMPVTMP:b) >& $(NULLDEV)
|
||||
.ELSE # "$(CCNUMVER)"!=""
|
||||
|
|
@ -2049,25 +1885,17 @@ $(MISC)$/$(TARGET)_%.done : $(COMMONMISC)$/$(TARGET)$/%.xrb
|
|||
@+$(RM) $(MISC)$/$(<:b).interm$(TARGET) >& $(NULLDEV)
|
||||
.ENDIF # "$(XMLPROPERTIES)"!=""
|
||||
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_sdi.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_sdi.mk
|
||||
.ENDIF
|
||||
|
||||
.IF "$(DEF1NAME)$(DEF2NAME)$(DEF3NAME)$(DEF4NAME)$(DEF5NAME)$(DEF6NAME)$(DEF7NAME)$(DEF8NAME)$(DEF9NAME)"!=""
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_def.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_def.mk
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
.IF "$(COMMONPRJHIDOTHERTARGET)"!=""
|
||||
$(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
|
||||
@echo ------------------------------
|
||||
@echo Making: $@
|
||||
@+$(IFEXIST) $@ $(THEN) $(RM) $@
|
||||
@+$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
|
||||
+$(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp
|
||||
@+$(RENAME) $@.$(ROUT).tmp $@
|
||||
.ENDIF
|
||||
|
|
@ -2088,49 +1916,28 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
|
|||
# - LIBS -
|
||||
# --------
|
||||
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_lib.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_lib.mk
|
||||
.ENDIF
|
||||
|
||||
#.INCLUDE : tg_lib.mk
|
||||
|
||||
# -------
|
||||
# - SRS -
|
||||
# -------
|
||||
|
||||
.IF "$(SRS1NAME)$(SRS2NAME)$(SRS3NAME)$(SRS4NAME)$(SRS5NAME)$(SRS6NAME)$(SRS7NAME)$(SRS8NAME)$(SRS9NAME)"!=""
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_srs.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_srs.mk
|
||||
.ENDIF
|
||||
.ENDIF # "$(SRS1NAME)$(SRS2NAME)$(SRS3NAME)$(SRS4NAME)$(SRS5NAME)$(SRS6NAME)$(SRS7NAME)$(SRS8NAME)$(SRS9NAME)"!=""
|
||||
|
||||
# -------
|
||||
# - RES -
|
||||
# -------
|
||||
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : tg_res.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_res.mk
|
||||
.ENDIF
|
||||
|
||||
# -------
|
||||
# - APP -
|
||||
# -------
|
||||
|
||||
#test:
|
||||
# echo test
|
||||
|
||||
.IF "$(APP1TARGETN)$(APP2TARGETN)$(APP3TARGETN)$(APP4TARGETN)$(APP5TARGETN)$(APP6TARGETN)$(APP7TARGETN)$(APP8TARGETN)$(APP9TARGETN)"!=""
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_app.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_app.mk
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
# -------
|
||||
|
|
@ -2138,12 +1945,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
|
|||
# -------
|
||||
|
||||
.IF "$(SCP1TARGETN)$(SCP2TARGETN)$(SCP3TARGETN)$(SCP4TARGETN)$(SCP5TARGETN)$(SCP6TARGETN)$(SCP7TARGETN)$(SCP8TARGETN)$(SCP9TARGETN)"!=""
|
||||
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_scp.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_scp.mk
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
# -------
|
||||
|
|
@ -2151,11 +1953,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
|
|||
# -------
|
||||
|
||||
.IF "$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!=""
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_zip.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_zip.mk
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
# -------
|
||||
|
|
@ -2163,22 +1961,14 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
|
|||
# -------
|
||||
|
||||
.IF "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_rslb.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_rslb.mk
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
# -------
|
||||
# - SHL -
|
||||
# -------
|
||||
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_shl.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_shl.mk
|
||||
.ENDIF
|
||||
|
||||
.IF "$(USE_VERSIONH)"!=""
|
||||
.INIT .SEQUENTIAL : $(USE_VERSIONH) $(NULLPRQ)
|
||||
|
|
@ -2188,12 +1978,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
|
|||
# - HXX -
|
||||
# -------
|
||||
|
||||
.IF "$(MK_UNROLL)"!=""
|
||||
.INCLUDE : _tg_hxx.mk
|
||||
.ELSE
|
||||
.INCLUDE : tg_hxx.mk
|
||||
.ENDIF
|
||||
|
||||
|
||||
# -------
|
||||
# - processing config -
|
||||
|
|
@ -2250,26 +2035,22 @@ last_target: $(LAZY_DEPS_WARNING)
|
|||
$(MISC)$/$(TARGET)genjava.mk: $(IDLFILES)
|
||||
|
||||
.IF "$(IDLFILES)"!=""
|
||||
.IF "$(URD)"!=""
|
||||
|
||||
$(URDTARGET) : $(DEPIDLFILES)
|
||||
.IF "$(MAXPROCESS)"<="1"
|
||||
#.IF "$(MAXPROCESS)"<="1"
|
||||
+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
|
||||
# +$(UNOIDL) @$(mktmp -Wb,c $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Burd -OH$(OUT)$/ucr$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
|
||||
.ENDIF # "$(MAXPROCESS)"<="1"
|
||||
#.ENDIF # "$(MAXPROCESS)"<="1"
|
||||
@+echo > $@
|
||||
|
||||
.IF "$(URDDOC)"!=""
|
||||
|
||||
$(URDDOCTARGET) : $(DEPIDLFILES)
|
||||
@+-mkdir $(OUT)$/ucrdoc >& $(NULLDEV)
|
||||
.IF "$(MAXPROCESS)"<="1"
|
||||
#.IF "$(MAXPROCESS)"<="1"
|
||||
+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
|
||||
# +$(UNOIDL) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Burd -OH$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
|
||||
.ENDIF # "$(MAXPROCESS)"<="1"
|
||||
#.ENDIF # "$(MAXPROCESS)"<="1"
|
||||
@+echo > $@
|
||||
.ENDIF # "$(URDDOC)"!=""
|
||||
.ENDIF # "$(URD)"!=""
|
||||
.ENDIF # "$(IDLFILES)"!=""
|
||||
|
||||
.IF "$(JAVACLASSFILES:s/DEFINED//)"!=""
|
||||
|
|
@ -2281,15 +2062,6 @@ $(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET)
|
|||
|
||||
.INCLUDE : tg_jar.mk
|
||||
|
||||
|
||||
# ----------------------------------
|
||||
# auto update of local environment
|
||||
# ----------------------------------
|
||||
|
||||
.IF "$(SOLARVERSION)"!="$(SHARED_SOLARVERSION)"
|
||||
.INCLUDE .IGNORE : $(SOLAR_ENV_ROOT)$/etools$/env_up.mk
|
||||
.ENDIF # "$(SOLARVERSION)"!="$(SHARED_SOLARVERSION)"
|
||||
|
||||
# ----------------------------------
|
||||
# - NOOPT - files ohne optimierung -
|
||||
# ----------------------------------
|
||||
|
|
@ -2385,24 +2157,24 @@ OTHERTARGET : $(OTHER)
|
|||
|
||||
killbin:
|
||||
.IF "$(GUI)"=="WNT"
|
||||
@+$(IFEXIST) $(BIN)\$(SHL1TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL1TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL2TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL2TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL3TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL3TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL4TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL4TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL5TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL5TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL6TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL6TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL7TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL7TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL8TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL8TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(SHL9TARGET).dll $(THEN) $(RM) $(BIN)\$(SHL9TARGET).dll
|
||||
@+$(IFEXIST) $(BIN)\$(APP1TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP1TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP2TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP2TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP3TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP3TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP4TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP4TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP5TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP5TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP6TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP6TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP7TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP7TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP8TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP8TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)\$(APP9TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)\$(APP9TARGET)$(EXECPOST)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL1TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL1TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL2TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL2TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL3TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL3TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL4TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL4TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL5TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL5TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL6TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL6TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL7TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL7TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL8TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL8TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(SHL9TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL9TARGET).dll $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(FI)
|
||||
@+$(IFEXIST) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(FI)
|
||||
|
||||
.ELSE # "$(GUI)"=="WNT"
|
||||
.IF "$(SHL1TARGET)"!=""
|
||||
|
|
@ -2546,9 +2318,9 @@ clean_all :
|
|||
.IF "$(OUT)"!=""
|
||||
.IF "$(USE_SHELL)"!="4nt"
|
||||
+test -f $(PRJ)$/prj/build.lst && rm -rf $(OUT)
|
||||
.ELSE # "$(GUI)"=="UNX"
|
||||
+$(IFEXIST) $(PRJ)$/prj/build.lst $(THEN) del /sxyz $(OUT)
|
||||
.ENDIF # "$(GUI)"=="UNX"
|
||||
.ELSE # "$(USE_SHELL)"!="4nt"
|
||||
+$(IFEXIST) $(PRJ)$/prj/build.lst $(THEN) del /sxyz $(OUT) $(FI)
|
||||
.ENDIF # "$(USE_SHELL)"!="4nt"
|
||||
@+echo local output tree is gone!
|
||||
.ELSE # "$(OUT)"!=""
|
||||
@+echo can\'t be done! $$(OUT) not defined.
|
||||
|
|
@ -2643,7 +2415,7 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
|
|||
$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY :
|
||||
@echo Making $@ :
|
||||
@echo ---------------
|
||||
@+$(IFEXIST) $@ $(THEN) $(RM) $@
|
||||
@+$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
|
||||
@echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010> $@.$(ROUT).tmp
|
||||
$(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | $(SORT) -u >> $@.$(ROUT).tmp
|
||||
@+$(RENAME) $@.$(ROUT).tmp $@
|
||||
|
|
|
|||
Loading…
Reference in a new issue