[proftpd] just cleanups

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

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

1 files changed, 23 insertions, 70 deletions

diff --git a/rules/proftpd.make b/rules/proftpd.make
index a6ac26576..627b9c221 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -17,123 +17,76 @@ PACKAGES-$(PTXCONF_PROFTPD) += proftpd
 #
 # Paths and names
 #
-PROFTPD_VERSION		= 1.3.2rc3
-PROFTPD			= proftpd-$(PROFTPD_VERSION)
-PROFTPD_SUFFIX		= tar.gz
-PROFTPD_URL		= ftp://ftp.proftpd.org/distrib/source/$(PROFTPD).$(PROFTPD_SUFFIX)
-PROFTPD_SOURCE		= $(SRCDIR)/$(PROFTPD).$(PROFTPD_SUFFIX)
-PROFTPD_DIR		= $(BUILDDIR)/$(PROFTPD)
+PROFTPD_VERSION		:= 1.3.2rc3
+PROFTPD			:= proftpd-$(PROFTPD_VERSION)
+PROFTPD_SUFFIX		:= tar.gz
+PROFTPD_URL		:= ftp://ftp.proftpd.org/distrib/source/$(PROFTPD).$(PROFTPD_SUFFIX)
+PROFTPD_SOURCE		:= $(SRCDIR)/$(PROFTPD).$(PROFTPD_SUFFIX)
+PROFTPD_DIR		:= $(BUILDDIR)/$(PROFTPD)
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-proftpd_get: $(STATEDIR)/proftpd.get
-
-$(STATEDIR)/proftpd.get: $(proftpd_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(PROFTPD_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, PROFTPD)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-proftpd_extract: $(STATEDIR)/proftpd.extract
-
-$(STATEDIR)/proftpd.extract: $(proftpd_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(PROFTPD_DIR))
-	@$(call extract, PROFTPD)
-	@$(call patchin, PROFTPD)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-proftpd_prepare: $(STATEDIR)/proftpd.prepare
-
-PROFTPD_AUTOCONF	=  $(CROSS_AUTOCONF_USR)
+PROFTPD_PATH		:= PATH=$(CROSS_PATH)
+PROFTPD_ENV		:= $(CROSS_ENV)
 
-PROFTPD_PATH		=  PATH=$(CROSS_PATH)
-PROFTPD_ENV		=  $(CROSS_ENV) ac_cv_func_setgrent_void=yes
-ifndef NATIVE
-PROFTPD_MAKEVARS	=  $(CROSS_ENV_CC)
-endif
+PROFTPD_AUTOCONF	:= $(CROSS_AUTOCONF_USR)
 
 ifdef PTXCONF_PROFTPD_PAM
 PROFTPD_AUTOCONF += --enable-pam
 else
 PROFTPD_AUTOCONF += --disable-pam
 endif
+
 ifdef PTXCONF_PROFTPD_SENDFILE
 PROFTPD_AUTOCONF += --enable-sendfile
 else
 PROFTPD_AUTOCONF += --disable-sendfile
 endif
+
 ifdef PTXCONF_PROFTPD_SHADOW
 PROFTPD_AUTOCONF += --enable-shadow
 else
 PROFTPD_AUTOCONF += --disable-shadow
 endif
+
 ifdef PTXCONF_PROFTPD_AUTOSHADOW
 PROFTPD_AUTOCONF += --enable-autoshadow
 else
 PROFTPD_AUTOCONF += --disable-autoshadow
 endif
 
-proftpd_extract_deps = \
-	$(STATEDIR)/virtual-xchain.install \
-	$(STATEDIR)/proftpd.extract
-
-$(STATEDIR)/proftpd.prepare: $(proftpd_prepare_deps_default)
-	@$(call targetinfo, $@)
-	cd $(PROFTPD_DIR) && \
-		$(PROFTPD_PATH) $(PROFTPD_ENV) \
-		./configure $(PROFTPD_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-proftpd_compile: $(STATEDIR)/proftpd.compile
-
-$(STATEDIR)/proftpd.compile: $(proftpd_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(PROFTPD_DIR) && $(PROFTPD_PATH) $(PROFTPD_ENV) make $(PROFTPD_MAKEVARS)
-	@$(call touch, $@)
-
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-proftpd_install: $(STATEDIR)/proftpd.install
-
-$(STATEDIR)/proftpd.install: $(proftpd_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/proftpd.install:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-proftpd_targetinstall: $(STATEDIR)/proftpd.targetinstall
-
-$(STATEDIR)/proftpd.targetinstall: $(proftpd_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/proftpd.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, proftpd)
 	@$(call install_fixup, proftpd,PACKAGE,proftpd)
 	@$(call install_fixup, proftpd,PRIORITY,optional)
 	@$(call install_fixup, proftpd,VERSION,$(PROFTPD_VERSION))
 	@$(call install_fixup, proftpd,SECTION,base)
-	@$(call install_fixup, proftpd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, proftpd,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, proftpd,DEPENDS,)
 	@$(call install_fixup, proftpd,DESCRIPTION,missing)
 
@@ -143,9 +96,9 @@ $(STATEDIR)/proftpd.targetinstall: $(proftpd_targetinstall_deps_default)
 
 	@$(call install_alternative, proftpd, 0, 0, 0644, /etc/proftpd.conf, n)
 
-	#
-	# busybox init
-	#
+#	#
+#	# busybox init
+#	#
 ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_PROFTPD_STARTSCRIPT
 	@$(call install_alternative, proftpd, 0, 0, 0755, /etc/init.d/proftpd, n)
@@ -154,7 +107,7 @@ endif
 
 	@$(call install_finish, proftpd)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean