diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Misc | 4 | ||||
| -rwxr-xr-x | configure | 14 |
3 files changed, 4 insertions, 18 deletions
@@ -25,8 +25,8 @@ TOOLS ?= netsniff-ng trafgen astraceroute flowtop ifpps bpfc curvetun mausezahn # For packaging purposes, prefix can define a different path. PREFIX ?= /usr/local -# Disable if you don't want it -CCACHE ?= $(CONFIG_CCACHE) +# Set to use ccache for compilation +CCACHE ?= # Location of an alternative destination directory for installation # Useful when cross-compiling and installing in a dedicated target directory @@ -67,7 +67,7 @@ coverity: $(Q)$(call RM,cov-int) $(Q)$(call MKDIR,cov-int) $(Q)./configure - $(Q)cov-build --dir cov-int $(MAKE) CCACHE= + $(Q)cov-build --dir cov-int $(MAKE) $(Q)tar czvf netsniff-ng-coverity.tgz cov-int $(Q)echo "Uploading snapshot to Coverity scanner" $(Q)curl --form file=@netsniff-ng-coverity.tgz --form project=netsniff-ng \ @@ -113,6 +113,6 @@ help: $(Q)echo " CFLAGS=\"-O2 -Wall ...\" - Overwrite CFLAGS for compilation" $(Q)echo " CPPFLAGS=\"-I <path> ...\" - Additional CFLAGS for compilation" $(Q)echo " LDFLAGS=\"-L <path> ...\" - Additional LDFLAGS for compilation" - $(Q)echo " CCACHE= - Do not use ccache for compilation" + $(Q)echo " CCACHE=ccache - Use ccache for compilation" $(Q)echo " C=1 - Check all C source files with sparse" $(Q)echo " Q= - Show verbose garbage" @@ -55,19 +55,6 @@ check_pkg_config() fi } -check_ccache() -{ - echo -n "[*] Checking ccache ... " - - if [ "x$(which ccache 2>> config.log)" == "x" ] ; then - echo "[NO]" - echo "CONFIG_CCACHE=" >> Config - else - echo "[YES]" - echo "CONFIG_CCACHE=ccache" >> Config - fi -} - check_flex() { echo -n "[*] Checking flex ... " @@ -590,7 +577,6 @@ if [ "$MISSING_PKG_CONFIG" == "1" ] ; then exit 1 fi -check_ccache check_flex check_bison check_nacl |