* thttpd.in, thttpd.make:

	cleanups, introducted '__' in options


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

1 files changed, 25 insertions, 70 deletions

diff --git a/rules/thttpd.make b/rules/thttpd.make
index 635563636..1070f130c 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -17,92 +17,48 @@ PACKAGES-$(PTXCONF_THTTPD) += thttpd
 #
 # Paths and names
 #
-THTTPD_VERSION	= 2.25b
-THTTPD		= thttpd-$(THTTPD_VERSION)
-THTTPD_SUFFIX	= tar.gz
-THTTPD_URL	= http://www.acme.com/software/thttpd/$(THTTPD).$(THTTPD_SUFFIX)
-THTTPD_SOURCE	= $(SRCDIR)/$(THTTPD).$(THTTPD_SUFFIX)
-THTTPD_DIR	= $(BUILDDIR)/$(THTTPD)
+THTTPD_VERSION	:= 2.25b
+THTTPD		:= thttpd-$(THTTPD_VERSION)
+THTTPD_SUFFIX	:= tar.gz
+THTTPD_URL	:= http://www.acme.com/software/thttpd/$(THTTPD).$(THTTPD_SUFFIX)
+THTTPD_SOURCE	:= $(SRCDIR)/$(THTTPD).$(THTTPD_SUFFIX)
+THTTPD_DIR	:= $(BUILDDIR)/$(THTTPD)
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-thttpd_get: $(STATEDIR)/thttpd.get
-
-$(STATEDIR)/thttpd.get: $(thttpd_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(THTTPD_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, THTTPD)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-thttpd_extract: $(STATEDIR)/thttpd.extract
-
-$(STATEDIR)/thttpd.extract: $(thttpd_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(THTTPD_DIR))
-	@$(call extract, THTTPD)
-	@$(call patchin, THTTPD)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-thttpd_prepare: $(STATEDIR)/thttpd.prepare
-
-THTTPD_PATH	=  PATH=$(CROSS_PATH)
-THTTPD_ENV 	=  $(CROSS_ENV)
+THTTPD_PATH	:=  PATH=$(CROSS_PATH)
+THTTPD_ENV 	:=  $(CROSS_ENV)
 
 #
 # autoconf
 #
-THTTPD_AUTOCONF =  $(CROSS_AUTOCONF_USR)
-
-$(STATEDIR)/thttpd.prepare: $(thttpd_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(THTTPD_DIR)/config.cache)
-	cd $(THTTPD_DIR) && \
-		$(THTTPD_PATH) $(THTTPD_ENV) \
-		./configure $(THTTPD_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-thttpd_compile: $(STATEDIR)/thttpd.compile
-
-$(STATEDIR)/thttpd.compile: $(thttpd_compile_deps_default)
-	@$(call targetinfo, $@)
-	$(THTTPD_PATH) make -C $(THTTPD_DIR)
-	@$(call touch, $@)
+THTTPD_AUTOCONF :=  $(CROSS_AUTOCONF_USR)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-thttpd_install: $(STATEDIR)/thttpd.install
-
-$(STATEDIR)/thttpd.install: $(thttpd_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/thttpd.install:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-thttpd_targetinstall: $(STATEDIR)/thttpd.targetinstall
-
-$(STATEDIR)/thttpd.targetinstall: $(thttpd_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/thttpd.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, thttpd)
 	@$(call install_fixup, thttpd,PACKAGE,thttpd)
@@ -115,41 +71,40 @@ $(STATEDIR)/thttpd.targetinstall: $(thttpd_targetinstall_deps_default)
 
 	@$(call install_copy, thttpd, 0, 0, 0755, $(THTTPD_DIR)/thttpd, \
 		/usr/sbin/thttpd)
-ifdef PTXCONF_ROOTFS_ETC_INITD_THTTPD
-ifdef PTXCONF_THTTPD_ETC_INITD_GENERIC
+
+ifdef PTXCONF_THTTPD__ETC_INITD_GENERIC
 	@$(call install_copy, thttpd, 0, 0, 0755, \
 		$(PTXDIST_TOPDIR)/generic/etc/init.d/thttpd, \
 		/etc/init.d/thttpd, n)
 endif
-ifdef PTXCONF_THTTPD_ETC_INITD_USER
+
+ifdef PTXCONF_THTTPD__ETC_INITD_USER
 	@$(call install_copy, thttpd, 0, 0, 0755, \
 		${PTXDIST_WORKSPACE}/projectroot/etc/init.d/thttpd, \
 		/etc/init.d/thttpd, n)
 endif
-endif
-#
-# FIXME: Is this packet the right location for the link?
-#
+
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK),"")
 	@$(call install_copy, thttpd, 0, 0, 0755, /etc/rc.d)
 	@$(call install_link, thttpd, ../init.d/thttpd, \
 		/etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK))
 endif
 
-ifdef PTXCONF_THTTPD_GENERIC_SITE
+ifdef PTXCONF_THTTPD__GENERIC_SITE
 	@$(call install_copy, thttpd, 12, 102, 0755, /var/www)
 	@$(call install_copy, thttpd, 12, 102, 0644, \
 		$(PTXDIST_TOPDIR)/generic/var/www/thttpd.html, \
 		/var/www/index.html, n)
 endif
 
-ifdef PTXCONF_THTTPD_INSTALL_HTPASSWD
-	@$(call install_copy, thttpd, 0, 0, 0744, \
+ifdef PTXCONF_THTTPD__INSTALL_HTPASSWD
+	@$(call install_copy, thttpd, 0, 0, 0755, \
 		$(THTTPD_DIR)/extras/htpasswd, \
 		/usr/sbin/htpasswd)
 endif
+
 	@$(call install_finish, thttpd)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean