Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

wx: Fix silent make rules

  • Loading branch information...
commit fb66fdcf7a03c2bc1c64ce35dc261865d12992ab 1 parent 8d48725
@nox nox authored proxyles committed
Showing with 15 additions and 13 deletions.
  1. +14 −13 lib/wx/c_src/Makefile.in
  2. +1 −0  make/output.mk.in
View
27 lib/wx/c_src/Makefile.in
@@ -46,6 +46,7 @@ HAVE_OPENGL = true
OPENGL_F = gl_funcs egl_impl
include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/output.mk
include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk
ERL_INCS= $(DED_INCLUDES)
@@ -107,9 +108,9 @@ endif
GL_LIBS = @GL_LIBS@
-CC_O = $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
+CC_O = $(V_CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
OBJC_CC_O = $(OBJC_CC) -c $(CFLAGS) $(OBJC_CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
-CPP_O = $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS)
+CPP_O = $(V_CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS)
# Targets
@@ -138,36 +139,36 @@ $(GL_OBJECTS): $(GL_H)
$(WX_OBJECTS): $(GENERATED_H) $(GENERAL_H)
$(SYS_TYPE)/%.o: %.cpp
- mkdir -p $(SYS_TYPE)
+ $(V_at)mkdir -p $(SYS_TYPE)
$(CPP_O) $< -o $@
$(SYS_TYPE)/%.o: %.c
- mkdir -p $(SYS_TYPE)
+ $(V_at)mkdir -p $(SYS_TYPE)
$(CC_O) $< -o $@
$(SYS_TYPE)/wxe_ps_init.o: wxe_ps_init.c
- mkdir -p $(SYS_TYPE)
- $(OBJC_CC_O) $< -o $@
+ $(V_at)mkdir -p $(SYS_TYPE)
+ $(cc_verbose)$(OBJC_CC_O) $< -o $@
$(SYS_TYPE)/%.o: gen/%.cpp
- mkdir -p $(SYS_TYPE)
+ $(V_at)mkdir -p $(SYS_TYPE)
$(CPP_O) $< -o $@
$(SYS_TYPE)/%.o: gen/%.c
- mkdir -p $(SYS_TYPE)
+ $(V_at)mkdir -p $(SYS_TYPE)
$(CC_O) $< -o $@
$(SYS_TYPE)/wxe_win32.$(RC_FILE_EXT): wxe_win32.rc
- mkdir -p $(SYS_TYPE)
+ $(V_at)mkdir -p $(SYS_TYPE)
$(RESCOMP) -o $@ $<
$(TARGET_DIR)/wxe_driver$(SO_EXT): $(WX_OBJECTS)
- mkdir -p $(TARGET_DIR)
- $(LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@
+ $(V_at)mkdir -p $(TARGET_DIR)
+ $(V_LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@
$(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS)
- mkdir -p $(TARGET_DIR)
- $(CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@
+ $(V_at)mkdir -p $(TARGET_DIR)
+ $(V_CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@
# ----------------------------------------------------
View
1  make/output.mk.in
@@ -67,6 +67,7 @@ V_CC = $(cc_verbose)$(CC)
cpp_verbose_0 = @echo " CPP "$@;
cpp_verbose = $(cpp_verbose_$(V))
+V_CPP = $(cpp_verbose)$(CPP)
# For the diameter compiler.
dia_verbose_0 = @echo " DIA "$@;
Please sign in to comment.
Something went wrong with that request. Please try again.