Ok, this should finish off my massive ro-organization. The source

tree is less messy now (which helps), all libraries are placed into
uClibc/lib when compiling, all libraries now use a consistant mechanism
for being built, all libraries use a consistant naming scheme where the
lib name includes the uClibc version number, which makes ldconfig
happy and willing to work with us.
 -Erik

17 files changed, 17 insertions, 34 deletions

diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index de8b9b3f5..7733c5b80 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../
+TOPDIR=../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 
 DIRS = assert ctype dirent fnmatch glob internals lsearch mntent syslog \
diff --git a/libc/misc/assert/Makefile b/libc/misc/assert/Makefile
index d6023490f..ad08d3dc9 100644
--- a/libc/misc/assert/Makefile
+++ b/libc/misc/assert/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=__assert.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/ctype/Makefile b/libc/misc/ctype/Makefile
index a9d5837e5..e0343ba00 100644
--- a/libc/misc/ctype/Makefile
+++ b/libc/misc/ctype/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 MSRC=ctype.c
 MOBJ= isalnum.o isalpha.o isascii.o iscntrl.o isdigit.o isgraph.o \
diff --git a/libc/misc/dirent/Makefile b/libc/misc/dirent/Makefile
index 8de2054b6..23b024b63 100644
--- a/libc/misc/dirent/Makefile
+++ b/libc/misc/dirent/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=alphasort.c closedir.c dirfd.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c telldir.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/fnmatch/Makefile b/libc/misc/fnmatch/Makefile
index ce2ac2a47..d5484f864 100644
--- a/libc/misc/fnmatch/Makefile
+++ b/libc/misc/fnmatch/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=fnmatch.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/glob/Makefile b/libc/misc/glob/Makefile
index 8254381ea..d6ea09b7e 100644
--- a/libc/misc/glob/Makefile
+++ b/libc/misc/glob/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=glob.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile
index b5d23f734..2d0be502c 100644
--- a/libc/misc/internals/Makefile
+++ b/libc/misc/internals/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=ultostr.c ltostr.c __uClibc_main.c tempname.c
 ifeq ($(HAS_FLOATS),true)
diff --git a/libc/misc/locale/Makefile b/libc/misc/locale/Makefile
index a54a0e38a..e90ada064 100644
--- a/libc/misc/locale/Makefile
+++ b/libc/misc/locale/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=locale.c localeconv.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/lock/Makefile b/libc/misc/lock/Makefile
index 041ca5404..e197bbb52 100644
--- a/libc/misc/lock/Makefile
+++ b/libc/misc/lock/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=flock.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/lsearch/Makefile b/libc/misc/lsearch/Makefile
index 5ea47e14d..6506c8c49 100644
--- a/libc/misc/lsearch/Makefile
+++ b/libc/misc/lsearch/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=lsearch.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/mntent/Makefile b/libc/misc/mntent/Makefile
index ee163c182..297e19f1f 100644
--- a/libc/misc/mntent/Makefile
+++ b/libc/misc/mntent/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=mntent.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/regex/Makefile b/libc/misc/regex/Makefile
index 89912aa74..30d9d4da0 100644
--- a/libc/misc/regex/Makefile
+++ b/libc/misc/regex/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=regex.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/syslog/Makefile b/libc/misc/syslog/Makefile
index a52d413ed..deca334f2 100644
--- a/libc/misc/syslog/Makefile
+++ b/libc/misc/syslog/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=syslog.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/misc/sysvipc/Makefile b/libc/misc/sysvipc/Makefile
index 326535576..d94531788 100644
--- a/libc/misc/sysvipc/Makefile
+++ b/libc/misc/sysvipc/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 DIRS=
 
diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile
index 25dbab14e..4ac8976a1 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=localtime.c gmtime.c asctime.c ctime.c asc_conv.c tm_conv.c mktime.c \
 	localtime_r.c gmtime_r.c asctime_r.c ctime_r.c utimes.c adjtime.c \
diff --git a/libc/misc/tsearch/Makefile b/libc/misc/tsearch/Makefile
index c897d2781..3055f6458 100644
--- a/libc/misc/tsearch/Makefile
+++ b/libc/misc/tsearch/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 MSRC=tsearch.c
 MOBJ=tsearch.o tfind.o tdelete.o twalk.o
diff --git a/libc/misc/utmp/Makefile b/libc/misc/utmp/Makefile
index 01b070f3e..438b5bd78 100644
--- a/libc/misc/utmp/Makefile
+++ b/libc/misc/utmp/Makefile
@@ -20,9 +20,8 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-TOPDIR=../../
+TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
 
 CSRC=utent.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))