From d739a91ef3f0cf959aa222cb697662c5bfac3cad Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sun, 3 Jan 2010 19:44:38 +0100 Subject: [xorg-lib-Xcomposite] cleanup makefile Signed-off-by: Michael Olbrich --- rules/xorg-lib-Xcomposite.make | 66 ++++-------------------------------------- 1 file changed, 6 insertions(+), 60 deletions(-) (limited to 'rules/xorg-lib-Xcomposite.make') diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make index 7ab761e2b..576e77cee 100644 --- a/rules/xorg-lib-Xcomposite.make +++ b/rules/xorg-lib-Xcomposite.make @@ -29,35 +29,14 @@ XORG_LIB_XCOMPOSITE_DIR := $(BUILDDIR)/$(XORG_LIB_XCOMPOSITE) # Get # ---------------------------------------------------------------------------- -xorg-lib-xcomposite_get: $(STATEDIR)/xorg-lib-xcomposite.get - -$(STATEDIR)/xorg-lib-xcomposite.get: $(xorg-lib-xcomposite_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(XORG_LIB_XCOMPOSITE_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, XORG_LIB_XCOMPOSITE) -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -xorg-lib-xcomposite_extract: $(STATEDIR)/xorg-lib-xcomposite.extract - -$(STATEDIR)/xorg-lib-xcomposite.extract: $(xorg-lib-xcomposite_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_LIB_XCOMPOSITE_DIR)) - @$(call extract, XORG_LIB_XCOMPOSITE) - @$(call patchin, XORG_LIB_XCOMPOSITE) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -xorg-lib-xcomposite_prepare: $(STATEDIR)/xorg-lib-xcomposite.prepare - XORG_LIB_XCOMPOSITE_PATH := PATH=$(CROSS_PATH) XORG_LIB_XCOMPOSITE_ENV := $(CROSS_ENV) @@ -66,56 +45,23 @@ XORG_LIB_XCOMPOSITE_ENV := $(CROSS_ENV) # XORG_LIB_XCOMPOSITE_AUTOCONF := $(CROSS_AUTOCONF_USR) -$(STATEDIR)/xorg-lib-xcomposite.prepare: $(xorg-lib-xcomposite_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_LIB_XCOMPOSITE_DIR)/config.cache) - cd $(XORG_LIB_XCOMPOSITE_DIR) && \ - $(XORG_LIB_XCOMPOSITE_PATH) $(XORG_LIB_XCOMPOSITE_ENV) \ - ./configure $(XORG_LIB_XCOMPOSITE_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -xorg-lib-xcomposite_compile: $(STATEDIR)/xorg-lib-xcomposite.compile - -$(STATEDIR)/xorg-lib-xcomposite.compile: $(xorg-lib-xcomposite_compile_deps_default) - @$(call targetinfo, $@) - cd $(XORG_LIB_XCOMPOSITE_DIR) && $(XORG_LIB_XCOMPOSITE_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -xorg-lib-xcomposite_install: $(STATEDIR)/xorg-lib-xcomposite.install - -$(STATEDIR)/xorg-lib-xcomposite.install: $(xorg-lib-xcomposite_install_deps_default) - @$(call targetinfo, $@) - @$(call install, XORG_LIB_XCOMPOSITE) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -xorg-lib-xcomposite_targetinstall: $(STATEDIR)/xorg-lib-xcomposite.targetinstall - -$(STATEDIR)/xorg-lib-xcomposite.targetinstall: $(xorg-lib-xcomposite_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/xorg-lib-xcomposite.targetinstall: + @$(call targetinfo) @$(call install_init, xorg-lib-xcomposite) @$(call install_fixup, xorg-lib-xcomposite,PACKAGE,xorg-lib-xcomposite) @$(call install_fixup, xorg-lib-xcomposite,PRIORITY,optional) @$(call install_fixup, xorg-lib-xcomposite,VERSION,$(XORG_LIB_XCOMPOSITE_VERSION)) @$(call install_fixup, xorg-lib-xcomposite,SECTION,base) - @$(call install_fixup, xorg-lib-xcomposite,AUTHOR,"Erwin Rol ") + @$(call install_fixup, xorg-lib-xcomposite,AUTHOR,"Erwin Rol ") @$(call install_fixup, xorg-lib-xcomposite,DEPENDS,) @$(call install_fixup, xorg-lib-xcomposite,DESCRIPTION,missing) - @$(call install_copy, xorg-lib-xcomposite, 0, 0, 0644, \ - $(XORG_LIB_XCOMPOSITE_DIR)/src/.libs/libXcomposite.so.1.0.0, \ + @$(call install_copy, xorg-lib-xcomposite, 0, 0, 0644, -, \ $(XORG_LIBDIR)/libXcomposite.so.1.0.0) @$(call install_link, xorg-lib-xcomposite, \ @@ -128,7 +74,7 @@ $(STATEDIR)/xorg-lib-xcomposite.targetinstall: $(xorg-lib-xcomposite_targetinsta @$(call install_finish, xorg-lib-xcomposite) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean -- cgit v1.2.3