diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:17:24 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:17:24 +0000 |
commit | f5d08a7fa7f7a36e1af2f6841c286ccee43dc379 (patch) | |
tree | aa6ba75075b8cd2e1a80d285b5fde24ed3949ea0 /solenv/inc/pstrules.mk | |
parent | 8eb5d32d619d6c3d300b9017525642062f653367 (diff) |
INTEGRATION: CWS tune03 (1.29.4); FILE MERGED
2004/08/16 17:29:49 mhu 1.29.4.3: #i31183# Handle 'adjustvisibility' analog to 'makedepend' to avoid bootstrap problem in 'soltools'.
2004/08/09 22:34:14 mhu 1.29.4.2: RESYNC: (1.29-1.30); FILE MERGED
2004/07/21 12:14:41 hjs 1.29.4.1: #i31183# adjust symbol visibility on solaris
Diffstat (limited to 'solenv/inc/pstrules.mk')
-rw-r--r-- | solenv/inc/pstrules.mk | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 3dc4af692c45..15451a1ee0bb 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -2,9 +2,9 @@ # # $RCSfile: pstrules.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.31 $ # -# last change: $Author: rt $ $Date: 2004-07-13 16:39:27 $ +# last change: $Author: rt $ $Date: 2004-08-23 09:17:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -76,6 +76,9 @@ $(OBJ)$/sxl_%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(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)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE @+if exist $@ $(RM) /q $@ >& $(NULLDEV) @@ -94,6 +97,9 @@ $(SLO)$/sxl_%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(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)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE @+if exist $@ $(RM) /q $@ >& $(NULLDEV) @@ -118,6 +124,9 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE @+if exist $@ $(RM) /q $@ >& $(NULLDEV) @@ -133,6 +142,9 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c .ELSE @$(RM) $@ $(@:s/.obj/.o/) $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ENDIF .ELSE @@ -156,6 +168,9 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE @+-$(RM) $@ @@ -168,6 +183,9 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.c .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE @+-$(RM) $@ |