aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarry Jeffery <harry@exec64.co.uk>2016-11-23 23:29:17 +0000
committerGitHub <noreply@github.com>2016-11-23 23:29:17 +0000
commitc6a811615b6323ea6b43851def18ad28b37e80d6 (patch)
treeb66485a0366068f900081cc13b317d8caa8f2e2e
parent8febdbbd354868f23725124eb2b657d946a18607 (diff)
parentf32830081016abdb0d6a823571f642ad1adaee58 (diff)
downloadimv-c6a811615b6323ea6b43851def18ad28b37e80d6.tar.gz
Merge pull request #99 from eXeC64/wall-of-text
Unconditionally echo build commands
-rw-r--r--Makefile20
1 files changed, 6 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index de51f1b..c25a276 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,6 @@ BINPREFIX ?= $(PREFIX)/bin
MANPREFIX ?= $(PREFIX)/share/man
DATAPREFIX ?= $(PREFIX)/share
-ifeq ($(V),)
-MUTE := @
-endif
-
CFLAGS ?= -W -Wall -pedantic -Wmissing-prototypes
CFLAGS += -std=c99
CPPFLAGS += $(shell sdl2-config --cflags) -D_XOPEN_SOURCE=700
@@ -30,8 +26,7 @@ CFLAGS += -DIMV_VERSION=\""$(VERSION)"\"
imv: $(TARGET)
$(TARGET): $(OBJECTS)
- @echo "LINKING $@"
- $(MUTE)$(CC) -o $@ $^ $(LIBS) $(LDFLAGS)
+ $(CC) -o $@ $^ $(LIBS) $(LDFLAGS)
debug: CFLAGS += -DDEBUG -g -pg
debug: $(TARGET)
@@ -39,22 +34,19 @@ debug: $(TARGET)
$(OBJECTS): | $(BUILDDIR)
$(BUILDDIR):
- $(MUTE)mkdir -p $(BUILDDIR)
+ mkdir -p $(BUILDDIR)
$(BUILDDIR)/%.o: src/%.c
- @echo "COMPILING $@"
- $(MUTE)$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
$(BUILDDIR)/test_%: test/%.c src/%.c
- @echo "BUILDING $@"
- $(MUTE)$(CC) -o $@ -Isrc $(TFLAGS) $^ $(LDFLAGS) $(TLIBS)
+ $(CC) -o $@ -Isrc $(TFLAGS) $^ $(LDFLAGS) $(TLIBS)
check: $(BUILDDIR) $(TESTS)
- @echo "RUNNING TESTS"
- $(MUTE)for t in $(TESTS); do $$t; done
+ for t in $(TESTS); do $$t; done
clean:
- $(MUTE)$(RM) -Rf $(BUILDDIR)
+ $(RM) -Rf $(BUILDDIR)
install: $(TARGET)
install -D -m 0755 $(TARGET) $(DESTDIR)$(BINPREFIX)/imv