diff options
| -rw-r--r-- | rules/alsa-lib.make | 61 | ||||
| -rw-r--r-- | rules/alsa-utils.make | 69 |
2 files changed, 15 insertions, 115 deletions
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make index 8d3e2be97..dcfe63263 100644 --- a/rules/alsa-lib.make +++ b/rules/alsa-lib.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib # # Paths and names # -ALSA_LIB_VERSION := 1.0.11 +ALSA_LIB_VERSION := 1.0.16 ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION) ALSA_LIB_SUFFIX := tar.bz2 ALSA_LIB_URL := ftp://ftp.alsa-project.org/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) @@ -29,30 +29,11 @@ ALSA_LIB_DIR := $(BUILDDIR)/$(ALSA_LIB) # Get # ---------------------------------------------------------------------------- -alsa-lib_get: $(STATEDIR)/alsa-lib.get - -$(STATEDIR)/alsa-lib.get: $(alsa-lib_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(ALSA_LIB_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, ALSA_LIB) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -alsa-lib_extract: $(STATEDIR)/alsa-lib.extract - -$(STATEDIR)/alsa-lib.extract: $(alsa-lib_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(ALSA_LIB_DIR)) - @$(call extract, ALSA_LIB) - @$(call patchin, ALSA_LIB) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -66,6 +47,7 @@ ALSA_LIB_ENV := $(CROSS_ENV) # ALSA_LIB_AUTOCONF := $(CROSS_AUTOCONF_USR) \ --disable-dependency-tracking \ + --disable-python \ --with-debug=no ifdef PTXCONF_ALSA_LIB_STATIC @@ -112,44 +94,13 @@ endif # --with-aload-devdir=dir # --with-pcm-plugins=<list> -$(STATEDIR)/alsa-lib.prepare: $(alsa-lib_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(ALSA_LIB_DIR)/config.cache) - cd $(ALSA_LIB_DIR) && \ - $(ALSA_LIB_PATH) $(ALSA_LIB_ENV) \ - ./configure $(ALSA_LIB_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -alsa-lib_compile: $(STATEDIR)/alsa-lib.compile - -$(STATEDIR)/alsa-lib.compile: $(alsa-lib_compile_deps_default) - @$(call targetinfo, $@) - cd $(ALSA_LIB_DIR) && $(ALSA_LIB_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -alsa-lib_install: $(STATEDIR)/alsa-lib.install - -$(STATEDIR)/alsa-lib.install: $(alsa-lib_install_deps_default) - @$(call targetinfo, $@) - @$(call install, ALSA_LIB) - @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -alsa-lib_targetinstall: $(STATEDIR)/alsa-lib.targetinstall - -$(STATEDIR)/alsa-lib.targetinstall: $(alsa-lib_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/alsa-lib.targetinstall: + @$(call targetinfo) @$(call install_init, alsa-lib) @$(call install_fixup, alsa-lib, PACKAGE, alsa-lib) @@ -210,7 +161,7 @@ endif @$(call install_finish, alsa-lib) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make index 0f350a076..5171e310c 100644 --- a/rules/alsa-utils.make +++ b/rules/alsa-utils.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils # # Paths and names # -ALSA_UTILS_VERSION := 1.0.11 +ALSA_UTILS_VERSION := 1.0.16 ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION) ALSA_UTILS_SUFFIX := tar.bz2 ALSA_UTILS_URL := ftp://ftp.alsa-project.org/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) @@ -29,86 +29,35 @@ ALSA_UTILS_DIR := $(BUILDDIR)/$(ALSA_UTILS) # Get # ---------------------------------------------------------------------------- -alsa-utils_get: $(STATEDIR)/alsa-utils.get - -$(STATEDIR)/alsa-utils.get: $(alsa-utils_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(ALSA_UTILS_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, ALSA_UTILS) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -alsa-utils_extract: $(STATEDIR)/alsa-utils.extract - -$(STATEDIR)/alsa-utils.extract: $(alsa-utils_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(ALSA_UTILS_DIR)) - @$(call extract, ALSA_UTILS) - @$(call patchin, ALSA_UTILS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -alsa-utils_prepare: $(STATEDIR)/alsa-utils.prepare - ALSA_UTILS_PATH := PATH=$(CROSS_PATH) ALSA_UTILS_ENV := $(CROSS_ENV) # # autoconf # -ALSA_UTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) \ - --disable-dependency-tracking +ALSA_UTILS_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --disable-dependency-tracking \ # switches that should be controlled # --disable-nls # --disable-alsamixer # --disable-alsatest -$(STATEDIR)/alsa-utils.prepare: $(alsa-utils_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(ALSA_UTILS_DIR)/config.cache) - cd $(ALSA_UTILS_DIR) && \ - $(ALSA_UTILS_PATH) $(ALSA_UTILS_ENV) \ - ./configure $(ALSA_UTILS_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -alsa-utils_compile: $(STATEDIR)/alsa-utils.compile - -$(STATEDIR)/alsa-utils.compile: $(alsa-utils_compile_deps_default) - @$(call targetinfo, $@) - cd $(ALSA_UTILS_DIR) && $(ALSA_UTILS_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -alsa-utils_install: $(STATEDIR)/alsa-utils.install - -$(STATEDIR)/alsa-utils.install: $(alsa-utils_install_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -alsa-utils_targetinstall: $(STATEDIR)/alsa-utils.targetinstall - -$(STATEDIR)/alsa-utils.targetinstall: $(alsa-utils_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/alsa-utils.targetinstall: + @$(call targetinfo) @$(call install_init, alsa-utils) @$(call install_fixup, alsa-utils, PACKAGE, alsa-utils) @@ -124,7 +73,7 @@ $(STATEDIR)/alsa-utils.targetinstall: $(alsa-utils_targetinstall_deps_default) @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/amidi/amidi, /usr/bin/amidi) @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/amixer/amixer, /usr/bin/amixer) @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/aplay/aplay, /usr/bin/aplay) - # link arecord aplay +# link arecord aplay @$(call install_link, alsa-utils, aplay, /usr/bin/arecord) @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/iecset/iecset, /usr/bin/iecset) @@ -136,7 +85,7 @@ $(STATEDIR)/alsa-utils.targetinstall: $(alsa-utils_targetinstall_deps_default) @$(call install_finish, alsa-utils) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |