diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:17:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:17:36 +0000 |
| commit | f217163931c50221d90d4ba9a5f6b6b235a32975 (patch) | |
| tree | 26f3ccb4d1d92bbeafbdd574a87f736f21971e0b /solenv/inc/rules.mk | |
| parent | f5d08a7fa7f7a36e1af2f6841c286ccee43dc379 (diff) | |
INTEGRATION: CWS tune03 (1.53.4); FILE MERGED
2004/08/16 17:29:49 mhu 1.53.4.3: #i31183# Handle 'adjustvisibility' analog to 'makedepend' to avoid bootstrap problem in 'soltools'.
2004/08/09 22:34:21 mhu 1.53.4.2: RESYNC: (1.53-1.55); FILE MERGED
2004/07/21 12:14:41 hjs 1.53.4.1: #i31183# adjust symbol visibility on solaris
Diffstat (limited to 'solenv/inc/rules.mk')
| -rw-r--r-- | solenv/inc/rules.mk | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 73b7cdb57319..0a47eb7aa185 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -2,9 +2,9 @@ # # $RCSfile: rules.mk,v $ # -# $Revision: 1.55 $ +# $Revision: 1.56 $ # -# last change: $Author: rt $ $Date: 2004-07-13 16:54:42 $ +# last change: $Author: rt $ $Date: 2004-08-23 09:17:36 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,6 +68,11 @@ $(OBJ)$/%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(noadjust)"=="" + $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(noadjust)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ELSE @+-$(RM) $@ >& $(NULLDEV) @@ -86,6 +91,9 @@ $(OBJ)$/%.obj : %.cpp .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp +.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) $@ >& $(NULLDEV) @@ -108,6 +116,9 @@ $(SLO)$/%.obj : %.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.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) $@ .ENDIF .ELSE # "$(GUI)"=="UNX" @@ -126,6 +137,9 @@ $(SLO)$/%.obj : %.cpp .ELSE @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp +.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 @@ -144,6 +158,9 @@ $(SLO)$/%.obj : $(MISC)$/%.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx +.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 @@ -161,6 +178,9 @@ $(OBJ)$/%.obj : $(MISC)$/%.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx +.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 @@ -178,6 +198,9 @@ $(OBJ)$/%.obj : %.c .ELSE @$(RM) $@ $(@:s/.obj/.o/) $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.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 @@ -197,6 +220,9 @@ $(OBJ)$/%.obj : $(MISC)$/%.c .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.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) $@ >& $(NULLDEV) @@ -211,6 +237,9 @@ $(SLO)$/%.obj : $(MISC)$/%.c .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.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) $@ >& $(NULLDEV) @@ -229,6 +258,9 @@ $(SLO)$/%.obj : %.c .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.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) $@ >& $(NULLDEV) |