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

4 files changed, 14 insertions, 19 deletions

diff --git a/libm/Makefile b/libm/Makefile
index 7227e664f..419e365c2 100644
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -1,7 +1,9 @@
 # Makefile for uClibc's math library
-#
 # Copyright (C) 2001 by Lineo, inc.
 #
+# This math library is derived primarily from the Cephes Math Library,
+# copyright by Stephen L. Moshier <moshier@world.std.com>
+#
 # 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
@@ -16,9 +18,6 @@
 # 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
@@ -55,7 +54,8 @@ tags:
 shared: all
 	@if [ -f $(LIBM) ] ; then \
 		$(TARGET_CC) $(LDFLAGS) -shared -o $(LIBM_SHARED_FULLNAME) \
-		    -Wl,-soname,$(LIBM_SHARED).$(MAJOR_VERSION) $(OBJS) $(TOPDIR)$(SHARED_FULLNAME); \
+		    -Wl,-soname,$(LIBM_SHARED).$(MAJOR_VERSION) -Wl,--whole-archive \
+		    $(LIBM) $(TOPDIR)lib/$(SHARED_FULLNAME); \
 		install -d $(TOPDIR)lib; \
 		rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
 		install -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
diff --git a/libm/double/Makefile b/libm/double/Makefile
index be3c5878a..b64116df8 100644
--- a/libm/double/Makefile
+++ b/libm/double/Makefile
@@ -1,7 +1,9 @@
 # Makefile for uClibc's math library
-#
 # Copyright (C) 2001 by Lineo, inc.
 #
+# This math library is derived primarily from the Cephes Math Library,
+# copyright by Stephen L. Moshier <moshier@world.std.com>
+#
 # 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
@@ -16,9 +18,6 @@
 # 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
diff --git a/libm/float/Makefile b/libm/float/Makefile
index 389ac1a5d..bae5fecea 100644
--- a/libm/float/Makefile
+++ b/libm/float/Makefile
@@ -1,7 +1,9 @@
 # Makefile for uClibc's math library
-#
 # Copyright (C) 2001 by Lineo, inc.
 #
+# This math library is derived primarily from the Cephes Math Library,
+# copyright by Stephen L. Moshier <moshier@world.std.com>
+#
 # 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
@@ -16,9 +18,6 @@
 # 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
@@ -40,8 +39,6 @@ CSRC= acoshf.c airyf.c asinf.c asinhf.c atanf.c \
 	struvef.c tandgf.c tanf.c tanhf.c ynf.c zetaf.c \
 	zetacf.c polevlf.c setprec.c mtherr.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
-
-
 OBJS=$(COBJS)
 
 all: $(OBJS) $(LIBM)
diff --git a/libm/ldouble/Makefile b/libm/ldouble/Makefile
index 43395a140..04b3aacac 100644
--- a/libm/ldouble/Makefile
+++ b/libm/ldouble/Makefile
@@ -1,7 +1,9 @@
 # Makefile for uClibc's math library
-#
 # Copyright (C) 2001 by Lineo, inc.
 #
+# This math library is derived primarily from the Cephes Math Library,
+# copyright by Stephen L. Moshier <moshier@world.std.com>
+#
 # 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
@@ -16,9 +18,6 @@
 # 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