diff -Naur libc-0.0.3.orig/src/Makefile libc-0.0.3/src/Makefile
--- libc-0.0.3.orig/src/Makefile	2009-11-11 10:34:58.000000000 +0100
+++ libc-0.0.3/src/Makefile	2009-11-16 02:07:08.000000000 +0100
@@ -1,5 +1,5 @@
 SUBDIRS	= dl kernel/linux kernel/freebsd kernel/netbsd kernel/openbsd kernel/solaris math pthread socket
-TARGETS	= libc.a libc.so start.o
+TARGETS	= libc.la start.o
 PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
@@ -13,6 +13,7 @@
 AR	= ar -rc
 RANLIB	= ranlib
 LD	= $(CC) -nostdlib -shared
+LIBTOOL	= libtool
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
@@ -24,148 +25,142 @@
 subdirs:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
 
-libc_OBJS = ctype.o dirent.o errno.o fcntl.o float.o fnmatch.o grp.o iconv.o langinfo.o libgen.o locale.o poll.o pwd.o search.o setjmp.o signal.o stdlib.o stdio.o string.o strings.o stropts.o sys/ipc.o sys/mman.o sys/mount.o sys/reboot.o sys/resource.o sys/select.o sys/shm.o sys/stat.o sys/statvfs.o sys/time.o sys/times.o sys/utsname.o sys/wait.o syscalls.o syslog.o termios.o time.o ucontext.o unistd.o utime.o utmpx.o
+libc_OBJS = ctype.lo dirent.lo errno.lo fcntl.lo float.lo fnmatch.lo grp.lo iconv.lo langinfo.lo libgen.lo locale.lo poll.lo pwd.lo search.lo setjmp.lo signal.lo stdlib.lo stdio.lo string.lo strings.lo stropts.lo sys/ipc.lo sys/mman.lo sys/mount.lo sys/reboot.lo sys/resource.lo sys/select.lo sys/shm.lo sys/stat.lo sys/statvfs.lo sys/time.lo sys/times.lo sys/utsname.lo sys/wait.lo syscalls.lo syslog.lo termios.lo time.lo ucontext.lo unistd.lo utime.lo utmpx.lo
 libc_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libc_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `$(CC) -print-libgcc-file-name`
-
+libc_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `$(CC) -print-libgcc-file-name` -Xcompiler -nostdlib
 libc_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS)
 
-libc.a: $(libc_OBJS)
-	$(AR) libc.a $(libc_OBJS)
-	$(RANLIB) libc.a
-
-libc.so: $(libc_OBJS)
-	$(LD) -o libc.so -Wl,-soname,libc.so.0 $(libc_OBJS) `$(CC) -print-libgcc-file-name`
-
+libc.la: $(libc_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -o libc.la $(libc_OBJS) `$(CC) -print-libgcc-file-name` -Xcompiler -nostdlib -rpath $(LIBDIR) $(libc_LDFLAGS)
 
 start.o_OBJS = start.o
 start.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS)
 
-ctype.o: ctype.c
-	$(CC) $(libc_CFLAGS) -c ctype.c
+ctype.o ctype.lo: ctype.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c ctype.c
 
-dirent.o: dirent.c
-	$(CC) $(libc_CFLAGS) -c dirent.c
+dirent.o dirent.lo: dirent.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c dirent.c
 
-errno.o: errno.c
-	$(CC) $(libc_CFLAGS) -c errno.c
+errno.o errno.lo: errno.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c errno.c
 
-fcntl.o: fcntl.c syscalls.h
-	$(CC) $(libc_CFLAGS) -c fcntl.c
+fcntl.o fcntl.lo: fcntl.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c fcntl.c
 
-float.o: float.c
-	$(CC) $(libc_CFLAGS) -c float.c
+float.o float.lo: float.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c float.c
 
-fnmatch.o: fnmatch.c
-	$(CC) $(libc_CFLAGS) -c fnmatch.c
+fnmatch.o fnmatch.lo: fnmatch.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c fnmatch.c
 
-grp.o: grp.c
-	$(CC) $(libc_CFLAGS) -c grp.c
+grp.o grp.lo: grp.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c grp.c
 
-iconv.o: iconv.c
-	$(CC) $(libc_CFLAGS) -c iconv.c
+iconv.o iconv.lo: iconv.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c iconv.c
 
-langinfo.o: langinfo.c
-	$(CC) $(libc_CFLAGS) -c langinfo.c
+langinfo.o langinfo.lo: langinfo.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c langinfo.c
 
-libgen.o: libgen.c
-	$(CC) $(libc_CFLAGS) -c libgen.c
+libgen.o libgen.lo: libgen.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c libgen.c
 
-locale.o: locale.c
-	$(CC) $(libc_CFLAGS) -c locale.c
+locale.o locale.lo: locale.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c locale.c
 
-poll.o: poll.c
-	$(CC) $(libc_CFLAGS) -c poll.c
+poll.o poll.lo: poll.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c poll.c
 
-pwd.o: pwd.c
-	$(CC) $(libc_CFLAGS) -c pwd.c
+pwd.o pwd.lo: pwd.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c pwd.c
 
-search.o: search.c
-	$(CC) $(libc_CFLAGS) -c search.c
+search.o search.lo: search.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c search.c
 
-setjmp.o: setjmp.c
-	$(CC) $(libc_CFLAGS) -c setjmp.c
+setjmp.o setjmp.lo: setjmp.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c setjmp.c
 
-signal.o: signal.c
-	$(CC) $(libc_CFLAGS) -c signal.c
+signal.o signal.lo: signal.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c signal.c
 
-stdlib.o: stdlib.c
-	$(CC) $(libc_CFLAGS) -c stdlib.c
+stdlib.o stdlib.lo: stdlib.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c stdlib.c
 
-stdio.o: stdio.c
-	$(CC) $(libc_CFLAGS) -c stdio.c
+stdio.o stdio.lo: stdio.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c stdio.c
 
-string.o: string.c
-	$(CC) $(libc_CFLAGS) -c string.c
+string.o string.lo: string.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c string.c
 
-strings.o: strings.c
-	$(CC) $(libc_CFLAGS) -c strings.c
+strings.o strings.lo: strings.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c strings.c
 
-stropts.o: stropts.c
-	$(CC) $(libc_CFLAGS) -c stropts.c
+stropts.o stropts.lo: stropts.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c stropts.c
 
-sys/ipc.o: sys/ipc.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/ipc.o -c sys/ipc.c
+sys/ipc.o sys/ipc.lo: sys/ipc.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/ipc.o -c sys/ipc.c
 
-sys/mman.o: sys/mman.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/mman.o -c sys/mman.c
+sys/mman.o sys/mman.lo: sys/mman.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/mman.o -c sys/mman.c
 
-sys/mount.o: sys/mount.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/mount.o -c sys/mount.c
+sys/mount.o sys/mount.lo: sys/mount.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/mount.o -c sys/mount.c
 
-sys/reboot.o: sys/reboot.c
-	$(CC) $(libc_CFLAGS) -o sys/reboot.o -c sys/reboot.c
+sys/reboot.o sys/reboot.lo: sys/reboot.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/reboot.o -c sys/reboot.c
 
-sys/resource.o: sys/resource.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/resource.o -c sys/resource.c
+sys/resource.o sys/resource.lo: sys/resource.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/resource.o -c sys/resource.c
 
-sys/select.o: sys/select.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/select.o -c sys/select.c
+sys/select.o sys/select.lo: sys/select.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/select.o -c sys/select.c
 
-sys/shm.o: sys/shm.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/shm.o -c sys/shm.c
+sys/shm.o sys/shm.lo: sys/shm.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/shm.o -c sys/shm.c
 
-sys/stat.o: sys/stat.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/stat.o -c sys/stat.c
+sys/stat.o sys/stat.lo: sys/stat.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/stat.o -c sys/stat.c
 
-sys/statvfs.o: sys/statvfs.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/statvfs.o -c sys/statvfs.c
+sys/statvfs.o sys/statvfs.lo: sys/statvfs.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/statvfs.o -c sys/statvfs.c
 
-sys/time.o: sys/time.c
-	$(CC) $(libc_CFLAGS) -o sys/time.o -c sys/time.c
+sys/time.o sys/time.lo: sys/time.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/time.o -c sys/time.c
 
-sys/times.o: sys/times.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/times.o -c sys/times.c
+sys/times.o sys/times.lo: sys/times.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/times.o -c sys/times.c
 
-sys/utsname.o: sys/utsname.c
-	$(CC) $(libc_CFLAGS) -o sys/utsname.o -c sys/utsname.c
+sys/utsname.o sys/utsname.lo: sys/utsname.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/utsname.o -c sys/utsname.c
 
-sys/wait.o: sys/wait.c syscalls.h
-	$(CC) $(libc_CFLAGS) -o sys/wait.o -c sys/wait.c
+sys/wait.o sys/wait.lo: sys/wait.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -o sys/wait.o -c sys/wait.c
 
-syscalls.o: syscalls.S kernel/freebsd/common.h kernel/freebsd/i386/syscalls.S kernel/linux/common.h kernel/linux/amd64/syscalls.S kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/linux/sparc/syscalls.S kernel/netbsd/common.h kernel/netbsd/common.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/sparc/syscalls.S kernel/netbsd/sparc64/syscalls.S kernel/openbsd/common.h kernel/openbsd/arm/syscalls.S kernel/openbsd/i386/syscalls.S
-	$(AS) $(libc_ASFLAGS) -o syscalls.o syscalls.S
+syscalls.o syscalls.lo: syscalls.S kernel/freebsd/common.h kernel/freebsd/i386/syscalls.S kernel/linux/common.h kernel/linux/amd64/syscalls.S kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/linux/sparc/syscalls.S kernel/netbsd/common.h kernel/netbsd/common.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/sparc/syscalls.S kernel/netbsd/sparc64/syscalls.S kernel/openbsd/common.h kernel/openbsd/arm/syscalls.S kernel/openbsd/i386/syscalls.S
+	$(LIBTOOL) --mode=compile $(AS) $(libc_ASFLAGS) -o syscalls.o syscalls.S
 
-syslog.o: syslog.c
-	$(CC) $(libc_CFLAGS) -c syslog.c
+syslog.o syslog.lo: syslog.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c syslog.c
 
-termios.o: termios.c syscalls.h
-	$(CC) $(libc_CFLAGS) -c termios.c
+termios.o termios.lo: termios.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c termios.c
 
-time.o: time.c
-	$(CC) $(libc_CFLAGS) -c time.c
+time.o time.lo: time.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c time.c
 
-ucontext.o: ucontext.c syscalls.h
-	$(CC) $(libc_CFLAGS) -c ucontext.c
+ucontext.o ucontext.lo: ucontext.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c ucontext.c
 
-unistd.o: unistd.c syscalls.h
-	$(CC) $(libc_CFLAGS) -c unistd.c
+unistd.o unistd.lo: unistd.c syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c unistd.c
 
-utime.o: utime.c
-	$(CC) $(libc_CFLAGS) -c utime.c
+utime.o utime.lo: utime.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c utime.c
 
-utmpx.o: utmpx.c
-	$(CC) $(libc_CFLAGS) -c utmpx.c
+utmpx.o utmpx.lo: utmpx.c
+	$(LIBTOOL) --mode=compile $(CC) $(libc_CFLAGS) -c utmpx.c
 
 start.o: start.S kernel/freebsd/i386/start.S kernel/linux/arm/start.S kernel/linux/i386/start.S kernel/linux/sparc/start.S kernel/netbsd/amd64/start.S kernel/netbsd/i386/start.S kernel/netbsd/sparc64/start.S kernel/netbsd/sparc/start.S kernel/openbsd/arm/start.S kernel/openbsd/i386/start.S
 	$(AS) $(start.o_ASFLAGS) -o start.o start.S
@@ -182,19 +177,14 @@
 install: all
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
 	$(MKDIR) $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 0644 libc.a $(DESTDIR)$(LIBDIR)/libc.a
-	$(INSTALL) -m 0755 libc.so $(DESTDIR)$(LIBDIR)/libc.so.0.0
-	$(LN) -s libc.so.0.0 $(DESTDIR)$(LIBDIR)/libc.so.0
-	$(LN) -s libc.so.0.0 $(DESTDIR)$(LIBDIR)/libc.so
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 libc.la $(DESTDIR)$(LIBDIR)/libc.la
+	$(LIBTOOL) --mode=finish $(DESTDIR)/$(LIBDIR)
 	$(MKDIR) $(DESTDIR)$(LIBDIR)
 	$(INSTALL) -m 0644 start.o $(DESTDIR)$(LIBDIR)/start.o
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
-	$(RM) $(DESTDIR)$(LIBDIR)/libc.a
-	$(RM) $(DESTDIR)$(LIBDIR)/libc.so.0.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libc.so.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libc.so
+	$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(LIBDIR)/libc.la
 	$(RM) $(DESTDIR)$(LIBDIR)/start.o
 
 .PHONY: all subdirs clean distclean install uninstall
diff -Naur libc-0.0.3.orig/src/dl/Makefile libc-0.0.3/src/dl/Makefile
--- libc-0.0.3.orig/src/dl/Makefile	2009-11-11 10:34:58.000000000 +0100
+++ libc-0.0.3/src/dl/Makefile	2009-11-16 02:07:08.000000000 +0100
@@ -1,4 +1,4 @@
-TARGETS	= libdl.a libdl.so
+TARGETS	= libdl.la
 PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
@@ -10,6 +10,7 @@
 AR	= ar -rc
 RANLIB	= ranlib
 LD	= $(CC) -nostdlib -shared
+LIBTOOL	= libtool
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
@@ -18,19 +19,15 @@
 
 all: $(TARGETS)
 
-libdl_OBJS = dlfcn.o
+libdl_OBJS = dlfcn.lo
 libdl_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libdl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+libdl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -Xcompiler -nostdlib
 
-libdl.a: $(libdl_OBJS)
-	$(AR) libdl.a $(libdl_OBJS)
-	$(RANLIB) libdl.a
+libdl.la: $(libdl_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -o libdl.la $(libdl_OBJS) -Xcompiler -nostdlib -rpath $(LIBDIR) $(libdl_LDFLAGS)
 
-libdl.so: $(libdl_OBJS)
-	$(LD) -o libdl.so -Wl,-soname,libdl.so.0 $(libdl_OBJS)
-
-dlfcn.o: dlfcn.c ../../include/dl/dlfcn.h
-	$(CC) $(libdl_CFLAGS) -c dlfcn.c
+dlfcn.o dlfcn.lo: dlfcn.c ../../include/dl/dlfcn.h
+	$(LIBTOOL) --mode=compile $(CC) $(libdl_CFLAGS) -c dlfcn.c
 
 clean:
 	$(RM) $(libdl_OBJS)
@@ -40,15 +37,10 @@
 
 install: all
 	$(MKDIR) $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 0644 libdl.a $(DESTDIR)$(LIBDIR)/libdl.a
-	$(INSTALL) -m 0755 libdl.so $(DESTDIR)$(LIBDIR)/libdl.so.0.0
-	$(LN) -s libdl.so.0.0 $(DESTDIR)$(LIBDIR)/libdl.so.0
-	$(LN) -s libdl.so.0.0 $(DESTDIR)$(LIBDIR)/libdl.so
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 libdl.la $(DESTDIR)$(LIBDIR)/libdl.la
+	$(LIBTOOL) --mode=finish $(DESTDIR)/$(LIBDIR)
 
 uninstall:
-	$(RM) $(DESTDIR)$(LIBDIR)/libdl.a
-	$(RM) $(DESTDIR)$(LIBDIR)/libdl.so.0.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libdl.so.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libdl.so
+	$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(LIBDIR)/libdl.la
 
 .PHONY: all clean distclean install uninstall
diff -Naur libc-0.0.3.orig/src/dl/project.conf libc-0.0.3/src/dl/project.conf
--- libc-0.0.3.orig/src/dl/project.conf	2009-08-06 00:54:56.000000000 +0200
+++ libc-0.0.3/src/dl/project.conf	2009-11-16 02:06:58.000000000 +0100
@@ -6,8 +6,9 @@
 dist=Makefile
 
 [libdl]
-type=library
+type=libtool
 sources=dlfcn.c
+ldflags=-Xcompiler -nostdlib
 install=$(LIBDIR)
 
 [dlfcn.c]
diff -Naur libc-0.0.3.orig/src/math/Makefile libc-0.0.3/src/math/Makefile
--- libc-0.0.3.orig/src/math/Makefile	2009-11-11 10:34:58.000000000 +0100
+++ libc-0.0.3/src/math/Makefile	2009-11-16 02:07:08.000000000 +0100
@@ -1,5 +1,5 @@
 SUBDIRS	= amd64 i386
-TARGETS	= libm.a libm.so
+TARGETS	= libm.la
 PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
@@ -13,6 +13,7 @@
 AR	= ar -rc
 RANLIB	= ranlib
 LD	= $(CC) -nostdlib -shared
+LIBTOOL	= libtool
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
@@ -24,23 +25,19 @@
 subdirs:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
 
-libm_OBJS = arch.o math.o
+libm_OBJS = arch.lo math.lo
 libm_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS)
 libm_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libm_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+libm_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -Xcompiler -nostdlib
 
-libm.a: $(libm_OBJS)
-	$(AR) libm.a $(libm_OBJS)
-	$(RANLIB) libm.a
+libm.la: $(libm_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -o libm.la $(libm_OBJS) -Xcompiler -nostdlib -rpath $(LIBDIR) $(libm_LDFLAGS)
 
-libm.so: $(libm_OBJS)
-	$(LD) -o libm.so -Wl,-soname,libm.so.0 $(libm_OBJS)
+arch.o arch.lo: arch.S amd64/math.S i386/math.S
+	$(LIBTOOL) --mode=compile $(AS) $(libm_ASFLAGS) -o arch.o arch.S
 
-arch.o: arch.S amd64/math.S i386/math.S
-	$(AS) $(libm_ASFLAGS) -o arch.o arch.S
-
-math.o: math.c ../../include/math/math.h
-	$(CC) $(libm_CFLAGS) -c math.c
+math.o math.lo: math.c ../../include/math/math.h
+	$(LIBTOOL) --mode=compile $(CC) $(libm_CFLAGS) -c math.c
 
 clean:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
@@ -54,16 +51,11 @@
 install: all
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
 	$(MKDIR) $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 0644 libm.a $(DESTDIR)$(LIBDIR)/libm.a
-	$(INSTALL) -m 0755 libm.so $(DESTDIR)$(LIBDIR)/libm.so.0.0
-	$(LN) -s libm.so.0.0 $(DESTDIR)$(LIBDIR)/libm.so.0
-	$(LN) -s libm.so.0.0 $(DESTDIR)$(LIBDIR)/libm.so
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 libm.la $(DESTDIR)$(LIBDIR)/libm.la
+	$(LIBTOOL) --mode=finish $(DESTDIR)/$(LIBDIR)
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
-	$(RM) $(DESTDIR)$(LIBDIR)/libm.a
-	$(RM) $(DESTDIR)$(LIBDIR)/libm.so.0.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libm.so.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libm.so
+	$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(LIBDIR)/libm.la
 
 .PHONY: all subdirs clean distclean install uninstall
diff -Naur libc-0.0.3.orig/src/math/project.conf libc-0.0.3/src/math/project.conf
--- libc-0.0.3.orig/src/math/project.conf	2009-08-06 00:54:57.000000000 +0200
+++ libc-0.0.3/src/math/project.conf	2009-11-16 02:07:00.000000000 +0100
@@ -9,8 +9,9 @@
 dist=Makefile,arch.h
 
 [libm]
-type=library
+type=libtool
 sources=arch.S,math.c
+ldflags=-Xcompiler -nostdlib
 install=$(LIBDIR)
 
 [arch.S]
diff -Naur libc-0.0.3.orig/src/project.conf libc-0.0.3/src/project.conf
--- libc-0.0.3.orig/src/project.conf	2009-11-08 20:09:37.000000000 +0100
+++ libc-0.0.3/src/project.conf	2009-11-16 02:05:04.000000000 +0100
@@ -9,9 +9,9 @@
 dist=Makefile,syscalls.h
 
 [libc]
-type=library
+type=libtool
 sources=ctype.c,dirent.c,errno.c,fcntl.c,float.c,fnmatch.c,grp.c,iconv.c,langinfo.c,libgen.c,locale.c,poll.c,pwd.c,search.c,setjmp.c,signal.c,stdlib.c,stdio.c,string.c,strings.c,stropts.c,sys/ipc.c,sys/mman.c,sys/mount.c,sys/reboot.c,sys/resource.c,sys/select.c,sys/shm.c,sys/stat.c,sys/statvfs.c,sys/time.c,sys/times.c,sys/utsname.c,sys/wait.c,syscalls.S,syslog.c,termios.c,time.c,ucontext.c,unistd.c,utime.c,utmpx.c
-ldflags=`$(CC) -print-libgcc-file-name`
+ldflags=`$(CC) -print-libgcc-file-name` -Xcompiler -nostdlib
 install=$(LIBDIR)
 
 [start.o]
diff -Naur libc-0.0.3.orig/src/pthread/Makefile libc-0.0.3/src/pthread/Makefile
--- libc-0.0.3.orig/src/pthread/Makefile	2009-11-11 10:34:58.000000000 +0100
+++ libc-0.0.3/src/pthread/Makefile	2009-11-16 02:07:08.000000000 +0100
@@ -1,4 +1,4 @@
-TARGETS	= libpthread.a libpthread.so
+TARGETS	= libpthread.la
 PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
@@ -10,6 +10,7 @@
 AR	= ar -rc
 RANLIB	= ranlib
 LD	= $(CC) -nostdlib -shared
+LIBTOOL	= libtool
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
@@ -18,19 +19,15 @@
 
 all: $(TARGETS)
 
-libpthread_OBJS = pthread.o
+libpthread_OBJS = pthread.lo
 libpthread_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libpthread_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+libpthread_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -Xcompiler -nostdlib
 
-libpthread.a: $(libpthread_OBJS)
-	$(AR) libpthread.a $(libpthread_OBJS)
-	$(RANLIB) libpthread.a
+libpthread.la: $(libpthread_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -o libpthread.la $(libpthread_OBJS) -Xcompiler -nostdlib -rpath $(LIBDIR) $(libpthread_LDFLAGS)
 
-libpthread.so: $(libpthread_OBJS)
-	$(LD) -o libpthread.so -Wl,-soname,libpthread.so.0 $(libpthread_OBJS)
-
-pthread.o: pthread.c
-	$(CC) $(libpthread_CFLAGS) -c pthread.c
+pthread.o pthread.lo: pthread.c
+	$(LIBTOOL) --mode=compile $(CC) $(libpthread_CFLAGS) -c pthread.c
 
 clean:
 	$(RM) $(libpthread_OBJS)
@@ -40,15 +37,10 @@
 
 install: all
 	$(MKDIR) $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 0644 libpthread.a $(DESTDIR)$(LIBDIR)/libpthread.a
-	$(INSTALL) -m 0755 libpthread.so $(DESTDIR)$(LIBDIR)/libpthread.so.0.0
-	$(LN) -s libpthread.so.0.0 $(DESTDIR)$(LIBDIR)/libpthread.so.0
-	$(LN) -s libpthread.so.0.0 $(DESTDIR)$(LIBDIR)/libpthread.so
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 libpthread.la $(DESTDIR)$(LIBDIR)/libpthread.la
+	$(LIBTOOL) --mode=finish $(DESTDIR)/$(LIBDIR)
 
 uninstall:
-	$(RM) $(DESTDIR)$(LIBDIR)/libpthread.a
-	$(RM) $(DESTDIR)$(LIBDIR)/libpthread.so.0.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libpthread.so.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libpthread.so
+	$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(LIBDIR)/libpthread.la
 
 .PHONY: all clean distclean install uninstall
diff -Naur libc-0.0.3.orig/src/pthread/project.conf libc-0.0.3/src/pthread/project.conf
--- libc-0.0.3.orig/src/pthread/project.conf	2009-08-06 00:54:57.000000000 +0200
+++ libc-0.0.3/src/pthread/project.conf	2009-11-16 02:07:03.000000000 +0100
@@ -6,6 +6,7 @@
 dist=Makefile
 
 [libpthread]
-type=library
+type=libtool
 sources=pthread.c
+ldflags=-Xcompiler -nostdlib
 install=$(LIBDIR)
diff -Naur libc-0.0.3.orig/src/socket/Makefile libc-0.0.3/src/socket/Makefile
--- libc-0.0.3.orig/src/socket/Makefile	2009-11-11 10:34:58.000000000 +0100
+++ libc-0.0.3/src/socket/Makefile	2009-11-16 02:07:08.000000000 +0100
@@ -1,5 +1,5 @@
 SUBDIRS	= kernel/freebsd kernel/linux kernel/netbsd
-TARGETS	= libsocket.a libsocket.so
+TARGETS	= libsocket.la
 PREFIX	= /usr/local
 DESTDIR	= 
 LIBDIR	= $(PREFIX)/lib
@@ -13,6 +13,7 @@
 AR	= ar -rc
 RANLIB	= ranlib
 LD	= $(CC) -nostdlib -shared
+LIBTOOL	= libtool
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
@@ -24,29 +25,25 @@
 subdirs:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
 
-libsocket_OBJS = arpa/inet.o netdb.o sys/socket.o syscalls.o
+libsocket_OBJS = arpa/inet.lo netdb.lo sys/socket.lo syscalls.lo
 libsocket_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libsocket_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+libsocket_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -Xcompiler -nostdlib
 libsocket_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS)
 
-libsocket.a: $(libsocket_OBJS)
-	$(AR) libsocket.a $(libsocket_OBJS)
-	$(RANLIB) libsocket.a
+libsocket.la: $(libsocket_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -o libsocket.la $(libsocket_OBJS) -Xcompiler -nostdlib -rpath $(LIBDIR) $(libsocket_LDFLAGS)
 
-libsocket.so: $(libsocket_OBJS)
-	$(LD) -o libsocket.so -Wl,-soname,libsocket.so.0 $(libsocket_OBJS)
+arpa/inet.o arpa/inet.lo: arpa/inet.c
+	$(LIBTOOL) --mode=compile $(CC) $(libsocket_CFLAGS) -o arpa/inet.o -c arpa/inet.c
 
-arpa/inet.o: arpa/inet.c
-	$(CC) $(libsocket_CFLAGS) -o arpa/inet.o -c arpa/inet.c
+netdb.o netdb.lo: netdb.c
+	$(LIBTOOL) --mode=compile $(CC) $(libsocket_CFLAGS) -c netdb.c
 
-netdb.o: netdb.c
-	$(CC) $(libsocket_CFLAGS) -c netdb.c
+sys/socket.o sys/socket.lo: sys/socket.c kernel/linux/common.h kernel/netbsd/common.h syscalls.h
+	$(LIBTOOL) --mode=compile $(CC) $(libsocket_CFLAGS) -o sys/socket.o -c sys/socket.c
 
-sys/socket.o: sys/socket.c kernel/linux/common.h kernel/netbsd/common.h syscalls.h
-	$(CC) $(libsocket_CFLAGS) -o sys/socket.o -c sys/socket.c
-
-syscalls.o: syscalls.S kernel/linux/common.h kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/common.h kernel/netbsd/sparc/syscalls.S
-	$(AS) $(libsocket_ASFLAGS) -o syscalls.o syscalls.S
+syscalls.o syscalls.lo: syscalls.S kernel/linux/common.h kernel/linux/arm/syscalls.S kernel/linux/i386/syscalls.S kernel/netbsd/amd64/syscalls.S kernel/netbsd/i386/syscalls.S kernel/netbsd/common.h kernel/netbsd/sparc/syscalls.S
+	$(LIBTOOL) --mode=compile $(AS) $(libsocket_ASFLAGS) -o syscalls.o syscalls.S
 
 clean:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
@@ -60,16 +57,11 @@
 install: all
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
 	$(MKDIR) $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 0644 libsocket.a $(DESTDIR)$(LIBDIR)/libsocket.a
-	$(INSTALL) -m 0755 libsocket.so $(DESTDIR)$(LIBDIR)/libsocket.so.0.0
-	$(LN) -s libsocket.so.0.0 $(DESTDIR)$(LIBDIR)/libsocket.so.0
-	$(LN) -s libsocket.so.0.0 $(DESTDIR)$(LIBDIR)/libsocket.so
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 libsocket.la $(DESTDIR)$(LIBDIR)/libsocket.la
+	$(LIBTOOL) --mode=finish $(DESTDIR)/$(LIBDIR)
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
-	$(RM) $(DESTDIR)$(LIBDIR)/libsocket.a
-	$(RM) $(DESTDIR)$(LIBDIR)/libsocket.so.0.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libsocket.so.0
-	$(RM) $(DESTDIR)$(LIBDIR)/libsocket.so
+	$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(LIBDIR)/libsocket.la
 
 .PHONY: all subdirs clean distclean install uninstall
diff -Naur libc-0.0.3.orig/src/socket/project.conf libc-0.0.3/src/socket/project.conf
--- libc-0.0.3.orig/src/socket/project.conf	2009-08-06 00:54:56.000000000 +0200
+++ libc-0.0.3/src/socket/project.conf	2009-11-16 02:07:06.000000000 +0100
@@ -9,8 +9,9 @@
 dist=Makefile,syscalls.h
 
 [libsocket]
-type=library
+type=libtool
 sources=arpa/inet.c,netdb.c,sys/socket.c,syscalls.S
+ldflags=-Xcompiler -nostdlib
 install=$(LIBDIR)
 
 [sys/socket.c]