diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-03 19:48:54 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-04 10:47:47 +0100 |
| commit | 1f974ffcfb44f17f5dbabed27584d968869a9116 (patch) | |
| tree | f9974fef7a86d4a6b00464df58a8605c1495baa3 | |
| parent | a25ccaec69abab11ea2eb3eb7639621ddd9ab58d (diff) | |
| download | ptxdist-1f974ffcfb44f17f5dbabed27584d968869a9116.tar.gz ptxdist-1f974ffcfb44f17f5dbabed27584d968869a9116.tar.xz | |
[xorg-lib-Xres] cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/xorg-lib-Xres.make | 66 |
1 files changed, 6 insertions, 60 deletions
diff --git a/rules/xorg-lib-Xres.make b/rules/xorg-lib-Xres.make index e8eb2a0bc..218188c68 100644 --- a/rules/xorg-lib-Xres.make +++ b/rules/xorg-lib-Xres.make @@ -29,35 +29,14 @@ XORG_LIB_XRES_DIR := $(BUILDDIR)/$(XORG_LIB_XRES) # Get # ---------------------------------------------------------------------------- -xorg-lib-xres_get: $(STATEDIR)/xorg-lib-xres.get - -$(STATEDIR)/xorg-lib-xres.get: $(xorg-lib-xres_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(XORG_LIB_XRES_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, XORG_LIB_XRES) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -xorg-lib-xres_extract: $(STATEDIR)/xorg-lib-xres.extract - -$(STATEDIR)/xorg-lib-xres.extract: $(xorg-lib-xres_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_LIB_XRES_DIR)) - @$(call extract, XORG_LIB_XRES) - @$(call patchin, XORG_LIB_XRES) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -xorg-lib-xres_prepare: $(STATEDIR)/xorg-lib-xres.prepare - XORG_LIB_XRES_PATH := PATH=$(CROSS_PATH) XORG_LIB_XRES_ENV := $(CROSS_ENV) @@ -68,56 +47,23 @@ XORG_LIB_XRES_AUTOCONF := $(CROSS_AUTOCONF_USR) XORG_LIB_XRES_AUTOCONF += --disable-malloc0returnsnull -$(STATEDIR)/xorg-lib-xres.prepare: $(xorg-lib-xres_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_LIB_XRES_DIR)/config.cache) - cd $(XORG_LIB_XRES_DIR) && \ - $(XORG_LIB_XRES_PATH) $(XORG_LIB_XRES_ENV) \ - ./configure $(XORG_LIB_XRES_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -xorg-lib-xres_compile: $(STATEDIR)/xorg-lib-xres.compile - -$(STATEDIR)/xorg-lib-xres.compile: $(xorg-lib-xres_compile_deps_default) - @$(call targetinfo, $@) - cd $(XORG_LIB_XRES_DIR) && $(XORG_LIB_XRES_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -xorg-lib-xres_install: $(STATEDIR)/xorg-lib-xres.install - -$(STATEDIR)/xorg-lib-xres.install: $(xorg-lib-xres_install_deps_default) - @$(call targetinfo, $@) - @$(call install, XORG_LIB_XRES) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -xorg-lib-xres_targetinstall: $(STATEDIR)/xorg-lib-xres.targetinstall - -$(STATEDIR)/xorg-lib-xres.targetinstall: $(xorg-lib-xres_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/xorg-lib-xres.targetinstall: + @$(call targetinfo) @$(call install_init, xorg-lib-xres) @$(call install_fixup, xorg-lib-xres,PACKAGE,xorg-lib-xres) @$(call install_fixup, xorg-lib-xres,PRIORITY,optional) @$(call install_fixup, xorg-lib-xres,VERSION,$(XORG_LIB_XRES_VERSION)) @$(call install_fixup, xorg-lib-xres,SECTION,base) - @$(call install_fixup, xorg-lib-xres,AUTHOR,"Erwin Rol <ero\@pengutronix.de>") + @$(call install_fixup, xorg-lib-xres,AUTHOR,"Erwin Rol <ero@pengutronix.de>") @$(call install_fixup, xorg-lib-xres,DEPENDS,) @$(call install_fixup, xorg-lib-xres,DESCRIPTION,missing) - @$(call install_copy, xorg-lib-xres, 0, 0, 0644, \ - $(XORG_LIB_XRES_DIR)/src/.libs/libXRes.so.1.0.0, \ + @$(call install_copy, xorg-lib-xres, 0, 0, 0644, -, \ $(XORG_LIBDIR)/libXRes.so.1.0.0) @$(call install_link, xorg-lib-xres, \ @@ -130,7 +76,7 @@ $(STATEDIR)/xorg-lib-xres.targetinstall: $(xorg-lib-xres_targetinstall_deps_defa @$(call install_finish, xorg-lib-xres) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |