summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2008-06-12 07:23:48 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2008-06-12 07:23:48 +0000
commit7ba61bc31642d5a51c370f5b746af1f17fc9dfa0 (patch)
treee989e852a2b8e9fa7258c01f9b071537ae01ccf4 /rules
parent2d955f732d69692cef8a8135134f47ec66d904b2 (diff)
downloadptxdist-7ba61bc31642d5a51c370f5b746af1f17fc9dfa0.tar.gz
ptxdist-7ba61bc31642d5a51c370f5b746af1f17fc9dfa0.tar.xz
* i915resolution.make:
version bump -> 0.5.3 clanups, only build on i386 * i855resolution.make: cleanups, only build on i386 git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8497 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r--rules/i855resolution.make75
-rw-r--r--rules/i915resolution.make69
2 files changed, 27 insertions, 117 deletions
diff --git a/rules/i855resolution.make b/rules/i855resolution.make
index 0253ab68f..c9af68711 100644
--- a/rules/i855resolution.make
+++ b/rules/i855resolution.make
@@ -12,7 +12,7 @@
#
# We provide this package
#
-PACKAGES-$(PTXCONF_I855RESOLUTION) += i855resolution
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_I855RESOLUTION) += i855resolution
#
# Paths and names
@@ -28,85 +28,37 @@ I855RESOLUTION_DIR := $(BUILDDIR)/855resolution
# Get
# ----------------------------------------------------------------------------
-i855resolution_get: $(STATEDIR)/i855resolution.get
-
-$(STATEDIR)/i855resolution.get: $(i855resolution_get_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
-
$(I855RESOLUTION_SOURCE):
- @$(call targetinfo, $@)
+ @$(call targetinfo)
@$(call get, I855RESOLUTION)
# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-i855resolution_extract: $(STATEDIR)/i855resolution.extract
-
-$(STATEDIR)/i855resolution.extract: $(i855resolution_extract_deps_default)
- @$(call targetinfo, $@)
-ifdef ARCH_X86
- @$(call clean, $(I855RESOLUTION_DIR))
- @$(call extract, I855RESOLUTION)
- @$(call patchin, I855RESOLUTION)
-endif
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-i855resolution_prepare: $(STATEDIR)/i855resolution.prepare
-
I855RESOLUTION_PATH := PATH=$(CROSS_PATH)
-I855RESOLUTION_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-I855RESOLUTION_AUTOCONF := $(CROSS_AUTOCONF_USR)
+I855RESOLUTION_MAKEVARS := $(CROSS_ENV_CC)
-$(STATEDIR)/i855resolution.prepare: $(i855resolution_prepare_deps_default)
- @$(call targetinfo, $@)
-ifdef ARCH_X86
- cd $(I855RESOLUTION_DIR) && $(I855RESOLUTION_PATH) make clean
-endif
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-i855resolution_compile: $(STATEDIR)/i855resolution.compile
-
-$(STATEDIR)/i855resolution.compile: $(i855resolution_compile_deps_default)
- @$(call targetinfo, $@)
-ifdef ARCH_X86
- cd $(I855RESOLUTION_DIR) && $(I855RESOLUTION_ENV) $(I855RESOLUTION_PATH) make
-endif
- @$(call touch, $@)
+$(STATEDIR)/i855resolution.prepare:
+ @$(call targetinfo)
+ cd $(I855RESOLUTION_DIR) && $(I855RESOLUTION_PATH) $(MAKE) clean
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
-i855resolution_install: $(STATEDIR)/i855resolution.install
-
-$(STATEDIR)/i855resolution.install: $(i855resolution_install_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
+$(STATEDIR)/i855resolution.install:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
-i855resolution_targetinstall: $(STATEDIR)/i855resolution.targetinstall
-
-$(STATEDIR)/i855resolution.targetinstall: $(i855resolution_targetinstall_deps_default)
- @$(call targetinfo, $@)
+$(STATEDIR)/i855resolution.targetinstall:
+ @$(call targetinfo)
-ifdef ARCH_X86
@$(call install_init, i855resolution)
@$(call install_fixup,i855resolution,PACKAGE,i855resolution)
@$(call install_fixup,i855resolution,PRIORITY,optional)
@@ -119,9 +71,8 @@ ifdef ARCH_X86
@$(call install_copy, i855resolution, 0, 0, 0755, $(I855RESOLUTION_DIR)/855resolution, /usr/sbin/855resolution)
@$(call install_finish,i855resolution)
-endif
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Clean
diff --git a/rules/i915resolution.make b/rules/i915resolution.make
index a21747d1f..3110852c3 100644
--- a/rules/i915resolution.make
+++ b/rules/i915resolution.make
@@ -12,12 +12,12 @@
#
# We provide this package
#
-PACKAGES-$(PTXCONF_I915RESOLUTION) += i915resolution
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_I915RESOLUTION) += i915resolution
#
# Paths and names
#
-I915RESOLUTION_VERSION := 0.5.2
+I915RESOLUTION_VERSION := 0.5.3
I915RESOLUTION := 915resolution-$(I915RESOLUTION_VERSION)
I915RESOLUTION_SUFFIX := tar.gz
I915RESOLUTION_URL := http://www.geocities.com/stomljen/$(I915RESOLUTION).$(I915RESOLUTION_SUFFIX)
@@ -28,77 +28,36 @@ I915RESOLUTION_DIR := $(BUILDDIR)/$(I915RESOLUTION)
# Get
# ----------------------------------------------------------------------------
-i915resolution_get: $(STATEDIR)/i915resolution.get
-
-$(STATEDIR)/i915resolution.get: $(i915resolution_get_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
-
$(I915RESOLUTION_SOURCE):
- @$(call targetinfo, $@)
+ @$(call targetinfo)
@$(call get, I915RESOLUTION)
# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-i915resolution_extract: $(STATEDIR)/i915resolution.extract
-
-$(STATEDIR)/i915resolution.extract: $(i915resolution_extract_deps_default)
- @$(call targetinfo, $@)
- @$(call clean, $(I915RESOLUTION_DIR))
- @$(call extract, I915RESOLUTION)
- @$(call patchin, I915RESOLUTION)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-i915resolution_prepare: $(STATEDIR)/i915resolution.prepare
-
I915RESOLUTION_PATH := PATH=$(CROSS_PATH)
-I915RESOLUTION_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-I915RESOLUTION_AUTOCONF := $(CROSS_AUTOCONF_USR)
+I915RESOLUTION_MAKEVARS := $(CROSS_ENV_CC)
-$(STATEDIR)/i915resolution.prepare: $(i915resolution_prepare_deps_default)
- @$(call targetinfo, $@)
- cd $(I915RESOLUTION_DIR) && $(I915RESOLUTION_PATH) make clean
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-i915resolution_compile: $(STATEDIR)/i915resolution.compile
-
-$(STATEDIR)/i915resolution.compile: $(i915resolution_compile_deps_default)
- @$(call targetinfo, $@)
- cd $(I915RESOLUTION_DIR) && $(I915RESOLUTION_ENV) $(I915RESOLUTION_PATH) make
- @$(call touch, $@)
+$(STATEDIR)/i915resolution.prepare:
+ @$(call targetinfo)
+ cd $(I915RESOLUTION_DIR) && $(I915RESOLUTION_PATH) $(MAKE) clean
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
-i915resolution_install: $(STATEDIR)/i915resolution.install
-
-$(STATEDIR)/i915resolution.install: $(i915resolution_install_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
+$(STATEDIR)/i915resolution.install:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
-i915resolution_targetinstall: $(STATEDIR)/i915resolution.targetinstall
-
-$(STATEDIR)/i915resolution.targetinstall: $(i915resolution_targetinstall_deps_default)
- @$(call targetinfo, $@)
+$(STATEDIR)/i915resolution.targetinstall:
+ @$(call targetinfo)
@$(call install_init, i915resolution)
@$(call install_fixup,i915resolution,PACKAGE,i915resolution)
@@ -113,7 +72,7 @@ $(STATEDIR)/i915resolution.targetinstall: $(i915resolution_targetinstall_deps_de
@$(call install_finish,i915resolution)
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Clean