View | Details | Raw Unified | Return to issue 44880
Collapse All | Expand All

(-)ooo/solenv/inc/pstrules.mk (-12 / +12 lines)
Lines 73-81 Link Here
73
.IF "$(GUI)"=="UNX"
73
.IF "$(GUI)"=="UNX"
74
	@$(RM) $@ $(@:s/.obj/.o/)
74
	@$(RM) $@ $(@:s/.obj/.o/)
75
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
75
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
76
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
76
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
77
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
77
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
78
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
78
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
79
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
79
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
80
.ELSE
80
.ELSE
81
	@+if exist $@ $(RM) /q $@ >& $(NULLDEV)
81
	@+if exist $@ $(RM) /q $@ >& $(NULLDEV)
Lines 94-102 Link Here
94
.IF "$(GUI)"=="UNX"
94
.IF "$(GUI)"=="UNX"
95
	@$(RM) $@ $(@:s/.obj/.o/)
95
	@$(RM) $@ $(@:s/.obj/.o/)
96
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
96
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
97
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
97
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
98
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
98
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
99
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
99
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
100
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
100
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
101
.ELSE
101
.ELSE
102
	@+if exist $@ $(RM) /q $@ >& $(NULLDEV)
102
	@+if exist $@ $(RM) /q $@ >& $(NULLDEV)
Lines 121-129 Link Here
121
.IF "$(GUI)"=="UNX"
121
.IF "$(GUI)"=="UNX"
122
	@$(RM) $@ $(@:s/.obj/.o/)
122
	@$(RM) $@ $(@:s/.obj/.o/)
123
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
123
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
124
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
124
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
125
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
125
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
126
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
126
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
127
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
127
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
128
.ELSE
128
.ELSE
129
	@+if exist $@ $(RM) /q $@ >& $(NULLDEV)
129
	@+if exist $@ $(RM) /q $@ >& $(NULLDEV)
Lines 139-147 Link Here
139
.ELSE
139
.ELSE
140
	@$(RM) $@ $(@:s/.obj/.o/)
140
	@$(RM) $@ $(@:s/.obj/.o/)
141
	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
141
	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
142
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
142
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
143
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
143
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
144
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
144
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
145
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
145
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
146
.ENDIF
146
.ENDIF
147
.ELSE
147
.ELSE
Lines 165-173 Link Here
165
.IF "$(GUI)"=="UNX"
165
.IF "$(GUI)"=="UNX"
166
	@$(RM) $@ $(@:s/.obj/.o/)
166
	@$(RM) $@ $(@:s/.obj/.o/)
167
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
167
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
168
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
168
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
169
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
169
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
170
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
170
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
171
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
171
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
172
.ELSE
172
.ELSE
173
	@+-$(RM) $@
173
	@+-$(RM) $@
Lines 180-188 Link Here
180
.IF "$(GUI)"=="UNX"
180
.IF "$(GUI)"=="UNX"
181
	@$(RM) $@ $(@:s/.obj/.o/)
181
	@$(RM) $@ $(@:s/.obj/.o/)
182
	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
182
	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
183
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
183
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
184
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
184
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
185
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
185
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
186
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
186
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
187
.ELSE
187
.ELSE
188
	@+-$(RM) $@
188
	@+-$(RM) $@

Return to issue 44880