aboutsummaryrefslogtreecommitdiff
path: root/package/tcpdump
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-19 21:17:48 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-19 21:17:48 +0000
commit8a7a669cd59a8f453de1cef63c5fc9d646119803 (patch)
treee16fae062093f84dedc6f158d7ddf45c5f942232 /package/tcpdump
parent2a1ee531daf1f92421d60cb74459f6dee3bf2a2e (diff)
downloadbuildroot-8a7a669cd59a8f453de1cef63c5fc9d646119803.tar.gz
buildroot-8a7a669cd59a8f453de1cef63c5fc9d646119803.tar.bz2
move tcpdump from lib to usr/lib, simplify configure, general cleanup
Diffstat (limited to 'package/tcpdump')
-rw-r--r--package/tcpdump/Config.in3
-rw-r--r--package/tcpdump/dhcpdump.mk22
-rw-r--r--package/tcpdump/tcpdump.mk24
3 files changed, 16 insertions, 33 deletions
diff --git a/package/tcpdump/Config.in b/package/tcpdump/Config.in
index 5a180a3e2d..dbe48ba34a 100644
--- a/package/tcpdump/Config.in
+++ b/package/tcpdump/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_TCPDUMP
bool "tcpdump"
+ select BR2_PACKAGE_LIBPCAP
default n
help
A tool for network monitoring and data acquisition.
@@ -9,6 +10,6 @@ config BR2_PACKAGE_TCPDUMP
config BR2_PACKAGE_DHCPDUMP
bool "dhcpdump"
default n
- depends BR2_PACKAGE_TCPDUMP
+ select BR2_PACKAGE_LIBPCAP
help
A tool for monitoring dhcp requests using tcpdump.
diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk
index e205f0eb19..07453c0cfd 100644
--- a/package/tcpdump/dhcpdump.mk
+++ b/package/tcpdump/dhcpdump.mk
@@ -19,7 +19,7 @@ dhcpdump-source: $(DL_DIR)/$(DHCPDUMP_SOURCE)
$(DHCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(DHCPDUMP_SOURCE)
$(DHCPDUMP_CAT) $(DL_DIR)/$(DHCPDUMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(DHCPDUMP_DIR)/.unpacked
+ touch $@
$(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
( \
@@ -32,31 +32,23 @@ $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
--sysconfdir=/etc \
- --datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --with-build-cc="$(HOSTCC)" \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
)
- touch $(DHCPDUMP_DIR)/.configured
+ touch $@
$(DHCPDUMP_DIR)/dhcpdump: $(DHCPDUMP_DIR)/.configured
$(MAKE) CC="$(TARGET_CC)" -C $(DHCPDUMP_DIR)
-$(TARGET_DIR)/sbin/dhcpdump: $(DHCPDUMP_DIR)/dhcpdump
+$(TARGET_DIR)/usr/sbin/dhcpdump: $(DHCPDUMP_DIR)/dhcpdump
cp -af $< $@
-dhcpdump: uclibc zlib libpcap $(TARGET_DIR)/sbin/dhcpdump
+dhcpdump: uclibc zlib libpcap $(TARGET_DIR)/usr/sbin/dhcpdump
dhcpdump-clean:
- rm -f $(TARGET_DIR)/sbin/dhcpdump
+ rm -f $(TARGET_DIR)/usr/sbin/dhcpdump
-$(MAKE) -C $(DHCPDUMP_DIR) clean
dhcpdump-dirclean:
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 969ae6aabf..f9c4adc640 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -34,18 +34,8 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --with-build-cc="$(HOSTCC)" \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
--without-crypto \
--disable-smb \
)
@@ -54,19 +44,19 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
$(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
$(MAKE) CC="$(TARGET_CC)" \
- LDFLAGS="-L$(STAGING_DIR)/lib" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
LIBS="-lpcap" \
INCLS="-I. -I$(STAGING_DIR)/usr/include" \
-C $(TCPDUMP_DIR)
-$(TARGET_DIR)/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump
+$(TARGET_DIR)/usr/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump
cp -f $< $@
- $(STRIP) -s $@
+ $(STRIP) $@
-tcpdump: uclibc zlib libpcap $(TARGET_DIR)/sbin/tcpdump
+tcpdump: uclibc zlib libpcap $(TARGET_DIR)/usr/sbin/tcpdump
tcpdump-clean:
- rm -f $(TARGET_DIR)/sbin/tcpdump
+ rm -f $(TARGET_DIR)/usr/sbin/tcpdump
-$(MAKE) -C $(TCPDUMP_DIR) clean
tcpdump-dirclean: