* beautification

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@659 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 30 insertions, 24 deletions

diff --git a/rules/template b/rules/template
index 30f2a96bd..e7d3307e5 100644
--- a/rules/template
+++ b/rules/template
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template,v 1.8 2003/10/24 01:10:26 mkl Exp $
+# $Id: template,v 1.9 2003/10/26 13:52:53 mkl Exp $
 #
 # Copyright (C) 2003 by @AUTHOR@
 #          
@@ -76,10 +76,10 @@ $(STATEDIR)/@packet@.extract: $(@packet@_extract_deps)
 #
 # autoconf
 #
-@PACKET@_AUTOCONF	=  --prefix=$(CROSS_LIB_DIR)
-@PACKET@_AUTOCONF	+= --build=$(GNU_HOST)
-@PACKET@_AUTOCONF	+= --host=$(PTXCONF_GNU_TARGET)
-#@PACKET@_AUTOCONF	+= 
+@PACKET@_AUTOCONF = \
+	--prefix=$(CROSS_LIB_DIR) \
+	--build=$(GNU_HOST) \
+	--host=$(PTXCONF_GNU_TARGET)
 
 $(STATEDIR)/@packet@.prepare: $(@packet@_prepare_deps)
 	@$(call targetinfo, $@)
diff --git a/rules/template-xchain b/rules/template-xchain
index 51be47563..643ed06ce 100644
--- a/rules/template-xchain
+++ b/rules/template-xchain
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template-xchain,v 1.1 2003/10/24 01:08:34 mkl Exp $
+# $Id: template-xchain,v 1.2 2003/10/26 13:52:53 mkl Exp $
 #
 # Copyright (C) 2003 by @AUTHOR@
 #          
@@ -75,11 +75,11 @@ $(STATEDIR)/@packet@.extract: $(@packet@_extract_deps)
 #
 # autoconf
 #
-@PACKET@_AUTOCONF	=  --prefix=$(PTXCONF_PREFIX)
-@PACKET@_AUTOCONF	+= --build=$(GNU_HOST)
-# @PACKET@_AUTOCONF	+= --host=$(GNU_HOST)
-# @PACKET@_AUTOCONF	+= --target=$(PTXCONF_GNU_TARGET)
-# @PACKET@_AUTOCONF	+= 
+@PACKET@_AUTOCONF = \
+	--prefix=$(PTXCONF_PREFIX) \
+	--build=$(GNU_HOST)
+# 	--host=$(GNU_HOST)
+# 	--target=$(PTXCONF_GNU_TARGET)
 
 $(STATEDIR)/@packet@.prepare: $(@packet@_prepare_deps)
 	@$(call targetinfo, $@)
diff --git a/rules/tinylogin.make b/rules/tinylogin.make
index 58be73354..bf5743bbd 100644
--- a/rules/tinylogin.make
+++ b/rules/tinylogin.make
@@ -1,7 +1,8 @@
 # -*-makefile-*-
-# $Id: tinylogin.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id: tinylogin.make,v 1.3 2003/10/26 13:51:36 mkl Exp $
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+#
 # See CREDITS for details about who has contributed to this project. 
 #
 # For further information about the PTXdist project and license conditions
@@ -22,7 +23,6 @@ TINYLOGIN		= tinylogin-1.4.tar.bz2
 TINYLOGIN_URL		= http://tinylogin.busybox.net/downloads/$(TINYLOGIN).tar.bz2
 TINYLOGIN_SOURCE	= $(SRCDIR)/$(TINYLOGIN).tar.bz2
 TINYLOGIN_DIR		= $(BUILDDIR)/$(TINYLOGIN)
-TINYLOGIN_EXTRACT 	= bzip2 -dc
 
 # ----------------------------------------------------------------------------
 # Get
@@ -38,7 +38,7 @@ $(STATEDIR)/tinylogin.get: $(tinylogin_get_deps)
 
 $(TINYLOGIN_SOURCE):
 	@$(call targetinfo, $@)
-	wget -P $(SRCDIR) $(PASSIVEFTP) $(TINYLOGIN_URL)
+	@$(call get, $(TINYLOGIN_URL))
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -48,7 +48,8 @@ tinylogin_extract: $(STATEDIR)/tinylogin.extract
 
 $(STATEDIR)/tinylogin.extract: $(STATEDIR)/tinylogin.get
 	@$(call targetinfo, $@)
-	$(TINYLOGIN_EXTRACT) $(TINYLOGIN_SOURCE) | tar -C $(BUILDDIR) -xf -
+	@$(call clean, $(TINYLOGIN_DIR))
+	@$(call extract, $(TINYLOGIN_SOURCE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -63,7 +64,9 @@ TINYLOGIN_MAKEVARS = CROSS=$(PTXCONF_GNU_TARGET)-
 #
 # dependencies
 #
-tinylogin_prepare_deps =  $(STATEDIR)/tinylogin.extract $(STATEDIR)/virtual-xchain.install
+tinylogin_prepare_deps = \
+	$(STATEDIR)/virtual-xchain.install \
+	$(STATEDIR)/tinylogin.extract
 
 $(STATEDIR)/tinylogin.prepare: $(tinylogin_prepare_deps)
 	@$(call targetinfo, $@)
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index 0013b899a..f7f7eb8d9 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
-# $Id: utelnetd.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
+# $Id: utelnetd.make,v 1.7 2003/10/26 13:51:51 mkl Exp $
 #
-# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
 #
 # For further information about the PTXdist project and license conditions
@@ -11,7 +11,7 @@
 #
 # We provide this package
 #
-ifeq (y,$(PTXCONF_UTELNETD))
+ifdef PTXCONF_UTELNETD
 PACKAGES += utelnetd
 endif
 
@@ -22,7 +22,6 @@ UTELNETD			= utelnetd-0.1.6
 UTELNETD_URL			= http://www.pengutronix.de/software/utelnetd/$(UTELNETD).tar.gz
 UTELNETD_SOURCE			= $(SRCDIR)/$(UTELNETD).tar.gz
 UTELNETD_DIR			= $(BUILDDIR)/$(UTELNETD)
-UTELNETD_EXTRACT 		= gzip -dc
 
 # ----------------------------------------------------------------------------
 # Get
@@ -36,7 +35,7 @@ $(STATEDIR)/utelnetd.get: $(UTELNETD_SOURCE)
 
 $(UTELNETD_SOURCE):
 	@$(call targetinfo, $@)
-	wget -P $(SRCDIR) $(PASSIVEFTP) $(UTELNETD_URL)
+	@$(call get, $(UTELNETD_URL))
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -47,7 +46,7 @@ utelnetd_extract: $(STATEDIR)/utelnetd.extract
 $(STATEDIR)/utelnetd.extract: $(STATEDIR)/utelnetd.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(UTELNETS_DIR))
-	$(UTELNETD_EXTRACT) $(UTELNETD_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
+	@$(call extract, $(UTELNETD_SOURCE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -56,7 +55,11 @@ $(STATEDIR)/utelnetd.extract: $(STATEDIR)/utelnetd.get
 
 utelnetd_prepare: $(STATEDIR)/utelnetd.prepare
 
-$(STATEDIR)/utelnetd.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/utelnetd.extract
+utelnetd_prepare_deps = \
+	$(STATEDIR)/virtual-xchain.install \
+	$(STATEDIR)/utelnetd.extract
+
+$(STATEDIR)/utelnetd.prepare: $(utelnetd_prepare_deps)
 	@$(call targetinfo, $@)
 	touch $@
 
@@ -66,7 +69,7 @@ $(STATEDIR)/utelnetd.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/ute
 
 utelnetd_compile: $(STATEDIR)/utelnetd.compile
 
-UTELNETD_ENVIRONMENT += PATH=$(PTXCONF_PREFIX)/bin:$$PATH
+UTELNETD_ENVIRONMENT += PATH=$(CROSS_PATH)
 UTELNETD_MAKEVARS    += CROSS=$(PTXCONF_GNU_TARGET)-
 
 $(STATEDIR)/utelnetd.compile: $(STATEDIR)/utelnetd.prepare