diff options
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 8f20e72d8e43..43e7f6a1740c 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -194,11 +194,11 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i) DEPIDLFILES:=$(IDLFILES) .ENDIF # "$(EXTERNIDLFILES)"!="" .ELSE # "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!="" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i) $i $(shell @($(FIND) $(IDLDIRS) -name $(i:f)) | $(SED) s/\//\\/g ))) -.ELSE # "$(GUI)"=="WNT" +.ELSE # "$(OS)"=="WNT" DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) $i $(shell @$(FIND) $(IDLDIRS) -name $(i:f) -print ) )) -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" .ENDIF # "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!="" .ENDIF # "$(IDLFILES)"!="" @@ -408,7 +408,7 @@ ZIPALL=ZIPALLTARGET .IF "$(APP1TARGET)"!="" APP1TARGETN=$(BIN)/$(APP1TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP1BASE)"=="" APP1BASE=$(BASE) .ENDIF @@ -420,7 +420,7 @@ APP1BASEX=/BASE:$(APP1BASE) .IF "$(APP2TARGET)"!="" APP2TARGETN=$(BIN)/$(APP2TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP2BASE)"=="" APP2BASE=$(BASE) .ENDIF @@ -432,7 +432,7 @@ APP2BASEX=/BASE:$(APP2BASE) .IF "$(APP3TARGET)"!="" APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP3BASE)"=="" APP3BASE=$(BASE) .ENDIF @@ -444,7 +444,7 @@ APP3BASEX=/BASE:$(APP3BASE) .IF "$(APP4TARGET)"!="" APP4TARGETN=$(BIN)/$(APP4TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP4BASE)"=="" APP4BASE=$(BASE) .ENDIF @@ -456,7 +456,7 @@ APP4BASEX=/BASE:$(APP4BASE) .IF "$(APP5TARGET)"!="" APP5TARGETN=$(BIN)/$(APP5TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP5BASE)"=="" APP5BASE=$(BASE) .ENDIF @@ -468,7 +468,7 @@ APP5BASEX=/BASE:$(APP5BASE) .IF "$(APP6TARGET)"!="" APP6TARGETN=$(BIN)/$(APP6TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP6BASE)"=="" APP6BASE=$(BASE) .ENDIF @@ -480,7 +480,7 @@ APP6BASEX=/BASE:$(APP6BASE) .IF "$(APP7TARGET)"!="" APP7TARGETN=$(BIN)/$(APP7TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP7BASE)"=="" APP7BASE=$(BASE) .ENDIF @@ -492,7 +492,7 @@ APP7BASEX=/BASE:$(APP7BASE) .IF "$(APP8TARGET)"!="" APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP8BASE)"=="" APP8BASE=$(BASE) .ENDIF @@ -504,7 +504,7 @@ APP8BASEX=/BASE:$(APP8BASE) .IF "$(APP9TARGET)"!="" APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP9BASE)"=="" APP9BASE=$(BASE) .ENDIF @@ -520,7 +520,7 @@ SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL1DLLPRE*=$(DLLPRE) SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL1BASE)"=="" SHL1BASE=$(BASE) .ENDIF @@ -536,7 +536,7 @@ SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL2DLLPRE*=$(DLLPRE) SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL2BASE)"=="" SHL2BASE=$(BASE) .ENDIF @@ -552,7 +552,7 @@ SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL3DLLPRE*=$(DLLPRE) SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL3BASE)"=="" SHL3BASE=$(BASE) .ENDIF @@ -568,7 +568,7 @@ SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL4DLLPRE*=$(DLLPRE) SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL4BASE)"=="" SHL4BASE=$(BASE) .ENDIF @@ -584,7 +584,7 @@ SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL5DLLPRE*=$(DLLPRE) SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL5BASE)"=="" SHL5BASE=$(BASE) .ENDIF @@ -600,7 +600,7 @@ SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL6DLLPRE*=$(DLLPRE) SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL6BASE)"=="" SHL6BASE=$(BASE) .ENDIF @@ -616,7 +616,7 @@ SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL7DLLPRE*=$(DLLPRE) SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL7BASE)"=="" SHL7BASE=$(BASE) .ENDIF @@ -632,7 +632,7 @@ SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL8DLLPRE*=$(DLLPRE) SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL8BASE)"=="" SHL8BASE=$(BASE) .ENDIF @@ -648,7 +648,7 @@ SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL9DLLPRE*=$(DLLPRE) SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(SHL9BASE)"=="" SHL9BASE=$(BASE) .ENDIF @@ -708,7 +708,7 @@ LIB8TARGETN=$(LIB8TARGET) LIB9TARGETN=$(LIB9TARGET) .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"!="GCC" LIB1ARCHIV= LIB2ARCHIV= @@ -720,7 +720,7 @@ LIB7ARCHIV= LIB8ARCHIV= LIB9ARCHIV= .ENDIF -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" .IF "$(RESLIB1NAME)" != "" .IF "$(RESLIB1NOVERSION)"=="" @@ -867,9 +867,9 @@ SDI5TARGET=$(MISC)/$(SDI5NAME).don .ENDIF .IF "$(UNIXTEXT)"!="" -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" CONVERTUNIXTEXT:=$(UNIXTEXT) -.ENDIF # "$(GUI)"=="UNX" +.ENDIF # "$(OS)"!="WNT" .ENDIF # "$(UNIXTEXT)"!="" .IF "$(EXTUPDATEINFO_NAME)"!="" @@ -1618,7 +1618,7 @@ ALLTAR : forcedeps @$(TOUCH) $(TMP)/makedt.don killbin: -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" @$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI) @$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI) @$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI) @@ -1638,7 +1638,7 @@ killbin: @$(IFEXIST) $(BIN)/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP8TARGET)$(EXECPOST) $(FI) @$(IFEXIST) $(BIN)/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP9TARGET)$(EXECPOST) $(FI) -.ELSE # "$(GUI)"=="WNT" +.ELSE # "$(OS)"=="WNT" .IF "$(SHL1TARGET)"!="" @-$(RM) $(LB)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST) .ENDIF @@ -1693,7 +1693,7 @@ killbin: .IF "$(APP9TARGET)"!="" @-$(RM) $(BIN)/$(APP9TARGET)$(EXECPOST) .ENDIF -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" killobj: .IF "$(SLOFILES)" != "" @@ -1911,17 +1911,17 @@ $(SUBDIRS) .PHONY : .ELSE # "$(mk_tmp)"!="" #.IF "$(PRJNAME)"!="sw" -.IF "$(GUI)"!="UNX" +.IF "$(OS)"=="WNT" $(SUBDIRS) .PHONY : @[ cd $@ cd @$(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS) ] -.ELSE # "$(GUI)"!="UNX" +.ELSE # "$(OS)"=="WNT" $(SUBDIRS) .PHONY : cd $@; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS) -.ENDIF # "$(GUI)"!="UNX" +.ENDIF # "$(OS)"=="WNT" #.ENDIF .ENDIF # "$(mk_tmp)"!="" .ENDIF # "$(SUBDIRS)"!="" |