diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-13 14:29:25 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-26 14:12:54 +0100 |
| commit | 592a6fe4444c745e55bc46ba88ec241667a4cfa6 (patch) | |
| tree | 205a9ab3fc0c5f6cfe02efd0200a8a276db35a4d /rules/xorg-font-encodings.make | |
| parent | c12dc71ce635a5b17ec1b3ab4b4ce1d94f1705f6 (diff) | |
| download | ptxdist-592a6fe4444c745e55bc46ba88ec241667a4cfa6.tar.gz ptxdist-592a6fe4444c745e55bc46ba88ec241667a4cfa6.tar.xz | |
[xorg-font-encodings] fix & cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-font-encodings.make')
| -rw-r--r-- | rules/xorg-font-encodings.make | 57 |
1 files changed, 4 insertions, 53 deletions
diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make index 6a7fc1ffb..e60f72bcb 100644 --- a/rules/xorg-font-encodings.make +++ b/rules/xorg-font-encodings.make @@ -32,30 +32,11 @@ endif # Get # ---------------------------------------------------------------------------- -xorg-font-encodings_get: $(STATEDIR)/xorg-font-encodings.get - -$(STATEDIR)/xorg-font-encodings.get: $(xorg-font-encodings_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(XORG_FONT_ENCODINGS_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, XORG_FONT_ENCODINGS) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -xorg-font-encodings_extract: $(STATEDIR)/xorg-font-encodings.extract - -$(STATEDIR)/xorg-font-encodings.extract: $(xorg-font-encodings_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_FONT_ENCODINGS_DIR)) - @$(call extract, XORG_FONT_ENCODINGS) - @$(call patchin, XORG_FONT_ENCODINGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -67,40 +48,10 @@ XORG_FONT_ENCODINGS_ENV := $(CROSS_ENV) # # autoconf # -XORG_FONT_ENCODINGS_AUTOCONF := +XORG_FONT_ENCODINGS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --with-encodingsdir=$(XORG_FONTDIR)/encodings -$(STATEDIR)/xorg-font-encodings.prepare: $(xorg-font-encodings_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_FONT_ENCODINGS_DIR)/config.cache) - cd $(XORG_FONT_ENCODINGS_DIR) && \ - $(XORG_FONT_ENCODINGS_PATH) $(XORG_FONT_ENCODINGS_ENV) \ - ./configure $(XORG_FONT_ENCODINGS_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -xorg-font-encodings_compile: $(STATEDIR)/xorg-font-encodings.compile - -$(STATEDIR)/xorg-font-encodings.compile: $(xorg-font-encodings_compile_deps_default) - @$(call targetinfo, $@) - cd $(XORG_FONT_ENCODINGS_DIR) && $(XORG_FONT_ENCODINGS_PATH) $(MAKE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -xorg-font-encodings_install: $(STATEDIR)/xorg-font-encodings.install - -$(STATEDIR)/xorg-font-encodings.install: $(xorg-font-encodings_install_deps_default) - @$(call targetinfo, $@) - @$(call install, XORG_FONT_ENCODINGS) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -108,7 +59,7 @@ $(STATEDIR)/xorg-font-encodings.install: $(xorg-font-encodings_install_deps_defa xorg-font-encodings_targetinstall: $(STATEDIR)/xorg-font-encodings.targetinstall $(STATEDIR)/xorg-font-encodings.targetinstall: $(xorg-font-encodings_targetinstall_deps_default) - @$(call targetinfo, $@) + @$(call targetinfo) @mkdir -p $(XORG_FONTS_DIR_INSTALL)/encodings @@ -122,7 +73,7 @@ $(STATEDIR)/xorg-font-encodings.targetinstall: $(xorg-font-encodings_targetinsta install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/encodings; \ done - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |