keep config and menu symbols in sync

git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@3768 f8d472c7-5700-0410-ac5a-87979cec3adf

1 files changed, 26 insertions, 26 deletions

diff --git a/rules/avrlib.make b/rules/avrlib.make
index c25cb02..752630e 100644
--- a/rules/avrlib.make
+++ b/rules/avrlib.make
@@ -12,18 +12,18 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_AVRLIB) += avrlib
+PACKAGES-$(PTXCONF_AVR8LIB) += avrlib
 
 #
 # Paths and names
 #
-AVRLIB_VERSION	:= $(call remove_quotes,$(PTXCONF_AVRLIB_VERSION))
-AVRLIB		:= avr-libc-$(AVRLIB_VERSION)
-AVRLIB_SUFFIX	:= tar.bz2
-AVRLIB_URL	:= http://download.savannah.gnu.org/releases/avr-libc/$(AVRLIB).$(AVRLIB_SUFFIX)
-AVRLIB_SOURCE	:= $(SRCDIR)/$(AVRLIB).$(AVRLIB_SUFFIX)
-AVRLIB_DIR	:= $(BUILDDIR)/$(AVRLIB)
-AVRLIB_BUILDDIR	:= $(BUILDDIR)/$(AVRLIB)-build
+AVR8LIB_VERSION	:= $(call remove_quotes,$(PTXCONF_AVR8LIB_VERSION))
+AVR8LIB		:= avr-libc-$(AVR8LIB_VERSION)
+AVR8LIB_SUFFIX	:= tar.bz2
+AVR8LIB_URL	:= http://download.savannah.gnu.org/releases/avr-libc/$(AVR8LIB).$(AVR8LIB_SUFFIX)
+AVR8LIB_SOURCE	:= $(SRCDIR)/$(AVR8LIB).$(AVR8LIB_SUFFIX)
+AVR8LIB_DIR	:= $(BUILDDIR)/$(AVR8LIB)
+AVR8LIB_BUILDDIR	:= $(BUILDDIR)/$(AVR8LIB)-build
 
 # ----------------------------------------------------------------------------
 # Get
@@ -35,9 +35,9 @@ $(STATEDIR)/avrlib.get: $(avrlib_get_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(AVRLIB_SOURCE):
+$(AVR8LIB_SOURCE):
 	@$(call targetinfo, $@)
-	@$(call get, AVRLIB)
+	@$(call get, AVR8LIB)
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -47,10 +47,10 @@ avrlib_extract: $(STATEDIR)/avrlib.extract
 
 $(STATEDIR)/avrlib.extract: $(avrlib_extract_deps_default)
 	@$(call targetinfo, $@)
-	@$(call clean, $(AVRLIB_DIR))
-	@$(call extract, AVRLIB)
-	@$(call patchin, AVRLIB)
-	mkdir -p $(AVRLIB_BUILDDIR)
+	@$(call clean, $(AVR8LIB_DIR))
+	@$(call extract, AVR8LIB)
+	@$(call patchin, AVR8LIB)
+	mkdir -p $(AVR8LIB_BUILDDIR)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -59,8 +59,8 @@ $(STATEDIR)/avrlib.extract: $(avrlib_extract_deps_default)
 
 avrlib_prepare: $(STATEDIR)/avrlib.prepare
 
-AVRLIB_PATH	:= PATH=$(CROSS_PATH)
-AVRLIB_ENV 	:= \
+AVR8LIB_PATH	:= PATH=$(CROSS_PATH)
+AVR8LIB_ENV 	:= \
 	$(CROSS_ENV) \
 	CC_FOR_BUILD=$(HOSTCC)
 
@@ -70,16 +70,16 @@ AVRLIB_ENV 	:= \
 # --targt could only be the string 'avr'
 # newer libs (at least 1.4.6) forces --host=avr!
 #
-AVRLIB_AUTOCONF := \
+AVR8LIB_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-multilib
 
 $(STATEDIR)/avrlib.prepare: $(avrlib_prepare_deps_default)
 	@$(call targetinfo, $@)
-	@$(call clean, $(AVRLIB_BUILDDIR)/config.cache)
-	cd $(AVRLIB_BUILDDIR) && \
-		$(AVRLIB_PATH) $(AVRLIB_ENV) \
-		$(AVRLIB_DIR)/configure $(AVRLIB_AUTOCONF)
+	@$(call clean, $(AVR8LIB_BUILDDIR)/config.cache)
+	cd $(AVR8LIB_BUILDDIR) && \
+		$(AVR8LIB_PATH) $(AVR8LIB_ENV) \
+		$(AVR8LIB_DIR)/configure $(AVR8LIB_AUTOCONF)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -90,7 +90,7 @@ avrlib_compile: $(STATEDIR)/avrlib.compile
 
 $(STATEDIR)/avrlib.compile: $(avrlib_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(AVRLIB_BUILDDIR) && $(AVRLIB_PATH) $(MAKE) $(PARALLELMFLAGS)
+	cd $(AVR8LIB_BUILDDIR) && $(AVR8LIB_PATH) $(MAKE) $(PARALLELMFLAGS)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -101,8 +101,8 @@ avrlib_install: $(STATEDIR)/avrlib.install
 
 $(STATEDIR)/avrlib.install: $(avrlib_install_deps_default)
 	@$(call targetinfo, $@)
-	cd $(AVRLIB_BUILDDIR) && \
-		$(AVRLIB_PATH) $(MAKE) install DESTDIR=$(SYSROOT)
+	cd $(AVR8LIB_BUILDDIR) && \
+		$(AVR8LIB_PATH) $(MAKE) install DESTDIR=$(SYSROOT)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -122,8 +122,8 @@ $(STATEDIR)/avrlib.targetinstall: $(avrlib_targetinstall_deps_default)
 avrlib_clean:
 	rm -rf $(STATEDIR)/avrlib.*
 	rm -rf $(IMAGEDIR)/avrlib_*
-	rm -rf $(AVRLIB_DIR)
-	rm -rf $(AVRLIB_BUILDDIR)
+	rm -rf $(AVR8LIB_DIR)
+	rm -rf $(AVR8LIB_BUILDDIR)
 
 # vim: syntax=make