Replace all Makefiles for new build infrastucture

70 files changed, 602 insertions, 3751 deletions

diff --git a/Makefile b/Makefile
index 05547b69f..652694f22 100644
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,21 @@
 noconfig_targets := menuconfig config oldconfig randconfig \
 	defconfig allyesconfig allnoconfig clean distclean \
 	release dist tags
+
 TOPDIR=./
-include Rules.mak
 
-RTLD_DIR =
+top_srcdir=$(TOPDIR)
+top_builddir=./
+include $(top_builddir)Rules.mak
+
+# need to have libc.so built, before we can build the others
 ifeq ($(HAVE_SHARED),y)
-RTLD_DIR = ldso
+PRE_DIRS = ldso libc
+DIRS = ldso libcrypt libresolv libnsl libutil librt
+else
+PRE_DIRS = libc
+DIRS = libcrypt libresolv libnsl libutil librt
 endif
-# need to have libc built, before we can build the others
-PRE_DIRS = $(RTLD_DIR) libc
-DIRS = $(RTLD_DIR) libcrypt libresolv libnsl libutil librt
 ifeq ($(UCLIBC_HAS_FLOATS),y)
 	DIRS += libm
 endif
@@ -44,12 +49,12 @@ finished: subdirs
 	$(SECHO)
 
 include/bits/uClibc_config.h: .config
-	@if [ ! -x ./extra/config/conf ] ; then \
-	    $(MAKE) -C extra/config conf; \
+	@if [ ! -x $(top_builddir)extra/config/conf ] ; then \
+	    $(MAKE) -C $(top_builddir)extra/config conf; \
 	fi
-	$(RM) -r include/bits
-	$(INSTALL) -d include/bits
-	@./extra/config/conf -o extra/Configs/Config.in
+	$(RM) -r $(top_builddir)include/bits
+	$(INSTALL) -d $(top_builddir)include/bits
+	@$(top_builddir)extra/config/conf -o $(top_srcdir)extra/Configs/Config.in
 
 # For the moment, we have to keep re-running this target 
 # because the fix includes scripts rely on pre-processers 
@@ -61,12 +66,18 @@ export header_extra_args =
 else
 export header_extra_args = -n
 endif
-headers: include/bits/uClibc_config.h
+headers: $(top_srcdir)include/bits/uClibc_config.h
 	@$(SHELL_SET_X); \
-	./extra/scripts/fix_includes.sh \
+	$(top_srcdir)extra/scripts/fix_includes.sh \
 		-k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
 		$(header_extra_args)
-	@cd include/bits; \
+	if [ -f libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h ] ; then \
+		$(LN) -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h include/ ; \
+	else \
+		$(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h include/ ; \
+	fi
+	$(LN) -fs ../libc/sysdeps/linux/common/dl-osinfo.h include/
+	@cd $(top_builddir)include/bits; \
 	set -e; \
 	for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
 		$(LN) -fs $$i .; \
@@ -76,7 +87,7 @@ headers: include/bits/uClibc_config.h
 			$(LN) -fs $$i .; \
 		done; \
 	fi
-	@cd include/sys; \
+	@cd $(top_builddir)include/sys; \
 	set -e; \
 	for i in `ls ../../libc/sysdeps/linux/common/sys/*.h` ; do \
 		$(LN) -fs $$i .; \
@@ -86,20 +97,23 @@ headers: include/bits/uClibc_config.h
 			$(LN) -fs $$i .; \
 		done; \
 	fi
-	@cd $(TOPDIR); \
+	@cd $(top_builddir); \
 	set -e; \
 	$(SHELL_SET_X); \
 	TOPDIR=. CC="$(CC)" /bin/sh extra/scripts/gen_bits_syscall_h.sh > include/bits/sysnum.h.new; \
 	if cmp include/bits/sysnum.h include/bits/sysnum.h.new >/dev/null 2>&1; then \
 		$(RM) include/bits/sysnum.h.new; \
 	else \
+		$(RM) include/bits/sysnum.h; \
 		mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
 	fi
+ifeq ($(HAVE_SHARED),y)
+	$(MAKE) -C ldso headers-y
+endif
 ifeq ($(UCLIBC_HAS_THREADS),y)
-	$(MAKE) -C libpthread headers
+	$(MAKE) -C libpthread headers-y
 endif
-	$(MAKE) -C libc/sysdeps/linux/common headers
-	$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
+	$(MAKE) -C libc/sysdeps/linux headers-y
 
 # Command used to download source code
 WGET:=wget --passive-ftp
@@ -108,14 +122,14 @@ LOCALE_DATA_FILENAME:=uClibc-locale-030818.tgz
 
 pregen: headers
 ifeq ($(UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA),y)
-	(cd extra/locale; \
+	(cd $(top_builddir)extra/locale; \
 	if [ ! -f $(LOCALE_DATA_FILENAME) ] ; then \
 	$(WGET) http://www.uclibc.org/downloads/$(LOCALE_DATA_FILENAME) ; \
 	fi )
 endif
 ifeq ($(UCLIBC_PREGENERATED_LOCALE_DATA),y)
-	(cd extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
-	$(MAKE) -C extra/locale pregen
+	(cd $(top_builddir)extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
+	$(MAKE) -C $(top_srcdir)extra/locale pregen
 endif
 
 pre_subdirs: $(patsubst %, _pre_dir_%, $(PRE_DIRS))
@@ -126,13 +140,10 @@ subdirs: $(patsubst %, _dir_%, $(DIRS))
 $(patsubst %, _dir_%, $(DIRS)): pre_subdirs
 	$(MAKE) -C $(patsubst _dir_%, %, $@)
 
-tags:
-	ctags -R
-
 install: install_runtime install_dev finished2
 
 
-RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
+RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
 
 # Installs header files.
 install_headers:
@@ -227,12 +238,12 @@ ifeq ($(HAVE_SHARED),y)
 		$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
 		$(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
 	done
-	if [ -f $(TOPDIR)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
+	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
 		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
 		sed 	-e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
 			-e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \
 			-e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
-			$(TOPDIR)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+			$(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
 	fi
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
 	$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
@@ -331,17 +342,17 @@ defconfig: extra/config/conf
 
 clean:
 	@$(RM) -r lib include/bits
-	$(RM) libc/*.a libc/obj.* libc/nonshared_obj.*
+	$(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a
 	$(RM) libc/misc/internals/interp.c
-	$(RM) ldso/libdl/*.a
 	$(RM) include/fpu_control.h include/dl-osinfo.h
 	$(MAKE) -C extra/locale clean
-	$(MAKE) -C ldso headers_clean
-	$(MAKE) -C libpthread headers_clean
+	$(MAKE) -C ldso headers_clean-y
+	$(MAKE) -C libpthread headers_clean-y
+	$(MAKE) -C libc/sysdeps/linux headers_clean-y
 	$(MAKE) -C test clean
 	$(MAKE) -C utils clean
 	@set -e; \
-	for i in `(cd $(TOPDIR)/libc/sysdeps/linux/common/sys; ls *.h)` ; do \
+	for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
 		$(RM) include/sys/$$i; \
 	done; \
 	if [ -d libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
@@ -350,10 +361,7 @@ clean:
 		done; \
 	fi
 	@$(RM) include/linux include/asm*
-	@if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then		\
-	    $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean;		\
-	fi
-	-find . \( -name \*.o -o -name \*.os \) -exec $(RM) {} \;
+	-find . \( -name \*.o -o -name \*.os -o -name \*.oS \) -exec $(RM) {} \;
 
 distclean: clean
 	-find . \( -name core -o -name \*.orig -o -name \*~ \) -exec $(RM) {} \;
@@ -370,6 +378,8 @@ dist release:
 
 endif # ifeq ($(HAVE_DOT_CONFIG),y)
 
+include $(top_srcdir)Makerules
+
 check:
 	$(MAKE) -C test
 
diff --git a/ldso/Makefile b/ldso/Makefile
index 57ddd4f3a..2dea1b3e9 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -2,59 +2,14 @@
 #
 # 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
-
-DIRS = ldso libdl
-
-ifeq ($(HAVE_SHARED),y)
-all: subdirs
-else
-all:
-endif
-
-LN_HEADERS      := $(patsubst %, include/%, elf.h)
-LN_ARCH_HEADERS := $(patsubst %, include/%, dl-startup.h dl-syscalls.h dl-sysdep.h dl-debug.h)
-HEADERS         := $(LN_HEADERS) $(LN_ARCH_HEADERS) include/dl-progname.h
-
-headers: $(HEADERS)
-
-$(LN_HEADERS):
-	$(LN) -sf $(TOPDIR)../$@ $@
-
-$(LN_ARCH_HEADERS):
-	$(LN) -sf ../ldso/$(TARGET_ARCH)/$(patsubst include/%,%,$@) $@
-
-include/dl-progname.h:
-	echo '#include "$(TARGET_ARCH)/elfinterp.c"' \
-		> include/dl-progname.h
-
-headers_clean:
-	$(RM) $(HEADERS)
-
-clean: subdirs_clean headers_clean
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
-
-$(patsubst %, _dir_%, $(DIRS)): headers
-	$(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(DIRS)): dummy
-	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
-.PHONY: dummy
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index bdc4904f1..f92f205a5 100644
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -1,99 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2004 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
-
-XXFLAGS=$(XWARNINGS) $(SSP_DISABLE_FLAGS) -DNOT_IN_libc
-
-ifeq ($(DODEBUG),y)
-# Not really much point in including debugging info, since gdb
-# can't really debug ldso, since gdb requires help from ldso to
-# debug things....
-XXFLAGS+=-Os -g
-else
-XXFLAGS+=$(OPTIMIZATION)
-endif
-XXFLAGS+= -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
-	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-	-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
-
-XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
-
-ifeq ($(SUPPORT_LD_DEBUG),y)
-XXFLAGS+=-D__SUPPORT_LD_DEBUG__
-endif
-
-ifeq ($(SUPPORT_LD_DEBUG_EARLY),y)
-XXFLAGS+=-D__SUPPORT_LD_DEBUG_EARLY__
-endif
-
-#This stuff will not work with -fomit-frame-pointer
-XXFLAGS := $(XXFLAGS:-fomit-frame-pointer=)
-
-# BEWARE!!! At least mips* will die if -O0 is used!!!
-ifeq ($(strip $(TARGET_ARCH)),mips)
-XXFLAGS := $(XXFLAGS:-O0=-O1)
-endif
-
-ASFLAGS=$(XXFLAGS)
-ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y)
-ASFLAGS+=$(call check_as,--noexecstack)
-endif
-
-LDFLAGS=$(CPU_LDFLAGS-y) -e _start -z now -Bsymbolic -shared --warn-common --export-dynamic --sort-common \
-	-z combreloc --discard-locals --discard-all --no-undefined
-
-ifeq ($(UCLIBC_BUILD_RELRO),y)
-LDFLAGS+=-z relro
-endif
-
-ifneq ($(SUPPORT_LD_DEBUG),y)
-LDFLAGS+=-s
-endif
-
-LIB_NAME := ld-uClibc
-SO_LIB_NAME := $(TOPDIR)lib/$(UCLIBC_LDSO)
-SO_FULL_NAME := $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC := ldso.c
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-SSRC := $(wildcard $(TARGET_ARCH)/*.S)
-SOBJ := $(patsubst %.S,%.o, $(SSRC))
-
-OBJS := $(SOBJ) $(COBJ)
-
-all: $(SO_LIB_NAME)
-
-$(SO_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(LD) $(LDFLAGS) -soname=$(UCLIBC_LDSO) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) $^ $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(XXFLAGS) -c $< -o $@
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o */*.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index 730d95c23..f92f205a5 100644
--- a/ldso/libdl/Makefile
+++ b/ldso/libdl/Makefile
@@ -1,95 +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
-
 
 TOPDIR=../../
-include $(TOPDIR)Rules.mak
-
-XXFLAGS=$(XWARNINGS) $(SSP_CFLAGS) $(SSP_ALL_CFLAGS)
-ifeq ($(DODEBUG),y)
-XXFLAGS+=-O0 -g3
-else
-XXFLAGS+=$(OPTIMIZATION)
-endif
-XXFLAGS+= $(XARCH_CFLAGS) $(CPU_CFLAGS) \
-	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-	-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I$(TOPDIR)ldso/ldso -I$(TOPDIR)include
-
-XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
-ifeq ($(SUPPORT_LD_DEBUG),y)
-XXFLAGS+=-D__SUPPORT_LD_DEBUG__
-endif
-XXFLAGS_NOPIC:=$(XXFLAGS)
-ifeq ($(DOPIC),y)
-    XXFLAGS += $(PICFLAG) -DSHARED
-endif
-
-# BEWARE!!! At least mips* will die if -O0 is used!!!
-ifeq ($(TARGET_ARCH),mips)
-XXFLAGS := $(XXFLAGS:-O0=-O1)
-endif
-
-LIB_NAME := libdl
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME := $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC := libdl.c
-OBJS := libdl.o
-PIC_OBJS := libdl_pic.o
-
-# we do not get here, do we need a libdl.a, if ld.so is not ours?
-#ifeq ($(HAVE_SHARED),y)
-all: $(AR_LIB_NAME) $(SO_LIB_NAME)
-#else
-#all: $(AR_LIB_NAME)
-#endif
-
-$(AR_LIB_NAME): $(OBJS) ../ldso/$(TARGET_ARCH)/resolve.o
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $^
-
-shared_$(LIB_NAME).a: $(PIC_OBJS)
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-# this will be built only on the second round, when libc.so is present,
-# else we would link against libc.a
-$(SO_LIB_NAME): shared_$(LIB_NAME).a
-	if [ -f $(TOPDIR)lib/libc.so ] ; then \
-		$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@ ; \
-		$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-			-o $(TOPDIR)lib/$(SO_FULL_NAME) -fini dl_cleanup --whole-archive $< \
-			--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-			-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(TOPDIR)lib/$(UCLIBC_LDSO) $(LIBGCC) ; \
-		$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) ; \
-		$(LN) -sf $(SO_FULL_NAME) $@ ; \
-	fi
-
-$(OBJS): %.o : %.c
-	$(CC) $(XXFLAGS_NOPIC) -c $< -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
-
-libdl_pic.o: libdl.c
-	$(CC) $(XXFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.[oa] *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/Makefile b/libc/Makefile
index d27990665..2dea1b3e9 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -1,120 +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.
-
-#--------------------------------------------------------
-#
-#There are a number of configurable options in "Config"
-#
-#--------------------------------------------------------
 
 TOPDIR=../
-include $(TOPDIR)Rules.mak
-
-DIRS = misc pwd_grp stdio string termios inet signal stdlib sysdeps unistd
-
-# Check if the target architecture has a version script for
-# libc, and if so, include it when linking.
-VERSION_SCRIPT:=${shell if [ -f sysdeps/linux/$(TARGET_ARCH)/libc.map ] ; then \
-        echo "--version-script sysdeps/linux/$(TARGET_ARCH)/libc.map"; fi}
-
-# we have SHARED_MAJORNAME=libc.so.$(MAJOR_VERSION) defined in Rules.mak
-LIB_NAME := libc
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-# Some functions are duplicated across subdirs, and when you pass $(AR)
-# the same object file more than once, it'll add it to the archive multiple 
-# times (boo!).  So what we do here is:
-#  - import all the objects (thus we may have dupes)
-#  - delete all the dupes
-#  - re-import certain objects based upon preference
-#    - the sysdeps dir should override all other symbols for example
-# We need to use shell globbing with obj.* because if we use make's wildcard,
-# the wildcard will be evaluated when `make` is run instead of when the make 
-# target is evaluated.  That means if you run `rm obj.* ; make`, the wildcard 
-# will evaluate to no files :(.
-shared_$(LIB_NAME).a: subdirs
-	$(RM) $@
-	objs=`cat obj.*` ; \
-	$(AR) $(ARFLAGS) $@ $$objs && \
-	$(AR) dN 2 $@ $$objs && \
-	$(AR) dN 2 $@ $$objs
-	@for objfile in obj.signal \
-	                obj.string.generic obj.string.$(TARGET_ARCH) obj.string \
-	                obj.sysdeps.common obj.sysdeps.$(TARGET_ARCH) ; do \
-		if [ -e $$objfile ] ; then \
-			if [ "$(MAKE_IS_SILENT)" = "n" ] ; then \
-				echo $(AR) $(ARFLAGS) $@ $$objfile ; \
-			fi ; \
-			objs=`cat $$objfile` ; \
-		fi ; \
-		$(AR) $(ARFLAGS) $@ $$objs || exit 1 ; \
-	done
-
-$(AR_LIB_NAME): shared_$(LIB_NAME).a
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	cp $< $@
-	$(AR) $(ARFLAGS) $@ misc/internals/static.o `cat nonshared_obj.*`
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(TOPDIR)lib/$(SHARED_MAJORNAME) $@
-	$(LD) $(LDFLAGS) $(VERSION_SCRIPT) -soname=$(SHARED_MAJORNAME) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive shared_$(LIB_NAME).a \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-init __uClibc_init $(TOPDIR)lib/$(UCLIBC_LDSO) $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(TOPDIR)lib/$(SHARED_MAJORNAME)
-	$(RM) $(TOPDIR)lib/$(NONSHARED_LIBNAME)
-	$(AR) $(ARFLAGS) $(TOPDIR)lib/$(NONSHARED_LIBNAME) `cat nonshared_obj.*`
-	echo "/* GNU ld script" > $@
-	echo " * Use the shared library, but some functions are only in" >> $@
-	echo " * the static library, so try that secondarily. */" >> $@
-ifeq ($(COMPAT_ATEXIT),y)
-	echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_MAJORNAME) $(ASNEEDED) )" >> $@
-else
-	echo "GROUP ( $(SHARED_MAJORNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@
-endif
-
-tags:
-	ctags -R
-
-clean: subdirs_clean
-	$(RM) *.a obj.* nonshared_obj.*
-
-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 subdirs
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/inet/Makefile b/libc/inet/Makefile
index e5c355d69..41567d9e9 100644
--- a/libc/inet/Makefile
+++ b/libc/inet/Makefile
@@ -1,97 +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
-
-ALL_SUBDIRS = rpc
-
-DIRS =
-ifeq ($(UCLIBC_HAS_RPC),y)
-DIRS += rpc
-endif
-
-MSRC := addr.c
-MOBJ := inet_aton.o inet_addr.o inet_ntoa.o inet_makeaddr.o inet_lnaof.o \
-	inet_netof.o
-
-MSRC2 := resolv.c
-MOBJ2 := encodeh.o decodeh.o encoded.o decoded.o lengthd.o encodeq.o \
-	decodeq.o lengthq.o encodea.o decodea.o encodep.o decodep.o \
-	formquery.o dnslookup.o resolveaddress.o opennameservers.o \
-	closenameservers.o resolvename.o gethostbyname.o res_init.o \
-	res_query.o gethostbyaddr.o read_etc_hosts_r.o get_hosts_byname_r.o \
-	get_hosts_byaddr_r.o gethostbyname2.o getnameinfo.o gethostent.o \
-	gethostbyname_r.o gethostbyname2_r.o gethostbyaddr_r.o \
-	res_comp.o ns_name.o
-
-MSRC3 := socketcalls.c
-MOBJ3 := accept.o bind.o connect.o getpeername.o getsockname.o getsockopt.o \
-	listen.o recv.o recvfrom.o recvmsg.o send.o sendmsg.o sendto.o \
-	setsockopt.o shutdown.o socket.o socketpair.o 
-
-CSRC := getservice.c getproto.c hostid.c getnetent.c getnetbynm.c getnetbyad.c \
-      inet_net.c ntop.c herror.c if_nametoindex.c gai_strerror.c getaddrinfo.c \
-      in6_addr.c ether_addr.c ntohl.c
-
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJ)
-
-OBJ_LIST := ../obj.inet
-
-all: $(OBJ_LIST) subdirs
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, inet/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ2): $(MSRC2)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ3): $(MSRC3)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-clean: subdirs_clean
-	$(RM) *.o *~ core
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
-
-$(patsubst %, _dir_%, $(DIRS)) : dummy
-	$(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : 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/inet/rpc/Makefile b/libc/inet/rpc/Makefile
index 474ed6484..493484b27 100644
--- a/libc/inet/rpc/Makefile
+++ b/libc/inet/rpc/Makefile
@@ -1,68 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001,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
-
-ifeq ($(UCLIBC_HAS_THREADS),y)
-CFLAGS += $(PTINC)
-endif
-
-ifeq ($(UCLIBC_HAS_FULL_RPC),y)
-CSRC := auth_none.c auth_unix.c authunix_prot.c bindresvport.c \
-	clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \
-	clnt_udp.c rpc_dtablesize.c get_myaddress.c getrpcent.c getrpcport.c \
-	pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c \
-	pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c rpc_callmsg.c \
-	svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_run.c svc_simple.c \
-	svc_tcp.c svc_udp.c xdr.c xdr_array.c xdr_float.c xdr_mem.c \
-	xdr_rec.c xdr_reference.c xdr_stdio.c \
-	rtime.c clnt_unix.c svc_unix.c create_xid.c xdr_intXX_t.c rcmd.c \
-	rexec.c sa_len.c ruserpass.c rpc_thread.c
-else
-# For now, only compile the stuff needed to do an NFS mount....
-CSRC := create_xid.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \
-	pmap_prot.c pmap_prot2.c clnt_simple.c clnt_perror.c \
-	clnt_tcp.c clnt_udp.c bindresvport.c authunix_prot.c \
-	auth_none.c auth_unix.c xdr.c xdr_array.c xdr_rec.c \
-	xdr_reference.c xdr_mem.c svc.c svc_auth.c svc_auth_unix.c \
-	rpc_callmsg.c rpc_prot.c rpc_dtablesize.c rpc_commondata.c \
-	rpc_thread.c rcmd.c rexec.c sa_len.c ruserpass.c rtime.c \
-	getrpcent.c
-endif
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.inet.rpc
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, inet/rpc/%, $^) > $@
-
-$(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/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 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 := mntent.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.mntent
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/mntent/%, $^) > $@
-
-$(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/pthread/Makefile b/libc/misc/pthread/Makefile
index 1230e44fe..493484b27 100644
--- a/libc/misc/pthread/Makefile
+++ b/libc/misc/pthread/Makefile
@@ -1,39 +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
-
-CFLAGS += $(PTINC)
-
-CSRC := no-tsd.c weaks.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.pthread
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/pthread/%, $^) > $@
-
-$(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/regex/Makefile b/libc/misc/regex/Makefile
index 2df62dd44..493484b27 100644
--- a/libc/misc/regex/Makefile
+++ b/libc/misc/regex/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 := regex.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.regex
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/regex/%, $^) > $@
-
-$(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/search/Makefile b/libc/misc/search/Makefile
index ce0c1b6b1..493484b27 100644
--- a/libc/misc/search/Makefile
+++ b/libc/misc/search/Makefile
@@ -1,68 +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
-
-MSRC1 := tsearch.c
-MOBJ1 := tsearch.o tfind.o tdelete.o twalk.o tdestroy.o
-
-MSRC2 := lsearch.c
-MOBJ2 := lfind.o lsearch.o
-
-MSRC3 := insremque.c
-MOBJ3 := insque.o remque.o
-
-MSRC4 := hsearch_r.c
-MOBJ4 := hcreate_r.o hdestroy_r.o hsearch_r.o
-
-CSRC := hsearch.c
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(COBJ) $(MOBJ1) $(MOBJ2) $(MOBJ3) $(MOBJ4)
-
-OBJ_LIST := ../../obj.misc.search
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/search/%, $^) > $@
-
-$(MOBJ1): $(MSRC1)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ2): $(MSRC2)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ3): $(MSRC3)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ4): $(MSRC4)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(COBJ): %.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/statfs/Makefile b/libc/misc/statfs/Makefile
index f91b619fa..493484b27 100644
--- a/libc/misc/statfs/Makefile
+++ b/libc/misc/statfs/Makefile
@@ -1,43 +1,15 @@
 # Makefile for uClibc
-# Copyright (C) 2001,2002 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.
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# 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.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# 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 = statvfs.c fstatvfs.c
-ifeq ($(UCLIBC_HAS_LFS),y)
-CSRC += fstatfs64.c statfs64.c statvfs64.c fstatvfs64.c
-endif
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.statfs
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/statfs/%, $^) > $@
-
-$(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/syslog/Makefile b/libc/misc/syslog/Makefile
index 525cc683d..493484b27 100644
--- a/libc/misc/syslog/Makefile
+++ b/libc/misc/syslog/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
-
-ifeq ($(UCLIBC_HAS_THREADS),y)
-CFLAGS += $(PTINC)
-endif
-
-CSRC := syslog.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.syslog
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/syslog/%, $^) > $@
-
-$(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/sysvipc/Makefile b/libc/misc/sysvipc/Makefile
index 99b72c897..493484b27 100644
--- a/libc/misc/sysvipc/Makefile
+++ b/libc/misc/sysvipc/Makefile
@@ -1,62 +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 := sem.c
-MOBJ := semget.o semctl.o semop.o
-
-MSRC2 := shm.c
-MOBJ2 := shmat.o shmctl.o shmdt.o shmget.o
-
-MSRC3 := msgq.c
-MOBJ3 := msgctl.o msgget.o msgrcv.o msgsnd.o
-
-CSRC := ftok.c 
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJ)
-
-OBJ_LIST := ../../obj.misc.sysvipc
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/sysvipc/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ2): $(MSRC2)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ3): $(MSRC3)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(COBJ): %.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/time/Makefile b/libc/misc/time/Makefile
index 9d128fb09..493484b27 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -1,71 +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 := time.c
-MOBJ =	asctime.o asctime_r.o clock.o ctime.o ctime_r.o gmtime.o gmtime_r.o \
-	localtime.o localtime_r.o mktime.o strftime.o strptime.o tzset.o \
-	_time_t2tm.o __time_tm.o _time_mktime.o dysize.o timegm.o \
-	_time_mktime_tzi.o _time_localtime_tzi.o
-MOBJx =
-
-ifeq ($(UCLIBC_HAS_FLOATS),y)
-	MOBJ += difftime.o 
-endif
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	MOBJx += strftime_l.o strptime_l.o
-endif
-
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-	MOBJ += wcsftime.o
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	MOBJx += wcsftime_l.o
-endif
-endif
-
-CSRC := adjtime.c ftime.c
-COBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(COBJS) $(MOBJ) $(MOBJx)
-
-OBJ_LIST := ../../obj.misc.time
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/time/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJx): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-
-$(COBJS): %.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/ttyent/Makefile b/libc/misc/ttyent/Makefile
index 9a172775f..493484b27 100644
--- a/libc/misc/ttyent/Makefile
+++ b/libc/misc/ttyent/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 := getttyent.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.ttyent
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/ttyent/%, $^) > $@
-
-$(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/utmp/Makefile b/libc/misc/utmp/Makefile
index c5e5fad11..493484b27 100644
--- a/libc/misc/utmp/Makefile
+++ b/libc/misc/utmp/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 := utent.c wtent.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.utmp
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/utmp/%, $^) > $@
-
-$(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/wchar/Makefile b/libc/misc/wchar/Makefile
index acff4dab6..493484b27 100644
--- a/libc/misc/wchar/Makefile
+++ b/libc/misc/wchar/Makefile
@@ -1,60 +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 := wchar.c
-MOBJ =	btowc.o wctob.o mbsinit.o mbrlen.o mbrtowc.o wcrtomb.o mbsrtowcs.o \
-	wcsrtombs.o _wchar_utf8sntowcs.o _wchar_wcsntoutf8s.o \
-	__mbsnrtowcs.o __wcsnrtombs.o wcwidth.o wcswidth.o
-
-ifeq ($(UCLIBC_HAS_LOCALE),y)
-	MOBJ += iconv.o
-endif
-
-# The stdio and time related wide functions are now built in the normal
-# directories.
-#
-# stdio: 
-#	fwide fgetwc getwchar fgetws fputwc putwchar fputws ungetwc
-#	getwc (fgetwc alias) getwc_unlocked (fgetwc_unlocked alias)
-#	putwc (fputwc alias) putwc_unlocked (fputwc_unlocked alias)
-# time:
-# wcsftime
-
-OBJS := $(MOBJ)
-
-OBJ_LIST := ../../obj.misc.wchar
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/wchar/%, $^) > $@
-
-$(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/wctype/Makefile b/libc/misc/wctype/Makefile
index 34cc2d966..493484b27 100644
--- a/libc/misc/wctype/Makefile
+++ b/libc/misc/wctype/Makefile
@@ -1,59 +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 :=	wctype.c
-MOBJ :=	iswalnum.o iswalpha.o iswcntrl.o iswdigit.o iswgraph.o \
-	iswlower.o iswprint.o iswpunct.o iswspace.o iswupper.o \
-	iswxdigit.o iswblank.o wctrans.o towctrans.o \
-	wctype.o iswctype.o towlower.o towupper.o
-
-MOBJx=	iswalnum_l.o iswalpha_l.o iswcntrl_l.o iswdigit_l.o iswgraph_l.o \
-	iswlower_l.o iswprint_l.o iswpunct_l.o iswspace_l.o iswupper_l.o \
-	iswxdigit_l.o iswblank_l.o \
-	wctype_l.o iswctype_l.o wctrans_l.o towctrans_l.o towlower_l.o towupper_l.o
-
-OBJS = $(MOBJ)
-
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	OBJS += $(MOBJx)
-endif
-
-OBJ_LIST := ../../obj.misc.wctype
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/wctype/%, $^) > $@
-
-$(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/wordexp/Makefile b/libc/misc/wordexp/Makefile
index 203a23ca2..493484b27 100644
--- a/libc/misc/wordexp/Makefile
+++ b/libc/misc/wordexp/Makefile
@@ -1,37 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 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
-
-CSRC := wordexp.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.misc.wordexp
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, misc/wordexp/%, $^) > $@
-
-$(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/pwd_grp/Makefile b/libc/pwd_grp/Makefile
index 226eb2654..41567d9e9 100644
--- a/libc/pwd_grp/Makefile
+++ b/libc/pwd_grp/Makefile
@@ -1,64 +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 := pwd_grp.c
-MOBJ =	fgetpwent_r.o fgetgrent_r.o fgetpwent.o fgetgrent.o \
-	getpwnam_r.o getgrnam_r.o getpwuid_r.o getgrgid_r.o \
-	getpwuid.o getgrgid.o getpwnam.o getgrnam.o getpw.o \
-	getpwent_r.o getgrent_r.o getpwent.o getgrent.o \
-	initgroups.o putpwent.o putgrent.o \
-	__parsepwent.o __parsegrent.o __pgsreader.o
-
-ifeq ($(HAS_SHADOW),y)
-MOBJ +=	fgetspent_r.o fgetspent.o sgetspent_r.o getspnam_r.o \
-	getspnam.o getspent_r.o getspent.o sgetspent.o \
-	putspent.o __parsespent.o # getspuid_r.o getspuid.o
-endif
-
-CSRC =
-ifeq ($(HAS_SHADOW),y)
-CSRC += lckpwdf.c
-endif
-
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-OBJS := $(MOBJ) $(COBJ)
-
-OBJ_LIST := ../obj.pwd_grp
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, pwd_grp/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(COBJ): %.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/signal/Makefile b/libc/signal/Makefile
index 962403cd9..41567d9e9 100644
--- a/libc/signal/Makefile
+++ b/libc/signal/Makefile
@@ -1,43 +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
-
-CSRC := allocrtsig.c killpg.c raise.c sigaction.c sigaddset.c sigandset.c \
-	sigblock.c sigdelset.c sigempty.c sigfillset.c siggetmask.c sighold.c \
-	sigignore.c sigintr.c sigisempty.c sigismem.c sigjmp.c signal.c \
-	sigorset.c sigpause.c sigrelse.c sigset.c sigsetmask.c sigsetops.c \
-	sysv_signal.c sigwait.c
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../obj.signal
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, signal/%, $^) > $@
-
-$(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/stdio/Makefile b/libc/stdio/Makefile
index e55f1038c..41567d9e9 100644
--- a/libc/stdio/Makefile
+++ b/libc/stdio/Makefile
@@ -1,150 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
-# Copyright (C) 2004 Manuel Novoa III <mjn3@codepoet.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
-
-# Note: The *64.o objects are empty when compiled without large file support.
-
-# SUSv3 functions
-CSRC = fclose.c fcloseall.c fdopen.c fgetpos.c fopen.c freopen.c \
-	fseeko.c fsetpos.c ftello.c getdelim.c getline.c gets.c getw.c \
-	perror.c puts.c putw.c remove.c rewind.c setbuf.c setbuffer.c \
-	setlinebuf.c setvbuf.c ungetc.c \
-	printf.c vprintf.c vsprintf.c fprintf.c snprintf.c dprintf.c \
-	asprintf.c sprintf.c vasprintf.c vdprintf.c vsnprintf.c \
-	tmpfile.c tmpnam.c tmpnam_r.c popen.c tempnam.c ctermid.c
-
-# getc -> alias for fgetc
-# putc -> alias for fputc
-# rename is a syscall
-
-# Implementation support functions
-CSRC += _READ.c _WRITE.c _adjust_pos.c _fopen.c _fwrite.c \
-	_rfill.c _stdio.c _trans2r.c _trans2w.c _wcommit.c \
-	_cs_funcs.c _load_inttype.c _store_inttype.c _uintmaxtostr.c
-ifeq ($(UCLIBC_HAS_FLOATS),y)
-CSRC += _fpmaxtostr.c
-endif
-
-# stdio_ext.h functions
-CSRC += __fbufsize.c __flbf.c __fpending.c __fpurge.c __freadable.c \
-	__freading.c __fsetlocking.c __fwritable.c __fwriting.c _flushlbf.c
-
-# Other glibc extensions
-ifeq ($(UCLIBC_HAS_GLIBC_CUSTOM_STREAMS),y)
-CSRC += fopencookie.c fmemopen.c open_memstream.c
-endif
-
-# pthread functions
-CSRC += flockfile.c ftrylockfile.c funlockfile.c
-
-# Functions with unlocked versions
-CUSRC = clearerr.c feof.c ferror.c fflush.c fgetc.c fgets.c fileno.c \
-	fputc.c fputs.c fread.c fwrite.c getchar.c putchar.c
-# getc_unlocked -> alias for fgetc_unlocked
-# putc_unlocked -> alias for fputc_unlocked
-
-# Largefile functions
-CLOBJS = fgetpos64.o fopen64.o freopen64.o fseeko64.o fsetpos64.o ftello64.o
-# tmpfile64.o
-
-# vfprintf and support functions
-MSRC2=	vfprintf.c
-ifneq ($(USE_OLD_VFPRINTF),y)
-MOBJ2=	vfprintf.o \
-	_ppfs_init.o _ppfs_prepargs.o _ppfs_setargs.o _ppfs_parsespec.o \
-	register_printf_function.o parse_printf_format.o
-else
-MOBJ2=
-CSRC += old_vfprintf.c
-endif
-
-# vfscanf and support functions plus other *scanf funcs
-MSRC3=	scanf.c
-MOBJ3=	vfscanf.o __scan_cookie.o __psfs_parse_spec.o __psfs_do_numeric.o \
-	scanf.o sscanf.o fscanf.o vscanf.o vsscanf.o
-
-MWSRC=  wstdio.c
-MWOBJ=
-
-CWSRC =
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-CWSRC += _wfwrite.c fwprintf.c swprintf.c vswprintf.c vwprintf.c wprintf.c \
-	fwide.c ungetwc.c
-CUSRC += fgetwc.c getwchar.c fgetws.c fputwc.c putwchar.c fputws.c
-# getwc (fgetwc alias) getwc_unlocked (fgetwc_unlocked alias)
-# putwc (fputwc alias) putwc_unlocked (fputwc_unlocked alias)
-MOBJ2 += vfwprintf.o
-MOBJ3 += wscanf.o swscanf.o fwscanf.o vwscanf.o vswscanf.o vfwscanf.o
-endif
-
-CSRC += $(CUSRC)
-
-COBJ  = $(patsubst %.c,%.o, $(CSRC))
-CUOBJS = $(patsubst %.c,%_unlocked.o, $(CUSRC))
-CWOBJS = $(patsubst %.c,%.o, $(CWSRC))
-
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-COBJ += $(CWOBJS)
-endif
-
-OBJS = $(COBJ) $(CUOBJS) $(MOBJ2) $(MOBJ3) $(MWOBJ)
-
-ifeq ($(UCLIBC_HAS_LFS),y)
-OBJS += $(CLOBJS)
-endif
-
-ifeq ($(UCLIBC_HAS_THREADS),y)
-CFLAGS += $(PTINC)
-endif
-
-OBJ_LIST := ../obj.stdio
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, stdio/%, $^) > $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-%_unlocked.o : %.c
-	$(CC) $(CFLAGS) -D__DO_UNLOCKED -c $< -o $@
-
-%64.o : %.c
-	$(CC) $(CFLAGS) -D__DO_LARGEFILE -c $< -o $@
-
-$(MOBJ2): $(MSRC2)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ3): $(MSRC3)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MWOBJ): $(MWSRC)
-	$(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/stdlib/Makefile b/libc/stdlib/Makefile
index fa360e4c9..41567d9e9 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -1,144 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
 # 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 =
-ifeq ($(MALLOC),y)
-    DIRS += malloc
-endif
-ifeq ($(MALLOC_SIMPLE),y)
-    DIRS += malloc-simple
-endif
-ifeq ($(MALLOC_STANDARD),y)
-    DIRS += malloc-standard
-endif
-
-MSRC := stdlib.c
-MOBJ = abs.o labs.o atoi.o atol.o strtol.o strtoul.o _stdlib_strto_l.o \
-       qsort.o bsearch.o \
-       llabs.o atoll.o strtoll.o strtoull.o _stdlib_strto_ll.o
-# (aliases) strtoq.o strtouq.o
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-MOBJx = strtol_l.o strtoul_l.o _stdlib_strto_l_l.o \
-	 strtoll_l.o strtoull_l.o _stdlib_strto_ll_l.o
-endif
-
-MSRC1 := strtod.c
-MOBJ1 = 
-MOBJ1x =
-
-ifeq ($(UCLIBC_HAS_FLOATS),y)
-	MOBJ += atof.o
-	MOBJ1 += strtod.o strtof.o strtold.o __strtofpmax.o __fp_range_check.o
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	MOBJ1x += strtod_l.o strtof_l.o strtold_l.o __strtofpmax_l.o
-endif
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-	MOBJ1 += wcstod.o wcstof.o wcstold.o __wcstofpmax.o
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	MOBJ1x += wcstod_l.o wcstof_l.o wcstold_l.o __wcstofpmax_l.o
-endif
-endif
-endif
-
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-	MOBJ += mblen.o mbtowc.o wctomb.o mbstowcs.o wcstombs.o \
-		_stdlib_mb_cur_max.o _stdlib_wcsto_l.o _stdlib_wcsto_ll.o \
-		wcstol.o wcstoul.o wcstoll.o wcstoull.o
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	MOBJx += _stdlib_wcsto_l_l.o _stdlib_wcsto_ll_l.o \
-		 wcstol_l.o wcstoul_l.o wcstoll_l.o wcstoull_l.o
-endif
-endif
-# (aliases) wcstoq.o wcstouq.o
-# wcstod wcstof wcstold
-
-MSRC2 := atexit.c
-MOBJ2 = on_exit.o __cxa_atexit.o __cxa_finalize.o __exit_handler.o exit.o
-ifeq ($(COMPAT_ATEXIT),y)
-MOBJ2 += old_atexit.o
-endif
-
-CSRC = \
-	abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c mkstemp64.c \
-	rand.c random.c random_r.c setenv.c system.c div.c ldiv.c lldiv.c \
-	getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c drand48-iter.c jrand48.c \
-	jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c nrand48.c \
-	nrand48_r.c rand_r.c srand48.c srand48_r.c seed48.c seed48_r.c \
-	valloc.c posix_memalign.c a64l.c l64a.c
-ifeq ($(UCLIBC_HAS_FLOATS),y)
-	CSRC += drand48.c drand48_r.c erand48.c erand48_r.c
-endif
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(MOBJ) $(MOBJx) $(MOBJ1) $(MOBJ1x) $(MOBJ2) $(COBJ)
-
-NONSHARED_OBJS := atexit.o
-
-OBJ_LIST := ../obj.stdlib
-
-NONSHARED_OBJ_LIST := ../nonshared_obj.stdlib
-
-all: $(OBJ_LIST) $(NONSHARED_OBJ_LIST) subdirs
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, stdlib/%, $^) > $@
-
-$(NONSHARED_OBJ_LIST): $(NONSHARED_OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, stdlib/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJx): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-
-$(MOBJ1): $(MSRC1)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJ1x): $(MSRC1)
-	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-
-$(MOBJ2) atexit.o: $(MSRC2)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
-
-$(patsubst %, _dir_%, $(DIRS)) : dummy
-	$(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
-	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
-
-clean: subdirs_clean
-	$(RM) *.o *~ core
 
-.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/stdlib/malloc-simple/Makefile b/libc/stdlib/malloc-simple/Makefile
index 6f2d25e42..493484b27 100644
--- a/libc/stdlib/malloc-simple/Makefile
+++ b/libc/stdlib/malloc-simple/Makefile
@@ -1,43 +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
-#
-# 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 := alloc.c
-MOBJ := malloc.o realloc.o free.o calloc.o memalign.o
-
-OBJS := $(MOBJ)
-
-OBJ_LIST := ../../obj.stdlib.malloc-simple
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, stdlib/malloc-simple/%, $^) > $@
-
-$(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/stdlib/malloc-standard/Makefile b/libc/stdlib/malloc-standard/Makefile
index 1e3d358bc..493484b27 100644
--- a/libc/stdlib/malloc-standard/Makefile
+++ b/libc/stdlib/malloc-standard/Makefile
@@ -1,54 +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
-
-# Turn on malloc debugging if requested
-ifeq ($(UCLIBC_MALLOC_DEBUGGING),y)
-CFLAGS += -D__MALLOC_DEBUGGING
-endif
-
-ifeq ($(UCLIBC_HAS_THREADS),y)
-CFLAGS += $(PTINC)
-endif
-
-# calloc.c can be found at uClibc/libc/stdlib/calloc.c
-# valloc.c can be found at uClibc/libc/stdlib/valloc.c
-CSRC := malloc.c calloc.c realloc.c free.c memalign.c mallopt.c mallinfo.c
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.stdlib.malloc-standard
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, stdlib/malloc-standard/%, $^) > $@
-
-$(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/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index af67064fb..493484b27 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -1,57 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2002,03  NEC Electronics Corporation
-# Copyright (C) 2002,03  Miles Bader <miles@gnu.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 = malloc.c calloc.c free.c realloc.c memalign.c \
-	heap_alloc.c heap_alloc_at.c heap_free.c
-
-# Turn on malloc debugging if requested
-ifeq ($(UCLIBC_MALLOC_DEBUGGING),y)
-CSRC += malloc_debug.c heap_debug.c
-CFLAGS += -DMALLOC_DEBUGGING -DHEAP_DEBUGGING
-ifeq ($(UCLIBC_UCLINUX_BROKEN_MUNMAP),y)
-CFLAGS += -DMALLOC_MMB_DEBUGGING
-endif
-endif
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST := ../../obj.stdlib.malloc
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, stdlib/malloc/%, $^) > $@
-
-malloc.o free.o realloc.o memalign.o: malloc.h
-$(OBJS): heap.h
-
-# Depend on uClinux_config.h to cache changes in __UCLIBC_MALLOC_DEBUGGING__
-$(OBJS): %.o : %.c ../../../include/bits/uClibc_config.h
-	$(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/string/Makefile b/libc/string/Makefile
index 428902369..41567d9e9 100644
--- a/libc/string/Makefile
+++ b/libc/string/Makefile
@@ -2,93 +2,14 @@
 #
 # Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# Licensed under the GNU Library General Public License version 2 or later.
-# See the COPYING.LIB file in the toplevel for more information.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
 
 TOPDIR=../../
-include $(TOPDIR)Rules.mak
-
-DIRS=
-
-ifeq ($(UCLIBC_HAS_STRING_GENERIC_OPT),y)
-DIRS += generic
-endif
-
-ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
-ifeq ($(TARGET_ARCH),$(wildcard $(TARGET_ARCH)))
-DIRS += $(TARGET_ARCH)
-endif
-endif
-
-ALL_SUBDIRS = generic arm frv i386 mips powerpc sh64 sparc x86_64
-
-MSRC := wstring.c
-MOBJ := basename.o bcopy.o bzero.o dirname.o ffs.o memccpy.o memchr.o memcmp.o \
-	memcpy.o memmove.o mempcpy.o memrchr.o 	memset.o rawmemchr.o stpcpy.o \
-	stpncpy.o strcasecmp.o strcasestr.o strcat.o strchrnul.o strchr.o \
-	strcmp.o strcpy.o strcspn.o strdup.o strlen.o strncasecmp.o strncat.o \
-	strncmp.o strncpy.o strndup.o strnlen.o strpbrk.o strrchr.o strsep.o \
-	strspn.o strstr.o strtok.o strtok_r.o strerror.o __xpg_strerror_r.o \
-	_string_syserrmsgs.o __glibc_strerror_r.o \
-	_string_syssigmsgs.o sys_siglist.o strsignal.o psignal.o \
-	 __xpg_basename.o strlcat.o strlcpy.o sys_errlist.o memmem.o
-
-MOBJW = wcscasecmp.o wcscat.o wcschrnul.o wcschr.o wcscmp.o wcscpy.o wcscspn.o \
-	wcsdup.o wcslen.o wcsncasecmp.o wcsncat.o wcsncmp.o wcsncpy.o \
-	wcsnlen.o wcspbrk.o wcsrchr.o wcsspn.o wcsstr.o wcstok.o wmemchr.o \
-	wmemcmp.o wmemcpy.o wmemmove.o wmempcpy.o wmemset.o wcpcpy.o wcpncpy.o \
-	__wcslcpy.o \
-	wcsxfrm.o strxfrm.o # wcscoll strcoll.o
-
-MOBJx =
-MOBJWx =
-
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-	MOBJx += strcasecmp_l.o strncasecmp_l.o
-	MOBJWx += wcscasecmp_l.o wcsncasecmp_l.o wcsxfrm_l.o strxfrm_l.o
-endif
-
-#ffsl ffsll
-
-OBJS = $(MOBJ) $(MOBJx)
-
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-	OBJS += $(MOBJW) $(MOBJWx)
-endif
-
-OBJ_LIST := ../obj.string
-
-all: subdirs
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(MOBJx): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-
-$(MOBJW): $(MSRC)
-	$(CC) $(CFLAGS) -DWANT_WIDE -DL_$* $< -c -o $*.o
-
-$(MOBJWx): $(MSRC)
-	$(CC) $(CFLAGS) -DWANT_WIDE -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-
-$(COBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-clean: subdirs_clean
-	$(RM) *.o *~ core
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
-
-$(patsubst %, _dir_%, $(DIRS)) : $(OBJ_LIST)
-	$(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : 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/string/arm/Makefile b/libc/string/arm/Makefile
index fecc8fc1c..a7cbf6fa1 100644
--- a/libc/string/arm/Makefile
+++ b/libc/string/arm/Makefile
@@ -1,40 +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
-
-SSRC := _memcpy.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \
-	strcmp.S strlen.S strncmp.S
-SOBJ :=	$(patsubst %.S,%.o, $(SSRC))
-
-OBJS := $(SOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/string/frv/Makefile b/libc/string/frv/Makefile
index 2c837a404..a7cbf6fa1 100644
--- a/libc/string/frv/Makefile
+++ b/libc/string/frv/Makefile
@@ -1,39 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2004 Alexandre Oliva <aoliva@redhat.com>
+# 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
-
-SSRC :=	memcpy.S memset.S
-SOBJ :=	$(patsubst %.S,%.o, $(SSRC))
-
-OBJS := $(SOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/string/generic/Makefile b/libc/string/generic/Makefile
index 36039e488..493484b27 100644
--- a/libc/string/generic/Makefile
+++ b/libc/string/generic/Makefile
@@ -1,40 +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
-
-CSRC :=	memchr.c memcmp.c memcpy.c memmem.c memmove.c mempcpy.c memrchr.c \
-	memset.c rawmemchr.c strcat.c strchr.c strchrnul.c strcmp.c strcpy.c \
-	strcspn.c strlen.c strncat.c strncmp.c strncpy.c strnlen.c \
-	strrchr.c strsep.c strspn.c strstr.c strtok_r.c
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-OBJ_LIST=../../obj.string.generic
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/generic/%, $(OBJS)) > $@
-
-$(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/string/i386/Makefile b/libc/string/i386/Makefile
index f0bc8c4c1..a7cbf6fa1 100644
--- a/libc/string/i386/Makefile
+++ b/libc/string/i386/Makefile
@@ -1,41 +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 := string.c
-MOBJ := strcpy.o strncpy.o strcat.o strncat.o strcmp.o \
-	strncmp.o strchr.o strrchr.o strlen.o strnlen.o \
-	memcpy.o memmove.o memchr.o memset.o 
-
-OBJS := $(MOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(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.arch
+include $(top_srcdir)Makerules
diff --git a/libc/string/mips/Makefile b/libc/string/mips/Makefile
index 3a07fbe0f..a7cbf6fa1 100644
--- a/libc/string/mips/Makefile
+++ b/libc/string/mips/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
-
-SSRC := memcpy.S memset.S
-SOBJ := $(patsubst %.S,%.o, $(SSRC))
-
-OBJS := $(SOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/string/powerpc/Makefile b/libc/string/powerpc/Makefile
index b6a758187..a7cbf6fa1 100644
--- a/libc/string/powerpc/Makefile
+++ b/libc/string/powerpc/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 := string.c
-MOBJ := memcpy.o memmove.o memset.o bzero.o 
-
-OBJS := $(MOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(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.arch
+include $(top_srcdir)Makerules
diff --git a/libc/string/sh64/Makefile b/libc/string/sh64/Makefile
index b060c4c93..a7cbf6fa1 100644
--- a/libc/string/sh64/Makefile
+++ b/libc/string/sh64/Makefile
@@ -1,39 +1,15 @@
-# Makefile for uClibc's sh64 optimized string routines
+# Makefile for uClibc
 #
-# Copyright (C) 2003 Paul Mundt <lethal@linux-sh.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
-
-SSRC := memcpy.S memset.S strcpy.S strlen.S
-SOBJ := $(patsubst %.S,%.o, $(SSRC))
-
-OBJS := $(SOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/string/sparc/Makefile b/libc/string/sparc/Makefile
index 593158979..a7cbf6fa1 100644
--- a/libc/string/sparc/Makefile
+++ b/libc/string/sparc/Makefile
@@ -2,33 +2,14 @@
 #
 # Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# Licensed under the GNU Library General Public License version 2 or later.
-# See the COPYING.LIB file in the toplevel for more information.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := $(wildcard *.c)
-COBJ := $(patsubst %.c,%.o,$(CSRC))
-
-SSRC := $(wildcard *.S)
-SOBJ := $(patsubst %.S,%.o,$(SSRC))
-
-OBJS := $(COBJ) $(SOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/string/x86_64/Makefile b/libc/string/x86_64/Makefile
index 593158979..a7cbf6fa1 100644
--- a/libc/string/x86_64/Makefile
+++ b/libc/string/x86_64/Makefile
@@ -2,33 +2,14 @@
 #
 # Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# Licensed under the GNU Library General Public License version 2 or later.
-# See the COPYING.LIB file in the toplevel for more information.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
 
 TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC := $(wildcard *.c)
-COBJ := $(patsubst %.c,%.o,$(CSRC))
-
-SSRC := $(wildcard *.S)
-SOBJ := $(patsubst %.S,%.o,$(SSRC))
-
-OBJS := $(COBJ) $(SOBJ)
-
-OBJ_LIST := ../../obj.string.$(TARGET_ARCH)
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, string/$(TARGET_ARCH)/%, $^) > $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/sysdeps/Makefile b/libc/sysdeps/Makefile
index f0d2ebd72..41567d9e9 100644
--- a/libc/sysdeps/Makefile
+++ b/libc/sysdeps/Makefile
@@ -1,37 +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
-
-DIRS = linux
-
-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
+TOPDIR=../../
 
-.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/sysdeps/linux/Makefile b/libc/sysdeps/linux/Makefile
index 0e891d193..493484b27 100644
--- a/libc/sysdeps/linux/Makefile
+++ b/libc/sysdeps/linux/Makefile
@@ -1,42 +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
-
-ALL_SUBDIRS = arm common cris h8300 i386 m68k mips nios nios2 powerpc sh sh64 sparc v850
-
-all: common $(TARGET_ARCH)
-
-tags:
-	ctags -R
-
-common: dummy
-	$(MAKE) -C common
-
-$(TARGET_ARCH): common
-	$(MAKE) -C $(TARGET_ARCH)
-
-clean: subdirs_clean
-
-subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
-
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
-	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
-.PHONY: dummy $(TARGET_ARCH)
+top_srcdir=$(TOPDIR)
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 055dc08f0..b1bf1ef10 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -1,76 +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
-
-CRT_SRC := crt1.S
-CRT_OBJ := crt1.o
-SCRT_OBJ := Scrt1.o
-CTOR_TARGETS := $(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
-
-SSRC :=	__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \
-	bsd-_setjmp.S sigrestorer.S mmap64.S
-SOBJ :=	$(patsubst %.S,%.o, $(SSRC))
-
-CSRC :=	brk.c syscall.c ioperm.c iopl.c sigaction.c __syscall_error.c
-COBJ :=	$(patsubst %.c,%.o, $(CSRC))
-
-OBJS :=	$(SOBJ) $(COBJ)
-
-OBJ_LIST := ../../../obj.sysdeps.$(TARGET_ARCH)
-
-all: $(OBJ_LIST) $(CTOR_TARGETS)
-
-$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(INSTALL) -d $(TOPDIR)lib/
-	cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/
-	echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $@
-
-$(CRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o
-
-$(SCRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-ifeq ($(UCLIBC_CTOR_DTOR),y)
-$(TOPDIR)lib/crti.o: crti.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-
-$(TOPDIR)lib/crtn.o: crtn.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-else
-$(CTOR_TARGETS):
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(AR) $(ARFLAGS) $@
-endif
-
-headers:
-	$(LN) -fs ../libc/sysdeps/linux/arm/fpu_control.h $(TOPDIR)/include/
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 704f0350b..4f2969fcd 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -1,62 +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
-
-SRCS = $(wildcard *.c)
-
-ifeq ($(EXCLUDE_BRK),y)
-SRCS := $(filter-out sbrk.c,$(SRCS))
-endif
-
-SRCS := $(filter-out ssp-local.c,$(SRCS))
-ifneq ($(UCLIBC_HAS_SSP),y)
-SRCS := $(filter-out ssp.c,$(SRCS))
-NONSHARED_OBJ_LIST :=
-else
-NONSHARED_OBJ_LIST := ../../../nonshared_obj.sysdeps.common
-ssp.o: CFLAGS += $(SSP_DISABLE_FLAGS)
-ssp-local.o: CFLAGS += $(SSP_DISABLE_FLAGS)
-endif
-
-OBJS := $(patsubst %.c,%.o, $(SRCS))
-
-NONSHARED_OBJS := ssp-local.o
-
-OBJ_LIST := ../../../obj.sysdeps.common
-
-all: $(OBJ_LIST) $(NONSHARED_OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, sysdeps/linux/common/%, $^) > $@
-
-$(NONSHARED_OBJ_LIST): $(NONSHARED_OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, sysdeps/linux/common/%, $^) > $@
-
-$(OBJS) $(NONSHARED_OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-headers:
-	$(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h $(TOPDIR)/include/
-	$(LN) -fs ../libc/sysdeps/linux/common/dl-osinfo.h $(TOPDIR)/include/
 
-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/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index ea61b8f3a..b1bf1ef10 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -1,76 +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
-
-CRT_SRC := crt1.S
-CRT_OBJ := crt1.o
-SCRT_OBJ := Scrt1.o
-CTOR_TARGETS := $(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
-
-SSRC :=	__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \
-	bsd-_setjmp.S syscall.S mmap.S mmap64.S
-SOBJ :=	$(patsubst %.S,%.o, $(SSRC))
-
-CSRC :=	brk.c sigaction.c __syscall_error.c
-COBJ :=	$(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(SOBJ) $(COBJ)
-
-OBJ_LIST := ../../../obj.sysdeps.$(TARGET_ARCH)
-
-all: $(OBJ_LIST) $(CTOR_TARGETS)
-
-$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(INSTALL) -d $(TOPDIR)lib/
-	cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/
-	echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $@
-
-$(CRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o
-
-$(SCRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-ifeq ($(UCLIBC_CTOR_DTOR),y)
-$(TOPDIR)lib/crti.o: crti.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-
-$(TOPDIR)lib/crtn.o: crtn.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-else
-$(CTOR_TARGETS):
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(AR) $(ARFLAGS) $@
-endif
-
-headers:
-	$(LN) -fs ../libc/sysdeps/linux/i386/fpu_control.h $(TOPDIR)include/
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile
index a08bfa9f6..b1bf1ef10 100644
--- a/libc/sysdeps/linux/mips/Makefile
+++ b/libc/sysdeps/linux/mips/Makefile
@@ -1,79 +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
-
-CRT_SRC := crt1.S
-CRT_OBJ := crt1.o
-SCRT_OBJ := Scrt1.o
-CTOR_TARGETS := $(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
-
-SSRC := bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S syscall.S pipe.S
-SOBJ := $(patsubst %.S,%.o, $(SSRC))
-
-CSRC := __longjmp.c  brk.c setjmp_aux.c mmap.c __syscall_error.c \
-	cacheflush.c pread_write.c sysmips.c _test_and_set.c sigaction.c
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(SOBJ) $(COBJ)
-
-OBJ_LIST := ../../../obj.sysdeps.$(TARGET_ARCH)
-
-all: $(OBJ_LIST) $(CTOR_TARGETS)
-
-$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(INSTALL) -d $(TOPDIR)lib/
-	cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/
-	echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $@
-
-$(CRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o
-
-$(SCRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-ifeq ($(UCLIBC_CTOR_DTOR),y)
-$(TOPDIR)lib/crti.o: crti.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-
-$(TOPDIR)lib/crtn.o: crtn.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-else
-$(CTOR_TARGETS):
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(AR) $(ARFLAGS) $@
-endif
-
-headers:
-	$(LN) -fs ../libc/sysdeps/linux/mips/sgidefs.h $(TOPDIR)/include/
-#	$(LN) -fs ../libc/sysdeps/linux/mips/regdef.h $(TOPDIR)/include/
-	$(LN) -fs ../libc/sysdeps/linux/mips/fpu_control.h $(TOPDIR)/include/
 
-clean:
-	$(RM) *.o *~ core
-	$(RM) $(TOPDIR)/include/sgidefs.h
+top_srcdir=$(TOPDIR)
+top_builddir=../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index 2a1f9cf89..b1bf1ef10 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -1,76 +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
-
-CRT_SRC := crt1.S
-CRT_OBJ := crt1.o
-SCRT_OBJ := Scrt1.o
-CTOR_TARGETS := $(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
-
-SSRC := __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \
-	clone.S __uClibc_syscall.S syscall.S vfork.S
-SOBJ := $(patsubst %.S,%.o, $(SSRC))
-
-CSRC := mmap.c __syscall_error.c pread_write.c ioctl.c
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(SOBJ) $(COBJ)
-
-OBJ_LIST := ../../../obj.sysdeps.$(TARGET_ARCH)
-
-all: $(OBJ_LIST) $(CTOR_TARGETS)
-
-$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $@
-	$(INSTALL) -d $(TOPDIR)lib/
-	cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/
-
-$(CRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o
-
-$(SCRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-ifeq ($(UCLIBC_CTOR_DTOR),y)
-$(TOPDIR)lib/crti.o: crti.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-
-$(TOPDIR)lib/crtn.o: crtn.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-else
-$(CTOR_TARGETS):
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(AR) $(ARFLAGS) $@
-endif
-
-headers:
-	$(LN) -fs ../libc/sysdeps/linux/powerpc/fpu_control.h $(TOPDIR)/include/
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/sysdeps/linux/x86_64/Makefile b/libc/sysdeps/linux/x86_64/Makefile
index 9bad495a9..b1bf1ef10 100644
--- a/libc/sysdeps/linux/x86_64/Makefile
+++ b/libc/sysdeps/linux/x86_64/Makefile
@@ -2,74 +2,14 @@
 #
 # 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
-
-CRT_SRC := crt1.S
-CRT_OBJ := crt1.o
-SCRT_OBJ := Scrt1.o
-CTOR_TARGETS := $(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
-
-SSRC := __longjmp.S vfork.S setjmp.S syscall.S bsd-setjmp.S bsd-_setjmp.S clone.S
-SOBJ := $(patsubst %.S,%.o, $(SSRC))
-
-CSRC := brk.c sigaction.c __syscall_error.c mmap.c
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(SOBJ) $(COBJ)
-
-OBJ_LIST := ../../../obj.sysdeps.$(TARGET_ARCH)
-
-all: $(OBJ_LIST) $(CTOR_TARGETS)
-
-$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(INSTALL) -d $(TOPDIR)lib/
-	cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/
-	echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $@
-
-$(CRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o
-
-$(SCRT_OBJ): $(CRT_SRC)
-	$(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o
-
-$(SOBJ): %.o : %.S
-	$(CC) $(ASFLAGS) -c $< -o $@
-
-$(COBJ): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-ifeq ($(UCLIBC_CTOR_DTOR),y)
-$(TOPDIR)lib/crti.o: crti.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-
-$(TOPDIR)lib/crtn.o: crtn.S
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(CC) $(ASFLAGS) $(SSP_DISABLE_FLAGS) -c $< -o $@
-else
-$(CTOR_TARGETS):
-	$(INSTALL) -d $(TOPDIR)lib/
-	$(AR) $(ARFLAGS) $@
-endif
-
-headers:
-	$(LN) -fs ../libc/sysdeps/linux/x86_64/fpu_control.h $(TOPDIR)/include/
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.arch
+include $(top_srcdir)Makerules
diff --git a/libc/termios/Makefile b/libc/termios/Makefile
index 95210d7a9..41567d9e9 100644
--- a/libc/termios/Makefile
+++ b/libc/termios/Makefile
@@ -1,52 +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 := termios.c
-MOBJ := tcdrain.o tcflow.o tcflush.o tcsendbreak.o tcsetpgrp.o tcgetpgrp.o \
-	isatty.o cfgetospeed.o cfgetispeed.o cfsetospeed.o cfsetispeed.o \
-	cfmakeraw.o cfsetspeed.o
-
-CSRC := tcgetattr.c tcgetsid.c tcsetattr.c ttyname.c
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-OBJS := $(MOBJ) $(COBJ)
-
-OBJ_LIST := ../obj.termios
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, termios/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(COBJ): %.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/unistd/Makefile b/libc/unistd/Makefile
index 7512e8362..41567d9e9 100644
--- a/libc/unistd/Makefile
+++ b/libc/unistd/Makefile
@@ -1,57 +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 := exec.c
-MOBJ = execl.o execv.o execle.o execlp.o execvp.o
-
-CSRC =	sleep.c usleep.c ualarm.c getpass.c sysconf.c getlogin.c \
-	fpathconf.c confstr.c pathconf.c swab.c usershell.c \
-	getsubopt.c daemon.c
-
-ifneq ($(ARCH_HAS_MMU),y)
-MOBJ += __exec_alloc.o
-endif
-
-ifeq ($(UCLIBC_HAS_GNU_GETOPT),y)
-CSRC += getopt.c
-else
-CSRC += getopt-susv3.c
-endif
-
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-OBJS := $(COBJ) $(MOBJ)
-
-OBJ_LIST := ../obj.unistd
-
-all: $(OBJ_LIST)
-
-$(OBJ_LIST): $(OBJS)
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	echo $(patsubst %, unistd/%, $^) > $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-$(COBJ): %.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/libcrypt/Makefile b/libcrypt/Makefile
index 7e673494f..2dea1b3e9 100644
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -1,69 +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
-
-CFLAGS += $(SSP_ALL_CFLAGS)
-
-LIB_NAME := libcrypt
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC := $(wildcard *.c)
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-# psm: 20051007 gcc-4.1-head optimizes crypt()/__des_crypt() away
-# $(AR_LIB_NAME): $(LIB_NAME).o
-
-$(AR_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(LIB_NAME).o: $(CSRC)
-	$(CC) $(CFLAGS) -o $@ -c $^
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libintl/Makefile b/libintl/Makefile
index 8fe45f56e..2dea1b3e9 100644
--- a/libintl/Makefile
+++ b/libintl/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
-
-CFLAGS += $(SSP_ALL_CFLAGS)
-
-LIB_NAME := libintl
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-MSRC := intl.c
-MOBJ := gettext.o ngettext.o  dgettext.o dcgettext.o dngettext.o dcngettext.o \
-	textdomain.o bindtextdomain.o bind_textdomain_codeset.o \
-	_nl_expand_alias.o _nl_msg_cat_cntr.o # glibc-isms
-
-OBJS := $(MOBJ)
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(MOBJ): $(MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libm/Makefile b/libm/Makefile
index 73101be89..2dea1b3e9 100644
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -1,128 +1,15 @@
-# Makefile for uClibc's math library
+# Makefile for uClibc
 #
-# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# The routines included in this math library are derived from the
-# math library for Apple's MacOS X/Darwin math library, which was
-# itself swiped from FreeBSD.  The original copyright information
-# is as follows:
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-#     Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-#
-#     Developed at SunPro, a Sun Microsystems, Inc. business.
-#     Permission to use, copy, modify, and distribute this
-#     software is freely granted, provided that this notice
-#     is preserved.
-#
-# It has been ported to work with uClibc and generally behave
-# by Erik Andersen <andersen@codepoet.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.
-#
-# 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
-
-CFLAGS += $(SSP_ALL_CFLAGS)
-
-CFLAGS += -D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE
-
-LIB_NAME := libm
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-FL_MSRC := float_wrappers.c
-
-ifeq ($(DO_C99_MATH),y)
-CSRC :=  e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c\
-         e_exp.c e_fmod.c e_gamma.c e_gamma_r.c e_hypot.c e_j0.c\
-         e_j1.c e_jn.c e_lgamma.c e_lgamma_r.c e_log.c e_log10.c\
-         e_pow.c e_remainder.c e_rem_pio2.c e_scalb.c e_sinh.c\
-         e_sqrt.c k_cos.c k_rem_pio2.c k_sin.c k_standard.c k_tan.c\
-         s_asinh.c s_atan.c s_cbrt.c s_ceil.c s_copysign.c s_cos.c\
-         s_erf.c s_expm1.c s_fabs.c s_finite.c s_floor.c s_frexp.c\
-         s_ilogb.c s_ldexp.c s_lib_version.c s_log1p.c s_logb.c\
-         s_matherr.c s_modf.c s_nextafter.c s_rint.c s_scalbn.c\
-         s_signgam.c s_significand.c s_sin.c s_tan.c s_tanh.c\
-         w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c w_cabs.c\
-         w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c w_gamma_r.c\
-         w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c w_lgamma_r.c\
-         w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c\
-         w_sqrt.c fpmacros.c nan.c
-FL_MOBJ := acosf.o acoshf.o asinf.o asinhf.o atan2f.o atanf.o atanhf.o cbrtf.o \
-	ceilf.o copysignf.o cosf.o coshf.o erfcf.o erff.o exp2f.o expf.o \
-	expm1f.o fabsf.o fdimf.o floorf.o fmaf.o fmaxf.o fminf.o fmodf.o \
-	frexpf.o hypotf.o ilogbf.o ldexpf.o lgammaf.o log10f.o log1pf.o \
-	log2f.o logbf.o logf.o lrintf.o lroundf.o modff.o nearbyintf.o \
-	nextafterf.o powf.o remainderf.o remquof.o rintf.o roundf.o \
-	scalblnf.o scalbnf.o sinf.o sinhf.o sqrtf.o tanf.o tanhf.o \
-	tgammaf.o truncf.o
-else
-# This list of math functions was taken from POSIX/IEEE 1003.1b-1993
-CSRC :=  w_acos.c w_asin.c s_atan.c w_atan2.c s_ceil.c s_cos.c \
-	 w_cosh.c w_exp.c s_fabs.c s_floor.c w_fmod.c s_frexp.c \
-	 s_ldexp.c w_log.c w_log10.c s_modf.c w_pow.c s_sin.c \
-	 w_sinh.c w_sqrt.c s_tan.c s_tanh.c \
-	 s_expm1.c s_scalbn.c s_copysign.c e_acos.c e_asin.c e_atan2.c \
-	 k_cos.c e_cosh.c e_exp.c e_fmod.c e_log.c e_log10.c e_pow.c \
-	 k_sin.c e_sinh.c e_sqrt.c k_tan.c e_rem_pio2.c k_rem_pio2.c \
-	 s_finite.c
-# We'll add sqrtf to avoid problems with libstdc++
-FL_MOBJ := sqrtf.o
-endif
-
-ifeq ($(HAS_FPU),y)
-ifeq ($(DO_C99_MATH),y)
-ARCH_CSRC := $(wildcard $(TARGET_ARCH)/*.c)
-ARCH_OBJS := $(patsubst %.c,%.o, $(ARCH_CSRC))
-endif
-endif
-
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-OBJS := $(COBJ) $(FL_MOBJ)
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS) $(ARCH_OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(ARCH_OBJS)
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(COBJ) $(ARCH_OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(FL_MOBJ): $(FL_MSRC)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-
-tags:
-	ctags -R
 
-clean:
-	$(RM) *.o */*.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libnsl/Makefile b/libnsl/Makefile
index b7367fb57..2dea1b3e9 100644
--- a/libnsl/Makefile
+++ b/libnsl/Makefile
@@ -1,58 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2002-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
-
-CFLAGS += $(SSP_ALL_CFLAGS)
-
-LIB_NAME := libnsl
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC := $(wildcard *.c)
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/Makefile b/libpthread/Makefile
index 28ac45e73..2dea1b3e9 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -1,71 +1,15 @@
-# Makefile for uClibc's pthread library
+# 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
-
-ALL_SUBDIRS = $(PTNAME) $(PTNAME)_db
-DIRS = $(PTNAME)
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	DIRS += $(PTNAME)_db
-endif
-
-all: subdirs
-
-# NPTL does not have a generic pthreadtypes.h
-# and each arch has to have both semaphore.h/pthreadtypes.h ?
-headers:
-	$(LN) -sf $(PTDIR)/sysdeps/pthread/pthread.h $(TOPDIR)include/
-	$(LN) -sf $(PTDIR)/semaphore.h $(TOPDIR)include/
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(LN) -sf $(PTDIR)_db/thread_db.h $(TOPDIR)include/
-endif
-ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-	$(LN) -sf ../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/semaphore.h $(TOPDIR)include/bits/
-	$(LN) -sf ../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h $(TOPDIR)include/bits/
-	$(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/libc-lock.h $(TOPDIR)include/bits/
-	$(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/stdio-lock.h $(TOPDIR)include/bits/
-else
-	$(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(TOPDIR)include/bits/
-endif
-
-tags:
-	ctags -R
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
-
-$(patsubst %, _dir_%, $(DIRS)) : headers
-	$(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
-	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
-
-headers_clean:
-	$(RM)	$(TOPDIR)include/pthread.h $(TOPDIR)include/semaphore.h \
-		$(TOPDIR)include/thread_db.h \
-		$(TOPDIR)include/bits/pthreadtypes.h $(TOPDIR)include/bits/semaphore.h \
-		$(TOPDIR)include/bits/libc-lock.h $(TOPDIR)include/bits/stdio-lock
-ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-	$(RM)	$(PTNAME)/version.h $(PTDIR)/banner.h \
-		$(PTDIR)/sysdeps/unix/sysv/linux/rtld-libc-lowlevellock.c
-endif
-
-clean: subdirs_clean headers_clean
 
-.PHONY: dummy
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile
index 78364d785..f92f205a5 100644
--- a/libpthread/linuxthreads/Makefile
+++ b/libpthread/linuxthreads/Makefile
@@ -1,87 +1,15 @@
-# Makefile for uClibc's pthread library
+# Makefile for uClibc
 #
-# Copyright (C) 2002 Erik Andersen <andersen@uclibc.org>
-# Copyright (C) 2003 Paul Mundt <lethal@linux-sh.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
-
-CFLAGS+=$(SSP_ALL_CFLAGS)
-
-# This stuff will not compile without at least -O1
-CFLAGS :=$(CFLAGS:-O0=-O1)
-
-# Get the thread include dependencies
-CFLAGS += $(PTINC)
-
-ARCH_CFLAGS := $(CFLAGS)
-
-ifeq ($(UCLIBC_CTOR_DTOR),y)
-SHARED_START_FILES = $(TOPDIR)lib/crti.o $(LIBGCC_DIR)crtbeginS.o
-SHARED_END_FILES = $(LIBGCC_DIR)crtendS.o $(TOPDIR)lib/crtn.o
-endif
-
-LIB_NAME := libpthread
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-ARCH_CSRC := $(wildcard sysdeps/$(TARGET_ARCH)/*.c)
-ARCH_OBJS := $(patsubst %.c,%.o, $(ARCH_CSRC))
--include sysdeps/$(TARGET_ARCH)/Makefile.arch
-
-CSRC = $(wildcard *.c)
-ifneq ($(UCLIBC_HAS_XLOCALE),y)
-CSRC := $(filter-out locale.c,$(CSRC))
-endif
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS) $(ARCH_OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-	$(STRIPTOOL) -X --strip-debug -R .note -R .comment $^
-else
-	$(STRIPTOOL) -x -R .note -R .comment $^
-endif
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(ARCH_OBJS)
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS_NOSTRIP) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) $(SHARED_START_FILES) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) $(SHARED_END_FILES)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(ARCH_OBJS): %.o : %.c
-	$(CC) $(ARCH_CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o sysdeps/*/*.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile
index 5f9a39705..f92f205a5 100644
--- a/libpthread/linuxthreads_db/Makefile
+++ b/libpthread/linuxthreads_db/Makefile
@@ -1,64 +1,15 @@
-# Makefile for uClibc's pthread library
+# 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
-
-#CFLAGS+=$(SSP_ALL_CFLAGS)
-
-LIB_NAME := libthread_db
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-# Get the thread include dependencies and shared object name
-CFLAGS += $(PTINC) -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
-
-# Remove any -z defs since this lib will have undefined symbols
-LDFLAGS := $(subst -z defs,,$(LDFLAGS)) --warn-unresolved-symbols
-
-CSRC := $(wildcard *.c)
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).1 $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.1 \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).1
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libresolv/Makefile b/libresolv/Makefile
index 0b039de91..2dea1b3e9 100644
--- a/libresolv/Makefile
+++ b/libresolv/Makefile
@@ -1,63 +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
-
-CFLAGS += $(SSP_ALL_CFLAGS)
-
-LIB_NAME := libresolv
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC := $(wildcard *.c)
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/librt/Makefile b/librt/Makefile
index febc845aa..2dea1b3e9 100644
--- a/librt/Makefile
+++ b/librt/Makefile
@@ -1,60 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2002-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
-
-CFLAGS += $(SSP_ALL_CFLAGS)
-
-LIB_NAME := librt
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-# uClibc's librt lacks all aio routines, all clock routines,
-# and all shm routines
-CSRC := $(wildcard *.c)
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libutil/Makefile b/libutil/Makefile
index 97b9d3913..2dea1b3e9 100644
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -1,72 +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
-
-CFLAGS += $(SSP_ALL_CFLAGS)
-
-LIB_NAME := libutil
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC = $(wildcard *.c)
-ifneq ($(ARCH_HAS_MMU),y)
-CSRC := $(filter-out forkpty.c,$(CSRC))
-endif
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-# psm: 20051007 gcc-4.1-head optimizes crypt()/__des_crypt() away
-# $(AR_LIB_NAME): $(LIB_NAME).o
-
-$(AR_LIB_NAME): $(OBJS)
-	$(INSTALL) -d $(TOPDIR)lib
-	$(RM) $@
-	$(STRIPTOOL) -x -R .note -R .comment $^
-	$(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
-	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
-	$(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
-		-o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
-		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-	$(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
-	$(LN) -sf $(SO_FULL_NAME) $@
-
-$(LIB_NAME).o: $(CSRC)
-	$(CC) $(CFLAGS) -o $@ -c $^
-
-$(OBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
 
-clean:
-	$(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules