git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/branches/OSELAS.Toolchain-mkl@6253 f8d472c7-5700-0410-ac5a-87979cec3adf

22 files changed, 204 insertions, 387 deletions

diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make
index d39a0bd..fe03e51 100644
--- a/rules/cross-gcc-first.make
+++ b/rules/cross-gcc-first.make
@@ -17,35 +17,22 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_GCC_FIRST) += cross-gcc-first
 #
 # Paths and names
 #
-CROSS_GCC_FIRST_VERSION		:= $(call remove_quotes,$(PTXCONF_CROSS_GCC_VERSION))
-CROSS_GCC_FIRST			:= gcc-$(CROSS_GCC_FIRST_VERSION)
-CROSS_GCC_FIRST_SUFFIX	 	:= tar.bz2
-CROSS_GCC_FIRST_URL	 	:= $(PTXCONF_SETUP_GNUMIRROR)/gcc/$(CROSS_GCC_FIRST)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX)
-CROSS_GCC_FIRST_SOURCE		:= $(SRCDIR)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX)
-CROSS_GCC_FIRST_DIR		:= $(BUILDDIR_CROSS_DEBUG)/$(CROSS_GCC_FIRST)
 CROSS_GCC_FIRST_BUILDDIR	:= $(CROSS_BUILDDIR)/$(CROSS_GCC_FIRST)-first-build
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-$(STATEDIR)/cross-gcc-first.get:
+$(STATEDIR)/cross-gcc-first.get:  $(STATEDIR)/cross-gcc.get
 	@$(call targetinfo)
 	@$(call touch)
 
-$(CROSS_GCC_FIRST_SOURCE):
-	@$(call targetinfo)
-	@$(call get, CROSS_GCC_FIRST)
-
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-$(STATEDIR)/cross-gcc-first.extract:
+$(STATEDIR)/cross-gcc-first.extract: $(STATEDIR)/cross-gcc.extract
 	@$(call targetinfo)
-	@$(call clean, $(CROSS_GCC_FIRST_DIR))
-	@$(call extract, CROSS_GCC_FIRST, $(BUILDDIR_CROSS_DEBUG))
-	@$(call patchin, CROSS_GCC_FIRST, $(CROSS_GCC_FIRST_DIR))
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -58,26 +45,6 @@ CROSS_GCC_FIRST_ENV	:= $(HOSTCC_ENV)
 #
 # autoconf
 #
-CROSS_GCC_AUTOCONF_COMMON := \
-	--target=$(PTXCONF_GNU_TARGET) \
-	--with-gmp=$(PTXCONF_SYSROOT_HOST) \
-	--with-mpfr=$(PTXCONF_SYSROOT_HOST) \
-	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG) \
-	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG_LIBC) \
-	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT) \
-	\
-	--disable-nls \
-	--enable-symvers=gnu \
-	--disable-libunwind-exceptions
-
-# for other architectures than AVR its not usefull to have multilib,
-# but we need a sysroot for them
-ifndef PTXCONF_ARCH_AVR
-CROSS_GCC_AUTOCONF_COMMON += \
-	--disable-multilib \
-	--with-sysroot=$(SYSROOT)
-endif
-
 CROSS_GCC_FIRST_AUTOCONF := \
 	$(CROSS_GCC_AUTOCONF_COMMON) \
 	--prefix=$(CROSS_GCC_FIRST_PREFIX) \
@@ -99,7 +66,7 @@ $(STATEDIR)/cross-gcc-first.prepare:
 	mkdir -p $(CROSS_GCC_FIRST_BUILDDIR)
 	cd $(CROSS_GCC_FIRST_BUILDDIR) && \
 		$(CROSS_GCC_FIRST_PATH) $(CROSS_GCC_FIRST_ENV) \
-		$(CROSS_GCC_FIRST_DIR)/configure $(CROSS_GCC_FIRST_AUTOCONF)
+		$(CROSS_GCC_DIR)/configure $(CROSS_GCC_FIRST_AUTOCONF)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -111,7 +78,7 @@ $(STATEDIR)/cross-gcc-first.compile:
 
 # 	export $(CROSS_GCC_FIRST_PATH); \
 # 	cd $(CROSS_GCC_FIRST_BUILDDIR) && \
-# 		if test -d $(CROSS_GCC_FIRST_DIR)/libdecnumber; then \
+# 		if test -d $(CROSS_GCC_DIR)/libdecnumber; then \
 # 			$(MAKE) configure-libdecnumber && \
 # 			$(MAKE) $(PARALLELMFLAGS) all-libdecnumber; \
 # 		fi
@@ -166,10 +133,10 @@ $(STATEDIR)/cross-gcc-first.install:
 		-print-libgcc-file-name | \
 		sed 's/libgcc/&_s/'`
 
-ifdef PTXCONF_CROSS_GCC_43
-	# FIXME - fix copy target
-	cp $(CROSS_GCC_FIRST_BUILDDIR)/gcc/include-fixed/limits.h $(SYSROOT)/usr/include/limits.h
-endif
+#ifdef PTXCONF_CROSS_GCC_43
+#	# FIXME - fix copy target
+#	cp $(CROSS_GCC_FIRST_BUILDDIR)/gcc/include-fixed/limits.h $(SYSROOT)/usr/include/limits.h
+#endif
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -178,7 +145,6 @@ endif
 
 cross-gcc-first_clean:
 	rm -rf $(STATEDIR)/cross-gcc-first.*
-	rm -rf $(CROSS_GCC_FIRST_DIR)
 	rm -rf $(CROSS_GCC_FIRST_BUILDDIR)
 
 # vim: syntax=make
diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in
index 3d561bd..d0acfae 100644
--- a/rules/cross-gcc.in
+++ b/rules/cross-gcc.in
@@ -1,15 +1,14 @@
 # config for cross-gcc-first
 
-menuconfig CROSS_GCC_FIRST
+menuconfig CROSS_GCC
+	bool
+	prompt "gcc                         "
 	bool
-	prompt "gcc (first)                 "
 	select CROSS_BINUTILS
-	select LIBC_HEADERS
-        select HOST_GMP if CROSS_GCC_43
-        select HOST_MPFR if CROSS_GCC_43
+	select LIBC_FIRST
 
 config CROSS_GCC_VERSION
-	depends on CROSS_GCC_FIRST
+	depends on CROSS_GCC
 	string
 	prompt "gcc version"
 	default "4.1.2"
@@ -17,24 +16,24 @@ config CROSS_GCC_VERSION
 	  Specify the version of gcc here.
 
 config CROSS_GCC_43
-	depends on CROSS_GCC_FIRST
+	depends on CROSS_GCC
 	bool
 	prompt "additional deps for gcc-4.3"
 	help
 	  Add new dependencies for gcc-4.3+: "GMP" and "MPFR"
 
 config CROSS_GCC_SERIES
-	depends on CROSS_GCC_FIRST
+	depends on CROSS_GCC
 	string
 	prompt "gcc patch series file"
 
-config CROSS_GCC_FIRST_SERIES
-	depends on CROSS_GCC_FIRST
+config CROSS_GCC_SERIES
+	depends on CROSS_GCC
 	string
 	default "${PTXCONF_CROSS_GCC_SERIES}"
 
 config CROSS_GCC_LANG
-	depends on CROSS_GCC_FIRST
+	depends on CROSS_GCC
 	string
 	prompt "languages"
 	default "c,c++"
@@ -46,7 +45,7 @@ config CROSS_GCC_LANG
 	  Delimiter is ','
 
 config CROSS_GCC_EXTRA_CONFIG
-	depends on CROSS_GCC_FIRST
+	depends on CROSS_GCC
 	string
 	prompt "extra configure options"
 	help
@@ -99,12 +98,11 @@ config CROSS_GCC_THREADS
 	default "win32" if CROSS_GCC_THREADS_WIN32
 
 ###
-### second
+### first
 ###
-config CROSS_GCC_SECOND
+config CROSS_GCC_FIRST
 	bool
 	select CROSS_BINUTILS
-	select CROSS_GCC_FIRST
-	select LIBC_FIRST
-	prompt "gcc (second)"
-
+	select LIBC_HEADERS
+        select HOST_GMP if CROSS_GCC_43
+        select HOST_MPFR if CROSS_GCC_43
diff --git a/rules/cross-gcc-second.make b/rules/cross-gcc.make
index 544cdc7..0c79aad 100644
--- a/rules/cross-gcc-second.make
+++ b/rules/cross-gcc.make
@@ -12,40 +12,69 @@
 #
 # We provide this package
 #
-CROSS_PACKAGES-$(PTXCONF_CROSS_GCC_SECOND) += cross-gcc-second
+CROSS_PACKAGES-$(PTXCONF_CROSS_GCC) += cross-gcc
 
 #
 # Paths and names
 #
-CROSS_GCC_SECOND_BUILDDIR	= $(CROSS_BUILDDIR)/$(CROSS_GCC_FIRST)-second-build
+CROSS_GCC_VERSION	:= $(call remove_quotes,$(PTXCONF_CROSS_GCC_VERSION))
+CROSS_GCC		:= gcc-$(CROSS_GCC_VERSION)
+CROSS_GCC_SUFFIX	:= tar.bz2
+CROSS_GCC_URL	 	:= $(PTXCONF_SETUP_GNUMIRROR)/gcc/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX)
+CROSS_GCC_SOURCE	:= $(SRCDIR)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX)
+CROSS_GCC_DIR		:= $(BUILDDIR_CROSS_DEBUG)/$(CROSS_GCC)
+CROSS_GCC_BUILDDIR	:= $(CROSS_BUILDDIR)/$(CROSS_GCC)-build
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-$(STATEDIR)/cross-gcc-second.get: $(STATEDIR)/cross-gcc-first.get
+$(CROSS_GCC_SOURCE):
 	@$(call targetinfo)
-	@$(call touch)
+	@$(call get, CROSS_GCC)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-$(STATEDIR)/cross-gcc-second.extract: $(STATEDIR)/cross-gcc-first.extract
+$(STATEDIR)/cross-gcc.extract:
 	@$(call targetinfo)
+	@$(call clean, $(CROSS_GCC_DIR))
+	@$(call extract, CROSS_GCC, $(BUILDDIR_CROSS_DEBUG))
+	@$(call patchin, CROSS_GCC, $(CROSS_GCC_DIR))
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-CROSS_GCC_SECOND_PATH	:= PATH=$(CROSS_PATH)
-CROSS_GCC_SECOND_ENV	:= $(HOSTCC_ENV)
+CROSS_GCC_PATH	:= PATH=$(CROSS_PATH)
+CROSS_GCC_ENV	:= $(HOSTCC_ENV)
 
 #
 # autoconf
 #
-CROSS_GCC_SECOND_AUTOCONF = \
+CROSS_GCC_AUTOCONF_COMMON := \
+	--target=$(PTXCONF_GNU_TARGET) \
+	--with-gmp=$(PTXCONF_SYSROOT_HOST) \
+	--with-mpfr=$(PTXCONF_SYSROOT_HOST) \
+	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG) \
+	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG_LIBC) \
+	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG_CXA_ATEXIT) \
+	\
+	--disable-nls \
+	--enable-symvers=gnu \
+	--disable-libunwind-exceptions
+
+# for other architectures than AVR its not usefull to have multilib,
+# but we need a sysroot for them
+ifndef PTXCONF_ARCH_AVR
+CROSS_GCC_AUTOCONF_COMMON += \
+	--disable-multilib \
+	--with-sysroot=$(SYSROOT)
+endif
+
+CROSS_GCC_AUTOCONF = \
 	$(CROSS_GCC_AUTOCONF_COMMON) \
 	--prefix=$(PTXCONF_SYSROOT_CROSS) \
 	\
@@ -56,26 +85,24 @@ CROSS_GCC_SECOND_AUTOCONF = \
 	--enable-libstdcxx-debug \
 	--enable-profile \
 	\
-	--enable-intermodule \
-	\
 	$(PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED)
 
-$(STATEDIR)/cross-gcc-second.prepare:
+$(STATEDIR)/cross-gcc.prepare:
 	@$(call targetinfo)
-	@$(call clean, $(CROSS_GCC_SECOND_BUILDDIR))
-	mkdir -p $(CROSS_GCC_SECOND_BUILDDIR)
-	cd $(CROSS_GCC_SECOND_BUILDDIR) && \
-		$(CROSS_GCC_SECOND_PATH) $(CROSS_GCC_SECOND_ENV) \
-		$(CROSS_GCC_FIRST_DIR)/configure $(CROSS_GCC_SECOND_AUTOCONF)
+	@$(call clean, $(CROSS_GCC_BUILDDIR))
+	mkdir -p $(CROSS_GCC_BUILDDIR)
+	cd $(CROSS_GCC_BUILDDIR) && \
+		$(CROSS_GCC_PATH) $(CROSS_GCC_ENV) \
+		$(CROSS_GCC_DIR)/configure $(CROSS_GCC_AUTOCONF)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-$(STATEDIR)/cross-gcc-second.compile:
+$(STATEDIR)/cross-gcc.compile:
 	@$(call targetinfo)
-	cd $(CROSS_GCC_SECOND_BUILDDIR) && $(CROSS_GCC_SECOND_PATH) \
+	cd $(CROSS_GCC_BUILDDIR) && $(CROSS_GCC_PATH) \
 		$(MAKE) $(PARALLELMFLAGS)
 	@$(call touch)
 
@@ -83,10 +110,10 @@ $(STATEDIR)/cross-gcc-second.compile:
 # Install
 # ----------------------------------------------------------------------------
 
-$(STATEDIR)/cross-gcc-second.install:
+$(STATEDIR)/cross-gcc.install:
 	@$(call targetinfo)
-	cd $(CROSS_GCC_SECOND_BUILDDIR) && \
-		$(CROSS_GCC_SECOND_PATH) $(MAKE) install
+	cd $(CROSS_GCC_BUILDDIR) && \
+		$(CROSS_GCC_PATH) $(MAKE) install
 	@find $(PTXCONF_SYSROOT_CROSS) -name "*.la" | while read la_file; do	\
 		rm -v $${la_file};						\
 	done
@@ -96,9 +123,9 @@ $(STATEDIR)/cross-gcc-second.install:
 # Clean
 # ----------------------------------------------------------------------------
 
-cross-gcc-second_clean:
-	rm -rf $(STATEDIR)/cross-gcc-second.*
-	rm -rf $(CROSS_GCC_SECOND_DIR)
-	rm -rf $(CROSS_GCC_SECOND_BUILDDIR)
+cross-gcc_clean:
+	rm -rf $(STATEDIR)/cross-gcc.*
+	rm -rf $(CROSS_GCC_DIR)
+	rm -rf $(CROSS_GCC_BUILDDIR)
 
 # vim: syntax=make
diff --git a/rules/glibc-crt.make b/rules/glibc-crt.make
index f01e695..e11e2fa 100644
--- a/rules/glibc-crt.make
+++ b/rules/glibc-crt.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_GLIBC_CRT) += glibc-crt
 #
 # Paths and names
 #
-GLIBC_CRT_DIR	= $(BUILDDIR)/$(GLIBC)-crt
+GLIBC_CRT_DIR	= $(BUILDDIR)/$(GLIBC)-crt-build
 
 # ----------------------------------------------------------------------------
 # Get
@@ -42,8 +42,10 @@ $(STATEDIR)/glibc-crt.extract: $(STATEDIR)/glibc.extract
 GLIBC_CRT_PATH := PATH=$(CROSS_PATH)
 GLIBC_CRT_ENV := \
 	BUILD_CC=$(HOSTCC) \
+	ac_cv_path_GREP=grep \
 	libc_cv_forced_unwind=yes \
-	libc_cv_c_cleanup=yes
+	libc_cv_c_cleanup=yes \
+	ac_cv_sizeof_long_double=8
 
 #
 # autoconf
diff --git a/rules/glibc-headers.make b/rules/glibc-headers.make
index 0bdb1ab..d64501a 100644
--- a/rules/glibc-headers.make
+++ b/rules/glibc-headers.make
@@ -39,8 +39,6 @@ $(STATEDIR)/glibc-headers.extract: $(STATEDIR)/glibc.extract
 # Prepare
 # ----------------------------------------------------------------------------
 
-glibc-headers_prepare: $(STATEDIR)/glibc-headers.prepare
-
 GLIBC_HEADERS_PATH := PATH=$(CROSS_PATH)
 #
 # these various env variables are necessary, because we are using the host compiler
@@ -74,7 +72,7 @@ GLIBC_HEADERS_AUTOCONF = \
 	\
 	--enable-hacker-mode
 
-$(STATEDIR)/glibc-headers.prepare: $(STATEDIR)/glibc.extract
+$(STATEDIR)/glibc-headers.prepare:
 	@$(call targetinfo)
 	@$(call clean, $(GLIBC_HEADERS_DIR))
 	mkdir -p $(GLIBC_HEADERS_DIR)
@@ -87,8 +85,6 @@ $(STATEDIR)/glibc-headers.prepare: $(STATEDIR)/glibc.extract
 # Compile
 # ----------------------------------------------------------------------------
 
-glibc-headers_compile: $(STATEDIR)/glibc-headers.compile
-
 $(STATEDIR)/glibc-headers.compile:
 	@$(call targetinfo)
 	cd $(GLIBC_HEADERS_DIR) && \
@@ -103,8 +99,6 @@ $(STATEDIR)/glibc-headers.compile:
 # Install
 # ----------------------------------------------------------------------------
 
-glibc-headers_install: $(STATEDIR)/glibc-headers.install
-
 $(STATEDIR)/glibc-headers.install:
 	@$(call targetinfo)
 	cd $(GLIBC_HEADERS_DIR) && \
@@ -122,8 +116,6 @@ $(STATEDIR)/glibc-headers.install:
 # Target-Install
 # ----------------------------------------------------------------------------
 
-glibc-headers_targetinstall: $(STATEDIR)/glibc-headers.targetinstall
-
 $(STATEDIR)/glibc-headers.targetinstall:
 	@$(call targetinfo)
 	@$(call touch)
diff --git a/rules/glibc.in b/rules/glibc.in
index 37d152d..0fed371 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -8,13 +8,14 @@ config GLIBC_FIRST
 	bool
 	select CROSS_GCC_FIRST
 
+
 menuconfig GLIBC
 	bool
-#	select GLIBC_CRT
+	select GLIBC_CRT
 	select GLIBC_PORTS		if GLIBC_ADDON_NPTL && ( ARCH_ARM || ARCH_MIPS )
 	select GLIBC_LINUXTHREADS	if GLIBC_ADDON_LINUXTHREADS
 
-	select CROSS_GCC_SECOND
+	select CROSS_GCC
 	select CROSS_GCC_SHARED
 	select CROSS_GCC_THREADS_POSIX
 	select CROSS_GCC_ENABLE_CXA_ATEXIT
diff --git a/rules/glibc.make b/rules/glibc.make
index 2724689..a9cf854 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -62,10 +62,10 @@ GLIBC_PATH := PATH=$(CROSS_PATH)
 GLIBC_ENV := \
 	CC=$(CROSS_CC) \
 	BUILD_CC=$(HOSTCC) \
-	ac_cv_path_GREP=grep \
-	libc_cv_forced_unwind=yes \
-	libc_cv_c_cleanup=yes \
 	ac_cv_sizeof_long_double=8
+# 	ac_cv_path_GREP=grep \
+# 	libc_cv_forced_unwind=yes \
+# 	libc_cv_c_cleanup=yes \
 GLIBC_MAKEVARS := AUTOCONF=no
 
 #
diff --git a/rules/host-dejagnu.make b/rules/host-dejagnu.make
index 042efe7..824e3a4 100644
--- a/rules/host-dejagnu.make
+++ b/rules/host-dejagnu.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
 # $Id$
 #
-# Copyright (C) 2007 by Marc Kleine-Budde
+# Copyright (C) 2007, 2008 by Marc Kleine-Budde
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -28,35 +28,14 @@ HOST_DEJAGNU_DIR	:= $(HOST_BUILDDIR)/$(HOST_DEJAGNU)
 # Get
 # ----------------------------------------------------------------------------
 
-host-dejagnu_get: $(STATEDIR)/host-dejagnu.get
-
-$(STATEDIR)/host-dejagnu.get:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(HOST_DEJAGNU_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, HOST_DEJAGNU)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-host-dejagnu_extract: $(STATEDIR)/host-dejagnu.extract
-
-$(STATEDIR)/host-dejagnu.extract:
-	@$(call targetinfo, $@)
-	@$(call clean, $(HOST_DEJAGNU_DIR))
-	@$(call extract, HOST_DEJAGNU, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_DEJAGNU, $(HOST_DEJAGNU_DIR))
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-host-dejagnu_prepare: $(STATEDIR)/host-dejagnu.prepare
-
 HOST_DEJAGNU_PATH	:= PATH=$(HOST_PATH)
 HOST_DEJAGNU_ENV 	:= $(HOST_ENV)
 
@@ -65,35 +44,14 @@ HOST_DEJAGNU_ENV 	:= $(HOST_ENV)
 #
 HOST_DEJAGNU_AUTOCONF	:= $(HOST_AUTOCONF)
 
-$(STATEDIR)/host-dejagnu.prepare:
-	@$(call targetinfo, $@)
-	@$(call clean, $(HOST_DEJAGNU_DIR)/config.cache)
-	cd $(HOST_DEJAGNU_DIR) && \
-		$(HOST_DEJAGNU_PATH) $(HOST_DEJAGNU_ENV) \
-		./configure $(HOST_DEJAGNU_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-host-dejagnu_compile: $(STATEDIR)/host-dejagnu.compile
-
-$(STATEDIR)/host-dejagnu.compile:
-	@$(call targetinfo, $@)
-	cd $(HOST_DEJAGNU_DIR) && $(HOST_DEJAGNU_PATH) $(MAKE) $(PARALLELMFLAGS)
-	@$(call touch, $@)
-
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-host-dejagnu_install: $(STATEDIR)/host-dejagnu.install
-
 $(STATEDIR)/host-dejagnu.install:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call install, HOST_DEJAGNU,,h)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/host-gmp.make b/rules/host-gmp.make
index 50f7257..77c402a 100644
--- a/rules/host-gmp.make
+++ b/rules/host-gmp.make
@@ -36,8 +36,6 @@ $(HOST_GMP_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-host-gmp_prepare: $(STATEDIR)/host-gmp.prepare
-
 HOST_GMP_PATH	:= PATH=$(HOST_PATH)
 HOST_GMP_ENV 	:= $(HOST_ENV)
 
diff --git a/rules/host-mpfr.make b/rules/host-mpfr.make
index 24aa8f8..6790ca5 100644
--- a/rules/host-mpfr.make
+++ b/rules/host-mpfr.make
@@ -36,7 +36,7 @@ $(HOST_MPFR_SOURCE):
 # Extract
 # ----------------------------------------------------------------------------
 
-$(STATEDIR)/host-mpfr.extract: $(host-mpfr_extract_deps_default)
+$(STATEDIR)/host-mpfr.extract:
 	@$(call targetinfo)
 	@$(call clean, $(HOST_MPFR_DIR))
 	@$(call extract, HOST_MPFR, $(HOST_BUILDDIR))
@@ -47,8 +47,6 @@ $(STATEDIR)/host-mpfr.extract: $(host-mpfr_extract_deps_default)
 # Prepare
 # ----------------------------------------------------------------------------
 
-host-mpfr_prepare: $(STATEDIR)/host-mpfr.prepare
-
 HOST_MPFR_PATH	:= PATH=$(HOST_PATH)
 HOST_MPFR_ENV 	:= $(HOST_ENV)
 
diff --git a/rules/kernel-headers.make b/rules/kernel-headers.make
index 73647be..c1cf97c 100644
--- a/rules/kernel-headers.make
+++ b/rules/kernel-headers.make
@@ -61,8 +61,6 @@ $(STATEDIR)/kernel-headers.prepare:
 # Compile
 # ----------------------------------------------------------------------------
 
-kernel-headers_compile: $(STATEDIR)/kernel-headers.compile
-
 $(STATEDIR)/kernel-headers.compile:
 	@$(call targetinfo)
 	yes "" | $(MAKE) -C $(KERNEL_HEADERS_DIR) $(KERNEL_HEADERS_MAKEVARS) oldconfig
diff --git a/rules/libc-first.make b/rules/libc-first.make
index ddcb7af..4d6aca2 100644
--- a/rules/libc-first.make
+++ b/rules/libc-first.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
 # $Id: template 6655 2007-01-02 12:55:21Z rsc $
 #
-# Copyright (C) 2006, 2007 by Marc Kleine-Budde <mkl@ppengutronix.de>
+# Copyright (C) 2006-2008 by Marc Kleine-Budde <mkl@ppengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -18,9 +18,7 @@ PACKAGES-$(PTXCONF_LIBC_FIRST) += libc-first
 # Get
 # ----------------------------------------------------------------------------
 
-libc-first_get: $(STATEDIR)/libc-first.get
-
-$(STATEDIR)/libc-first.get: $(libc-first_get_deps_default)
+$(STATEDIR)/libc-first.get:
 	@$(call targetinfo)
 	@$(call touch)
 
@@ -28,9 +26,7 @@ $(STATEDIR)/libc-first.get: $(libc-first_get_deps_default)
 # Extract
 # ----------------------------------------------------------------------------
 
-libc-first_extract: $(STATEDIR)/libc-first.extract
-
-$(STATEDIR)/libc-first.extract: $(libc-first_extract_deps_default)
+$(STATEDIR)/libc-first.extract:
 	@$(call targetinfo)
 	@$(call touch)
 
@@ -38,9 +34,7 @@ $(STATEDIR)/libc-first.extract: $(libc-first_extract_deps_default)
 # Prepare
 # ----------------------------------------------------------------------------
 
-libc-first_prepare: $(STATEDIR)/libc-first.prepare
-
-$(STATEDIR)/libc-first.prepare: $(libc-first_prepare_deps_default)
+$(STATEDIR)/libc-first.prepare:
 	@$(call targetinfo)
 	@$(call touch)
 
@@ -48,9 +42,7 @@ $(STATEDIR)/libc-first.prepare: $(libc-first_prepare_deps_default)
 # Compile
 # ----------------------------------------------------------------------------
 
-libc-first_compile: $(STATEDIR)/libc-first.compile
-
-$(STATEDIR)/libc-first.compile: $(libc-first_compile_deps_default)
+$(STATEDIR)/libc-first.compile:
 	@$(call targetinfo)
 	@$(call touch)
 
@@ -58,9 +50,7 @@ $(STATEDIR)/libc-first.compile: $(libc-first_compile_deps_default)
 # Install
 # ----------------------------------------------------------------------------
 
-libc-first_install: $(STATEDIR)/libc-first.install
-
-$(STATEDIR)/libc-first.install: $(libc-first_install_deps_default)
+$(STATEDIR)/libc-first.install:
 	@$(call targetinfo)
 	@$(call touch)
 
@@ -68,9 +58,7 @@ $(STATEDIR)/libc-first.install: $(libc-first_install_deps_default)
 # Target-Install
 # ----------------------------------------------------------------------------
 
-libc-first_targetinstall: $(STATEDIR)/libc-first.targetinstall
-
-$(STATEDIR)/libc-first.targetinstall: $(libc-first_targetinstall_deps_default)
+$(STATEDIR)/libc-first.targetinstall:
 	@$(call targetinfo)
 	@$(call touch)
 
diff --git a/rules/libc-headers.make b/rules/libc-headers.make
index c0e7800..446500b 100644
--- a/rules/libc-headers.make
+++ b/rules/libc-headers.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
 # $Id: template 6001 2006-08-12 10:15:00Z mkl $
 #
-# Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de>
+# Copyright (C) 2006-2008 by Marc Kleine-Budde <mkl@pengutronix.de>
 #          
 # See CREDITS for details about who has contributed to this project.
 #
@@ -18,61 +18,49 @@ PACKAGES-$(PTXCONF_LIBC_HEADERS) += libc_headers
 # Get
 # ----------------------------------------------------------------------------
 
-libc_headers_get: $(STATEDIR)/libc_headers.get
-
 $(STATEDIR)/libc_headers.get:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-libc_headers_extract: $(STATEDIR)/libc_headers.extract
-
 $(STATEDIR)/libc_headers.extract:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-libc_headers_prepare: $(STATEDIR)/libc_headers.prepare
-
 $(STATEDIR)/libc_headers.prepare:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-libc_headers_compile: $(STATEDIR)/libc_headers.compile
-
 $(STATEDIR)/libc_headers.compile:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-libc_headers_install: $(STATEDIR)/libc_headers.install
-
 $(STATEDIR)/libc_headers.install:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-libc_headers_targetinstall: $(STATEDIR)/libc_headers.targetinstall
-
 $(STATEDIR)/libc_headers.targetinstall:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/libc.in b/rules/libc.in
index 4f17674..599c9a4 100644
--- a/rules/libc.in
+++ b/rules/libc.in
@@ -11,7 +11,7 @@ config LIBC_FIRST
 
 config LIBC
 	bool
-	select CROSS_GCC_SECOND
+	select CROSS_GCC
 	select GLIBC			if LIBC_GLIBC
 	select UCLIBC			if LIBC_UCLIBC
 	select NEWLIB			if LIBC_NEWLIB
diff --git a/rules/libc.vars b/rules/libc.vars
index cf404a5..aa99ca9 100644
--- a/rules/libc.vars
+++ b/rules/libc.vars
@@ -1,6 +1,6 @@
-CROSS_GCC_SHARED		# build gcc-second shared
+CROSS_GCC_SHARED		# build gcc shared
 
-CROSS_GCC_THREADS_SINGLE	# no threads in gcc-second
-CROSS_GCC_THREADS_POSIX		# posix threads in gcc-second
-CROSS_GCC_THREADS_WIN32		# win32 threads in gcc-second
+CROSS_GCC_THREADS_SINGLE	# no threads in gcc
+CROSS_GCC_THREADS_POSIX		# posix threads in gcc
+CROSS_GCC_THREADS_WIN32		# win32 threads in gcc
 
diff --git a/rules/mingw-runtime-headers.make b/rules/mingw-runtime-headers.make
index d60d1b5..70ad029 100644
--- a/rules/mingw-runtime-headers.make
+++ b/rules/mingw-runtime-headers.make
@@ -14,72 +14,55 @@
 #
 PACKAGES-$(PTXCONF_MINGW_RUNTIME_HEADERS) += mingw-runtime-headers
 
-#
-# Paths and names
-#
-MINGW_RUNTIME_HEADERS_DIR      = $(BUILDDIR)/$(MINGW_RUNTIME)-headers
-
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-mingw-runtime-headers_get: $(STATEDIR)/mingw-runtime-headers.get
-
 $(STATEDIR)/mingw-runtime-headers.get:  $(STATEDIR)/mingw-runtime.get
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-mingw-runtime-headers_extract: $(STATEDIR)/mingw-runtime-headers.extract
-
 $(STATEDIR)/mingw-runtime-headers.extract: $(STATEDIR)/mingw-runtime.extract
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-mingw-runtime-headers_prepare: $(STATEDIR)/mingw-runtime-headers.prepare
-
 $(STATEDIR)/mingw-runtime-headers.prepare:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-mingw-runtime-headers_compile: $(STATEDIR)/mingw-runtime-headers.compile
-
 $(STATEDIR)/mingw-runtime-headers.compile:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-mingw-runtime-headers_install: $(STATEDIR)/mingw-runtime-headers.install
-
 $(STATEDIR)/mingw-runtime-headers.install:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	mkdir -p $(SYSROOT)/mingw/include
-	cp -r $(MINGW_RUNTIME_BUILDDIR)/include/* $(SYSROOT)/mingw/include/
-	@$(call touch, $@)
+	cp -r $(MINGW_RUNTIME_BUILDDIR)/include/* $(SYSROOT)/mingw/include
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-mingw-runtime-headers_targetinstall: $(STATEDIR)/mingw-runtime-headers.targetinstall
-
 $(STATEDIR)/mingw-runtime-headers.targetinstall:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
@@ -87,6 +70,5 @@ $(STATEDIR)/mingw-runtime-headers.targetinstall:
 
 mingw-runtime-headers_clean:
 	rm -rf $(STATEDIR)/mingw-runtime-headers.*
-	rm -rf $(MINGW_RUNTIME_HEADERS_DIR)
 
 # vim: syntax=make
diff --git a/rules/mingw-runtime.make b/rules/mingw-runtime.make
index fec39dc..baa2aad 100644
--- a/rules/mingw-runtime.make
+++ b/rules/mingw-runtime.make
@@ -29,36 +29,26 @@ MINGW_RUNTIME_BUILDDIR	:= $(BUILDDIR)/mingw-runtime-$(MINGW_RUNTIME_VERSION)
 # Get
 # ----------------------------------------------------------------------------
 
-mingw-runtime_get: $(STATEDIR)/mingw-runtime.get
-
-$(STATEDIR)/mingw-runtime.get: $(mingw-runtime_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(MINGW_RUNTIME_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, MINGW_RUNTIME)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-mingw-runtime_extract: $(STATEDIR)/mingw-runtime.extract
-
-$(STATEDIR)/mingw-runtime.extract: $(mingw-runtime_extract_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/mingw-runtime.extract:
+	@$(call targetinfo)
 	@$(call clean, $(MINGW_RUNTIME_DIR))
 	@$(call clean, $(MINGW_RUNTIME_BUILDDIR))
 	@$(call extract, MINGW_RUNTIME)
 	@$(call patchin, MINGW_RUNTIME, $(MINGW_RUNTIME_DIR))
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-mingw-runtime_prepare: $(STATEDIR)/mingw-runtime.prepare
-
 MINGW_RUNTIME_PATH := PATH=$(CROSS_PATH)
 MINGW_RUNTIME_ENV := $(CROSS_ENV)
 
@@ -68,47 +58,40 @@ MINGW_RUNTIME_AUTOCONF := \
 	--host=$(PTXCONF_GNU_TARGET) \
 	--target=$(PTXCONF_GNU_TARGET) \
 
-
 $(STATEDIR)/mingw-runtime.prepare: $(mingw-runtime_prepare_deps_default)
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	cd $(MINGW_RUNTIME_BUILDDIR) && $(MINGW_RUNTIME_ENV) $(MINGW_RUNTIME_PATH) \
-			./configure $(MINGW_RUNTIME_AUTOCONF)
-	@$(call touch, $@)
+		./configure $(MINGW_RUNTIME_AUTOCONF)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-mingw-runtime_compile: $(STATEDIR)/mingw-runtime.compile
-
-$(STATEDIR)/mingw-runtime.compile: $(mingw-runtime_compile_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/mingw-runtime.compile:
+	@$(call targetinfo)
 	cd $(MINGW_RUNTIME_BUILDDIR) && $(MINGW_RUNTIME_PATH) \
-		$(MAKE) W32API_INCLUDE=-I$(SYSROOT)/mingw/include/ $(PARALLELMFLAGS)
-	@$(call touch, $@)
+		$(MAKE) W32API_INCLUDE=-I$(SYSROOT)/mingw/include $(PARALLELMFLAGS)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-mingw-runtime_install: $(STATEDIR)/mingw-runtime.install
-
-$(STATEDIR)/mingw-runtime.install: $(mingw-runtime_install_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/mingw-runtime.install:
+	@$(call targetinfo)
 	cd $(MINGW_RUNTIME_BUILDDIR) && \
 		$(MINGW_RUNTIME_PATH) $(MAKE) \
 		install_root=$(SYSROOT) install
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-mingw-runtime_targetinstall: $(STATEDIR)/mingw-runtime.targetinstall
-
-$(STATEDIR)/mingw-runtime.targetinstall: $(mingw-runtime_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/mingw-runtime.targetinstall:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/uclibc-headers.make b/rules/uclibc-headers.make
index b4f82c2..f2ee5bc 100644
--- a/rules/uclibc-headers.make
+++ b/rules/uclibc-headers.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
 # $Id: template 6001 2006-08-12 10:15:00Z mkl $
 #
-# Copyright (C) 2006, 2007 by Marc Kleine-Budde <mkl@pengutronix.de>
+# Copyright (C) 2006-2008 by Marc Kleine-Budde <mkl@pengutronix.de>
 #          
 # See CREDITS for details about who has contributed to this project.
 #
@@ -18,68 +18,53 @@ PACKAGES-$(PTXCONF_UCLIBC_HEADERS) += uclibc-headers
 # Get
 # ----------------------------------------------------------------------------
 
-uclibc-headers_get: $(STATEDIR)/uclibc-headers.get
-
 $(STATEDIR)/uclibc-headers.get: $(STATEDIR)/uclibc.get
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-uclibc-headers_extract: $(STATEDIR)/uclibc-headers.extract
-
 $(STATEDIR)/uclibc-headers.extract: $(STATEDIR)/uclibc.extract
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-uclibc-headers_prepare: $(STATEDIR)/uclibc-headers.prepare
-
-UCLIBC_HEADERS_PATH	:= PATH=$(CROSS_PATH)
-UCLIBC_HEADERS_ENV 	:= $(CROSS_ENV)
-
 $(STATEDIR)/uclibc-headers.prepare: $(STATEDIR)/uclibc.prepare
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-uclibc-headers_compile: $(STATEDIR)/uclibc-headers.compile
-
 $(STATEDIR)/uclibc-headers.compile:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-uclibc-headers_install: $(STATEDIR)/uclibc-headers.install
-
 $(STATEDIR)/uclibc-headers.install:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	cd $(UCLIBC_DIR) && \
 		$(UCLIBC_PATH) $(UCLIBC_ENV) \
 		$(MAKE) $(UCLIBC_MAKEVARS) \
 		pregen install_dev DEVEL_PREFIX=/usr/ PREFIX=$(SYSROOT) KERNEL_SOURCE=$(SYSROOT)/usr
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-uclibc-headers_targetinstall: $(STATEDIR)/uclibc-headers.targetinstall
-
 $(STATEDIR)/uclibc-headers.targetinstall:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/uclibc.make b/rules/uclibc.make
index d3202de..7e7f4b9 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -31,44 +31,32 @@ uclibc_fix_config =								\
 	echo 'KERNEL_SOURCE="$(SYSROOT)/usr"'           	>> $(1);	\
 	echo 'SHARED_LIB_LOADER_PREFIX="/lib"'                  >> $(1);	\
 	echo 'RUNTIME_PREFIX="/"'                               >> $(1);	\
-	echo 'DEVEL_PREFIX=$(CROSS_LIB_DIR)'                    >> $(1);	\
-	perl -i -p -e 's/^(.*=)"(.*?)"(.*)"(.*)"/$$1"$$2$$3$$4"/'  $(1);	\
-	perl -i -p -e 's/^(.*=)"(.*?)"(.*)/$$1"$$2$$3"/'           $(1)
+	echo 'DEVEL_PREFIX=$(CROSS_LIB_DIR)'                    >> $(1);
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-uclibc_get: $(STATEDIR)/uclibc.get
-
-$(STATEDIR)/uclibc.get:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(UCLIBC_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, UCLIBC)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-uclibc_extract: $(STATEDIR)/uclibc.extract
-
 $(STATEDIR)/uclibc.extract:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call clean, $(UCLIBC_DIR))
 	@$(call extract, UCLIBC)
 	@$(call patchin, UCLIBC)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-uclibc_prepare: $(STATEDIR)/uclibc.prepare
-
 UCLIBC_PATH	:= PATH=$(CROSS_PATH)
 UCLIBC_ENV 	:= $(CROSS_ENV)
 
@@ -76,48 +64,42 @@ UCLIBC_MAKEVARS	:= \
 		CROSS=$(COMPILER_PREFIX)
 
 $(STATEDIR)/uclibc.prepare:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	grep -e PTXCONF_UC_ $(PTXDIST_WORKSPACE)/ptxconfig | \
 		sed -e 's/PTXCONF_UC_//g' > $(UCLIBC_DIR)/.config
 	@$(call uclibc_fix_config, $(UCLIBC_DIR)/.config)
 	yes "" | $(UCLIBC_PATH) $(MAKE) -C $(UCLIBC_DIR) \
 		$(UCLIBC_MAKEVARS) \
 		oldconfig
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-uclibc_compile: $(STATEDIR)/uclibc.compile
-
 $(STATEDIR)/uclibc.compile:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	cd $(UCLIBC_DIR) && $(UCLIBC_PATH) $(MAKE) $(UCLIBC_MAKEVARS)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-uclibc_install: $(STATEDIR)/uclibc.install
-
 $(STATEDIR)/uclibc.install:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	cd $(UCLIBC_DIR) && \
 		$(UCLIBC_PATH) $(MAKE) $(UCLIBC_MAKEVARS) \
 		install DEVEL_PREFIX=/usr/ PREFIX=$(SYSROOT)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-uclibc_targetinstall: $(STATEDIR)/uclibc.targetinstall
-
 $(STATEDIR)/uclibc.targetinstall:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/w32api-headers.make b/rules/w32api-headers.make
index 209fa65..234b328 100644
--- a/rules/w32api-headers.make
+++ b/rules/w32api-headers.make
@@ -23,63 +23,51 @@ W32API_HEADERS_DIR	= $(BUILDDIR)/$(W32API)-headers
 # Get
 # ----------------------------------------------------------------------------
 
-w32api-headers_get: $(STATEDIR)/w32api-headers.get
-
 $(STATEDIR)/w32api-headers.get: $(STATEDIR)/w32api.get
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-w32api-headers_extract: $(STATEDIR)/w32api-headers.extract
-
 $(STATEDIR)/w32api-headers.extract: $(STATEDIR)/w32api.extract
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-w32api-headers_prepare: $(STATEDIR)/w32api-headers.prepare
-
 $(STATEDIR)/w32api-headers.prepare:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-w32api-headers_compile: $(STATEDIR)/w32api-headers.compile
-
 $(STATEDIR)/w32api-headers.compile:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-w32api-headers_install: $(STATEDIR)/w32api-headers.install 
-
 $(STATEDIR)/w32api-headers.install:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	mkdir -p $(SYSROOT)/mingw/include
-	cp -r $(W32API_BUILDDIR)/include/* $(SYSROOT)/mingw/include/
-	@$(call touch, $@)
+	cp -r $(W32API_BUILDDIR)/include/* $(SYSROOT)/mingw/include
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-w32api-headers_targetinstall: $(STATEDIR)/w32api-headers.targetinstall
-
 $(STATEDIR)/w32api-headers.targetinstall:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/w32api.in b/rules/w32api.in
index fd27aad..2acfea3 100644
--- a/rules/w32api.in
+++ b/rules/w32api.in
@@ -9,6 +9,6 @@ config W32API_VERSION
 	depends on W32API
 	string
 	prompt "w32api version"
-	default "3.8"
+	default "3.11"
 	help
 	  Specify the w32api version here.
diff --git a/rules/w32api.make b/rules/w32api.make
index d28ea1b..98c4002 100644
--- a/rules/w32api.make
+++ b/rules/w32api.make
@@ -30,36 +30,26 @@ W32API_BUILDDIR	:= $(BUILDDIR)/w32api-$(W32API_VERSION)
 # Get
 # ----------------------------------------------------------------------------
 
-w32api_get: $(STATEDIR)/w32api.get
-
-$(STATEDIR)/w32api.get: $(w32api_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(W32API_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, W32API)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-w32api_extract: $(STATEDIR)/w32api.extract
-
-$(STATEDIR)/w32api.extract: $(w32api_extract_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/w32api.extract:
+	@$(call targetinfo)
 	@$(call clean, $(W32API_DIR))
 	@$(call clean, $(W32API_BUILDDIR))
 	@$(call extract, W32API)
 	@$(call patchin, W32API, $(W32API_DIR))
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-w32api_prepare: $(STATEDIR)/w32api.prepare
-
 W32API_PATH := PATH=$(CROSS_PATH)
 W32API_ENV := $(CROSS_ENV)
 
@@ -67,49 +57,42 @@ W32API_AUTOCONF := \
 	--prefix=$(SYSROOT)/mingw \
 	--build=$(GNU_BUILD) \
 	--host=$(PTXCONF_GNU_TARGET) \
-	--target=$(PTXCONF_GNU_TARGET) \
+	--target=$(PTXCONF_GNU_TARGET)
 
-
-$(STATEDIR)/w32api.prepare: $(w32api_prepare_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/w32api.prepare:
+	@$(call targetinfo)
 	cd $(W32API_BUILDDIR) && $(W32API_ENV) $(W32API_PATH) \
-			./configure $(W32API_AUTOCONF)
-	@$(call touch, $@)
+		./configure $(W32API_AUTOCONF)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-w32api_compile: $(STATEDIR)/w32api.compile
-
-$(STATEDIR)/w32api.compile: $(w32api_compile_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/w32api.compile:
+	@$(call targetinfo)
 	cd $(W32API_BUILDDIR) && $(W32API_PATH) \
 		$(MAKE) $(PARALLELMFLAGS)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-w32api_install: $(STATEDIR)/w32api.install
-
-$(STATEDIR)/w32api.install: $(w32api_install_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/w32api.install:
+	@$(call targetinfo)
 	cd $(W32API_BUILDDIR) && \
 		$(W32API_PATH) $(MAKE) \
 		install_root=$(SYSROOT) install
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-w32api_targetinstall: $(STATEDIR)/w32api.targetinstall
-
-$(STATEDIR)/w32api.targetinstall: $(w32api_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/w32api.targetinstall:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean