Fix all the makefiles. Clean up some warnings, cleanup some headers.

 -Erik

1 files changed, 39 insertions, 47 deletions

diff --git a/Makefile b/Makefile
index d47ad04ce..442083cba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,62 +1,54 @@
-DIRS = headers error getent malloc-simple misc regex stdio2 \
+# Makefile for uCLibc
+#
+# Copyright (C) 2000 by Lineo, inc.
+#
+# 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 General Public License for more
+# details.
+#
+# You should have received a copy of the GNU 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.
+
+DIRS = error getent malloc misc regex stdio \
 	    string termios time sysdeps #rpc
-
 all: libc.a
 
-libc.a: $(DIRS) dummy
+libc.a: subdirs headers
 	@echo
 	@echo Finally finished compiling...
 	@echo
 	$(CROSS)ranlib $@
 
-headers: dummy
-	if [ ! -L "include/asm" ]; then ln -s /usr/src/linux/include/asm include/asm ; fi
-	if [ ! -L "include/net" ]; then ln -s /usr/src/linux/include/net include/net ; fi
-	if [ ! -L "include/linux" ]; then ln -s /usr/src/linux/include/linux include/linux ; fi
-
-error: dummy
-	make -C error
-
-getent: dummy
-	make -C getent
-
-malloc-simple: dummy
-	make -C malloc-simple
-
-misc: dummy
-	make -C misc
-
-net: dummy
-	make -C net
-
-regex: dummy
-	make -C regex
-
-rpc: dummy
-	make -C rpc
 
-stdio2: dummy
-	make -C stdio2
-
-string: dummy
-	make -C string
-
-sysdeps: dummy
-	make -C sysdeps
-
-termios: dummy
-	make -C termios
-
-time: dummy
-	make -C time
+headers: dummy
+	@if [ ! -L "include/asm" ]; then ln -s /usr/src/linux/include/asm include/asm ; fi
+	@if [ ! -L "include/net" ]; then ln -s /usr/src/linux/include/net include/net ; fi
+	@if [ ! -L "include/linux" ]; then ln -s /usr/src/linux/include/linux include/linux ; fi
 
 tags:
 	ctags -R
 	
-dummy:
+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
 
-clean:
-	-rm -f `find -name \*.[oa]` `find -name \*~` core
-	-rm -rf include/asm include/net include/linux
-	make -C test clean
+.PHONY: dummy