Skip to content

Commit fb66fdc

Browse files
noxproxyles
authored andcommitted
wx: Fix silent make rules
1 parent 8d48725 commit fb66fdc

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

lib/wx/c_src/Makefile.in

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ HAVE_OPENGL = true
4646
OPENGL_F = gl_funcs egl_impl
4747

4848
include $(ERL_TOP)/make/target.mk
49+
include $(ERL_TOP)/make/output.mk
4950
include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk
5051

5152
ERL_INCS= $(DED_INCLUDES)
@@ -107,9 +108,9 @@ endif
107108

108109
GL_LIBS = @GL_LIBS@
109110

110-
CC_O = $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
111+
CC_O = $(V_CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
111112
OBJC_CC_O = $(OBJC_CC) -c $(CFLAGS) $(OBJC_CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
112-
CPP_O = $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS)
113+
CPP_O = $(V_CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS)
113114

114115
# Targets
115116

@@ -138,36 +139,36 @@ $(GL_OBJECTS): $(GL_H)
138139
$(WX_OBJECTS): $(GENERATED_H) $(GENERAL_H)
139140

140141
$(SYS_TYPE)/%.o: %.cpp
141-
mkdir -p $(SYS_TYPE)
142+
$(V_at)mkdir -p $(SYS_TYPE)
142143
$(CPP_O) $< -o $@
143144

144145
$(SYS_TYPE)/%.o: %.c
145-
mkdir -p $(SYS_TYPE)
146+
$(V_at)mkdir -p $(SYS_TYPE)
146147
$(CC_O) $< -o $@
147148

148149
$(SYS_TYPE)/wxe_ps_init.o: wxe_ps_init.c
149-
mkdir -p $(SYS_TYPE)
150-
$(OBJC_CC_O) $< -o $@
150+
$(V_at)mkdir -p $(SYS_TYPE)
151+
$(cc_verbose)$(OBJC_CC_O) $< -o $@
151152

152153
$(SYS_TYPE)/%.o: gen/%.cpp
153-
mkdir -p $(SYS_TYPE)
154+
$(V_at)mkdir -p $(SYS_TYPE)
154155
$(CPP_O) $< -o $@
155156

156157
$(SYS_TYPE)/%.o: gen/%.c
157-
mkdir -p $(SYS_TYPE)
158+
$(V_at)mkdir -p $(SYS_TYPE)
158159
$(CC_O) $< -o $@
159160

160161
$(SYS_TYPE)/wxe_win32.$(RC_FILE_EXT): wxe_win32.rc
161-
mkdir -p $(SYS_TYPE)
162+
$(V_at)mkdir -p $(SYS_TYPE)
162163
$(RESCOMP) -o $@ $<
163164

164165
$(TARGET_DIR)/wxe_driver$(SO_EXT): $(WX_OBJECTS)
165-
mkdir -p $(TARGET_DIR)
166-
$(LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@
166+
$(V_at)mkdir -p $(TARGET_DIR)
167+
$(V_LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@
167168

168169
$(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS)
169-
mkdir -p $(TARGET_DIR)
170-
$(CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@
170+
$(V_at)mkdir -p $(TARGET_DIR)
171+
$(V_CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@
171172

172173

173174
# ----------------------------------------------------

make/output.mk.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ V_CC = $(cc_verbose)$(CC)
6767

6868
cpp_verbose_0 = @echo " CPP "$@;
6969
cpp_verbose = $(cpp_verbose_$(V))
70+
V_CPP = $(cpp_verbose)$(CPP)
7071

7172
# For the diameter compiler.
7273
dia_verbose_0 = @echo " DIA "$@;

0 commit comments

Comments
 (0)