* rules/gtk.make, rules/ipkg.make, rules/inotify-tools.make, rules/net-snmp.make, rules/apache2.make, rules/sysfsutils.make, rules/libcurl.make, rules/glade.make, rules/fcgi.make, rules/tslib.make, rules/fontconfig.make, rules/dbus.make, rules/libxslt.make, rules/libpv.make:

	conversion due to not-relinking: executeables are moved from <src>/.libs to <src>


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

1 files changed, 16 insertions, 52 deletions

diff --git a/rules/fcgi.make b/rules/fcgi.make
index 9fc7d9c42..9c181614c 100644
--- a/rules/fcgi.make
+++ b/rules/fcgi.make
@@ -1,3 +1,4 @@
+# -*-makefile-*-
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -13,26 +14,20 @@ PACKAGES-$(PTXCONF_FCGI) += fcgi
 #
 # Paths and names
 #
-FCGI_VERSION    = 2.4.0
-FCGI		= fcgi-$(FCGI_VERSION)
-FCGI_SUFFIX	= tar.gz
-FCGI_URL	= http://www.fastcgi.com/dist/fcgi.$(FCGI_SUFFIX)
-FCGI_SOURCE	= $(SRCDIR)/$(FCGI).$(FCGI_SUFFIX)
-FCGI_DIR	= $(BUILDDIR)/$(FCGI)
+FCGI_VERSION    := 2.4.0
+FCGI		:= fcgi-$(FCGI_VERSION)
+FCGI_SUFFIX	:= tar.gz
+FCGI_URL	:= http://www.fastcgi.com/dist/fcgi.$(FCGI_SUFFIX)
+FCGI_SOURCE	:= $(SRCDIR)/$(FCGI).$(FCGI_SUFFIX)
+FCGI_DIR	:= $(BUILDDIR)/$(FCGI)
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-fcgi_get: $(STATEDIR)/fcgi.get
-
-$(STATEDIR)/fcgi.get: $(fcgi_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(FCGI_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, FCGI)
 
 # ----------------------------------------------------------------------------
@@ -42,18 +37,16 @@ $(FCGI_SOURCE):
 fcgi_extract: $(STATEDIR)/fcgi.extract
 
 $(STATEDIR)/fcgi.extract: $(fcgi_extract_deps_default)
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call clean, $(FCGI_DIR))
 	@$(call extract, FCGI)
 	@$(call patchin, FCGI)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-fcgi_prepare: $(STATEDIR)/fcgi.prepare
-
 FCGI_PATH	=  PATH=$(CROSS_PATH)
 FCGI_ENV 	=  $(CROSS_ENV)
 
@@ -62,43 +55,12 @@ FCGI_ENV 	=  $(CROSS_ENV)
 #
 FCGI_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/fcgi.prepare: $(fcgi_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(FCGI_DIR)/config.cache)
-	cd $(FCGI_DIR) && \
-		$(FCGI_PATH) $(FCGI_ENV) \
-		./configure $(FCGI_AUTOCONF) --prefix=/usr
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-fcgi_compile: $(STATEDIR)/fcgi.compile
-
-$(STATEDIR)/fcgi.compile: $(fcgi_compile_deps_default)
-	@$(call targetinfo, $@)
-	$(FCGI_PATH) make -C $(FCGI_DIR)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-fcgi_install: $(STATEDIR)/fcgi.install
-
-$(STATEDIR)/fcgi.install: $(fcgi_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-fcgi_targetinstall: $(STATEDIR)/fcgi.targetinstall
-
-$(STATEDIR)/fcgi.targetinstall: $(fcgi_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/fcgi.targetinstall:
+	@$(call targetinfo)
 	@$(call install_init, fcgi)
 	@$(call install_fixup, fcgi,PACKAGE,fcgi)
 	@$(call install_fixup, fcgi,PRIORITY,optional)
@@ -107,15 +69,17 @@ $(STATEDIR)/fcgi.targetinstall: $(fcgi_targetinstall_deps_default)
 	@$(call install_fixup, fcgi,AUTHOR,"Daniel Schnell <danielsch\@marel.com>")
 	@$(call install_fixup, fcgi,DEPENDS,)
 	@$(call install_fixup, fcgi,DESCRIPTION,missing)
-	@$(call install_copy, fcgi, 0, 0, 0755, $(FCGI_DIR)/cgi-fcgi/.libs/cgi-fcgi, \
+
+	@$(call install_copy, fcgi, 0, 0, 0755, $(FCGI_DIR)/cgi-fcgi/cgi-fcgi, \
 		/usr/bin/cgi-fcgi)
+
 	@$(call install_copy, fcgi, 0, 0, 0755, $(FCGI_DIR)/libfcgi/.libs/libfcgi.so.0.0.0, \
 		/usr/lib/libfcgi.so.0.0.0)
 	@$(call install_link,  fcgi, libfcgi.so.0.0.0,  /usr/lib/libfcgi.so.0)
 	@$(call install_link,  fcgi, libfcgi.so.0, /usr/lib/libfcgi.so)
 
 	@$(call install_finish, fcgi)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean