diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-09 21:26:38 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-10 15:54:00 +0100 |
| commit | 2c839167fa4b2fe67d5e7917faf015ee04671e25 (patch) | |
| tree | 9ebe03b79de8e98ed0031137343cdfc64c8a87fa /rules/xorg-fonts.make | |
| parent | e898912dbc0adbbc22f9ddf9961ecc8f3662e9e3 (diff) | |
| download | ptxdist-2c839167fa4b2fe67d5e7917faf015ee04671e25.tar.gz ptxdist-2c839167fa4b2fe67d5e7917faf015ee04671e25.tar.xz | |
[xorg-fonts] cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-fonts.make')
| -rw-r--r-- | rules/xorg-fonts.make | 56 |
1 files changed, 20 insertions, 36 deletions
diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make index 8993d4366..48b4cd53c 100644 --- a/rules/xorg-fonts.make +++ b/rules/xorg-fonts.make @@ -1,7 +1,7 @@ # -*-makefile-*- -# $Id: template 6655 2007-01-02 12:55:21Z rsc $ # # Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de> +# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -26,76 +26,60 @@ XORG_FONTS_DIR_INSTALL := $(XORG_FONTS_DIR)-install # Get # ---------------------------------------------------------------------------- -xorg-fonts_get: $(STATEDIR)/xorg-fonts.get - -$(STATEDIR)/xorg-fonts.get: - @$(call targetinfo, $@) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -xorg-fonts_extract: $(STATEDIR)/xorg-fonts.extract - -$(STATEDIR)/xorg-fonts.extract: $(xorg-fonts_extract_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) +$(STATEDIR)/xorg-fonts.extract: + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -xorg-fonts_prepare: $(STATEDIR)/xorg-fonts.prepare - XORG_FONTS_PATH := PATH=$(HOST_PATH) -$(STATEDIR)/xorg-fonts.prepare: $(xorg-fonts_prepare_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) +$(STATEDIR)/xorg-fonts.prepare: + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -xorg-fonts_compile: $(STATEDIR)/xorg-fonts.compile - -$(STATEDIR)/xorg-fonts.compile: $(xorg-fonts_compile_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) +$(STATEDIR)/xorg-fonts.compile: + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -xorg-fonts_install: $(STATEDIR)/xorg-fonts.install - -$(STATEDIR)/xorg-fonts.install: $(xorg-fonts_install_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) +$(STATEDIR)/xorg-fonts.install: + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -xorg-fonts_targetinstall: $(STATEDIR)/xorg-fonts.targetinstall.post - -$(STATEDIR)/xorg-fonts.targetinstall: $(xorg-fonts_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/xorg-fonts.targetinstall: + @$(call targetinfo) @if test -e $(XORG_FONTS_DIR_INSTALL); then \ rm -rf $(XORG_FONTS_DIR_INSTALL); \ fi @mkdir -p $(XORG_FONTS_DIR_INSTALL) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Target-Install-post # ---------------------------------------------------------------------------- -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-fonts.install - @$(call targetinfo, $@) +$(STATEDIR)/xorg-fonts.targetinstall.post: + @$(call targetinfo) @$(XORG_FONTS_PATH); \ find $(XORG_FONTS_DIR_INSTALL) -mindepth 1 -type d | while read dir; do \ @@ -121,7 +105,7 @@ $(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-fonts.install @$(call install_fixup, xorg-fonts,PRIORITY,optional) @$(call install_fixup, xorg-fonts,VERSION,$(XORG_FONTS_VERSION)) @$(call install_fixup, xorg-fonts,SECTION,base) - @$(call install_fixup, xorg-fonts,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, xorg-fonts,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, xorg-fonts,DEPENDS,) @$(call install_fixup, xorg-fonts,DESCRIPTION,missing) @@ -133,7 +117,7 @@ $(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-fonts.install @$(call install_finish, xorg-fonts) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |