summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-06-28 14:42:13 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-06-28 14:42:13 +0200
commit24ba6650ed66c896ec703dd067af42b05434cce4 (patch)
tree6981cdd861e39af59fdc8a4b912c0e6133f2ea08 /Makefile
parent278f62a9da99dcca7a7b95f34635b0fcd1a88185 (diff)
parentf2da15da75130a11676d3083b2d70458b6ab38c2 (diff)
Merge branch 'config'
Pull in the configure script. From now on, before calling 'make' the './configure' script will need to get called. This is no autotools generated script, but manually written to check for netsniff-ng's dependencies.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8a8b76b..9ad9db5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@
# Copyright 2012 - 2013 Daniel Borkmann <borkmann@gnumaniacs.org>
# Subject to the GNU GPL, version 2.
+include Config
+
VERSION = 0
PATCHLEVEL = 5
SUBLEVEL = 8
@@ -14,7 +16,7 @@ TOOLS ?= netsniff-ng trafgen astraceroute flowtop ifpps bpfc curvetun mausezahn
PREFIX ?=
# Disable if you don't want it
-CCACHE ?= ccache
+CCACHE ?= $(CONFIG_CCACHE)
# Location of installation paths.
SBINDIR = $(PREFIX)/usr/sbin
@@ -203,6 +205,7 @@ install_all: $(foreach tool,$(TOOLS),$(tool)_install)
install_allbutcurvetun: $(foreach tool,$(filter-out curvetun,$(TOOLS)),$(tool)_install)
install_allbutmausezahn: $(foreach tool,$(filter-out mausezahn,$(TOOLS)),$(tool)_install)
clean mostlyclean: $(foreach tool,$(TOOLS),$(tool)_clean)
+ $(Q)$(call RM,Config)
realclean distclean clobber: $(foreach tool,$(TOOLS),$(tool)_distclean)
$(Q)$(call RMDIR,$(ETCDIRE))
mrproper: clean distclean