Replace all Makefiles for new build infrastucture

56 files changed, 448 insertions, 2810 deletions

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