Replace all Makefiles for new build infrastucture

26 files changed, 208 insertions, 1109 deletions

diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index e512467e8..41567d9e9 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -1,69 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../
-include $(TOPDIR)Rules.mak
-
-
-DIRS = assert ctype dirent file fnmatch internals \
-       mntent syslog time utmp sysvipc statfs \
-       error ttyent gnu search locale
-ifeq ($(UCLIBC_HAS_REGEX),y)
-DIRS += regex
-endif
-ifeq ($(UCLIBC_HAS_WORDEXP),y)
-DIRS += wordexp
-endif
-ifeq ($(UCLIBC_HAS_THREADS),y)
-DIRS += pthread
-endif
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-DIRS += wctype wchar
-endif
-ifeq ($(UCLIBC_HAS_GETTEXT_AWARENESS),y)
-DIRS += intl
-endif
-ifeq ($(UCLIBC_HAS_FTW),y)
-DIRS += ftw
-endif
-ifeq ($(UCLIBC_HAS_GLOB),y)
-DIRS += glob
-endif
-
-all: subdirs
-
-tags:
-	ctags -R
-
-clean: subdirs_clean
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
-
-$(patsubst %, _dir_%, $(DIRS)) : dummy
-	$(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(DIRS)) : dummy
-	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
-.PHONY: dummy
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/assert/Makefile b/libc/misc/assert/Makefile
index cfc0b7dcc..493484b27 100644
--- a/libc/misc/assert/Makefile
+++ b/libc/misc/assert/Makefile
@@ -1,42 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := __assert.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.assert
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/assert/%, $^) > $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/ctype/Makefile b/libc/misc/ctype/Makefile
index 4dc944bfa..493484b27 100644
--- a/libc/misc/ctype/Makefile
+++ b/libc/misc/ctype/Makefile
@@ -1,65 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-MSRC := ctype.c
-MOBJ =	isalnum.o isalpha.o isascii.o iscntrl.o isdigit.o \
-	isgraph.o islower.o isprint.o ispunct.o isspace.o \
-	isupper.o isxdigit.o toascii.o tolower.o toupper.o \
-	isblank.o isxlower.o isxupper.o
-
-ifeq ($(UCLIBC_HAS_CTYPE_TABLES),y)
-MOBJ += __C_ctype_b.o __C_ctype_tolower.o __C_ctype_toupper.o \
-	__ctype_b_loc.o __ctype_tolower_loc.o __ctype_toupper_loc.o \
-	__ctype_assert.o isctype.o
-endif
-
-MOBJx:=	isalnum_l.o isalpha_l.o isascii_l.o iscntrl_l.o isdigit_l.o \
-	isgraph_l.o islower_l.o isprint_l.o ispunct_l.o isspace_l.o \
-	isupper_l.o isxdigit_l.o toascii_l.o tolower_l.o toupper_l.o \
-	isblank_l.o # isxlower_l.o isxupper_l.o
-
-OBJS = $(MOBJ)
-
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	OBJS += $(MOBJx)
-endif
-
-OBJ_LIST := ../../obj.misc.ctype
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/ctype/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJx): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/dirent/Makefile b/libc/misc/dirent/Makefile
index 19ab29fb0..493484b27 100644
--- a/libc/misc/dirent/Makefile
+++ b/libc/misc/dirent/Makefile
@@ -1,45 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2001 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := alphasort.c closedir.c dirfd.c opendir.c readdir.c rewinddir.c scandir.c \
-     	seekdir.c telldir.c readdir64.c alphasort64.c scandir64.c readdir_r.c \
-	readdir64_r.c
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.dirent
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/dirent/%, $^) > $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/error/Makefile b/libc/misc/error/Makefile
index 05f6ca670..493484b27 100644
--- a/libc/misc/error/Makefile
+++ b/libc/misc/error/Makefile
@@ -1,37 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := error.c err.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.error
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/error/%, $^) > $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/file/Makefile b/libc/misc/file/Makefile
index 90aecf6b7..493484b27 100644
--- a/libc/misc/file/Makefile
+++ b/libc/misc/file/Makefile
@@ -1,46 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC = lockf.c
-ifeq ($(UCLIBC_HAS_LFS),y)
-CSRC += lockf64.c
-endif
-
-OBJS=$(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.file
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/file/%, $^) > $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/fnmatch/Makefile b/libc/misc/fnmatch/Makefile
index 0c2969dac..493484b27 100644
--- a/libc/misc/fnmatch/Makefile
+++ b/libc/misc/fnmatch/Makefile
@@ -1,42 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := fnmatch.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.fnmatch
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/fnmatch/%, $^) > $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/ftw/Makefile b/libc/misc/ftw/Makefile
index c6b4ccc5a..493484b27 100644
--- a/libc/misc/ftw/Makefile
+++ b/libc/misc/ftw/Makefile
@@ -1,39 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-MSRC := ftw.c
-MOBJ := ftw.o ftw64.o
-
-OBJS := $(MOBJ)
-
-OBJ_LIST := ../../obj.misc.ftw
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/ftw/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/glob/Makefile b/libc/misc/glob/Makefile
index 0933d0516..493484b27 100644
--- a/libc/misc/glob/Makefile
+++ b/libc/misc/glob/Makefile
@@ -1,44 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := glob.c glob64.c glob-hooks.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.glob
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/glob/%, $^) > $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-glob64.o: glob64.c glob.c
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/gnu/Makefile b/libc/misc/gnu/Makefile
index 4bc62d37e..493484b27 100644
--- a/libc/misc/gnu/Makefile
+++ b/libc/misc/gnu/Makefile
@@ -1,42 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := obstack.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.gnu
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/gnu/%, $^) > $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile
index 52fd45a44..493484b27 100644
--- a/libc/misc/internals/Makefile
+++ b/libc/misc/internals/Makefile
@@ -1,58 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-ifeq ($(UCLIBC_HAS_THREADS),y)
-CFLAGS += $(PTINC)
-endif
-
-CSRC := __uClibc_main.c tempname.c errno.c __errno_location.c __h_errno_location.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(UCLIBC_HAS_SSP),y)
-__uClibc_main.o: CFLAGS += $(SSP_DISABLE_FLAGS)
-endif
-
-OBJ_LIST := ../../obj.misc.internals
-
-all: $(OBJ_LIST) interp.o static.o
-
-$(OBJ_LIST): $(OBJS)
-	echo $(patsubst %, misc/internals/%, $^) > $@
-
-interp.c: Makefile
-	echo "/* Force shared libraries to know about the correct library loader */" > interp.c
-	echo "#include <features.h>" >> interp.c
-	echo "#ifdef __HAVE_ELF__" >> interp.c
-	echo "const char __dl_ldso__[] __attribute__ ((section " \
-		"(\".interp\"))) =\""$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)"\";" >> interp.c
-	echo "#endif" >> interp.c
-
-$(OBJS) interp.o static.o: %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
-clean:
-	$(RM) *.o interp.c *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/intl/Makefile b/libc/misc/intl/Makefile
index 4cedc491e..493484b27 100644
--- a/libc/misc/intl/Makefile
+++ b/libc/misc/intl/Makefile
@@ -1,48 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-MSRC := intl.c
-MOBJ := __uClibc_dgettext.o __uClibc_dcgettext.o \
-	__uClibc_textdomain.o __uClibc_bindtextdomain.o # for libstd++
-
-OBJS := $(MOBJ)
-
-OBJ_LIST := ../../obj.misc.intl
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/intl/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/locale/Makefile b/libc/misc/locale/Makefile
index 9ad80ff5a..493484b27 100644
--- a/libc/misc/locale/Makefile
+++ b/libc/misc/locale/Makefile
@@ -1,66 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-MSRC := locale.c
-MOBJ = setlocale.o localeconv.o _locale_init.o nl_langinfo.o
-MOBJx =
-
-ifeq ($(UCLIBC_HAS_LOCALE),y)
-	MOBJ += newlocale.o __locale_mbrtowc_l.o
-endif
-
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	MOBJx += nl_langinfo_l.o duplocale.o freelocale.o uselocale.o __curlocale.o
-endif
-
-DATA=
-ifeq ($(UCLIBC_HAS_LOCALE),y)
-	DATA = locale_data.o
-endif
-
-OBJS := $(MOBJ) $(MOBJx) $(DATA)
-
-OBJ_LIST := ../../obj.misc.locale
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/locale/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJx): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-
-locale_data.o: ../../../extra/locale/locale_data.c
-	$(CC) $(CFLAGS) -c -D__WCHAR_ENABLED -I$(dir $<) $< -o $@
-
-clean:
-	$(RM) *.o *~ core
 
-.PHONY: data
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/mntent/Makefile b/libc/misc/mntent/Makefile
index 871e3e61e..493484b27 100644
--- a/libc/misc/mntent/Makefile
+++ b/libc/misc/mntent/Makefile
@@ -1,42 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY