diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-03 19:19:00 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-04 10:45:44 +0100 |
commit | e783c6d899c2edfb2af94d940ef15faf2aec44e9 (patch) | |
tree | ffa1e07073f9fc1350090f3e00da3055b3351413 /rules/xorg-lib-xkbfile.make | |
parent | f44acde7941c877860841200bace7b6f6d5fd352 (diff) | |
download | ptxdist-e783c6d899c2edfb2af94d940ef15faf2aec44e9.tar.gz ptxdist-e783c6d899c2edfb2af94d940ef15faf2aec44e9.tar.xz |
[xorg-lib-xkbfile] cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-lib-xkbfile.make')
-rw-r--r-- | rules/xorg-lib-xkbfile.make | 66 |
1 files changed, 6 insertions, 60 deletions
diff --git a/rules/xorg-lib-xkbfile.make b/rules/xorg-lib-xkbfile.make index 19bb18526..ba6a747e4 100644 --- a/rules/xorg-lib-xkbfile.make +++ b/rules/xorg-lib-xkbfile.make @@ -29,35 +29,14 @@ XORG_LIB_XKBFILE_DIR := $(BUILDDIR)/$(XORG_LIB_XKBFILE) # Get # ---------------------------------------------------------------------------- -xorg-lib-xkbfile_get: $(STATEDIR)/xorg-lib-xkbfile.get - -$(STATEDIR)/xorg-lib-xkbfile.get: $(xorg-lib-xkbfile_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(XORG_LIB_XKBFILE_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, XORG_LIB_XKBFILE) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -xorg-lib-xkbfile_extract: $(STATEDIR)/xorg-lib-xkbfile.extract - -$(STATEDIR)/xorg-lib-xkbfile.extract: $(xorg-lib-xkbfile_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_LIB_XKBFILE_DIR)) - @$(call extract, XORG_LIB_XKBFILE) - @$(call patchin, XORG_LIB_XKBFILE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -xorg-lib-xkbfile_prepare: $(STATEDIR)/xorg-lib-xkbfile.prepare - XORG_LIB_XKBFILE_PATH := PATH=$(CROSS_PATH) XORG_LIB_XKBFILE_ENV := $(CROSS_ENV) @@ -67,56 +46,23 @@ XORG_LIB_XKBFILE_ENV := $(CROSS_ENV) XORG_LIB_XKBFILE_AUTOCONF := $(CROSS_AUTOCONF_USR) \ --disable-dependency-tracking -$(STATEDIR)/xorg-lib-xkbfile.prepare: $(xorg-lib-xkbfile_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_LIB_XKBFILE_DIR)/config.cache) - cd $(XORG_LIB_XKBFILE_DIR) && \ - $(XORG_LIB_XKBFILE_PATH) $(XORG_LIB_XKBFILE_ENV) \ - ./configure $(XORG_LIB_XKBFILE_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -xorg-lib-xkbfile_compile: $(STATEDIR)/xorg-lib-xkbfile.compile - -$(STATEDIR)/xorg-lib-xkbfile.compile: $(xorg-lib-xkbfile_compile_deps_default) - @$(call targetinfo, $@) - cd $(XORG_LIB_XKBFILE_DIR) && $(XORG_LIB_XKBFILE_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -xorg-lib-xkbfile_install: $(STATEDIR)/xorg-lib-xkbfile.install - -$(STATEDIR)/xorg-lib-xkbfile.install: $(xorg-lib-xkbfile_install_deps_default) - @$(call targetinfo, $@) - @$(call install, XORG_LIB_XKBFILE) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -xorg-lib-xkbfile_targetinstall: $(STATEDIR)/xorg-lib-xkbfile.targetinstall - -$(STATEDIR)/xorg-lib-xkbfile.targetinstall: $(xorg-lib-xkbfile_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/xorg-lib-xkbfile.targetinstall: + @$(call targetinfo) @$(call install_init, xorg-lib-xkbfile) @$(call install_fixup, xorg-lib-xkbfile,PACKAGE,xorg-lib-xkbfile) @$(call install_fixup, xorg-lib-xkbfile,PRIORITY,optional) @$(call install_fixup, xorg-lib-xkbfile,VERSION,$(XORG_LIB_XKBFILE_VERSION)) @$(call install_fixup, xorg-lib-xkbfile,SECTION,base) - @$(call install_fixup, xorg-lib-xkbfile,AUTHOR,"Erwin Rol <ero\@pengutronix.de>") + @$(call install_fixup, xorg-lib-xkbfile,AUTHOR,"Erwin Rol <ero@pengutronix.de>") @$(call install_fixup, xorg-lib-xkbfile,DEPENDS,) @$(call install_fixup, xorg-lib-xkbfile,DESCRIPTION,missing) - @$(call install_copy, xorg-lib-xkbfile, 0, 0, 0644, \ - $(XORG_LIB_XKBFILE_DIR)/src/.libs/libxkbfile.so.1.0.2, \ + @$(call install_copy, xorg-lib-xkbfile, 0, 0, 0644, -, \ $(XORG_LIBDIR)/libxkbfile.so.1.0.2) @$(call install_link, xorg-lib-xkbfile, \ @@ -129,7 +75,7 @@ $(STATEDIR)/xorg-lib-xkbfile.targetinstall: $(xorg-lib-xkbfile_targetinstall_dep @$(call install_finish, xorg-lib-xkbfile) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |