Specify QUIETLY in minimal places
This commit is contained in:
parent
37c03a9cb9
commit
f9880b9bfa
24
Makefile
24
Makefile
|
@ -11,17 +11,17 @@ QUIETLY:=@
|
|||
|
||||
# Set some basic program-wide compile settings
|
||||
# In the future these shouldn't be assumed.
|
||||
CC:=gcc
|
||||
CC:=$(QUIETLY)gcc
|
||||
PROJCFLAGS:=-O2 -Wall -I'./include'
|
||||
LD:=ld
|
||||
AR:=ar
|
||||
INSTALL:=install
|
||||
OBJCOPY:=objcopy
|
||||
LD:=$(QUIETLY)ld
|
||||
AR:=$(QUIETLY)ar
|
||||
INSTALL:=$(QUIETLY)install
|
||||
OBJCOPY:=$(QUIETLY)objcopy
|
||||
BUILD_DIR:=build
|
||||
|
||||
MKDIR:=mkdir -p
|
||||
ECHO:=echo
|
||||
RM:=rm
|
||||
MKDIR:=$(QUIETLY)mkdir -p
|
||||
ECHO:=$(QUIETLY)echo
|
||||
RM:=$(QUIETLY)rm
|
||||
|
||||
ifndef PREFIX
|
||||
PREFIX=/usr
|
||||
|
@ -49,14 +49,14 @@ real-all: $(EXECUTABLE_FULL)
|
|||
install: $(INSTALL_TARGETS)
|
||||
|
||||
$(BUILD_DIR):
|
||||
$(QUIETLY)$(ECHO) " MKDIR $(BUILD_DIR)"
|
||||
$(QUIETLY)$(MKDIR) $(BUILD_DIR)
|
||||
$(ECHO) " MKDIR $(BUILD_DIR)"
|
||||
$(MKDIR) $(BUILD_DIR)
|
||||
|
||||
# Calls all the clean targets to be run, so we can clean up the build directory
|
||||
clean: $(CLEAN_TARGETS)
|
||||
|
||||
# Top level clean -- deletes whole build directory
|
||||
build_clean:
|
||||
$(QUIETLY)$(ECHO) " RM $(BUILD_DIR)"
|
||||
$(QUIETLY)$(RM) -fr $(BUILD_DIR)
|
||||
$(ECHO) " RM $(BUILD_DIR)"
|
||||
$(RM) -fr $(BUILD_DIR)
|
||||
|
||||
|
|
|
@ -20,26 +20,26 @@ LIBREDDIT_OBJECTS := $(patsubst %,$(LIBREDDIT_CMP_DIR)/%,$(LIBREDDIT_SOURCES:.c=
|
|||
libreddit: $(LIBREDDIT_STATIC)
|
||||
|
||||
$(LIBREDDIT_CMP_DIR): | $(BUILD_DIR)
|
||||
$(QUIETLY)$(ECHO) " MKDIR $(LIBREDDIT_CMP_DIR)"
|
||||
$(QUIETLY)$(MKDIR) $(LIBREDDIT_CMP_DIR)
|
||||
$(ECHO) " MKDIR $(LIBREDDIT_CMP_DIR)"
|
||||
$(MKDIR) $(LIBREDDIT_CMP_DIR)
|
||||
|
||||
# Removes the libreddit folder
|
||||
libreddit_clean:
|
||||
$(QUIETLY)$(ECHO) " RM $(LIBREDDIT_CMP_DIR)"
|
||||
$(QUIETLY)$(RM) -fr $(LIBREDDIT_CMP_DIR)
|
||||
$(ECHO) " RM $(LIBREDDIT_CMP_DIR)"
|
||||
$(RM) -fr $(LIBREDDIT_CMP_DIR)
|
||||
|
||||
$(LIBREDDIT_STATIC): $(LIBREDDIT_COMBINED)
|
||||
$(QUIETLY)$(ECHO) " AR $(LIBREDDIT_STATIC)"
|
||||
$(QUIETLY)$(AR) rcs $(LIBREDDIT_STATIC) $(LIBREDDIT_COMBINED)
|
||||
$(ECHO) " AR $(LIBREDDIT_STATIC)"
|
||||
$(AR) rcs $(LIBREDDIT_STATIC) $(LIBREDDIT_COMBINED)
|
||||
|
||||
$(LIBREDDIT_COMBINED): $(LIBREDDIT_OBJECTS)
|
||||
$(QUIETLY)$(ECHO) " LD $@"
|
||||
$(QUIETLY)$(LD) -r $(LIBREDDIT_OBJECTS) -o $@
|
||||
$(QUIETLY)$(ECHO) " STRIP $@"
|
||||
$(QUIETLY)$(OBJCOPY) --keep-global-symbols $(LIBREDDIT_DIR)/global_symbols $@
|
||||
$(ECHO) " LD $@"
|
||||
$(LD) -r $(LIBREDDIT_OBJECTS) -o $@
|
||||
$(ECHO) " STRIP $@"
|
||||
$(OBJCOPY) --keep-global-symbols $(LIBREDDIT_DIR)/global_symbols $@
|
||||
|
||||
# Compiles a single c file into a coresponding .o file
|
||||
$(LIBREDDIT_CMP_DIR)/%.o: $(LIBREDDIT_DIR)/%.c | $(LIBREDDIT_CMP_DIR)
|
||||
$(QUIETLY)$(ECHO) " CC $@"
|
||||
$(QUIETLY)$(CC) $(LIBREDDIT_CFLAGS) -c $< -o $@
|
||||
$(ECHO) " CC $@"
|
||||
$(CC) $(LIBREDDIT_CFLAGS) -c $< -o $@
|
||||
|
||||
|
|
|
@ -16,23 +16,23 @@ CREDDIT_SOURCES:=$(patsubst $(CREDDIT_DIR)/%,%,$(wildcard $(CREDDIT_DIR)/*.c))
|
|||
CREDDIT_OBJECTS:=$(patsubst %,$(CREDDIT_DIR_CMP)/%,$(CREDDIT_SOURCES:.c=.o))
|
||||
|
||||
$(CREDDIT_DIR_CMP): | $(BUILD_DIR)
|
||||
$(QUIETLY)$(ECHO) " MKDIR $(CREDDIT_DIR_CMP)"
|
||||
$(QUIETLY)$(MKDIR) $(CREDDIT_DIR_CMP)
|
||||
$(ECHO) " MKDIR $(CREDDIT_DIR_CMP)"
|
||||
$(MKDIR) $(CREDDIT_DIR_CMP)
|
||||
|
||||
creddit: $(EXECUTABLE_FULL)
|
||||
|
||||
$(EXECUTABLE_FULL): libreddit $(CREDDIT_OBJECTS) | $(CREDDIT_DIR_CMP)
|
||||
$(QUIETLY)$(ECHO) " CC $(EXECUTABLE_FULL)"
|
||||
$(QUIETLY)$(CC) $(CREDDIT_OBJECTS) $(CREDDIT_CFLAGS) $(CREDDIT_LDFLAGS) -o $(EXECUTABLE_FULL)
|
||||
$(ECHO) " CC $(EXECUTABLE_FULL)"
|
||||
$(CC) $(CREDDIT_OBJECTS) $(CREDDIT_CFLAGS) $(CREDDIT_LDFLAGS) -o $(EXECUTABLE_FULL)
|
||||
|
||||
creddit_clean:
|
||||
$(QUIETLY)$(ECHO) " RM $(CREDDIT_DIR_CMP)"
|
||||
$(QUIETLY)$(RM) -fr $(CREDDIT_DIR_CMP)
|
||||
$(ECHO) " RM $(CREDDIT_DIR_CMP)"
|
||||
$(RM) -fr $(CREDDIT_DIR_CMP)
|
||||
|
||||
creddit_install: $(EXECUTABLE_FULL)
|
||||
$(QUIETLY)$(ECHO) " INSTALL $(EXECUTABLE_FULL)"
|
||||
$(QUIETLY)$(INSTALL) -m 0755 $(EXECUTABLE_FULL) $(PREFIX)/bin/
|
||||
$(ECHO) " INSTALL $(EXECUTABLE_FULL)"
|
||||
$(INSTALL) -m 0755 $(EXECUTABLE_FULL) $(PREFIX)/bin/
|
||||
|
||||
$(CREDDIT_DIR_CMP)/%.o: $(CREDDIT_DIR)/%.c | $(CREDDIT_DIR_CMP)
|
||||
$(QUIETLY)$(ECHO) " CC $@"
|
||||
$(QUIETLY)$(CC) $(CREDDIT_CFLAGS) -c $< -o $@
|
||||
$(ECHO) " CC $@"
|
||||
$(CC) $(CREDDIT_CFLAGS) -c $< -o $@
|
||||
|
|
Loading…
Reference in New Issue