summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/libnet.make16
-rw-r--r--rules/libpcap.make24
-rw-r--r--rules/popt.make17
-rw-r--r--rules/xchain-gdb.make13
4 files changed, 38 insertions, 32 deletions
diff --git a/rules/libnet.make b/rules/libnet.make
index 30af363dc..34c455210 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $Id: libnet.make,v 1.7 2003/10/23 15:01:19 mkl Exp $
+# $Id: libnet.make,v 1.8 2003/10/28 01:50:31 mkl Exp $
#
# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
#
@@ -79,16 +79,18 @@ libnet_prepare_deps = \
$(STATEDIR)/virtual-xchain.install
LIBNET_PATH = PATH=$(CROSS_PATH)
-LIBNET_ENV = $(CROSS_ENV)
-LIBNET_ENV += ac_libnet_have_packet_socket=yes
+LIBNET_ENV = \
+ $(CROSS_ENV) \
+ ac_libnet_have_packet_socket=yes
#
# autoconf
#
-LIBNET_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
-LIBNET_AUTOCONF += --build=$(GNU_HOST)
-LIBNET_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
-LIBNET_AUTOCONF += --with-pf_packet=yes
+LIBNET_AUTOCONF = \
+ --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET) \
+ --with-pf_packet=yes
$(STATEDIR)/libnet.prepare: $(libnet_prepare_deps)
@$(call targetinfo, $@)
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 8f53c6461..46a28a8d5 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $Id: libpcap.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
+# $Id: libpcap.make,v 1.4 2003/10/28 01:50:31 mkl Exp $
#
# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
#
@@ -32,7 +32,7 @@ LIBPCAP_DIR = $(BUILDDIR)/$(LIBPCAP)
libpcap_get: $(STATEDIR)/libpcap.get
-libpcap_get_deps = $(LIBPCAP_SOURCE)
+libpcap_get_deps = $(LIBPCAP_SOURCE)
$(STATEDIR)/libpcap.get: $(libpcap_get_deps)
@$(call targetinfo, $@)
@@ -48,7 +48,7 @@ $(LIBPCAP_SOURCE):
libpcap_extract: $(STATEDIR)/libpcap.extract
-libpcap_extract_deps = $(STATEDIR)/libpcap.get
+libpcap_extract_deps = $(STATEDIR)/libpcap.get
$(STATEDIR)/libpcap.extract: $(libpcap_extract_deps)
@$(call targetinfo, $@)
@@ -70,17 +70,19 @@ libpcap_prepare_deps = \
$(STATEDIR)/virtual-xchain.install
LIBPCAP_PATH = PATH=$(CROSS_PATH)
-LIBPCAP_ENV = $(CROSS_ENV)
-LIBPCAP_ENV += ac_cv_linux_vers=2
+LIBPCAP_ENV = \
+ $(CROSS_ENV) \
+ ac_cv_linux_vers=2
#
# autoconf
#
-LIBPCAP_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
-LIBPCAP_AUTOCONF += --build=$(GNU_HOST)
-LIBPCAP_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
-LIBPCAP_AUTOCONF += --with-pcap=linux
+LIBPCAP_AUTOCONF = \
+ --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET) \
+ --with-pcap=linux
$(STATEDIR)/libpcap.prepare: $(libpcap_prepare_deps)
@$(call targetinfo, $@)
@@ -96,7 +98,7 @@ $(STATEDIR)/libpcap.prepare: $(libpcap_prepare_deps)
libpcap_compile: $(STATEDIR)/libpcap.compile
-libpcap_compile_deps = $(STATEDIR)/libpcap.prepare
+libpcap_compile_deps = $(STATEDIR)/libpcap.prepare
$(STATEDIR)/libpcap.compile: $(libpcap_compile_deps)
@$(call targetinfo, $@)
@@ -120,7 +122,7 @@ $(STATEDIR)/libpcap.install: $(STATEDIR)/libpcap.compile
libpcap_targetinstall: $(STATEDIR)/libpcap.targetinstall
-libpcap_targetinstall_deps = $(STATEDIR)/libpcap.install
+libpcap_targetinstall_deps = $(STATEDIR)/libpcap.install
$(STATEDIR)/libpcap.targetinstall: $(libpcap_targetinstall_deps)
@$(call targetinfo, $@)
diff --git a/rules/popt.make b/rules/popt.make
index a7c691848..4805b6489 100644
--- a/rules/popt.make
+++ b/rules/popt.make
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $Id: popt.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
+# $Id: popt.make,v 1.4 2003/10/28 01:50:31 mkl Exp $
#
# Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
#
@@ -32,7 +32,7 @@ POPT_DIR = $(BUILDDIR)/$(POPT)
popt_get: $(STATEDIR)/popt.get
-popt_get_deps = $(POPT_SOURCE)
+popt_get_deps = $(POPT_SOURCE)
$(STATEDIR)/popt.get: $(popt_get_deps)
@$(call targetinfo, $@)
@@ -48,7 +48,7 @@ $(POPT_SOURCE):
popt_extract: $(STATEDIR)/popt.extract
-popt_extract_deps = $(STATEDIR)/popt.get
+popt_extract_deps = $(STATEDIR)/popt.get
$(STATEDIR)/popt.extract: $(popt_extract_deps)
@$(call targetinfo, $@)
@@ -75,9 +75,10 @@ POPT_ENV = $(CROSS_ENV)
#
# autoconf
#
-POPT_AUTOCONF = --prefix=$(CROSS_LIB_DIR)
-POPT_AUTOCONF += --build=$(GNU_HOST)
-POPT_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
+POPT_AUTOCONF = \
+ --prefix=$(CROSS_LIB_DIR) \
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET)
$(STATEDIR)/popt.prepare: $(popt_prepare_deps)
@$(call targetinfo, $@)
@@ -93,7 +94,7 @@ $(STATEDIR)/popt.prepare: $(popt_prepare_deps)
popt_compile: $(STATEDIR)/popt.compile
-popt_compile_deps = $(STATEDIR)/popt.prepare
+popt_compile_deps = $(STATEDIR)/popt.prepare
$(STATEDIR)/popt.compile: $(popt_compile_deps)
@$(call targetinfo, $@)
@@ -117,7 +118,7 @@ $(STATEDIR)/popt.install: $(STATEDIR)/popt.compile
popt_targetinstall: $(STATEDIR)/popt.targetinstall
-popt_targetinstall_deps = $(STATEDIR)/popt.compile
+popt_targetinstall_deps = $(STATEDIR)/popt.compile
$(STATEDIR)/popt.targetinstall: $(popt_targetinstall_deps)
@$(call targetinfo, $@)
diff --git a/rules/xchain-gdb.make b/rules/xchain-gdb.make
index df203bc43..77272e7ab 100644
--- a/rules/xchain-gdb.make
+++ b/rules/xchain-gdb.make
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $Id: xchain-gdb.make,v 1.7 2003/10/23 17:54:36 mkl Exp $
+# $Id: xchain-gdb.make,v 1.8 2003/10/28 01:50:31 mkl Exp $
#
# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
@@ -47,12 +47,13 @@ xchain-gdb_prepare: $(STATEDIR)/xchain-gdb.prepare
#
# autoconf
#
-XCHAIN_GDB_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
-XCHAIN_GDB_AUTOCONF += --build=$(GNU_HOST)
-XCHAIN_GDB_AUTOCONF += --host=$(GNU_HOST)
-XCHAIN_GDB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
+XCHAIN_GDB_AUTOCONF = \
+ --prefix=$(PTXCONF_PREFIX) \
+ --build=$(GNU_HOST) \
+ --host=$(GNU_HOST) \
+ --target=$(PTXCONF_GNU_TARGET)
-XCHAIN_GDB_ENV = $(HOSTCC_ENV)
+XCHAIN_GDB_ENV = $(HOSTCC_ENV)
$(STATEDIR)/xchain-gdb.prepare: $(STATEDIR)/xchain-gdb.extract
@$(call targetinfo, $@)