summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cmds11
-rw-r--r--Makefile2
-rw-r--r--Template6
3 files changed, 10 insertions, 9 deletions
diff --git a/Cmds b/Cmds
index 247a972..2296e76 100644
--- a/Cmds
+++ b/Cmds
@@ -1,13 +1,14 @@
-# Be quite and do not echo the cmd
+# Be quiet and do not echo the cmd
Q = @
# Try to use bash as shell for make
SHELL := $(shell if [ -x /bin/bash ]; then echo /bin/bash; else echo /bin/sh; fi)
-# GCC related stuff
-LD = $(Q)echo -e " LD\t$@" && $(CCACHE) $(CROSS_COMPILE)gcc
-CCNQ = $(CCACHE) $(CROSS_COMPILE)gcc
-CC = $(Q)echo -e " CC\t$<" && $(CCNQ)
+# Compiler related stuff
+CC = gcc
+LD = $(Q)echo -e " LD\t$@" && $(CCACHE) $(CROSS_COMPILE)$(CC)
+CCNQ = $(CCACHE) $(CROSS_COMPILE)$(CC)
+CCQ = $(Q)echo -e " CC\t$<" && $(CCNQ)
ifeq ($(DEBUG), 1)
STRIP = $(Q)true
else
diff --git a/Makefile b/Makefile
index 90387ab..f76fa10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# netsniff-ng build system
# Copyright 2012 - 2013 Daniel Borkmann <borkmann@gnumaniacs.org>
-# Copyright 2013 Tobias Klauser <tklauser@distanz.ch>
+# Copyright 2013 - 2014 Tobias Klauser <tklauser@distanz.ch>
# Subject to the GNU GPL, version 2.
-include Config
diff --git a/Template b/Template
index 4978eed..fa574de 100644
--- a/Template
+++ b/Template
@@ -17,10 +17,10 @@ define TOOL_templ
$(Q)$$(call RM,$$(DESTDIR)$$(SBINDIR)/$(1))
$(Q)$$(call RM,$$(DESTDIR)$$(MAN8DIR)/$(1).8.gz)
$(1)/%.yy.o: $(1)/%.yy.c
- $$(CC) $$(CFLAGS) -o $$@ -c $$<
+ $$(CCQ) $$(CFLAGS) -o $$@ -c $$<
$(1)/%.tab.o: $(1)/%.tab.c
- $$(CC) $$(CFLAGS) -o $$@ -c $$<
+ $$(CCQ) $$(CFLAGS) -o $$@ -c $$<
$(1)/%.o: %.c
$$(CHECK) $$(CFLAGS) $$(CHECKFLAGS) $$<
- $$(CC) $$(CFLAGS) -o $(1)/$$(shell basename $$@) -c $$<
+ $$(CCQ) $$(CFLAGS) -o $(1)/$$(shell basename $$@) -c $$<
endef