* uclibc.in, gcclibs.in, libc.in, uclibc.make, glibc.make:

	new LIBC layer for deps to c library


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8043 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 128 insertions, 65 deletions

diff --git a/rules/gcclibs.in b/rules/gcclibs.in
index 72203d0bd..bcba7a768 100644
--- a/rules/gcclibs.in
+++ b/rules/gcclibs.in
@@ -11,7 +11,7 @@ config GCCLIBS_CXX
 	bool "libstdc++"
 	select GCCLIBS
 	select GCCLIBS_GCC_S
-	select GLIBC_LIBM
+	select LIBC_M
 	help
 	  Selects the GNU Standard C++ Library
 	  libstdc++ in addition to libgcc_s
diff --git a/rules/glibc.make b/rules/glibc.make
index bf13104f5..13b5d40ef 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -1,9 +1,9 @@
 # -*-makefile-*-
 # $Id$
 #
-# Copyright (C) 2005 by Marc Kleine-Budde <mkl@pengutronix.de>, Pengutronix e.K., Hildesheim, Germany
-# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002      by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003      by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2005-2008 by Marc Kleine-Budde <mkl@pengutronix.de>, Pengutronix e.K., Hildesheim, Germany
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -25,32 +25,25 @@ GLIBC_VERSION	:= $(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
 # Get
 # ----------------------------------------------------------------------------
 
-glibc_get: $(STATEDIR)/glibc.get
-
 $(STATEDIR)/glibc.get:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-glibc_extract: $(STATEDIR)/glibc.extract
-
 $(STATEDIR)/glibc.extract:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-glibc_prepare: $(STATEDIR)/glibc.prepare
-
 $(STATEDIR)/glibc.prepare:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
@@ -59,27 +52,23 @@ $(STATEDIR)/glibc.prepare:
 glibc_compile: $(STATEDIR)/glibc.compile
 
 $(STATEDIR)/glibc.compile:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-glibc_install: $(STATEDIR)/glibc.install
-
 $(STATEDIR)/glibc.install:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-glibc_targetinstall: $(STATEDIR)/glibc.targetinstall
-
 $(STATEDIR)/glibc.targetinstall:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 
 	@$(call install_init, glibc)
 	@$(call install_fixup, glibc,PACKAGE,glibc)
@@ -94,7 +83,7 @@ ifdef PTXCONF_GLIBC
 	@$(call install_copy_toolchain_dl, glibc, /lib)
 endif
 
-ifdef PTXCONF_GLIBC_LIBC
+ifdef PTXCONF_GLIBC_C
 	@$(call install_copy_toolchain_lib, glibc, libc.so.6)
 endif
 
@@ -106,7 +95,7 @@ ifdef PTXCONF_GLIBC_THREAD_DB
 	@$(call install_copy_toolchain_lib, glibc, libthread_db.so)
 endif
 
-ifdef PTXCONF_GLIBC_LIBRT
+ifdef PTXCONF_GLIBC_RT
 	@$(call install_copy_toolchain_lib, glibc, librt.so)
 endif
 
@@ -122,7 +111,7 @@ ifdef PTXCONF_GLIBC_UTIL
 	@$(call install_copy_toolchain_lib, glibc, libutil.so)
 endif
 
-ifdef PTXCONF_GLIBC_LIBM
+ifdef PTXCONF_GLIBC_M
 	@$(call install_copy_toolchain_lib, glibc, libm.so)
 endif
 
@@ -192,7 +181,7 @@ endif
 # 	done;
 	@$(call install_finish, glibc)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/libc.in b/rules/libc.in
index 8025dfc4c..9849a8da0 100644
--- a/rules/libc.in
+++ b/rules/libc.in
@@ -3,4 +3,79 @@ menu "C library                     "
 source "rules/glibc.in"
 source "rules/uclibc.in"
 
+config LIBC_C
+	bool
+	select GLIBC_C			if GLIBC
+	select UCLIBC_C			if UCLIBC
+
+config LIBC_PTHREAD
+	bool
+	select GLIBC_PTHREAD		if GLIBC
+	select UCLIBC_PTHREAD		if UCLIBC
+
+config LIBC_THREAD_DB
+	bool
+	select GLIBC_THREAD_DB		if GLIBC
+	select UCLIBC_THREAD_DB		if UCLIBC
+
+config LIBC_RT
+	bool
+	select GLIBC_RT			if GLIBC
+	select UCLIBC_RT		if UCLIBC
+
+config LIBC_DL
+	bool
+	select GLIBC_DL			if GLIBC
+	select UCLIBC_DL		if UCLIBC
+
+config LIBC_CRYPT
+	bool
+	select GLIBC_CRYPT		if GLIBC
+	select UCLIBC_CRYPT		if UCLIBC
+
+config LIBC_UTIL
+	bool
+	select GLIBC_UTIL		if GLIBC
+	select UCLIBC_UTIL		if UCLIBC
+
+config LIBC_M
+	bool
+	select GLIBC_M			if GLIBC
+	select UCLIBC_M			if UCLIBC
+
+config LIBC_NSS_DNS
+	bool
+	select GLIBC_NSS_DNS		if GLIBC
+
+config LIBC_NSS_FILES
+	bool
+	select GLIBC_NSS_FILES		if GLIBC
+
+config LIBC_NSS_HESIOD
+	bool
+	select GLIBC_NSS_HESIOD		if GLIBC
+
+config LIBC_NSS_NIS
+	bool
+	select GLIBC_NSS_NIS		if GLIBC
+
+config LIBC_NSS_NISPLUS
+	bool
+	select GLIBC_NSS_NISPLUS	if GLIBC
+
+config LIBC_NSS_COMPAT
+	bool
+	select GLIBC_NSS_COMPAT		if GLIBC
+
+
+config LIBC_RESOLV
+	bool
+	select GLIBC_RESOLV		if GLIBC
+	select UCLIBC_RESOLV		if UCLIBC
+
+config LIBC_NSL
+	bool
+	select GLIBC_NSL		if GLIBC
+	select UCLIBC_NSL		if UCLIBC
+
 endmenu
diff --git a/rules/uclibc.in b/rules/uclibc.in
index 476589be5..e01e11c64 100644
--- a/rules/uclibc.in
+++ b/rules/uclibc.in
@@ -11,7 +11,7 @@ config UCLIBC_VERSION
 comment	"Install options"
 	depends on UCLIBC
 
-config UCLIBC_LIBC
+config UCLIBC_C
 	bool
 	depends on UCLIBC
 	prompt "Install libc on the target"
@@ -28,35 +28,35 @@ config UCLIBC_LIBC
 
 config UCLIBC_CRYPT
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libcrypt on the target"
 	help
 	  The encryption/decryption library
 
 config UCLIBC_DL
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libdl on the target"
 	help
 	  The dynamic linking library
 
 config UCLIBC_M
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libm on the target"
 	help
 	  The C math libary
 
 config UCLIBC_NSL
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libnsl on the target"
 	help
 	  The network services library
 
 config UCLIBC_PTHREAD
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libpthread on the target"
 	help
 	  If at least one application on the target uses threads when executed
@@ -64,7 +64,7 @@ config UCLIBC_PTHREAD
 
 config UCLIBC_THREAD_DB
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libthread_db on the target"
 	help
 	  If at least one application on the target uses threads when executed
@@ -74,14 +74,21 @@ config UCLIBC_THREAD_DB
 
 config UCLIBC_RESOLV
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libresolv on the target"
 	help
 	  The resolver library
 
+config UCLIBC_RT
+	bool
+	depends on UCLIBC
+	prompt "Install librt on the target"
+	help
+	  The rt library
+
 config UCLIBC_UTIL
 	bool
-	depends on UCLIBC_LIBC
+	depends on UCLIBC
 	prompt "Install libutil on the target"
 	help
 	  Contains code for "standard" functions used in many different Unix
diff --git a/rules/uclibc.make b/rules/uclibc.make
index 46e562866..0da8ef91e 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
 # $Id$
 #
-# Copyright (C) 2003, 2004 by Marc Kleine-Budde <kleine-budde@gmx.de>
+# Copyright (C) 2003, 2004, 2008 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -20,60 +20,48 @@ UCLIBC_VERSION	:= $(call remove_quotes,$(PTXCONF_UCLIBC_VERSION))
 # Get
 # ----------------------------------------------------------------------------
 
-uclibc_get: $(STATEDIR)/uclibc.get
-
 $(STATEDIR)/uclibc.get:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
-uclibc_extract: $(STATEDIR)/uclibc.extract
-
 $(STATEDIR)/uclibc.extract:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-uclibc_prepare: $(STATEDIR)/uclibc.prepare
-
 $(STATEDIR)/uclibc.prepare:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-uclibc_compile: $(STATEDIR)/uclibc.compile
-
 $(STATEDIR)/uclibc.compile:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-uclibc_install: $(STATEDIR)/uclibc.install
-
 $(STATEDIR)/uclibc.install:
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-uclibc_targetinstall: $(STATEDIR)/uclibc.targetinstall
-
 $(STATEDIR)/uclibc.targetinstall:
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 
 	@$(call install_init, uclibc)
 	@$(call install_fixup, uclibc,PACKAGE,uclibc)
@@ -88,7 +76,7 @@ ifdef PTXCONF_UCLIBC
 	@$(call install_copy_toolchain_dl, uclibc, /lib)
 endif
 
-ifdef PTXCONF_UCLIBC_LIBC
+ifdef PTXCONF_UCLIBC_C
 	@$(call install_copy_toolchain_lib, uclibc, libc.so)
 endif
 
@@ -120,12 +108,16 @@ ifdef PTXCONF_UCLIBC_RESOLV
 	@$(call install_copy_toolchain_lib, uclibc, libresolv.so)
 endif
 
+ifdef PTXCONF_UCLIBC_RT
+	@$(call install_copy_toolchain_lib, uclibc, librt.so)
+endif
+
 ifdef PTXCONF_UCLIBC_UTIL
 	@$(call install_copy_toolchain_lib, uclibc, libutil.so)
 endif
 	@$(call install_finish, uclibc)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean