diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-05 09:37:43 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-05 09:37:43 +0000 |
| commit | f79339ebd8f3ca5785d5eec2f1b575c249bee171 (patch) | |
| tree | 78ed071e32579678c84536fae641b53852249e7f /solenv/inc/pstrules.mk | |
| parent | c474834ef81aa6319515641bd5fd3179a7a763d3 (diff) | |
INTEGRATION: CWS ause068 (1.40.112); FILE MERGED
2006/09/15 13:26:33 hjs 1.40.112.2: #i69536# don't force shell for echo
2006/09/15 10:57:29 hjs 1.40.112.1: #i69560# remove obsolete SVXLIGHT
Diffstat (limited to 'solenv/inc/pstrules.mk')
| -rw-r--r-- | solenv/inc/pstrules.mk | 55 |
1 files changed, 3 insertions, 52 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 09647b2760bf..b5521b35b7b7 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -4,9 +4,9 @@ # # $RCSfile: pstrules.mk,v $ # -# $Revision: 1.40 $ +# $Revision: 1.41 $ # -# last change: $Author: kz $ $Date: 2006-07-05 21:56:33 $ +# last change: $Author: kz $ $Date: 2006-10-05 10:37:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -33,55 +33,6 @@ # #************************************************************************* - -#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ svxlight rules +++++++++++++++++++++++++++++++++++++ -#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(SVXLIGHT)"=="TRUE" -.IF "$(SVXLIGHTOBJFILES)"!="" - -SVXLIGHTDEFS=-DSVX_LIGHT - -$(OBJ)$/sxl_%.obj : %.cxx - @echo ------------------------------ - @echo Making: $@ -.IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) -.ELSE - @+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(FI) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -.ENDIF - -.ENDIF # "$(SVXLIGHTOBJFILES)"!="" - -.IF "$(SVXLIGHTSLOFILES)"!="" - -SVXLIGHTDEFS=-DSVX_LIGHT - -$(SLO)$/sxl_%.obj : %.cxx - @echo ------------------------------ - @echo Making: $@ -.IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) -.ELSE - @+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(FI) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -.ENDIF - -.ENDIF # "$(SVXLIGHTSLOFILES)"!="" -.ENDIF # "$(SVXLIGHT)"=="TRUE" - #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #+++++++++++ second_build rules +++++++++++++++++++++++++++++++++++++ #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -122,7 +73,7 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c .ENDIF .ELSE @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - @+echo. + @echo. .IF "$(COM)"=="GCC" $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c .ELSE |