diff options
| -rw-r--r-- | solenv/inc/pstrules.mk | 6 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 20 |
2 files changed, 15 insertions, 11 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 69cf4df0498b..76f2ba13e875 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -2,9 +2,9 @@ # # $RCSfile: pstrules.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: hjs $ $Date: 2001-10-19 13:03:25 $ +# last change: $Author: hjs $ $Date: 2001-11-21 17:13:21 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -65,6 +65,7 @@ #+++++++++++ svxlight rules +++++++++++++++++++++++++++++++++++++ #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(SVXLIGHT)"=="TRUE" .IF "$(SVXLIGHTOBJFILES)"!="" SVXLIGHTDEFS=-DSVX_LIGHT @@ -120,6 +121,7 @@ $(SLO)$/sxl_%.obj : %.cxx .ENDIF .ENDIF # "$(SVXLIGHTSLOFILES)"!="" +.ENDIF # "$(SVXLIGHT)"=="TRUE" #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #+++++++++++ second_build rules +++++++++++++++++++++++++++++++++++++ diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 7ea260b1198a..c08b6fdc862d 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -2,9 +2,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.85 $ +# $Revision: 1.86 $ # -# last change: $Author: hjs $ $Date: 2001-11-07 18:43:20 $ +# last change: $Author: hjs $ $Date: 2001-11-21 17:17:23 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -103,7 +103,7 @@ SOLARVERSION=$(SOLARVER)$/$(UPD) @+tr -d "\015" < $(SOLARVERSION)$/$(UPD)minor.mk > $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk .ELSE # "$(GUI)"=="UNX" @+$(COPY) $(SOLARVERSION)$/$(UPD)minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk >& $(NULLDEV) - @+$(COPY) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.flag >& $(NULLDEV) + @+$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg >& $(NULLDEV) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(UPDATER)"!="" @@ -1410,18 +1410,20 @@ CDEFS+=-DUPD=\"$(UPD)\" -DMINOR=\"$(LAST_MINOR)\" -DBUILD_ID=\"$(BUILD)\" CDEFS+= -DTF_NEWEX .ENDIF -.IF "$(UPDATER)"=="YES" -SVXLIGHT=TRUE -.ENDIF +#.IF "$(UPDATER)"=="YES" +#SVXLIGHT=TRUE +#.ENDIF #defaults for UCR HEADER UNOUCRBASE*=UCR UNOUCROUT*=$(OUT)$/inc -.IF "$(UDKSTAMP))"=="" +.IF "$(UDKSTAMP)"=="" UNOUCRRDB*=$(SOLARBINDIR)$/udkapi.rdb -.ELSE # "$(UDKSTAMP))"=="" +UNOUCRDEP*=$(SOLARBINDIR)$/udkapi.rdb +.ELSE # "$(UDKSTAMP)"=="" UNOUCRRDB*=$(SOLARBINDIR)$/applicat.rdb -.ENDIF # "$(UDKSTAMP))"=="" +UNOUCRDEP*=$(SOLARBINDIR)$/applicat.rdb +.ENDIF # "$(UDKSTAMP)"=="" # --- Compiler ----------------------------------------------------- .INCLUDE : rules.mk |