summaryrefslogtreecommitdiff
path: root/netsniff-ng/Makefile
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-09 20:16:40 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-09 20:20:52 +0200
commitd4e385dd0e633525666bf95c56a2045bacc2a485 (patch)
treea87c451e7f988b65d5a3e350969ca765cff02add /netsniff-ng/Makefile
parentc07bdeb7419baf7f66e8de386744be9ec4891bb3 (diff)
configure: fix multiple issues in build configuration
This patch is a bundle of multiple fixes. 1) Fix compilation of astraceroute when HAVE_LIBPCAP=1: astraceroute doesn't need libpcap, so add an additional guard/define to bpf.h and bpf_comp.c and netsniff-ng.c. Also since we generate a config.h file, we do not need to have this additional compile flag anymore. 2) Fix tstamping.{h,c} to use the configure script instead of the Makefile. For doing this, also fix the object inclusion in netsniff-ng/Makefile. Last but not least, rename __WITH_... into HAVE_... as this is more clean. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'netsniff-ng/Makefile')
-rw-r--r--netsniff-ng/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/netsniff-ng/Makefile b/netsniff-ng/Makefile
index e05ad1d..2f64c0f 100644
--- a/netsniff-ng/Makefile
+++ b/netsniff-ng/Makefile
@@ -57,7 +57,6 @@ netsniff-ng-objs = dissector.o \
ring_tx.o \
ring.o \
tprintf.o \
- tstamping.o \
timer.o \
geoip.o \
mac80211.o \
@@ -66,3 +65,6 @@ netsniff-ng-objs = dissector.o \
ifeq ($(CONFIG_LIBPCAP), 1)
netsniff-ng-objs += bpf_comp.o
endif
+ifeq ($(CONFIG_HWTSTAMP), 1)
+netsniff-ng-objs += tstamping.o
+endif