diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-02-09 13:46:56 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-02-09 13:46:56 +0000 |
| commit | b8aa7028710e3b75c48cf346319139d96523c166 (patch) | |
| tree | 99661c255d4cda446bdb699684636e03d6653a0c /rules/libpcap.make | |
| parent | 6c3484a3a7361b2dd54c651701533ea9878fa5a3 (diff) | |
| download | ptxdist-b8aa7028710e3b75c48cf346319139d96523c166.tar.gz ptxdist-b8aa7028710e3b75c48cf346319139d96523c166.tar.xz | |
* rules/libpcap.make, rules/tcpdump.make:
cleanups
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4552 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libpcap.make')
| -rw-r--r-- | rules/libpcap.make | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/rules/libpcap.make b/rules/libpcap.make index 822733a04..160b21a9c 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -17,12 +17,12 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap # # Paths and names # -LIBPCAP_VERSION = 0.8.3 -LIBPCAP = libpcap-$(LIBPCAP_VERSION) -LIBPCAP_SUFFIX = tar.gz -LIBPCAP_URL = http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) -LIBPCAP_SOURCE = $(SRCDIR)/$(LIBPCAP).$(LIBPCAP_SUFFIX) -LIBPCAP_DIR = $(BUILDDIR)/$(LIBPCAP) +LIBPCAP_VERSION := 0.8.3 +LIBPCAP := libpcap-$(LIBPCAP_VERSION) +LIBPCAP_SUFFIX := tar.gz +LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) +LIBPCAP_SOURCE := $(SRCDIR)/$(LIBPCAP).$(LIBPCAP_SUFFIX) +LIBPCAP_DIR := $(BUILDDIR)/$(LIBPCAP) -include $(call package_depfile) @@ -60,16 +60,17 @@ $(STATEDIR)/libpcap.extract: $(libpcap_extract_deps_default) libpcap_prepare: $(STATEDIR)/libpcap.prepare -LIBPCAP_PATH = PATH=$(CROSS_PATH) -LIBPCAP_ENV = \ +LIBPCAP_PATH := PATH=$(CROSS_PATH) +LIBPCAP_ENV := \ $(CROSS_ENV) \ ac_cv_linux_vers=2 # # autoconf # -LIBPCAP_AUTOCONF = $(CROSS_AUTOCONF_USR) -LIBPCAP_AUTOCONF += --with-pcap=linux +LIBPCAP_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --with-pcap=linux $(STATEDIR)/libpcap.prepare: $(libpcap_prepare_deps_default) @$(call targetinfo, $@) @@ -87,7 +88,8 @@ libpcap_compile: $(STATEDIR)/libpcap.compile $(STATEDIR)/libpcap.compile: $(libpcap_compile_deps_default) @$(call targetinfo, $@) - cd $(LIBPCAP_DIR) && $(LIBPCAP_PATH) make + cd $(LIBPCAP_DIR) && \ + $(LIBPCAP_ENV) $(LIBPCAP_PATH) $(LIBPCAP_PATH) make @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -98,7 +100,6 @@ libpcap_install: $(STATEDIR)/libpcap.install $(STATEDIR)/libpcap.install: $(libpcap_install_deps_default) @$(call targetinfo, $@) - # FIXME: shoudldn' that run on targetinstall? @$(call install, LIBPCAP) @$(call touch, $@) @@ -110,6 +111,7 @@ libpcap_targetinstall: $(STATEDIR)/libpcap.targetinstall $(STATEDIR)/libpcap.targetinstall: $(libpcap_targetinstall_deps_default) @$(call targetinfo, $@) +# no targetinstall, cause it's a static lib (mkl) @$(call touch, $@) # ---------------------------------------------------------------------------- |