* mkfontdir: moved to xorg namespace for hosttools.

	Merged from branches/ptxdist-trunk-mkl by rsc.


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

6 files changed, 118 insertions, 136 deletions

diff --git a/rules/host-mkfontdir.in b/rules/host-mkfontdir.in
deleted file mode 100644
index 6539d4bf7..000000000
--- a/rules/host-mkfontdir.in
+++ /dev/null
@@ -1,3 +0,0 @@
-config HOST_MKFONTDIR
-	select HOST_MKFONTSCALE
-	bool
diff --git a/rules/host-mkfontdir.make b/rules/host-mkfontdir.make
deleted file mode 100644
index 5234dccaa..000000000
--- a/rules/host-mkfontdir.make
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2006 by Luotao Fu <lfu@pengutronix.de>
-#
-# 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
-#
-HOST_PACKAGES-$(PTXCONF_HOST_MKFONTDIR) += host-mkfontdir
-
-#
-# Paths and names
-#
-HOST_MKFONTDIR_VERSION	:= 1.0.2
-HOST_MKFONTDIR		:= mkfontdir-X11R7.1-$(HOST_MKFONTDIR_VERSION)
-HOST_MKFONTDIR_SUFFIX		:= tar.bz2
-HOST_MKFONTDIR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(HOST_MKFONTDIR).$(HOST_MKFONTDIR_SUFFIX)
-HOST_MKFONTDIR_SOURCE		:= $(SRCDIR)/$(HOST_MKFONTDIR).$(HOST_MKFONTDIR_SUFFIX)
-HOST_MKFONTDIR_DIR		:= $(HOST_BUILDDIR)/$(HOST_MKFONTDIR)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-host-mkfontdir_get: $(STATEDIR)/host-mkfontdir.get
-
-$(STATEDIR)/host-mkfontdir.get: $(host-mkfontdir_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(HOST_MKFONTDIR_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, HOST_MKFONTDIR)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-host-mkfontdir_extract: $(STATEDIR)/host-mkfontdir.extract
-
-$(STATEDIR)/host-mkfontdir.extract: $(host-mkfontdir_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(HOST_MKFONTDIR_DIR))
-	@$(call extract, HOST_MKFONTDIR, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_MKFONTDIR, $(HOST_MKFONTDIR_DIR))
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-host-mkfontdir_prepare: $(STATEDIR)/host-mkfontdir.prepare
-
-HOST_MKFONTDIR_PATH	:= PATH=$(HOST_PATH)
-HOST_MKFONTDIR_ENV 	:= $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_MKFONTDIR_AUTOCONF	:= $(HOST_AUTOCONF)
-
-$(STATEDIR)/host-mkfontdir.prepare: $(host-mkfontdir_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(HOST_MKFONTDIR_DIR)/config.cache)
-	cd $(HOST_MKFONTDIR_DIR) && \
-		$(HOST_MKFONTDIR_PATH) $(HOST_MKFONTDIR_ENV) \
-		./configure $(HOST_MKFONTDIR_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-host-mkfontdir_compile: $(STATEDIR)/host-mkfontdir.compile
-
-$(STATEDIR)/host-mkfontdir.compile: $(host-mkfontdir_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(HOST_MKFONTDIR_DIR) && $(HOST_MKFONTDIR_PATH) $(MAKE)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-host-mkfontdir_install: $(STATEDIR)/host-mkfontdir.install
-
-$(STATEDIR)/host-mkfontdir.install: $(host-mkfontdir_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, HOST_MKFONTDIR,,h)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-host-mkfontdir_clean:
-	rm -rf $(STATEDIR)/host-mkfontdir.*
-	rm -rf $(HOST_MKFONTDIR_DIR)
-
-# vim: syntax=make
diff --git a/rules/host-xorg-app-mkfontdir.in b/rules/host-xorg-app-mkfontdir.in
new file mode 100644
index 000000000..b51bad48d
--- /dev/null
+++ b/rules/host-xorg-app-mkfontdir.in
@@ -0,0 +1,3 @@
+config HOST_XORG_APP_MKFONTDIR
+	select HOST_XORG_APP_MKFONTSCALE
+	bool
diff --git a/rules/host-xorg-app-mkfontdir.make b/rules/host-xorg-app-mkfontdir.make
new file mode 100644
index 000000000..81fc2cec5
--- /dev/null
+++ b/rules/host-xorg-app-mkfontdir.make
@@ -0,0 +1,97 @@
+# -*-makefile-*-
+# $Id$
+#
+# Copyright (C) 2006 by Luotao Fu <lfu@pengutronix.de>
+#
+# 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
+#
+HOST_PACKAGES-$(PTXCONF_HOST_XORG_APP_MKFONTDIR) += host-xorg-app-mkfontdir
+
+#
+# Paths and names
+#
+HOST_XORG_APP_MKFONTDIR_DIR	= $(HOST_BUILDDIR)/$(XORG_APP_MKFONTDIR)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+host-xorg-app-mkfontdir_get: $(STATEDIR)/host-xorg-app-mkfontdir.get
+
+$(STATEDIR)/host-xorg-app-mkfontdir.get: $(STATEDIR)/xorg-app-mkfontdir.get
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+host-xorg-app-mkfontdir_extract: $(STATEDIR)/host-xorg-app-mkfontdir.extract
+
+$(STATEDIR)/host-xorg-app-mkfontdir.extract: $(host-xorg-app-mkfontdir_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_XORG_APP_MKFONTDIR_DIR))
+	@$(call extract, XORG_APP_MKFONTDIR, $(HOST_BUILDDIR))
+	@$(call patchin, XORG_APP_MKFONTDIR, $(HOST_XORG_APP_MKFONTDIR_DIR))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+host-xorg-app-mkfontdir_prepare: $(STATEDIR)/host-xorg-app-mkfontdir.prepare
+
+HOST_XORG_APP_MKFONTDIR_PATH	:= PATH=$(HOST_PATH)
+HOST_XORG_APP_MKFONTDIR_ENV 	:= $(HOST_ENV)
+
+#
+# autoconf
+#
+HOST_XORG_APP_MKFONTDIR_AUTOCONF	:= $(HOST_AUTOCONF)
+
+$(STATEDIR)/host-xorg-app-mkfontdir.prepare: $(host-xorg-app-mkfontdir_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_XORG_APP_MKFONTDIR_DIR)/config.cache)
+	cd $(HOST_XORG_APP_MKFONTDIR_DIR) && \
+		$(HOST_XORG_APP_MKFONTDIR_PATH) $(HOST_XORG_APP_MKFONTDIR_ENV) \
+		./configure $(HOST_XORG_APP_MKFONTDIR_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+host-xorg-app-mkfontdir_compile: $(STATEDIR)/host-xorg-app-mkfontdir.compile
+
+$(STATEDIR)/host-xorg-app-mkfontdir.compile: $(host-xorg-app-mkfontdir_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(HOST_XORG_APP_MKFONTDIR_DIR) && $(HOST_XORG_APP_MKFONTDIR_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+host-xorg-app-mkfontdir_install: $(STATEDIR)/host-xorg-app-mkfontdir.install
+
+$(STATEDIR)/host-xorg-app-mkfontdir.install: $(host-xorg-app-mkfontdir_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, HOST_XORG_APP_MKFONTDIR,,h)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+host-xorg-app-mkfontdir_clean:
+	rm -rf $(STATEDIR)/host-xorg-app-mkfontdir.*
+	rm -rf $(HOST_XORG_APP_MKFONTDIR_DIR)
+
+# vim: syntax=make
diff --git a/rules/xorg-app-mkfontdir.in b/rules/xorg-app-mkfontdir.in
index 5dd497266..b6bba7a00 100644
--- a/rules/xorg-app-mkfontdir.in
+++ b/rules/xorg-app-mkfontdir.in
@@ -1,8 +1,6 @@
 config XORG_APP_MKFONTDIR
 	bool
 	depends on XORG_APP
-	select XORG_LIB_FONTENC
-	select FREETYPE
 	prompt "xorg mkfontdir"
 	help
 	  Create an index of scalable font files for X
diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make
index 5f001380d..2204b6ffc 100644
--- a/rules/xorg-app-mkfontdir.make
+++ b/rules/xorg-app-mkfontdir.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template 4761 2006-02-24 17:35:57Z sha $
+# $Id: template 6487 2006-12-07 20:55:55Z rsc $
 #
 # Copyright (C) 2006 by Sascha Hauer
 #
@@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_XORG_APP_MKFONTDIR) += xorg-app-mkfontdir
 #
 # Paths and names
 #
-XORG_APP_MKFONTDIR_VERSION	:= 1.0.1
-XORG_APP_MKFONTDIR		:= mkfontscale-X11R7.0-$(XORG_APP_MKFONTDIR_VERSION)
+XORG_APP_MKFONTDIR_VERSION	:= 1.0.2
+XORG_APP_MKFONTDIR		:= mkfontdir-X11R7.1-$(XORG_APP_MKFONTDIR_VERSION)
 XORG_APP_MKFONTDIR_SUFFIX	:= tar.bz2
-XORG_APP_MKFONTDIR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
+XORG_APP_MKFONTDIR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
 XORG_APP_MKFONTDIR_SOURCE	:= $(SRCDIR)/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
 XORG_APP_MKFONTDIR_DIR		:= $(BUILDDIR)/$(XORG_APP_MKFONTDIR)
 
-
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
@@ -58,8 +57,8 @@ $(STATEDIR)/xorg-app-mkfontdir.extract: $(xorg-app-mkfontdir_extract_deps_defaul
 
 xorg-app-mkfontdir_prepare: $(STATEDIR)/xorg-app-mkfontdir.prepare
 
-XORG_APP_MKFONTDIR_PATH	:=  PATH=$(CROSS_PATH)
-XORG_APP_MKFONTDIR_ENV 	:=  $(CROSS_ENV)
+XORG_APP_MKFONTDIR_PATH	:= PATH=$(CROSS_PATH)
+XORG_APP_MKFONTDIR_ENV 	:= $(CROSS_ENV)
 
 #
 # autoconf
@@ -84,12 +83,7 @@ xorg-app-mkfontdir_compile: $(STATEDIR)/xorg-app-mkfontdir.compile
 
 $(STATEDIR)/xorg-app-mkfontdir.compile: $(xorg-app-mkfontdir_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_APP_MKFONTDIR_DIR) && $(XORG_APP_MKFONTDIR_PATH) make
-
-# mkfontdir is just a wrapper for mkfontscale -b -s -l. generate it
-	echo "#!/bin/sh" > $(XORG_APP_MKFONTDIR_DIR)/mkfontdir
-	echo "exec $(XORG_BINDIR)/mkfontscale -b -s -l \"\$$@\"" >> $(XORG_APP_MKFONTDIR_DIR)/mkfontdir
-
+	cd $(XORG_APP_MKFONTDIR_DIR) && $(XORG_APP_MKFONTDIR_PATH) $(MAKE) $(PARALLELMFLAGS)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -113,18 +107,17 @@ $(STATEDIR)/xorg-app-mkfontdir.targetinstall: $(xorg-app-mkfontdir_targetinstall
 	@$(call targetinfo, $@)
 
 	@$(call install_init, xorg-app-mkfontdir)
-	@$(call install_fixup,xorg-app-mkfontdir,PACKAGE,xorg-app-mkfontdir)
-	@$(call install_fixup,xorg-app-mkfontdir,PRIORITY,optional)
-	@$(call install_fixup,xorg-app-mkfontdir,VERSION,$(XORG_APP_MKFONTDIR_VERSION))
-	@$(call install_fixup,xorg-app-mkfontdir,SECTION,base)
-	@$(call install_fixup,xorg-app-mkfontdir,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,xorg-app-mkfontdir,DEPENDS,)
-	@$(call install_fixup,xorg-app-mkfontdir,DESCRIPTION,missing)
-
-	@$(call install_copy, xorg-app-mkfontdir, 0, 0, 0755, $(XORG_APP_MKFONTDIR_DIR)/mkfontscale, $(XORG_BINDIR)/mkfontscale)
-	@$(call install_copy, xorg-app-mkfontdir, 0, 0, 0755, $(XORG_APP_MKFONTDIR_DIR)/mkfontdir, $(XORG_BINDIR)/mkfontdir)
-
-	@$(call install_finish,xorg-app-mkfontdir)
+	@$(call install_fixup, xorg-app-mkfontdir,PACKAGE,xorg-app-mkfontdir)
+	@$(call install_fixup, xorg-app-mkfontdir,PRIORITY,optional)
+	@$(call install_fixup, xorg-app-mkfontdir,VERSION,$(XORG_APP_MKFONTDIR_VERSION))
+	@$(call install_fixup, xorg-app-mkfontdir,SECTION,base)
+	@$(call install_fixup, xorg-app-mkfontdir,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xorg-app-mkfontdir,DEPENDS,)
+	@$(call install_fixup, xorg-app-mkfontdir,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-app-mkfontdir, 0, 0, 0755, $(XORG_APP_MKFONTDIR_DIR)/foobar, /dev/null)
+
+	@$(call install_finish, xorg-app-mkfontdir)
 
 	@$(call touch, $@)