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

(-)ooo/solenv/inc/rules.mk (-20 / +20 lines)
Lines 65-75 Link Here
65
.IF "$(GUI)"=="UNX"
65
.IF "$(GUI)"=="UNX"
66
	@$(RM) $@ $(@:s/.obj/.o/)
66
	@$(RM) $@ $(@:s/.obj/.o/)
67
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
67
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
68
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
68
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
69
.IF "$(noadjust)"==""   
69
.IF "$(noadjust)"==""   
70
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
70
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
71
.ENDIF          # "$(noadjust)"==""   
71
.ENDIF          # "$(noadjust)"==""   
72
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
72
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
73
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
73
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
74
.ELSE
74
.ELSE
75
	@+-$(RM) $@ >& $(NULLDEV)
75
	@+-$(RM) $@ >& $(NULLDEV)
Lines 88-96 Link Here
88
.IF "$(GUI)"=="UNX"
88
.IF "$(GUI)"=="UNX"
89
	@$(RM) $@ $(@:s/.obj/.o/)
89
	@$(RM) $@ $(@:s/.obj/.o/)
90
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
90
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
91
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
91
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
92
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
92
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
93
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
93
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
94
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
94
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
95
.ELSE
95
.ELSE
96
	@+-$(RM) $@ >& $(NULLDEV)
96
	@+-$(RM) $@ >& $(NULLDEV)
Lines 113-121 Link Here
113
.ELSE
113
.ELSE
114
	@$(RM) $@ $(@:s/.obj/.o/)
114
	@$(RM) $@ $(@:s/.obj/.o/)
115
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
115
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
116
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
116
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
117
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
117
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
118
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
118
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
119
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
119
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
120
.ENDIF
120
.ENDIF
121
.ELSE			# "$(GUI)"=="UNX"
121
.ELSE			# "$(GUI)"=="UNX"
Lines 134-142 Link Here
134
.ELSE
134
.ELSE
135
	@$(RM) $@ $(@:s/.obj/.o/)
135
	@$(RM) $@ $(@:s/.obj/.o/)
136
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
136
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
137
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
137
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
138
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
138
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
139
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
139
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
140
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
140
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
141
.ENDIF
141
.ENDIF
142
.ELSE
142
.ELSE
Lines 155-163 Link Here
155
.ELSE
155
.ELSE
156
	@$(RM) $@ $(@:s/.obj/.o/)
156
	@$(RM) $@ $(@:s/.obj/.o/)
157
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
157
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
158
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
158
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
159
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
159
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
160
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
160
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
161
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
161
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
162
.ENDIF
162
.ENDIF
163
.ELSE
163
.ELSE
Lines 175-183 Link Here
175
.ELSE
175
.ELSE
176
	@$(RM) $@ $(@:s/.obj/.o/)
176
	@$(RM) $@ $(@:s/.obj/.o/)
177
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
177
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
178
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
178
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
179
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
179
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
180
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
180
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
181
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
181
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
182
.ENDIF
182
.ENDIF
183
.ELSE
183
.ELSE
Lines 195-203 Link Here
195
.ELSE
195
.ELSE
196
	@$(RM) $@ $(@:s/.obj/.o/)
196
	@$(RM) $@ $(@:s/.obj/.o/)
197
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
197
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
198
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
198
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
199
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
199
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
200
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
200
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
201
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
201
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
202
.ENDIF
202
.ENDIF
203
.ELSE
203
.ELSE
Lines 217-225 Link Here
217
.IF "$(GUI)"=="UNX"
217
.IF "$(GUI)"=="UNX"
218
	@$(RM) $@ $(@:s/.obj/.o/)
218
	@$(RM) $@ $(@:s/.obj/.o/)
219
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.c
219
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.c
220
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
220
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
221
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
221
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
222
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
222
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
223
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
223
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
224
.ELSE
224
.ELSE
225
	@+-$(RM) $@ >& $(NULLDEV)
225
	@+-$(RM) $@ >& $(NULLDEV)
Lines 234-242 Link Here
234
.IF "$(GUI)"=="UNX"
234
.IF "$(GUI)"=="UNX"
235
	@$(RM) $@ $(@:s/.obj/.o/)
235
	@$(RM) $@ $(@:s/.obj/.o/)
236
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.c
236
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.c
237
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
237
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
238
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
238
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
239
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
239
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
240
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
240
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
241
.ELSE
241
.ELSE
242
	@+-$(RM) $@ >& $(NULLDEV)
242
	@+-$(RM) $@ >& $(NULLDEV)
Lines 255-263 Link Here
255
.IF "$(GUI)"=="UNX"
255
.IF "$(GUI)"=="UNX"
256
	@$(RM) $@ $(@:s/.obj/.o/)
256
	@$(RM) $@ $(@:s/.obj/.o/)
257
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
257
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
258
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
258
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
259
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
259
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
260
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
260
.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(COM)"!="GCC"
261
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
261
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
262
.ELSE
262
.ELSE
263
	@+-$(RM) $@ >& $(NULLDEV)
263
	@+-$(RM) $@ >& $(NULLDEV)

Return to issue 44880