updated

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

3 files changed, 139 insertions, 151 deletions

diff --git a/rules/fontconfig22.in b/rules/fontconfig.in
index baa7ddc33..8ed7f666d 100644
--- a/rules/fontconfig22.in
+++ b/rules/fontconfig.in
@@ -1,5 +1,6 @@
-menuconfig FONTCONFIG22
-	bool "Fontconfig 2.2        "
+menuconfig FONTCONFIG
+	bool "Fontconfig            "
+	select FREETYPE
 	help
 	  Fontconfig is a font configuration and 
 	  customization library, which does not depend on 
diff --git a/rules/fontconfig.make b/rules/fontconfig.make
new file mode 100644
index 000000000..c9a673ba0
--- /dev/null
+++ b/rules/fontconfig.make
@@ -0,0 +1,136 @@
+# -*-makefile-*-
+# $Id: template 4761 2006-02-24 17:35:57Z sha $
+#
+# Copyright (C) 2006 by Robert Schwebel
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_FONTCONFIG) += fontconfig
+
+#
+# Paths and names
+#
+FONTCONFIG_VERSION	:= 2.3.94
+FONTCONFIG		:= fontconfig-$(FONTCONFIG_VERSION)
+FONTCONFIG_SUFFIX	:= tar.gz
+FONTCONFIG_URL		:= http://fontconfig.org/release/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
+FONTCONFIG_SOURCE	:= $(SRCDIR)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
+FONTCONFIG_DIR		:= $(BUILDDIR)/$(FONTCONFIG)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+fontconfig_get: $(STATEDIR)/fontconfig.get
+
+$(STATEDIR)/fontconfig.get: $(fontconfig_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(FONTCONFIG_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(FONTCONFIG_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+fontconfig_extract: $(STATEDIR)/fontconfig.extract
+
+$(STATEDIR)/fontconfig.extract: $(fontconfig_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(FONTCONFIG_DIR))
+	@$(call extract, $(FONTCONFIG_SOURCE))
+	@$(call patchin, $(FONTCONFIG))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+fontconfig_prepare: $(STATEDIR)/fontconfig.prepare
+
+FONTCONFIG_PATH	:=  PATH=$(CROSS_PATH)
+FONTCONFIG_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+FONTCONFIG_AUTOCONF := $(CROSS_AUTOCONF_USR)
+# freetype-config is a shell script, so we can use the installed one
+FONTCONFIG_AUTOCONF += --with-freetype-config=$(SYSROOT)/usr/bin/freetype-config
+FONTCONFIG_AUTOCONF += --with-expat=$(SYSROOT)/usr
+
+$(STATEDIR)/fontconfig.prepare: $(fontconfig_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(FONTCONFIG_DIR)/config.cache)
+	cd $(FONTCONFIG_DIR) && \
+		$(FONTCONFIG_PATH) $(FONTCONFIG_ENV) \
+		./configure $(FONTCONFIG_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+fontconfig_compile: $(STATEDIR)/fontconfig.compile
+
+$(STATEDIR)/fontconfig.compile: $(fontconfig_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(FONTCONFIG_DIR) && $(FONTCONFIG_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+fontconfig_install: $(STATEDIR)/fontconfig.install
+
+$(STATEDIR)/fontconfig.install: $(fontconfig_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, FONTCONFIG)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+fontconfig_targetinstall: $(STATEDIR)/fontconfig.targetinstall
+
+$(STATEDIR)/fontconfig.targetinstall: $(fontconfig_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, fontconfig)
+	@$(call install_fixup,fontconfig,PACKAGE,fontconfig)
+	@$(call install_fixup,fontconfig,PRIORITY,optional)
+	@$(call install_fixup,fontconfig,VERSION,$(FONTCONFIG_VERSION))
+	@$(call install_fixup,fontconfig,SECTION,base)
+	@$(call install_fixup,fontconfig,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,fontconfig,DEPENDS,)
+	@$(call install_fixup,fontconfig,DESCRIPTION,missing)
+
+	@$(call install_copy, fontconfig, 0, 0, 0755, $(FONTCONFIG_DIR)/foobar, /dev/null)
+
+	@$(call install_finish,fontconfig)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+fontconfig_clean:
+	rm -rf $(STATEDIR)/fontconfig.*
+	rm -rf $(IMAGEDIR)/fontconfig_*
+	rm -rf $(FONTCONFIG_DIR)
+
+# vim: syntax=make
diff --git a/rules/fontconfig22.make b/rules/fontconfig22.make
deleted file mode 100644
index cf58a24c3..000000000
--- a/rules/fontconfig22.make
+++ /dev/null
@@ -1,149 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-#                       Pengutronix <info@pengutronix.de>, Germany
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_FONTCONFIG22) += fontconfig22
-
-
-#
-# Paths and names
-#
-FONTCONFIG22_VERSION		= 2.2.99
-FONTCONFIG22			= fontconfig-$(FONTCONFIG22_VERSION)
-FONTCONFIG22_SUFFIX		= tar.gz
-FONTCONFIG22_URL		= http://fontconfig.org/release/$(FONTCONFIG22).$(FONTCONFIG22_SUFFIX)
-FONTCONFIG22_SOURCE		= $(SRCDIR)/$(FONTCONFIG22).$(FONTCONFIG22_SUFFIX)
-FONTCONFIG22_DIR		= $(BUILDDIR)/$(FONTCONFIG22)
-
--include $(call package_depfile)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-fontconfig22_get: $(STATEDIR)/fontconfig22.get
-
-$(STATEDIR)/fontconfig22.get: $(fontconfig22_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(FONTCONFIG22_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(FONTCONFIG22_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-fontconfig22_extract: $(STATEDIR)/fontconfig22.extract
-
-$(STATEDIR)/fontconfig22.extract: $(fontconfig22_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(FONTCONFIG22_DIR))
-	@$(call extract, $(FONTCONFIG22_SOURCE))
-	@$(call patchin, $(FONTCONFIG22))
-
-	# man pages are missing, fake them
-	touch $(FONTCONFIG22_DIR)/fc-cache/fc-cache.1 
-	touch $(FONTCONFIG22_DIR)/fc-list/fc-list.1
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-fontconfig22_prepare: $(STATEDIR)/fontconfig22.prepare
-
-FONTCONFIG22_PATH	=  PATH=$(CROSS_PATH)
-FONTCONFIG22_ENV 	=  $(CROSS_ENV)
-
-#
-# autoconf
-#
-FONTCONFIG22_AUTOCONF	=  $(CROSS_AUTOCONF_USR)
-FONTCONFIG22_AUTOCONF	+= --disable-docs
-FONTCONFIG22_AUTOCONF	+= --with-expat-lib=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
-FONTCONFIG22_AUTOCONF	+= --with-expat-include=$(PTXCONF_PREFIX)/include
-FONTCONFIG22_AUTOCONF	+= --with-freetype-config="pkg-config freetype2"
-
-$(STATEDIR)/fontconfig22.prepare: $(fontconfig22_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(FONTCONFIG22_BUILDDIR))
-	cd $(FONTCONFIG22_DIR) && \
-		$(FONTCONFIG22_PATH) $(FONTCONFIG22_ENV) \
-		./configure $(FONTCONFIG22_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-fontconfig22_compile: $(STATEDIR)/fontconfig22.compile
-
-$(STATEDIR)/fontconfig22.compile: $(fontconfig22_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(FONTCONFIG22_DIR) && \
-		$(FONTCONFIG22_PATH) make 
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-fontconfig22_install: $(STATEDIR)/fontconfig22.install
-
-$(STATEDIR)/fontconfig22.install: $(fontconfig22_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, FONTCONFIG22)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-fontconfig22_targetinstall: $(STATEDIR)/fontconfig22.targetinstall
-
-$(STATEDIR)/fontconfig22.targetinstall: $(fontconfig22_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-
-	@$(call install_init, fontconfig22)
-	@$(call install_fixup, fontconfig22,PACKAGE,fontconfig22)
-	@$(call install_fixup, fontconfig22,PRIORITY,optional)
-	@$(call install_fixup, fontconfig22,VERSION,$(FONTCONFIG22_VERSION))
-	@$(call install_fixup, fontconfig22,SECTION,base)
-	@$(call install_fixup, fontconfig22,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup, fontconfig22,DEPENDS,)
-	@$(call install_fixup, fontconfig22,DESCRIPTION,missing)
-
-	@$(call install_copy, fontconfig22, 0, 0, 0644, \
-		$(FONTCONFIG22_DIR)/src/.libs/libfontconfig.so.1.0.4, \
-		/usr/lib/libfontconfig.so.1.0.4)
-	@$(call install_link, fontconfig22, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so.1)
-	@$(call install_link, fontconfig22, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so)
-
-	@$(call install_finish, fontconfig22)
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-fontconfig22_clean:
-	rm -rf $(STATEDIR)/fontconfig22.*
-	rm -rf $(IMAGEDIR)/fontconfig22_*
-	rm -rf $(FONTCONFIG22_DIR)
-
-# vim: syntax=make