diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-03 16:57:37 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-04 10:42:54 +0100 |
| commit | e688a90956485dd29bd242cdebb503fa90054b3c (patch) | |
| tree | f0e0abca2105510727d2dc03f599a33e75f38d85 /rules/xterm.make | |
| parent | f5815bce5839633ad2f0f65b7c32ea4c144eac9c (diff) | |
| download | ptxdist-e688a90956485dd29bd242cdebb503fa90054b3c.tar.gz ptxdist-e688a90956485dd29bd242cdebb503fa90054b3c.tar.xz | |
[xterm] version bump 250 -> 253 & cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xterm.make')
| -rw-r--r-- | rules/xterm.make | 63 |
1 files changed, 6 insertions, 57 deletions
diff --git a/rules/xterm.make b/rules/xterm.make index 1605507bc..8916745ba 100644 --- a/rules/xterm.make +++ b/rules/xterm.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XTERM) += xterm # # Paths and names # -XTERM_VERSION := 250 +XTERM_VERSION := 253 XTERM := xterm-$(XTERM_VERSION) XTERM_SUFFIX := tgz XTERM_URL := ftp://invisible-island.net/xterm/$(XTERM).$(XTERM_SUFFIX) @@ -29,30 +29,11 @@ XTERM_DIR := $(BUILDDIR)/$(XTERM) # Get # ---------------------------------------------------------------------------- -xterm_get: $(STATEDIR)/xterm.get - -$(STATEDIR)/xterm.get: $(xterm_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(XTERM_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, XTERM) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -xterm_extract: $(STATEDIR)/xterm.extract - -$(STATEDIR)/xterm.extract: $(xterm_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XTERM_DIR)) - @$(call extract, XTERM) - @$(call patchin, XTERM) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -68,59 +49,27 @@ XTERM_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --disable-freetype -$(STATEDIR)/xterm.prepare: $(xterm_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XTERM_DIR)/config.cache) - cd $(XTERM_DIR) && \ - $(XTERM_PATH) $(XTERM_ENV) \ - ./configure $(XTERM_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -xterm_compile: $(STATEDIR)/xterm.compile - -$(STATEDIR)/xterm.compile: $(xterm_compile_deps_default) - @$(call targetinfo, $@) - cd $(XTERM_DIR) && $(XTERM_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -xterm_install: $(STATEDIR)/xterm.install - -$(STATEDIR)/xterm.install: $(xterm_install_deps_default) - @$(call targetinfo, $@) - @$(call install, XTERM) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -xterm_targetinstall: $(STATEDIR)/xterm.targetinstall - $(STATEDIR)/xterm.targetinstall: $(xterm_targetinstall_deps_default) - @$(call targetinfo, $@) + @$(call targetinfo) @$(call install_init, xterm) @$(call install_fixup,xterm,PACKAGE,xterm) @$(call install_fixup,xterm,PRIORITY,optional) @$(call install_fixup,xterm,VERSION,$(XTERM_VERSION)) @$(call install_fixup,xterm,SECTION,base) - @$(call install_fixup,xterm,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,xterm,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup,xterm,DEPENDS,) @$(call install_fixup,xterm,DESCRIPTION,missing) - @$(call install_copy, xterm, 0, 0, 0755, $(XTERM_DIR)/xterm, $(XORG_BINDIR)/xterm) + @$(call install_copy, xterm, 0, 0, 0755, -, $(XORG_BINDIR)/xterm) @$(call install_finish,xterm) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |