[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Makefiles verbosity patch
From: |
Stefan Urbanek |
Subject: |
Makefiles verbosity patch |
Date: |
Sat, 08 Jun 2002 18:35:16 +0200 |
Hi,
Attached are .make file differences that will supress showing commands
executed by make on compiling and linking. If you would like to see the
commands, just type
> make verbose=yes
Stefan
--- ../make_copy/common.make Sat Jun 8 17:46:00 2002
+++ common.make Sat Jun 8 18:28:31 2002
@@ -363,16 +363,30 @@
endif
endif
+ifeq ($(verbose),yes)
+ LIB_LINK_CMD_PREFIX =
+ LIB_LINK_CMD_SUFFIX =
+else
+ LIB_LINK_CMD_PREFIX = @( echo Linking $(GNUSTEP_INSTANCE) ...;
+ LIB_LINK_CMD_SUFFIX = )
+endif
+
ifeq ($(shared), yes)
- LIB_LINK_CMD = $(SHARED_LIB_LINK_CMD)
- FRAMEWORK_LINK_CMD = $(SHARED_FRAMEWORK_LINK_CMD)
+ LIB_LINK_CMD = $(LIB_LINK_CMD_PREFIX) $(SHARED_LIB_LINK_CMD) \
+ $(LIB_LINK_CMD_SUFFIX)
+ FRAMEWORK_LINK_CMD = $(LIB_LINK_CMD_PREFIX) \
+ $(SHARED_FRAMEWORK_LINK_CMD) \
+ $(LIB_LINK_CMD_SUFFIX)
OBJ_DIR_PREFIX += shared_
INTERNAL_OBJCFLAGS += $(SHARED_CFLAGS)
INTERNAL_CFLAGS += $(SHARED_CFLAGS)
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_SHARED_LIB_COMMAND)
else
- LIB_LINK_CMD = $(STATIC_LIB_LINK_CMD)
- FRAMEWORK_LINK_CMD = $(STATIC_FRAMEWORK_LINK_CMD)
+ LIB_LINK_CMD = $(LIB_LINK_CMD_PREFIX) $(STATIC_LIB_LINK_CMD) \
+ $(LIB_LINK_CMD_SUFFIX)
+ FRAMEWORK_LINK_CMD = $(LIB_LINK_CMD_PREFIX) \
+ $(STATIC_FRAMEWORK_LINK_CMD) \
+ $(LIB_LINK_CMD_SUFFIX)
OBJ_DIR_PREFIX += static_
AFTER_INSTALL_LIBRARY_CMD = $(AFTER_INSTALL_STATIC_LIB_COMMAND)
LIBRARY_NAME_SUFFIX := s$(LIBRARY_NAME_SUFFIX)
--- ../make_copy/rules.make Sat Jun 8 17:46:00 2002
+++ rules.make Sat Jun 8 18:23:15 2002
@@ -302,57 +302,76 @@
# as well, so the following rule is simply equivalent to
# $(CC) $< -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -o $@
# and similarly all the rules below
-$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.c
- $(CC) $< -c \
+
+ifeq ($(verbose),yes)
+ CMD_PREFIX =
+ CMD_SUFFIX =
+else
+ CMD_PREFIX = @( echo Compiling $< ...;
+ CMD_SUFFIX = )
+endif
+
+C_COMPILE_CMD = $(CMD_PREFIX) $(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS)) \
- $($<_FILE_FLAGS) -o $@
+ $($<_FILE_FLAGS) -o $@ $(CMD_SUFFIX)
-$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
- $(CC) $< -c \
+M_COMPILE_CMD = $(CMD_PREFIX) $(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_OBJCFLAGS)) \
- $($<_FILE_FLAGS) -o $@
+ $($<_FILE_FLAGS) -o $@ $(CMD_SUFFIX)
-$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.C
- $(CC) $< -c \
+CC_COMPILE_CMD = $(CMD_PREFIX) $(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
- $($<_FILE_FLAGS) -o $@
+ $($<_FILE_FLAGS) -o $@ $(CMD_SUFFIX)
-$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cc
- $(CC) $< -c \
+CPP_COMPILE_CMD = $(CMD_PREFIX) $(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
- $($<_FILE_FLAGS) -o $@
+ $($<_FILE_FLAGS) -o $@ $(CMD_SUFFIX)
-$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cpp
- $(CC) $< -c \
+CXX_COMPILE_CMD = $(CMD_PREFIX) $(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
- $($<_FILE_FLAGS) -o $@
+ $($<_FILE_FLAGS) -o $@ $(CMD_SUFFIX)
-$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cxx
- $(CC) $< -c \
+CP_COMPILE_CMD = $(CMD_PREFIX) $(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
- $($<_FILE_FLAGS) -o $@
+ $($<_FILE_FLAGS) -o $@ $(CMD_SUFFIX)
+
+JAVA_COMPILE_CMD = $(CMD_PREFIX) $(JAVAC) \
+ $(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_JAVACFLAGS)) \
+ $($<_FILE_FLAGS) $< $(CMD_SUFFIX)
+
+$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.c
+ $(C_COMPILE_CMD)
+
+$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
+ $(M_COMPILE_CMD)
+
+$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.C
+ $(CC_COMPILE_CMD)
+
+$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cc
+ $(CC_COMPILE_CMD)
+
+$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cpp
+ $(CPP_COMPILE_CMD)
+
+$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cxx
+ $(CXX_COMPILE_CMD)
$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cp
- $(CC) $< -c \
- $(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
- $(ALL_CFLAGS) \
- $(ALL_CCFLAGS)) \
- $($<_FILE_FLAGS) -o $@
+ $(CP_COMPILE_CMD)
%.class : %.java
- $(JAVAC) \
- $(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_JAVACFLAGS)) \
- $($<_FILE_FLAGS) $<
+ $(JAVA_COMPILE_CMD)
# A jni header file which is created using JAVAH
# Example of how this rule will be applied:
- Makefiles verbosity patch,
Stefan Urbanek <=
- Re: Makefiles verbosity patch, Nicola Pero, 2002/06/13
- Re: Makefiles verbosity patch, Chris B . Vetter, 2002/06/13
- Re: Makefiles verbosity patch, Markus Hitter, 2002/06/13
- Re: Makefiles verbosity patch, Marcus Müller, 2002/06/14
- Re: Makefiles verbosity patch, Markus Hitter, 2002/06/14
- Re: Makefiles verbosity patch, Marcus Müller, 2002/06/14
- Anybody interested in porting Log4j in Objective-C?, Giulio Cesare Solaroli, 2002/06/14
- Re: Makefiles verbosity patch, Markus Hitter, 2002/06/14