* libcgicc.in, libcgicc.make:

	With ptxdist 1.0.2 some problems arised with the nameing of kconfig and makefile names.
	Patch by: Carsten Schlote

	further cleanups


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

1 files changed, 23 insertions, 73 deletions

diff --git a/rules/libcgicc.make b/rules/libcgicc.make
index b79cdca08..f6128c9c7 100644
--- a/rules/libcgicc.make
+++ b/rules/libcgicc.make
@@ -1,6 +1,8 @@
+# -*-makefile-*-
 # $Id$
 #
 # Copyright (C) 2005 by Alessio Igor Bogani
+#               2008 by Marc Kleine-Budde <mkl@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -11,115 +13,62 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_CGICC) += libcgicc
+PACKAGES-$(PTXCONF_LIBCGICC) += libcgicc
 
 #
 # Paths and names
 #
-CGICC_VERSION		= 3.2.3
-CGICC			= cgicc-$(CGICC_VERSION)
-CGICC_SUFFIX		= tar.gz
-CGICC_URL		= ftp://ftp.gnu.org/gnu/cgicc/$(CGICC).$(CGICC_SUFFIX)
-CGICC_SOURCE		= $(SRCDIR)/$(CGICC).$(CGICC_SUFFIX)
-CGICC_DIR		= $(BUILDDIR)/$(CGICC)
+LIBCGICC_VERSION	:= 3.2.3
+LIBCGICC		:= cgicc-$(LIBCGICC_VERSION)
+LIBCGICC_SUFFIX		:= tar.gz
+LIBCGICC_URL		:= $(PTXCONF_SETUP_GNUMIRROR)/cgicc/$(LIBCGICC).$(LIBCGICC_SUFFIX)
+LIBCGICC_SOURCE		:= $(SRCDIR)/$(LIBCGICC).$(LIBCGICC_SUFFIX)
+LIBCGICC_DIR		:= $(BUILDDIR)/$(LIBCGICC)
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-libcgicc_get: $(STATEDIR)/libcgicc.get
-
-$(STATEDIR)/libcgicc.get: $(libcgicc_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(CGICC_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, CGICC)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-libcgicc_extract: $(STATEDIR)/libcgicc.extract
-
-$(STATEDIR)/libcgicc.extract: $(libcgicc_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(CGICC_DIR))
-	@$(call extract, CGICC)
-	@$(call patchin, CGICC)
-	@$(call touch, $@)
+$(LIBCGICC_SOURCE):
+	@$(call targetinfo)
+	@$(call get, LIBCGICC)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-libcgicc_prepare: $(STATEDIR)/libcgicc.prepare
-
-CGICC_PATH	=  PATH=$(CROSS_PATH)
-CGICC_ENV 	=  $(CROSS_ENV)
+LIBCGICC_PATH	:= PATH=$(CROSS_PATH)
+LIBCGICC_ENV 	:= $(CROSS_ENV)
 
 #
 # autoconf
 #
-CGICC_AUTOCONF =  $(CROSS_AUTOCONF_USR)
-
-$(STATEDIR)/libcgicc.prepare: $(libcgicc_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(CGICC_DIR)/config.cache)
-	cd $(CGICC_DIR) && \
-		$(CGICC_PATH) $(CGICC_ENV) \
-		./configure $(CGICC_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-libcgicc_compile: $(STATEDIR)/libcgicc.compile
-
-$(STATEDIR)/libcgicc.compile: $(libcgicc_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(CGICC_DIR) && $(CGICC_ENV) $(CGICC_PATH) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-libcgicc_install: $(STATEDIR)/libcgicc.install
-
-$(STATEDIR)/libcgicc.install: $(libcgicc_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, CGICC)
-	@$(call touch, $@)
+LIBCGICC_AUTOCONF := $(CROSS_AUTOCONF_USR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-libcgicc_targetinstall: $(STATEDIR)/libcgicc.targetinstall
-
-$(STATEDIR)/libcgicc.targetinstall: $(libcgicc_targetinstall_deps_default)
+$(STATEDIR)/libcgicc.targetinstall:
 
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call install_init, libcgicc)
-	@$(call install_fixup, libcgicc,PACKAGE,cgicc)
+	@$(call install_fixup, libcgicc,PACKAGE,libcgicc)
 	@$(call install_fixup, libcgicc,PRIORITY,optional)
-	@$(call install_fixup, libcgicc,VERSION,$(CGICC_VERSION))
+	@$(call install_fixup, libcgicc,VERSION,$(LIBCGICC_VERSION))
 	@$(call install_fixup, libcgicc,SECTION,base)
 	@$(call install_fixup, libcgicc,AUTHOR,"Carsten Schlote <c.schlote\@konzeptpark.de>")
 	@$(call install_fixup, libcgicc,DEPENDS,)
 	@$(call install_fixup, libcgicc,DESCRIPTION,missing)
 
-	@$(call install_copy, libcgicc, 0,0, 755, $(CGICC_DIR)/cgicc/.libs/libcgicc.so.5.0.1, /usr/lib/libcgicc.so.5.0.1)
+	@$(call install_copy, libcgicc, 0,0, 644, $(LIBCGICC_DIR)/cgicc/.libs/libcgicc.so.5.0.1, /usr/lib/libcgicc.so.5.0.1)
 	@$(call install_link, libcgicc, libcgicc.so.5.0.1, /usr/lib/libcgicc.so.5)
 	@$(call install_link, libcgicc, libcgicc.so.5.0.1, /usr/lib/libcgicc.so)
 
 	@$(call install_finish, libcgicc)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
@@ -127,6 +76,7 @@ $(STATEDIR)/libcgicc.targetinstall: $(libcgicc_targetinstall_deps_default)
 
 libcgicc_clean:
 	rm -rf $(STATEDIR)/libcgicc.*
-	rm -rf $(CGICC_DIR)
+	rm -rf $(IMAGEDIR)/libcgicc_*
+	rm -rf $(LIBCGICC_DIR)
 
 # vim: syntax=make