OSDN Git Service

syscall: Portability code for epoll_event on GNU/Linux.
[pf3gnuchains/gcc-fork.git] / libgo / Makefile.am
index 9274b36..2a68019 100644 (file)
@@ -38,7 +38,7 @@ ACLOCAL_AMFLAGS = -I ./config -I ../config
 
 AM_CFLAGS = -fexceptions -fplan9-extensions $(SPLIT_STACK) $(WARN_CFLAGS) \
        $(STRINGOPS_FLAG) \
-       -I $(srcdir)/../gcc -I $(MULTIBUILDTOP)../../gcc/include
+       -I $(srcdir)/../libgcc -I $(MULTIBUILDTOP)../../gcc/include
 
 if USING_SPLIT_STACK
 AM_LDFLAGS = -XCClinker $(SPLIT_STACK)
@@ -105,7 +105,8 @@ toolexeclibgo_DATA = \
        bufio.gox \
        bytes.gox \
        cmath.gox \
-       ebnf.gox \
+       crypto.gox \
+       csv.gox \
        exec.gox \
        expvar.gox \
        flag.gox \
@@ -119,9 +120,9 @@ toolexeclibgo_DATA = \
        json.gox \
        log.gox \
        math.gox \
+       mail.gox \
        mime.gox \
        net.gox \
-       netchan.gox \
        os.gox \
        patch.gox \
        path.gox \
@@ -142,8 +143,8 @@ toolexeclibgo_DATA = \
        template.gox \
        testing.gox \
        time.gox \
-       try.gox \
        unicode.gox \
+       url.gox \
        utf16.gox \
        utf8.gox \
        websocket.gox \
@@ -158,8 +159,10 @@ toolexeclibgoarchive_DATA = \
 toolexeclibgocompressdir = $(toolexeclibgodir)/compress
 
 toolexeclibgocompress_DATA = \
+       compress/bzip2.gox \
        compress/flate.gox \
        compress/gzip.gox \
+       compress/lzw.gox \
        compress/zlib.gox
 
 toolexeclibgocontainerdir = $(toolexeclibgodir)/container
@@ -167,22 +170,25 @@ toolexeclibgocontainerdir = $(toolexeclibgodir)/container
 toolexeclibgocontainer_DATA = \
        container/heap.gox \
        container/list.gox \
-       container/ring.gox \
-       container/vector.gox
+       container/ring.gox
 
 toolexeclibgocryptodir = $(toolexeclibgodir)/crypto
 
 toolexeclibgocrypto_DATA = \
        crypto/aes.gox \
-       crypto/block.gox \
+       crypto/bcrypt.gox \
        crypto/blowfish.gox \
        crypto/cast5.gox \
        crypto/cipher.gox \
+       crypto/des.gox \
+       crypto/dsa.gox \
+       crypto/ecdsa.gox \
        crypto/elliptic.gox \
        crypto/hmac.gox \
        crypto/md4.gox \
        crypto/md5.gox \
        crypto/ocsp.gox \
+       crypto/openpgp.gox \
        crypto/rand.gox \
        crypto/rc4.gox \
        crypto/ripemd160.gox \
@@ -200,9 +206,16 @@ toolexeclibgocryptoopenpgpdir = $(toolexeclibgocryptodir)/openpgp
 
 toolexeclibgocryptoopenpgp_DATA = \
        crypto/openpgp/armor.gox \
+       crypto/openpgp/elgamal.gox \
        crypto/openpgp/error.gox \
+       crypto/openpgp/packet.gox \
        crypto/openpgp/s2k.gox
 
+toolexeclibgocryptox509dir = $(toolexeclibgocryptodir)/x509
+
+toolexeclibgocryptox509_DATA = \
+       crypto/x509/pkix.gox
+
 toolexeclibgodebugdir = $(toolexeclibgodir)/debug
 
 toolexeclibgodebug_DATA = \
@@ -210,8 +223,7 @@ toolexeclibgodebug_DATA = \
        debug/elf.gox \
        debug/gosym.gox \
        debug/macho.gox \
-       debug/pe.gox \
-       debug/proc.gox
+       debug/pe.gox
 
 toolexeclibgoencodingdir = $(toolexeclibgodir)/encoding
 
@@ -220,7 +232,6 @@ toolexeclibgoencoding_DATA = \
        encoding/base32.gox \
        encoding/base64.gox \
        encoding/binary.gox \
-       encoding/line.gox \
        encoding/git85.gox \
        encoding/hex.gox \
        encoding/pem.gox
@@ -228,38 +239,68 @@ toolexeclibgoencoding_DATA = \
 toolexeclibgoexpdir = $(toolexeclibgodir)/exp
 
 toolexeclibgoexp_DATA = \
-       exp/datafmt.gox \
-       exp/draw.gox \
-       exp/eval.gox
+       exp/ebnf.gox \
+       exp/gui.gox \
+       exp/norm.gox \
+       exp/spdy.gox \
+       exp/sql.gox \
+       exp/ssh.gox \
+       exp/terminal.gox \
+       exp/types.gox
+
+toolexeclibgoexpguidir = $(toolexeclibgoexpdir)/gui
+
+toolexeclibgoexpgui_DATA = \
+       exp/gui/x11.gox
+
+toolexeclibgoexpsqldir = $(toolexeclibgoexpdir)/sql
+
+toolexeclibgoexpsql_DATA = \
+       exp/sql/driver.gox
+
+toolexeclibgoexptemplatedir = $(toolexeclibgoexpdir)/template
+
+toolexeclibgoexptemplate_DATA = \
+       exp/template/html.gox
 
 toolexeclibgogodir = $(toolexeclibgodir)/go
 
 toolexeclibgogo_DATA = \
        go/ast.gox \
+       go/build.gox \
        go/doc.gox \
        go/parser.gox \
        go/printer.gox \
        go/scanner.gox \
-       go/token.gox \
-       go/typechecker.gox
+       go/token.gox
 
 toolexeclibgohashdir = $(toolexeclibgodir)/hash
 
 toolexeclibgohash_DATA = \
        hash/adler32.gox \
        hash/crc32.gox \
-       hash/crc64.gox
+       hash/crc64.gox \
+       hash/fnv.gox
 
 toolexeclibgohttpdir = $(toolexeclibgodir)/http
 
 toolexeclibgohttp_DATA = \
+       http/cgi.gox \
+       http/fcgi.gox \
+       http/httptest.gox \
        http/pprof.gox
 
 toolexeclibgoimagedir = $(toolexeclibgodir)/image
 
 toolexeclibgoimage_DATA = \
+       image/bmp.gox \
+       image/color.gox \
+       image/draw.gox \
+       image/gif.gox \
        image/jpeg.gox \
-       image/png.gox
+       image/png.gox \
+       image/tiff.gox \
+       image/ycbcr.gox
 
 toolexeclibgoindexdir = $(toolexeclibgodir)/index
 
@@ -282,6 +323,13 @@ toolexeclibgonet_DATA = \
        net/dict.gox \
        net/textproto.gox
 
+toolexeclibgoolddir = $(toolexeclibgodir)/old
+
+toolexeclibgoold_DATA = \
+       old/netchan.gox \
+       old/regexp.gox \
+       old/template.gox
+
 toolexeclibgoosdir = $(toolexeclibgodir)/os
 
 if LIBGO_IS_LINUX
@@ -293,8 +341,19 @@ endif
 
 toolexeclibgoos_DATA = \
        $(os_inotify_gox) \
+       os/user.gox \
        os/signal.gox
 
+toolexeclibgopathdir = $(toolexeclibgodir)/path
+
+toolexeclibgopath_DATA = \
+       path/filepath.gox
+
+toolexeclibgoregexpdir = $(toolexeclibgodir)/regexp
+
+toolexeclibgoregexp_DATA = \
+       regexp/syntax.gox
+
 toolexeclibgorpcdir = $(toolexeclibgodir)/rpc
 
 toolexeclibgorpc_DATA = \
@@ -306,6 +365,16 @@ toolexeclibgoruntime_DATA = \
        runtime/debug.gox \
        runtime/pprof.gox
 
+toolexeclibgotemplatedir = $(toolexeclibgodir)/template
+
+toolexeclibgotemplate_DATA = \
+       template/parse.gox
+
+toolexeclibgosyncdir = $(toolexeclibgodir)/sync
+
+toolexeclibgosync_DATA = \
+       sync/atomic.gox
+
 toolexeclibgotestingdir = $(toolexeclibgodir)/testing
 
 toolexeclibgotesting_DATA = \
@@ -338,7 +407,6 @@ runtime_files = \
        runtime/go-chan-len.c \
        runtime/go-check-interface.c \
        runtime/go-close.c \
-       runtime/go-closed.c \
        runtime/go-construct-map.c \
        runtime/go-convert-interface.c \
        runtime/go-copy.c \
@@ -352,8 +420,10 @@ runtime_files = \
        runtime/go-int-array-to-string.c \
        runtime/go-int-to-string.c \
        runtime/go-interface-compare.c \
+       runtime/go-interface-eface-compare.c \
        runtime/go-interface-val-compare.c \
        runtime/go-lock-os-thread.c \
+       runtime/go-make-slice.c \
        runtime/go-map-delete.c \
        runtime/go-map-index.c \
        runtime/go-map-len.c \
@@ -366,6 +436,7 @@ runtime_files = \
        runtime/go-panic.c \
        runtime/go-panic-defer.c \
        runtime/go-print.c \
+       runtime/go-rand.c \
        runtime/go-rec-big.c \
        runtime/go-rec-nb-big.c \
        runtime/go-rec-nb-small.c \
@@ -384,6 +455,7 @@ runtime_files = \
        runtime/go-send-nb-big.c \
        runtime/go-send-nb-small.c \
        runtime/go-send-small.c \
+       runtime/go-setenv.c \
        runtime/go-signal.c \
        runtime/go-strcmp.c \
        runtime/go-string-to-byte-array.c \
@@ -403,6 +475,7 @@ runtime_files = \
        runtime/go-unsafe-newarray.c \
        runtime/go-unsafe-pointer.c \
        runtime/go-unwind.c \
+       runtime/cpuprof.c \
        runtime/mcache.c \
        runtime/mcentral.c \
        $(runtime_mem_file) \
@@ -410,11 +483,10 @@ runtime_files = \
        runtime/mfixalloc.c \
        runtime/mgc0.c \
        runtime/mheap.c \
-       runtime/mheapmap32.c \
-       runtime/mheapmap64.c \
        runtime/msize.c \
        runtime/proc.c \
        runtime/thread.c \
+       runtime/yield.c \
        $(rtems_task_variable_add_file) \
        chan.c \
        iface.c \
@@ -488,9 +560,12 @@ go_cmath_files = \
        go/cmath/sqrt.go \
        go/cmath/tan.go
 
-go_ebnf_files = \
-       go/ebnf/ebnf.go \
-       go/ebnf/parser.go
+go_crypto_files = \
+       go/crypto/crypto.go
+
+go_csv_files = \
+       go/csv/reader.go \
+       go/csv/writer.go
 
 go_exec_files = \
        go/exec/exec.go \
@@ -521,28 +596,35 @@ go_hash_files = \
        go/hash/hash.go
 
 go_html_files = \
+       go/html/const.go \
        go/html/doc.go \
        go/html/entity.go \
        go/html/escape.go \
+       go/html/node.go \
        go/html/parse.go \
+       go/html/render.go \
        go/html/token.go
 
 go_http_files = \
        go/http/chunked.go \
        go/http/client.go \
+       go/http/cookie.go \
        go/http/dump.go \
+       go/http/filetransport.go \
        go/http/fs.go \
+       go/http/header.go \
        go/http/lex.go \
        go/http/persist.go \
        go/http/request.go \
        go/http/response.go \
+       go/http/reverseproxy.go \
        go/http/server.go \
+       go/http/sniff.go \
        go/http/status.go \
        go/http/transfer.go \
-       go/http/url.go
+       go/http/transport.go
 
 go_image_files = \
-       go/image/color.go \
        go/image/format.go \
        go/image/geom.go \
        go/image/image.go \
@@ -558,12 +640,14 @@ go_json_files = \
        go/json/encode.go \
        go/json/indent.go \
        go/json/scanner.go \
-       go/json/stream.go
+       go/json/stream.go \
+       go/json/tags.go
 
 go_log_files = \
        go/log/log.go
 
 go_math_files = \
+       go/math/abs.go \
        go/math/acosh.go \
        go/math/asin.go \
        go/math/asinh.go \
@@ -574,15 +658,13 @@ go_math_files = \
        go/math/cbrt.go \
        go/math/const.go \
        go/math/copysign.go \
+       go/math/dim.go \
        go/math/erf.go \
        go/math/exp.go \
        go/math/exp_port.go \
        go/math/exp2.go \
        go/math/expm1.go \
-       go/math/fabs.go \
-       go/math/fdim.go \
        go/math/floor.go \
-       go/math/fmod.go \
        go/math/frexp.go \
        go/math/gamma.go \
        go/math/hypot.go \
@@ -596,6 +678,7 @@ go_math_files = \
        go/math/log1p.go \
        go/math/log10.go \
        go/math/logb.go \
+       go/math/mod.go \
        go/math/modf.go \
        go/math/nextafter.go \
        go/math/pow.go \
@@ -611,13 +694,16 @@ go_math_files = \
        go/math/tanh.go \
        go/math/unsafe.go
 
+go_mail_files = \
+       go/mail/message.go
+
 go_mime_files = \
        go/mime/grammar.go \
        go/mime/mediatype.go \
        go/mime/type.go
 
 if LIBGO_IS_RTEMS
-go_net_fd_os_file = go/net/fd_rtems.go
+go_net_fd_os_file = go/net/fd_select.go
 go_net_newpollserver_file = go/net/newpollserver_rtems.go
 else # !LIBGO_IS_RTEMS
 if LIBGO_IS_LINUX
@@ -626,43 +712,86 @@ go_net_newpollserver_file = go/net/newpollserver.go
 else # !LIBGO_IS_LINUX && !LIBGO_IS_RTEMS
 # By default use select with pipes.  Most systems should have
 # something better.
-go_net_fd_os_file = go/net/fd_rtems.go
+go_net_fd_os_file = go/net/fd_select.go
 go_net_newpollserver_file = go/net/newpollserver.go
 endif # !LIBGO_IS_LINUX
 endif # !LIBGO_IS_RTEMS
 
+if LIBGO_IS_LINUX
+go_net_cgo_file = go/net/cgo_linux.go
+go_net_sock_file = go/net/sock_linux.go
+else
+if LIBGO_IS_IRIX
+go_net_cgo_file = go/net/cgo_linux.go
+go_net_sock_file = go/net/sock_linux.go
+else
+if LIBGO_IS_SOLARIS
+go_net_cgo_file = go/net/cgo_linux.go
+go_net_sock_file = go/net/sock_linux.go
+else
+go_net_cgo_file = go/net/cgo_bsd.go
+go_net_sock_file = go/net/sock_bsd.go
+endif
+endif
+endif
+
+if LIBGO_IS_LINUX
+go_net_sendfile_file = go/net/sendfile_linux.go
+else
+go_net_sendfile_file = go/net/sendfile_stub.go
+endif
+
+if LIBGO_IS_LINUX
+go_net_interface_file = go/net/interface_linux.go
+else
+go_net_interface_file = go/net/interface_stub.go
+endif
+
 go_net_files = \
+       go/net/cgo_unix.go \
+       $(go_net_cgo_file) \
        go/net/dial.go \
        go/net/dnsclient.go \
+       go/net/dnsclient_unix.go \
        go/net/dnsconfig.go \
        go/net/dnsmsg.go \
        $(go_net_newpollserver_file) \
        go/net/fd.go \
        $(go_net_fd_os_file) \
+       go/net/file.go \
        go/net/hosts.go \
+       go/net/interface.go \
+       $(go_net_interface_file) \
        go/net/ip.go \
        go/net/iprawsock.go \
+       go/net/iprawsock_posix.go \
        go/net/ipsock.go \
+       go/net/ipsock_posix.go \
+       go/net/lookup_unix.go \
        go/net/net.go \
        go/net/parse.go \
        go/net/pipe.go \
        go/net/port.go \
+       $(go_net_sendfile_file) \
        go/net/sock.go \
+       $(go_net_sock_file) \
        go/net/tcpsock.go \
+       go/net/tcpsock_posix.go \
        go/net/udpsock.go \
-       go/net/unixsock.go
-
-go_netchan_files = \
-       go/netchan/common.go \
-       go/netchan/export.go \
-       go/netchan/import.go
+       go/net/udpsock_posix.go \
+       go/net/unixsock.go \
+       go/net/unixsock_posix.go
 
 if LIBGO_IS_SOLARIS
 if LIBGO_IS_386
 go_os_dir_file = go/os/dir_largefile.go
 else
+if LIBGO_IS_SPARC
+go_os_dir_file = go/os/dir_largefile.go
+else
 go_os_dir_file = go/os/dir_regfile.go
 endif
+endif
 else
 if LIBGO_IS_LINUX
 go_os_dir_file = go/os/dir_largefile.go
@@ -677,6 +806,9 @@ else
 if LIBGO_IS_SOLARIS
 go_os_sys_file = go/os/sys_uname.go
 else
+if LIBGO_IS_IRIX
+go_os_sys_file = go/os/sys_uname.go
+else
 if LIBGO_IS_RTEMS
 go_os_sys_file = go/os/sys_uname.go
 else
@@ -684,6 +816,7 @@ go_os_sys_file = go/os/sys_bsd.go
 endif
 endif
 endif
+endif
 
 go_os_files = \
        $(go_os_dir_file) \
@@ -691,16 +824,23 @@ go_os_files = \
        go/os/env.go \
        go/os/env_unix.go \
        go/os/error.go \
+       go/os/error_posix.go \
        go/os/exec.go \
+       go/os/exec_posix.go \
+       go/os/exec_unix.go \
        go/os/file.go \
+       go/os/file_posix.go \
        go/os/file_unix.go \
        go/os/getwd.go \
        go/os/path.go \
+       go/os/path_unix.go \
        go/os/proc.go \
        go/os/stat.go \
+       go/os/str.go \
        $(go_os_sys_file) \
        go/os/time.go \
-       go/os/types.go
+       go/os/types.go \
+       signal_unix.go
 
 go_patch_files = \
        go/patch/apply.go \
@@ -710,8 +850,7 @@ go_patch_files = \
 
 go_path_files = \
        go/path/match.go \
-       go/path/path.go \
-       go/path/path_unix.go
+       go/path/path.go
 
 go_rand_files = \
        go/rand/exp.go \
@@ -726,6 +865,7 @@ go_reflect_files = \
        go/reflect/value.go
 
 go_regexp_files = \
+       go/regexp/exec.go \
        go/regexp/regexp.go
 
 go_rpc_files = \
@@ -737,8 +877,7 @@ go_runtime_files = \
        go/runtime/debug.go \
        go/runtime/error.go \
        go/runtime/extern.go \
-       go/runtime/malloc_defs.go \
-       go/runtime/runtime_defs.go \
+       go/runtime/mem.go \
        go/runtime/sig.go \
        go/runtime/softfloat64.go \
        go/runtime/type.go \
@@ -777,45 +916,68 @@ go_strconv_files = \
 
 go_strings_files = \
        go/strings/reader.go \
+       go/strings/replace.go \
        go/strings/strings.go
 
 go_sync_files = \
+       go/sync/cond.go \
        go/sync/mutex.go \
        go/sync/once.go \
-       go/sync/rwmutex.go
-go_sync_c_files = \
-       go/sync/cas.c
+       go/sync/rwmutex.go \
+       go/sync/waitgroup.go
+
+if LIBGO_IS_SOLARIS
+go_syslog_file = go/syslog/syslog_libc.go
+else
+if LIBGO_IS_IRIX
+go_syslog_file = go/syslog/syslog_libc.go
+else
+go_syslog_file = go/syslog/syslog_unix.go
+endif
+endif
 
 go_syslog_files = \
-       go/syslog/syslog.go
+       go/syslog/syslog.go \
+       $(go_syslog_file)
+go_syslog_c_files = \
+       go/syslog/syslog_c.c
 
 go_tabwriter_files = \
        go/tabwriter/tabwriter.go
 
 go_template_files = \
-       go/template/format.go \
-       go/template/template.go
+       go/template/doc.go \
+       go/template/exec.go \
+       go/template/funcs.go \
+       go/template/helper.go \
+       go/template/parse.go \
+       go/template/set.go
 
 go_testing_files = \
        go/testing/benchmark.go \
+       go/testing/example.go \
        go/testing/testing.go
 
 go_time_files = \
        go/time/format.go \
        go/time/sleep.go \
+       go/time/sys.go \
+       go/time/sys_unix.go \
        go/time/tick.go \
        go/time/time.go \
+       go/time/zoneinfo_posix.go \
        go/time/zoneinfo_unix.go
 
-go_try_files = \
-       go/try/try.go
-
 go_unicode_files = \
        go/unicode/casetables.go \
        go/unicode/digit.go \
+       go/unicode/graphic.go \
        go/unicode/letter.go \
        go/unicode/tables.go
 
+go_url_files = \
+       go/url/url.go
+
 go_utf16_files = \
        go/utf16/utf16.go
 
@@ -825,10 +987,13 @@ go_utf8_files = \
 
 go_websocket_files = \
        go/websocket/client.go \
+       go/websocket/hixie.go \
+       go/websocket/hybi.go \
        go/websocket/server.go \
        go/websocket/websocket.go
 
 go_xml_files = \
+       go/xml/marshal.go \
        go/xml/read.go \
        go/xml/xml.go
 
@@ -839,7 +1004,14 @@ go_archive_tar_files = \
 
 go_archive_zip_files = \
        go/archive/zip/reader.go \
-       go/archive/zip/struct.go
+       go/archive/zip/struct.go \
+       go/archive/zip/writer.go
+
+go_compress_bzip2_files = \
+       go/compress/bzip2/bit_reader.go \
+       go/compress/bzip2/bzip2.go \
+       go/compress/bzip2/huffman.go \
+       go/compress/bzip2/move_to_front.go
 
 go_compress_flate_files = \
        go/compress/flate/deflate.go \
@@ -854,6 +1026,10 @@ go_compress_gzip_files = \
        go/compress/gzip/gzip.go \
        go/compress/gzip/gunzip.go
 
+go_compress_lzw_files = \
+       go/compress/lzw/reader.go \
+       go/compress/lzw/writer.go
+
 go_compress_zlib_files = \
        go/compress/zlib/reader.go \
        go/compress/zlib/writer.go
@@ -867,26 +1043,13 @@ go_container_list_files = \
 go_container_ring_files = \
        go/container/ring/ring.go
 
-go_container_vector_files = \
-       go/container/vector/defs.go \
-       go/container/vector/intvector.go \
-       go/container/vector/stringvector.go \
-       go/container/vector/vector.go
-
 go_crypto_aes_files = \
        go/crypto/aes/block.go \
        go/crypto/aes/cipher.go \
        go/crypto/aes/const.go
-go_crypto_block_files = \
-       go/crypto/block/cbc.go \
-       go/crypto/block/cfb.go \
-       go/crypto/block/cmac.go \
-       go/crypto/block/cipher.go \
-       go/crypto/block/ctr.go \
-       go/crypto/block/eax.go \
-       go/crypto/block/ecb.go \
-       go/crypto/block/ofb.go \
-       go/crypto/block/xor.go
+go_crypto_bcrypt_files = \
+       go/crypto/bcrypt/base64.go \
+       go/crypto/bcrypt/bcrypt.go
 go_crypto_blowfish_files = \
        go/crypto/blowfish/block.go \
        go/crypto/blowfish/const.go \
@@ -901,6 +1064,14 @@ go_crypto_cipher_files = \
        go/crypto/cipher/io.go \
        go/crypto/cipher/ocfb.go \
        go/crypto/cipher/ofb.go
+go_crypto_des_files = \
+       go/crypto/des/block.go \
+       go/crypto/des/cipher.go \
+       go/crypto/des/const.go
+go_crypto_dsa_files = \
+       go/crypto/dsa/dsa.go
+go_crypto_ecdsa_files = \
+       go/crypto/ecdsa/ecdsa.go
 go_crypto_elliptic_files = \
        go/crypto/elliptic/elliptic.go
 go_crypto_hmac_files = \
@@ -913,9 +1084,15 @@ go_crypto_md5_files = \
        go/crypto/md5/md5block.go
 go_crypto_ocsp_files = \
        go/crypto/ocsp/ocsp.go
+go_crypto_openpgp_files = \
+       go/crypto/openpgp/canonical_text.go \
+       go/crypto/openpgp/keys.go \
+       go/crypto/openpgp/read.go \
+       go/crypto/openpgp/write.go
 go_crypto_rand_files = \
        go/crypto/rand/rand.go \
-       go/crypto/rand/rand_unix.go
+       go/crypto/rand/rand_unix.go \
+       go/crypto/rand/util.go
 go_crypto_rc4_files = \
        go/crypto/rc4/rc4.go
 go_crypto_ripemd160_files = \
@@ -937,7 +1114,6 @@ go_crypto_subtle_files = \
        go/crypto/subtle/constant_time.go
 go_crypto_tls_files = \
        go/crypto/tls/alert.go \
-       go/crypto/tls/ca_set.go \
        go/crypto/tls/cipher_suites.go \
        go/crypto/tls/common.go \
        go/crypto/tls/conn.go \
@@ -946,10 +1122,14 @@ go_crypto_tls_files = \
        go/crypto/tls/handshake_server.go \
        go/crypto/tls/key_agreement.go \
        go/crypto/tls/prf.go \
+       go/crypto/tls/root_unix.go \
        go/crypto/tls/tls.go
 go_crypto_twofish_files = \
        go/crypto/twofish/twofish.go
 go_crypto_x509_files = \
+       go/crypto/x509/cert_pool.go \
+       go/crypto/x509/pkcs1.go \
+       go/crypto/x509/verify.go \
        go/crypto/x509/x509.go
 go_crypto_xtea_files = \
        go/crypto/xtea/block.go \
@@ -958,11 +1138,29 @@ go_crypto_xtea_files = \
 go_crypto_openpgp_armor_files = \
        go/crypto/openpgp/armor/armor.go \
        go/crypto/openpgp/armor/encode.go
+go_crypto_openpgp_elgamal_files = \
+       go/crypto/openpgp/elgamal/elgamal.go
 go_crypto_openpgp_error_files = \
        go/crypto/openpgp/error/error.go
+go_crypto_openpgp_packet_files = \
+       go/crypto/openpgp/packet/compressed.go \
+       go/crypto/openpgp/packet/encrypted_key.go \
+       go/crypto/openpgp/packet/literal.go \
+       go/crypto/openpgp/packet/one_pass_signature.go \
+       go/crypto/openpgp/packet/packet.go \
+       go/crypto/openpgp/packet/private_key.go \
+       go/crypto/openpgp/packet/public_key.go \
+       go/crypto/openpgp/packet/reader.go \
+       go/crypto/openpgp/packet/signature.go \
+       go/crypto/openpgp/packet/symmetric_key_encrypted.go \
+       go/crypto/openpgp/packet/symmetrically_encrypted.go \
+       go/crypto/openpgp/packet/userid.go
 go_crypto_openpgp_s2k_files = \
        go/crypto/openpgp/s2k/s2k.go
 
+go_crypto_x509_pkix_files = \
+       go/crypto/x509/pkix/pkix.go
+
 go_debug_dwarf_files = \
        go/debug/dwarf/buf.go \
        go/debug/dwarf/const.go \
@@ -983,11 +1181,6 @@ go_debug_pe_files = \
        go/debug/pe/file.go \
        go/debug/pe/pe.go
 
-go_debug_proc_files = \
-       go/debug/proc/proc.go \
-       go/debug/proc/proc_$(GOOS).go \
-       $(GO_DEBUG_PROC_REGS_OS_ARCH_FILE)
-
 go_encoding_ascii85_files = \
        go/encoding/ascii85/ascii85.go
 go_encoding_base32_files = \
@@ -995,45 +1188,92 @@ go_encoding_base32_files = \
 go_encoding_base64_files = \
        go/encoding/base64/base64.go
 go_encoding_binary_files = \
-       go/encoding/binary/binary.go
+       go/encoding/binary/binary.go \
+       go/encoding/binary/varint.go
 go_encoding_git85_files = \
        go/encoding/git85/git.go
 go_encoding_hex_files = \
        go/encoding/hex/hex.go
-go_encoding_line_files = \
-       go/encoding/line/line.go
 go_encoding_pem_files = \
        go/encoding/pem/pem.go
 
-go_exp_datafmt_files = \
-       go/exp/datafmt/datafmt.go \
-       go/exp/datafmt/parser.go
-go_exp_draw_files = \
-       go/exp/draw/draw.go \
-       go/exp/draw/event.go
-go_exp_eval_files = \
-       go/exp/eval/abort.go \
-       go/exp/eval/bridge.go \
-       go/exp/eval/compiler.go \
-       go/exp/eval/expr.go \
-       go/exp/eval/expr1.go \
-       go/exp/eval/func.go \
-       go/exp/eval/scope.go \
-       go/exp/eval/stmt.go \
-       go/exp/eval/type.go \
-       go/exp/eval/typec.go \
-       go/exp/eval/value.go \
-       go/exp/eval/world.go
+go_exp_ebnf_files = \
+       go/exp/ebnf/ebnf.go \
+       go/exp/ebnf/parser.go
+go_exp_gui_files = \
+       go/exp/gui/gui.go
+go_exp_norm_files = \
+       go/exp/norm/composition.go \
+       go/exp/norm/forminfo.go \
+       go/exp/norm/input.go \
+       go/exp/norm/normalize.go \
+       go/exp/norm/readwriter.go \
+       go/exp/norm/tables.go \
+       go/exp/norm/trie.go
+go_exp_spdy_files = \
+       go/exp/spdy/read.go \
+       go/exp/spdy/types.go \
+       go/exp/spdy/write.go
+go_exp_sql_files = \
+       go/exp/sql/convert.go \
+       go/exp/sql/sql.go
+go_exp_ssh_files = \
+       go/exp/ssh/channel.go \
+       go/exp/ssh/common.go \
+       go/exp/ssh/doc.go \
+       go/exp/ssh/messages.go \
+       go/exp/ssh/server.go \
+       go/exp/ssh/server_shell.go \
+       go/exp/ssh/transport.go
+go_exp_terminal_files = \
+       go/exp/terminal/shell.go \
+       go/exp/terminal/terminal.go
+go_exp_types_files = \
+       go/exp/types/check.go \
+       go/exp/types/const.go \
+       go/exp/types/exportdata.go \
+       go/exp/types/gcimporter.go \
+       go/exp/types/types.go \
+       go/exp/types/universe.go
+
+go_exp_gui_x11_files = \
+       go/exp/gui/x11/auth.go \
+       go/exp/gui/x11/conn.go
+
+go_exp_sql_driver_files = \
+       go/exp/sql/driver/driver.go \
+       go/exp/sql/driver/types.go
+
+go_exp_template_html_files = \
+       go/exp/template/html/attr.go \
+       go/exp/template/html/clone.go \
+       go/exp/template/html/content.go \
+       go/exp/template/html/context.go \
+       go/exp/template/html/css.go \
+       go/exp/template/html/doc.go \
+       go/exp/template/html/error.go \
+       go/exp/template/html/escape.go \
+       go/exp/template/html/html.go \
+       go/exp/template/html/js.go \
+       go/exp/template/html/transition.go \
+       go/exp/template/html/url.go
 
 go_go_ast_files = \
        go/go/ast/ast.go \
        go/go/ast/filter.go \
        go/go/ast/print.go \
+       go/go/ast/resolve.go \
        go/go/ast/scope.go \
        go/go/ast/walk.go
+go_go_build_files = \
+       go/go/build/build.go \
+       go/go/build/dir.go \
+       go/go/build/path.go \
+       syslist.go
 go_go_doc_files = \
        go/go/doc/comment.go \
-       go/go/doc/doc.go
+       go/go/doc/doc.go \
+       go/go/doc/example.go
 go_go_parser_files = \
        go/go/parser/interface.go \
        go/go/parser/parser.go
@@ -1045,31 +1285,63 @@ go_go_scanner_files = \
        go/go/scanner/scanner.go
 go_go_token_files = \
        go/go/token/position.go \
+       go/go/token/serialize.go \
        go/go/token/token.go
-go_go_typechecker_files = \
-       go/go/typechecker/scope.go \
-       go/go/typechecker/typechecker.go \
-       go/go/typechecker/universe.go
 
 go_hash_adler32_files = \
        go/hash/adler32/adler32.go
 go_hash_crc32_files = \
-       go/hash/crc32/crc32.go
+       go/hash/crc32/crc32.go \
+       go/hash/crc32/crc32_generic.go
 go_hash_crc64_files = \
        go/hash/crc64/crc64.go
-
+go_hash_fnv_files = \
+       go/hash/fnv/fnv.go
+
+go_http_cgi_files = \
+       go/http/cgi/child.go \
+       go/http/cgi/host.go
+go_http_fcgi_files = \
+       go/http/fcgi/child.go \
+       go/http/fcgi/fcgi.go
+go_http_httptest_files = \
+       go/http/httptest/recorder.go \
+       go/http/httptest/server.go
 go_http_pprof_files = \
        go/http/pprof/pprof.go
 
+go_image_bmp_files = \
+       go/image/bmp/reader.go
+
+go_image_color_files = \
+       go/image/color/color.go
+
+go_image_draw_files = \
+       go/image/draw/draw.go
+
+go_image_gif_files = \
+       go/image/gif/reader.go
+
 go_image_jpeg_files = \
+       go/image/jpeg/fdct.go \
        go/image/jpeg/huffman.go \
        go/image/jpeg/idct.go \
-       go/image/jpeg/reader.go
+       go/image/jpeg/reader.go \
+       go/image/jpeg/writer.go
 
 go_image_png_files = \
        go/image/png/reader.go \
        go/image/png/writer.go
 
+go_image_tiff_files = \
+       go/image/tiff/buffer.go \
+       go/image/tiff/compress.go \
+       go/image/tiff/consts.go \
+       go/image/tiff/reader.go
+
+go_image_ycbcr_files = \
+       go/image/ycbcr/ycbcr.go
+
 go_index_suffixarray_files = \
        go/index/suffixarray/qsufsort.go \
        go/index/suffixarray/suffixarray.go
@@ -1079,23 +1351,54 @@ go_io_ioutil_files = \
        go/io/ioutil/tempfile.go
 
 go_mime_multipart_files = \
-       go/mime/multipart/multipart.go
+       go/mime/multipart/formdata.go \
+       go/mime/multipart/multipart.go \
+       go/mime/multipart/writer.go
 
 go_net_dict_files = \
        go/net/dict/dict.go
 
 go_net_textproto_files = \
+       go/net/textproto/header.go \
        go/net/textproto/pipeline.go \
        go/net/textproto/reader.go \
        go/net/textproto/textproto.go \
        go/net/textproto/writer.go
 
+go_old_netchan_files = \
+       go/old/netchan/common.go \
+       go/old/netchan/export.go \
+       go/old/netchan/import.go
+go_old_regexp_files = \
+       go/old/regexp/regexp.go
+go_old_template_files = \
+       go/old/template/doc.go \
+       go/old/template/execute.go \
+       go/old/template/format.go \
+       go/old/template/parse.go
+
 go_os_inotify_files = \
        go/os/inotify/inotify_linux.go
 
+go_os_user_files = \
+       go/os/user/user.go \
+       go/os/user/lookup_unix.go
+
 go_os_signal_files = \
-       go/os/signal/signal.go \
-       unix.go
+       go/os/signal/signal.go
+
+go_path_filepath_files = \
+       go/path/filepath/match.go \
+       go/path/filepath/path.go \
+       go/path/filepath/path_unix.go
+
+go_regexp_syntax_files = \
+       go/regexp/syntax/compile.go \
+       go/regexp/syntax/parse.go \
+       go/regexp/syntax/perl_groups.go \
+       go/regexp/syntax/prog.go \
+       go/regexp/syntax/regexp.go \
+       go/regexp/syntax/simplify.go
 
 go_rpc_jsonrpc_files = \
        go/rpc/jsonrpc/client.go \
@@ -1106,6 +1409,17 @@ go_runtime_debug_files = \
 go_runtime_pprof_files = \
        go/runtime/pprof/pprof.go
 
+go_template_parse_files = \
+       go/template/parse/lex.go \
+       go/template/parse/node.go \
+       go/template/parse/parse.go \
+       go/template/parse/set.go
+
+go_sync_atomic_files = \
+       go/sync/atomic/doc.go
+go_sync_atomic_c_files = \
+       go/sync/atomic/atomic.c
+
 go_testing_iotest_files = \
        go/testing/iotest/logger.go \
        go/testing/iotest/reader.go \
@@ -1117,89 +1431,142 @@ go_testing_script_files = \
 
 # Define Syscall and Syscall6.
 if LIBGO_IS_RTEMS
-syscall_syscall_file = syscalls/syscall_stubs.go
+syscall_syscall_file = go/syscall/syscall_stubs.go
 else
-syscall_syscall_file = syscalls/syscall.go
+syscall_syscall_file = go/syscall/syscall_unix.go
 endif
 
-# Declare libc functions that vary for largefile systems.
-if LIBGO_IS_LINUX
-# Always use lseek64 on GNU/Linux.
-syscall_filesize_file = syscalls/sysfile_largefile.go
-syscall_stat_file = syscalls/sysfile_stat_largefile.go
-else # !LIBGO_IS_LINUX
-if LIBGO_IS_SOLARIS
-# FIXME: Same for sparc vs. sparc64.  Introduce new/additional conditional?
-if LIBGO_IS_386
-# Use lseek64 on 386 Solaris.
-syscall_filesize_file = syscalls/sysfile_largefile.go
-syscall_stat_file = syscalls/sysfile_stat_largefile.go
-else # !LIBGO_IS_LINUX && LIBGO_IS_SOLARIS && !LIBGO_IS_386
-# Use lseek on amd64 Solaris.
-syscall_filesize_file = syscalls/sysfile_regfile.go
-syscall_stat_file = syscalls/sysfile_stat_regfile.go
-endif # !LIBGO_IS_386
-else # !LIBGO_IS_LINUX && !LIBGO_IS_SOLARIS
-# Use lseek by default.
-syscall_filesize_file = syscalls/sysfile_regfile.go
-syscall_stat_file = syscalls/sysfile_stat_regfile.go
-endif # !LIBGO_IS_SOLARIS
-endif # !LIBGO_IS_LINUX
-
-
-# Define ForkExec, PtraceForkExec, Exec, and Wait4.
+# Define ForkExec and Exec.
 if LIBGO_IS_RTEMS
-syscall_exec_os_file = syscalls/exec_stubs.go
+syscall_exec_file = go/syscall/exec_stubs.go
 else
-syscall_exec_os_file = syscalls/exec.go
+syscall_exec_file = go/syscall/exec_unix.go
 endif
 
-# Define Sleep.
-if LIBGO_IS_RTEMS
-syscall_sleep_file = syscalls/sleep_rtems.go
+# Define Wait4.
+if HAVE_WAIT4
+syscall_wait_file = go/syscall/libcall_wait4.go
 else
-syscall_sleep_file = syscalls/sleep_select.go
+syscall_wait_file = go/syscall/libcall_waitpid.go
 endif
 
-# Define Errstr.
+# Define Sleep.
 if LIBGO_IS_RTEMS
-syscall_errstr_file = syscalls/errstr_rtems.go
+syscall_sleep_file = go/syscall/sleep_rtems.go
 else
-syscall_errstr_file = syscalls/errstr.go
+syscall_sleep_file = go/syscall/sleep_select.go
 endif
 
-# Declare libc_strerror_r which is the Go name for strerror_r.
+# Define Errstr.
+if LIBGO_IS_LINUX
+syscall_errstr_file = go/syscall/errstr_linux.go
+else
 if LIBGO_IS_RTEMS
-# RTEMS uses newlib in which strerror_r returns char *.
-syscall_errstr_decl_file = syscalls/errstr_decl_rtems.go
+syscall_errstr_file = go/syscall/errstr_linux.go
 else
-if LIBGO_IS_LINUX
-# In Linux the POSIX strerror_r is called __xpg_strerror_r.
-syscall_errstr_decl_file = syscalls/errstr_decl_linux.go
+if HAVE_STRERROR_R
+syscall_errstr_file = go/syscall/errstr.go
 else
-# On other systems we hope strerror_r is just strerror_r.
-syscall_errstr_decl_file = syscalls/errstr_decl.go
+syscall_errstr_file = go/syscall/errstr_nor.go
+endif
 endif
 endif
 
+# Declare libc functions that vary for largefile systems.
+if LIBGO_IS_LINUX
+# Always use lseek64 on GNU/Linux.
+syscall_size_file = go/syscall/libcall_posix_largefile.go
+else # !LIBGO_IS_LINUX
+if LIBGO_IS_SOLARIS
+if LIBGO_IS_386
+# Use lseek64 on 32-bit Solaris/x86.
+syscall_size_file = go/syscall/libcall_posix_largefile.go
+else # !LIBGO_IS_386
+if LIBGO_IS_SPARC
+# Use lseek64 on 32-bit Solaris/SPARC.
+syscall_size_file = go/syscall/libcall_posix_largefile.go
+else # !LIBGO_IS_386 && !LIBGO_IS_SPARC
+# Use lseek on 64-bit Solaris.
+syscall_size_file = go/syscall/libcall_posix_regfile.go
+endif # !LIBGO_IS_386 && !LIBGO_IS_SPARC
+endif # !LIBGO_IS_SOLARIS
+else # !LIBGO_IS_LINUX && !LIBGO_IS_SOLARIS
+# Use lseek by default.
+syscall_size_file = go/syscall/libcall_posix_regfile.go
+endif # !LIBGO_IS_SOLARIS
+endif # !LIBGO_IS_LINUX
+
 # Define socket sizes and types.
 if LIBGO_IS_LINUX
-syscall_socket_os_file = syscalls/socket_linux.go
+syscall_socket_file = go/syscall/socket_linux.go epoll.go
 else
 if LIBGO_IS_SOLARIS
-syscall_socket_os_file = syscalls/socket_solaris.go
+syscall_socket_file = go/syscall/socket_solaris.go
 else
-syscall_socket_os_file = syscalls/socket_bsd.go
+if LIBGO_IS_IRIX
+syscall_socket_file = go/syscall/socket_irix.go
+else
+syscall_socket_file = go/syscall/socket_bsd.go
+endif
+endif
+endif
+
+# Support for uname.
+if LIBGO_IS_SOLARIS
+if LIBGO_IS_386
+# 32-bit Solaris 2/x86 needs _nuname, handled in libcall_solaris_386.go.
+syscall_uname_file =
+else # !LIBGO_IS_386 && LIBGO_IS_SOLARIS
+syscall_uname_file = go/syscall/libcall_uname.go
 endif
+else # !LIBGO_IS_SOLARIS
+syscall_uname_file = go/syscall/libcall_uname.go
 endif
 
-# Support for epoll.
+# Support for netlink sockets and messages.
 if LIBGO_IS_LINUX
-syscall_socket_epoll_file = syscalls/socket_epoll.go
+syscall_netlink_file = go/syscall/netlink_linux.go
 else
-syscall_socket_epoll_file =
+syscall_netlink_file =
 endif
 
+go_base_syscall_files = \
+       go/syscall/libcall_support.go \
+       go/syscall/libcall_posix.go \
+       go/syscall/socket.go \
+       go/syscall/str.go \
+       go/syscall/syscall.go \
+       $(syscall_syscall_file) \
+       $(syscall_exec_file) \
+       $(syscall_wait_file) \
+       $(syscall_sleep_file) \
+       $(syscall_errstr_file) \
+       $(syscall_size_file) \
+       $(syscall_socket_file) \
+       $(syscall_uname_file) \
+       $(syscall_netlink_file) \
+       $(GO_LIBCALL_OS_FILE) \
+       $(GO_LIBCALL_OS_ARCH_FILE) \
+       $(GO_SYSCALL_OS_FILE) \
+       $(GO_SYSCALL_OS_ARCH_FILE)
+
+go_syscall_files = \
+       $(go_base_syscall_files) \
+       libcalls.go \
+       sysinfo.go \
+       syscall_arch.go
+go_syscall_c_files = \
+       go/syscall/errno.c \
+       go/syscall/wait.c
+
+libcalls.go: s-libcalls; @true
+s-libcalls: Makefile go/syscall/mksyscall.awk $(go_base_syscall_files)
+       rm -f libcalls.go.tmp
+       files=`echo $^ | sed -e 's/Makefile//' -e 's|[^ ]*go/syscall/mksyscall.awk||'`; \
+       $(AWK) -f $(srcdir)/go/syscall/mksyscall.awk $${files} > libcalls.go.tmp
+       $(SHELL) $(srcdir)/../move-if-change libcalls.go.tmp libcalls.go
+       $(STAMP) $@
+
 syscall_arch.go: s-syscall_arch; @true
 s-syscall_arch: Makefile
        rm -f syscall_arch.go.tmp
@@ -1209,164 +1576,216 @@ s-syscall_arch: Makefile
        $(SHELL) $(srcdir)/../move-if-change syscall_arch.go.tmp syscall_arch.go
        $(STAMP) $@
 
-go_syscall_files = \
-       $(syscall_errstr_file) \
-       $(syscall_errstr_decl_file) \
-       syscalls/exec_helpers.go \
-       $(syscall_exec_os_file) \
-       $(syscall_filesize_file) \
-       $(syscall_stat_file) \
-       $(syscall_sleep_file) \
-       syscalls/socket.go \
-       $(syscall_socket_os_file) \
-       $(syscall_socket_epoll_file) \
-       $(syscall_syscall_file) \
-       syscalls/syscall_unix.go \
-       syscalls/stringbyte.go \
-       syscalls/syscall_$(GOOS).go \
-       $(GO_SYSCALLS_SYSCALL_OS_ARCH_FILE) \
-       syscalls/sysfile_posix.go \
-       sysinfo.go \
-       syscall_arch.go
-go_syscall_c_files = \
-       syscalls/errno.c
+sysinfo.go: s-sysinfo; @true
+s-sysinfo: $(srcdir)/mksysinfo.sh config.h
+       CC="$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OSCFLAGS)" $(SHELL) $(srcdir)/mksysinfo.sh
+       $(SHELL) $(srcdir)/../move-if-change tmp-sysinfo.go sysinfo.go
+       $(STAMP) $@
+
+# The epoll struct has an embedded union and is packed on x86_64,
+# which is too complicated for mksysinfo.sh.  We find the offset of
+# the only field we care about in configure.ac, and generate the
+# struct here.
+epoll.go: s-epoll; @true
+s-epoll: Makefile
+       rm -f epoll.go.tmp
+       echo 'package syscall' > epoll.go.tmp
+       echo 'type EpollEvent struct {' >> epoll.go.tmp
+       echo '  Events uint32' >> epoll.go.tmp
+       case "$(SIZEOF_STRUCT_EPOLL_EVENT),$(STRUCT_EPOLL_EVENT_FD_OFFSET)" in \
+       0,0) echo 1>&2 "*** struct epoll_event data.fd offset unknown"; \
+          exit 1; ;; \
+       8,4) echo '     Fd int32' >> epoll.go.tmp; ;; \
+       12,4) echo '    Fd int32' >> epoll.go.tmp; \
+          echo '       Pad [4]byte' >> epoll.go.tmp; ;; \
+       12,8) echo '    Pad [4]byte' >> epoll.go.tmp; \
+          echo '       Fd int32' >> epoll.go.tmp; ;; \
+       16,8) echo '    Pad [4]byte' >> epoll.go.tmp; \
+          echo '       Fd int32' >> epoll.go.tmp; \
+          echo '       Pad2 [4]byte' >> epoll.go.tmp; ;; \
+       *) echo 1>&2 "*** struct epoll_event unsupported"; \
+          exit 1; ;; \
+       esac
+       echo '}' >> epoll.go.tmp
+       $(SHELL) $(srcdir)/../move-if-change epoll.go.tmp epoll.go
+       $(STAMP) $@
 
 if LIBGO_IS_LINUX
-# os_lib_inotify_la = os/libinotify.la
-os_lib_inotify_la =
+# os_lib_inotify_lo = os/inotify.lo
+os_lib_inotify_lo =
 else
-os_lib_inotify_la =
+os_lib_inotify_lo =
 endif
 
 libgo_go_objs = \
-       asn1/libasn1.la \
-       big/libbig.la \
-       bufio/libbufio.la \
-       bytes/libbytes.la \
-       cmath/libcmath.la \
-       ebnf/libebnf.la \
-       exec/libexec.la \
-       expvar/libexpvar.la \
-       flag/libflag.la \
-       fmt/libfmt.la \
-       gob/libgob.la \
-       hash/libhash.la \
-       html/libhtml.la \
-       http/libhttp.la \
-       image/libimage.la \
-       io/libio.la \
-       json/libjson.la \
-       log/liblog.la \
-       math/libmath.la \
-       mime/libmime.la \
-       net/libnet.la \
-       netchan/libnetchan.la \
-       os/libos.la \
-       patch/libpatch.la \
-       path/libpath.la \
-       rand/librand.la \
-       reflect/libreflect.la \
-       regexp/libregexp.la \
-       rpc/librpc.la \
-       runtime/libruntime.la \
-       scanner/libscanner.la \
-       smtp/libsmtp.la \
-       sort/libsort.la \
-       strconv/libstrconv.la \
-       strings/libstrings.la \
-       sync/libsync.la \
-       syslog/libsyslog.la \
-       tabwriter/libtabwriter.la \
-       template/libtemplate.la \
-       time/libtime.la \
-       try/libtry.la \
-       unicode/libunicode.la \
-       utf16/libutf16.la \
-       utf8/libutf8.la \
-       websocket/libwebsocket.la \
-       xml/libxml.la \
-       archive/libtar.la \
-       archive/libzip.la \
-       compress/libflate.la \
-       compress/libgzip.la \
-       compress/libzlib.la \
-       container/libheap.la \
-       container/liblist.la \
-       container/libring.la \
-       container/libvector.la \
-       crypto/libaes.la \
-       crypto/libblock.la \
-       crypto/libblowfish.la \
-       crypto/libcast5.la \
-       crypto/libcipher.la \
-       crypto/libelliptic.la \
-       crypto/libhmac.la \
-       crypto/libmd4.la \
-       crypto/libmd5.la \
-       crypto/libocsp.la \
-       crypto/librand.la \
-       crypto/librc4.la \
-       crypto/libripemd160.la \
-       crypto/librsa.la \
-       crypto/libsha1.la \
-       crypto/libsha256.la \
-       crypto/libsha512.la \
-       crypto/libsubtle.la \
-       crypto/libtls.la \
-       crypto/libtwofish.la \
-       crypto/libx509.la \
-       crypto/libxtea.la \
-       crypto/openpgp/libarmor.la \
-       crypto/openpgp/liberror.la \
-       crypto/openpgp/libs2k.la \
-       debug/libdwarf.la \
-       debug/libelf.la \
-       debug/libgosym.la \
-       debug/libmacho.la \
-       debug/libpe.la \
-       debug/libproc.la \
-       encoding/libascii85.la \
-       encoding/libbase32.la \
-       encoding/libbase64.la \
-       encoding/libbinary.la \
-       encoding/libgit85.la \
-       encoding/libhex.la \
-       encoding/libline.la \
-       encoding/libpem.la \
-       exp/libdatafmt.la \
-       exp/libdraw.la \
-       exp/libeval.la \
-       go/libast.la \
-       go/libdoc.la \
-       go/libparser.la \
-       go/libprinter.la \
-       go/libscanner.la \
-       go/libtoken.la \
-       go/libtypechecker.la \
-       hash/libadler32.la \
-       hash/libcrc32.la \
-       hash/libcrc64.la \
-       http/libpprof.la \
-       image/libjpeg.la \
-       image/libpng.la \
-       index/libsuffixarray.la \
-       io/libioutil.la \
-       mime/libmultipart.la \
-       net/libdict.la \
-       net/libtextproto.la \
-       $(os_lib_inotify_la) \
-       os/libsignal.la \
-       rpc/libjsonrpc.la \
-       runtime/libdebug.la \
-       runtime/libpprof.la \
-       syscalls/libsyscall.la \
-       testing/libtesting.la \
-       testing/libiotest.la \
-       testing/libquick.la \
-       testing/libscript.la
+       asn1/asn1.lo \
+       big/big.lo \
+       bufio/bufio.lo \
+       bytes/bytes.lo \
+       bytes/index.lo \
+       cmath/cmath.lo \
+       crypto/crypto.lo \
+       csv/csv.lo \
+       exec/exec.lo \
+       expvar/expvar.lo \
+       flag/flag.lo \
+       fmt/fmt.lo \
+       gob/gob.lo \
+       hash/hash.lo \
+       html/html.lo \
+       http/http.lo \
+       image/image.lo \
+       io/io.lo \
+       json/json.lo \
+       log/log.lo \
+       math/math.lo \
+       mail/mail.lo \
+       mime/mime.lo \
+       net/net.lo \
+       os/os.lo \
+       patch/patch.lo \
+       path/path.lo \
+       rand/rand.lo \
+       reflect/reflect.lo \
+       regexp/regexp.lo \
+       rpc/rpc.lo \
+       runtime/runtime.lo \
+       scanner/scanner.lo \
+       smtp/smtp.lo \
+       sort/sort.lo \
+       strconv/strconv.lo \
+       strings/strings.lo \
+       sync/sync.lo \
+       syslog/syslog.lo \
+       syslog/syslog_c.lo \
+       tabwriter/tabwriter.lo \
+       template/template.lo \
+       time/time.lo \
+       unicode/unicode.lo \
+       url/url.lo \
+       utf16/utf16.lo \
+       utf8/utf8.lo \
+       websocket/websocket.lo \
+       xml/xml.lo \
+       archive/tar.lo \
+       archive/zip.lo \
+       compress/bzip2.lo \
+       compress/flate.lo \
+       compress/gzip.lo \
+       compress/lzw.lo \
+       compress/zlib.lo \
+       container/heap.lo \
+       container/list.lo \
+       container/ring.lo \
+       crypto/aes.lo \
+       crypto/bcrypt.lo \
+       crypto/blowfish.lo \
+       crypto/cast5.lo \
+       crypto/cipher.lo \
+       crypto/des.lo \
+       crypto/dsa.lo \
+       crypto/ecdsa.lo \
+       crypto/elliptic.lo \
+       crypto/hmac.lo \
+       crypto/md4.lo \
+       crypto/md5.lo \
+       crypto/ocsp.lo \
+       crypto/openpgp.lo \
+       crypto/rand.lo \
+       crypto/rc4.lo \
+       crypto/ripemd160.lo \
+       crypto/rsa.lo \
+       crypto/sha1.lo \
+       crypto/sha256.lo \
+       crypto/sha512.lo \
+       crypto/subtle.lo \
+       crypto/tls.lo \
+       crypto/twofish.lo \
+       crypto/x509.lo \
+       crypto/xtea.lo \
+       crypto/openpgp/armor.lo \
+       crypto/openpgp/elgamal.lo \
+       crypto/openpgp/error.lo \
+       crypto/openpgp/packet.lo \
+       crypto/openpgp/s2k.lo \
+       crypto/x509/pkix.lo \
+       debug/dwarf.lo \
+       debug/elf.lo \
+       debug/gosym.lo \
+       debug/macho.lo \
+       debug/pe.lo \
+       encoding/ascii85.lo \
+       encoding/base32.lo \
+       encoding/base64.lo \
+       encoding/binary.lo \
+       encoding/git85.lo \
+       encoding/hex.lo \
+       encoding/pem.lo \
+       exp/ebnf.lo \
+       exp/gui.lo \
+       exp/norm.lo \
+       exp/spdy.lo \
+       exp/sql.lo \
+       exp/ssh.lo \
+       exp/terminal.lo \
+       exp/types.lo \
+       exp/gui/x11.lo \
+       exp/sql/driver.lo \
+       exp/template/html.lo \
+       go/ast.lo \
+       go/build.lo \
+       go/doc.lo \
+       go/parser.lo \
+       go/printer.lo \
+       go/scanner.lo \
+       go/token.lo \
+       hash/adler32.lo \
+       hash/crc32.lo \
+       hash/crc64.lo \
+       hash/fnv.lo \
+       http/cgi.lo \
+       http/fcgi.lo \
+       http/httptest.lo \
+       http/pprof.lo \
+       image/bmp.lo \
+       image/color.lo \
+       image/draw.lo \
+       image/gif.lo \
+       image/jpeg.lo \
+       image/png.lo \
+       image/tiff.lo \
+       image/ycbcr.lo \
+       index/suffixarray.lo \
+       io/ioutil.lo \
+       mime/multipart.lo \
+       net/dict.lo \
+       net/textproto.lo \
+       old/netchan.lo \
+       old/regexp.lo \
+       old/template.lo \
+       $(os_lib_inotify_lo) \
+       os/user.lo \
+       os/signal.lo \
+       path/filepath.lo \
+       regexp/syntax.lo \
+       rpc/jsonrpc.lo \
+       runtime/debug.lo \
+       runtime/pprof.lo \
+       sync/atomic.lo \
+       sync/atomic_c.lo \
+       syscall/syscall.lo \
+       syscall/errno.lo \
+       syscall/wait.lo \
+       template/parse.lo \
+       testing/testing.lo \
+       testing/iotest.lo \
+       testing/quick.lo \
+       testing/script.lo
 
 libgo_la_SOURCES = $(runtime_files)
 
+libgo_la_LDFLAGS = $(PTHREAD_CFLAGS) $(AM_LDFLAGS)
+
 libgo_la_LIBADD = \
        $(libgo_go_objs) $(LIBFFI) $(PTHREAD_LIBS) $(MATH_LIBS) $(NET_LIBS)
 
@@ -1385,1537 +1804,1648 @@ LTGOCOMPILE = $(LIBTOOL) --tag GO --mode=compile $(GOC) $(INCLUDES) \
 GOLINK = $(LIBTOOL) --tag GO --mode-link $(GOC) \
        $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_GOCFLAGS) $(LTLDFLAGS) -o $@
 
-# Build a package.  This builds a .o and a .lo.
+# Build the .go files for a package, generating a .lo file.
 BUILDPACKAGE = \
-       rm -f `echo $@ | sed -e 's|/lib|/|' -e 's/\.a/.gox/'`; \
-       test -d $(@D) || $(MKDIR_P) $(@D); \
-       rm -f $@; \
+       $(MKDIR_P) $(@D); \
        files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
        $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_$(@D)" -o $@ $$files
 
-# Build a .la file from a .lo file.
-.lo.la:
-       $(LINK) $<
-
 if LIBGO_IS_RTEMS
 use_dejagnu = yes
 else
 use_dejagnu = no
 endif
 
+GOTESTFLAGS =
+
 # Check a package.
 CHECK = \
-       @GC="$(GOC) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -Wl,-R,`${PWD_COMMAND}`/.libs"; \
+       GC="$(GOC) $(GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \
        export GC; \
+       GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \
+       export GOLIBS; \
        RUNTESTFLAGS="$(RUNTESTFLAGS)"; \
        export RUNTESTFLAGS; \
        MAKE="$(MAKE)"; \
        export MAKE; \
-       rm -f $@-log; \
+       libgccdir=`${GOC} -print-libgcc-file-name | sed -e 's|/[^/]*$$||'`; \
+       LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \
+       LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \
+       export LD_LIBRARY_PATH; \
+       rm -f $@-testsum $@-testlog; \
        prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
        test "$${prefix}" != "." || prefix="$(@D)"; \
        if test "$(use_dejagnu)" = "yes"; then \
-         $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)"; \
+         $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS); \
        else \
-         if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" >>$@-log 2>&1; then \
+         if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
+           echo "PASS: $(@D)" >> $@-testlog; \
            echo "PASS: $(@D)"; \
+           echo "PASS: $(@D)" > $@-testsum; \
          else \
-           echo "FAIL: $(@D)"; \
-           cat $@-log; \
+           echo "FAIL: $(@D)" >> $@-testlog; \
+           cat $@-testlog; \
+           echo "FAIL: $(@D)" > $@-testsum; \
            exit 1; \
          fi; \
        fi
 
 # Build all packages before checking any.
 CHECK_DEPS = libgo.la libgobegin.a \
-       $(toolexeclib_DATA) \
-       $(toolexeclibarchive_DATA) \
-       $(toolexeclibcompress_DATA) \
-       $(toolexeclibcontainer_DATA) \
-       $(toolexeclibcrypto_DATA) \
-       $(toolexeclibdebug_DATA) \
-       $(toolexeclibencoding_DATA) \
-       $(toolexeclibexp_DATA) \
        $(toolexeclibgo_DATA) \
-       $(toolexeclibhash_DATA) \
-       $(toolexeclibhttp_DATA) \
-       $(toolexeclibimage_DATA) \
-       $(toolexeclibio_DATA) \
-       $(toolexeclibos_DATA) \
-       $(toolexeclibrpc_DATA) \
-       $(toolexeclibruntime_DATA) \
-       $(toolexeclibtesting_DATA)
-
-asn1/libasn1.$(OBJEXT): $(go_asn1_files) bytes.gox fmt.gox io.gox os.gox \
+       $(toolexeclibgoarchive_DATA) \
+       $(toolexeclibgocompress_DATA) \
+       $(toolexeclibgocontainer_DATA) \
+       $(toolexeclibgocrypto_DATA) \
+       $(toolexeclibgocryptoopenpgp_DATA) \
+       $(toolexeclibgodebug_DATA) \
+       $(toolexeclibgoencoding_DATA) \
+       $(toolexeclibgoexp_DATA) \
+       $(toolexeclibgogo_DATA) \
+       $(toolexeclibgohash_DATA) \
+       $(toolexeclibgohttp_DATA) \
+       $(toolexeclibgoimage_DATA) \
+       $(toolexeclibgoindex_DATA) \
+       $(toolexeclibgoio_DATA) \
+       $(toolexeclibgomime_DATA) \
+       $(toolexeclibgonet_DATA) \
+       $(toolexeclibgoos_DATA) \
+       $(toolexeclibgopath_DATA) \
+       $(toolexeclibgorpc_DATA) \
+       $(toolexeclibgoruntime_DATA) \
+       $(toolexeclibgosync_DATA) \
+       $(toolexeclibgotesting_DATA)
+
+asn1/asn1.lo: $(go_asn1_files) big.gox bytes.gox fmt.gox io.gox os.gox \
                reflect.gox strconv.gox strings.gox time.gox
        $(BUILDPACKAGE)
-asn1/libasn1.lo: asn1/libasn1.$(OBJEXT)
-asn1/libasn1.la: asn1/libasn1.lo
 asn1/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: asn1/check
 
-big/libbig.$(OBJEXT): $(go_big_files) fmt.gox rand.gox strings.gox
+big/big.lo: $(go_big_files) encoding/binary.gox fmt.gox io.gox os.gox \
+               rand.gox strings.gox
        $(BUILDPACKAGE)
-big/libbig.lo: big/libbig.$(OBJEXT)
-big/libbig.la: big/libbig.lo
 big/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: big/check
 
-bufio/libbufio.$(OBJEXT): $(go_bufio_files) bytes.gox io.gox os.gox \
-               strconv.gox utf8.gox
+bufio/bufio.lo: $(go_bufio_files) bytes.gox io.gox os.gox strconv.gox utf8.gox
        $(BUILDPACKAGE)
-bufio/libbufio.lo: bufio/libbufio.$(OBJEXT)
-bufio/libbufio.la: bufio/libbufio.lo
 bufio/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: bufio/check
 
-bytes/bytes.$(OBJEXT): $(go_bytes_files) $(go_bytes_c_files) io.gox os.gox \
-               unicode.gox utf8.gox
-       test -d bytes || $(MKDIR_P) bytes
-       $(LTGOCOMPILE) -I . -c -o bytes/bytes.$(OBJEXT) -fgo-prefix=libgo_bytes $(srcdir)/go/bytes/buffer.go $(srcdir)/go/bytes/bytes.go $(srcdir)/go/bytes/bytes_decl.go
-bytes/index.$(OBJEXT): go/bytes/indexbyte.c bytes/bytes.$(OBJEXT)
-       $(LTCOMPILE) -c -o bytes/index.$(OBJEXT) $(srcdir)/go/bytes/indexbyte.c
-bytes/libbytes.la: bytes/bytes.$(OBJEXT) bytes/index.$(OBJEXT)
-       $(LINK) bytes/bytes.lo bytes/index.lo
+bytes/bytes.lo: $(go_bytes_files) io.gox os.gox unicode.gox utf8.gox
+       $(BUILDPACKAGE)
+bytes/index.lo: $(go_bytes_c_files) bytes/bytes.lo
+       $(LTCOMPILE) -c -o bytes/index.lo $(srcdir)/go/bytes/indexbyte.c
 bytes/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: bytes/check
 
-cmath/libcmath.$(OBJEXT): $(go_cmath_files) math.gox
+cmath/cmath.lo: $(go_cmath_files) math.gox
        $(BUILDPACKAGE)
-cmath/libcmath.lo: cmath/libcmath.$(OBJEXT)
-cmath/libcmath.la: cmath/libcmath.lo
 cmath/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: cmath/check
 
-ebnf/libebnf.$(OBJEXT): $(go_ebnf_files) container/vector.gox go/scanner.gox \
-               go/token.gox os.gox strconv.gox unicode.gox utf8.gox
+crypto/crypto.lo: $(go_crypto_files) hash.gox
        $(BUILDPACKAGE)
-ebnf/libebnf.lo: ebnf/libebnf.$(OBJEXT)
-ebnf/libebnf.la: ebnf/libebnf.lo
-ebnf/check: $(CHECK_DEPS)
-       $(CHECK)
-.PHONY: ebnf/check
+crypto/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: crypto/check
 
-exec/libexec.$(OBJEXT): $(go_exec_files) os.gox strings.gox
+csv/csv.lo: $(go_csv_files) bufio.gox bytes.gox fmt.gox io.gox os.gox \
+               strings.gox unicode.gox utf8.gox
+       $(BUILDPACKAGE)
+csv/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: csv/check
+
+exec/exec.lo: $(go_exec_files) bytes.gox io.gox os.gox strconv.gox \
+               strings.gox syscall.gox
        $(BUILDPACKAGE)
-exec/libexec.lo: exec/libexec.$(OBJEXT)
-exec/libexec.la: exec/libexec.lo
 exec/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: exec/check
 
-expvar/libexpvar.$(OBJEXT): $(go_expvar_files) bytes.gox fmt.gox http.gox \
-               json.gox log.gox os.gox runtime.gox strconv.gox sync.gox
+expvar/expvar.lo: $(go_expvar_files) bytes.gox fmt.gox http.gox json.gox \
+               log.gox os.gox runtime.gox strconv.gox sync.gox
        $(BUILDPACKAGE)
-expvar/libexpvar.lo: expvar/libexpvar.$(OBJEXT)
-expvar/libexpvar.la: expvar/libexpvar.lo
 expvar/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: expvar/check
 
-flag/libflag.$(OBJEXT): $(go_flag_files) fmt.gox os.gox strconv.gox
+flag/flag.lo: $(go_flag_files) fmt.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-flag/libflag.lo: flag/libflag.$(OBJEXT)
-flag/libflag.la: flag/libflag.lo
 flag/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: flag/check
 
-fmt/libfmt.$(OBJEXT): $(go_fmt_files) bytes.gox io.gox os.gox reflect.gox \
-               strconv.gox strings.gox unicode.gox utf8.gox
+fmt/fmt.lo: $(go_fmt_files) bytes.gox io.gox math.gox os.gox reflect.gox \
+               strconv.gox strings.gox sync.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
-fmt/libfmt.lo: fmt/libfmt.$(OBJEXT)
-fmt/libfmt.la: fmt/libfmt.lo
 fmt/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: fmt/check
 
-gob/libgob.$(OBJEXT): $(go_gob_files) bytes.gox fmt.gox io.gox math.gox \
+gob/gob.lo: $(go_gob_files) bufio.gox bytes.gox fmt.gox io.gox math.gox \
                os.gox reflect.gox runtime.gox strings.gox sync.gox \
                unicode.gox utf8.gox
        $(BUILDPACKAGE)
-gob/libgob.lo: gob/libgob.$(OBJEXT)
-gob/libgob.la: gob/libgob.lo
 gob/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: gob/check
 
-hash/libhash.$(OBJEXT): $(go_hash_files) io.gox
+hash/hash.lo: $(go_hash_files) io.gox
        $(BUILDPACKAGE)
-hash/libhash.lo: hash/libhash.$(OBJEXT)
-hash/libhash.la: hash/libhash.lo
 hash/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: hash/check
 
-html/libhtml.$(OBJEXT): $(go_html_files) bytes.gox io.gox os.gox strconv.gox \
-               strings.gox utf8.gox
+html/html.lo: $(go_html_files) bufio.gox bytes.gox fmt.gox io.gox os.gox \
+               strconv.gox strings.gox utf8.gox
        $(BUILDPACKAGE)
-html/libhtml.lo: html/libhtml.$(OBJEXT)
-html/libhtml.la: html/libhtml.lo
 html/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: html/check
 
-http/libhttp.$(OBJEXT): $(go_http_files) bufio.gox bytes.gox \
-               container/list.gox container/vector.gox crypto/rand.gox \
-               crypto/tls.gox encoding/base64.gox fmt.gox io.gox \
-               io/ioutil.gox log.gox mime.gox mime/multipart.gox net.gox \
-               os.gox path.gox sort.gox strconv.gox strings.gox sync.gox \
-               time.gox utf8.gox
+http/http.lo: $(go_http_files) bufio.gox bytes.gox compress/gzip.gox \
+               crypto/rand.gox crypto/tls.gox encoding/base64.gox \
+               encoding/binary.gox fmt.gox io.gox io/ioutil.gox log.gox \
+               mime.gox mime/multipart.gox net.gox net/textproto.gox os.gox \
+               path.gox path/filepath.gox runtime/debug.gox sort.gox \
+               strconv.gox strings.gox sync.gox time.gox url.gox utf8.gox
        $(BUILDPACKAGE)
-http/libhttp.lo: http/libhttp.$(OBJEXT)
-http/libhttp.la: http/libhttp.lo
 http/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: http/check
 
-image/libimage.$(OBJEXT): $(go_image_files) bufio.gox io.gox os.gox strconv.gox
+image/image.lo: $(go_image_files) bufio.gox image/color.gox io.gox os.gox \
+               strconv.gox
        $(BUILDPACKAGE)
-image/libimage.lo: image/libimage.$(OBJEXT)
-image/libimage.la: image/libimage.lo
 image/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: image/check
 
-io/libio.$(OBJEXT): $(go_io_files) os.gox runtime.gox sync.gox
+io/io.lo: $(go_io_files) os.gox sync.gox
        $(BUILDPACKAGE)
-io/libio.lo: io/libio.$(OBJEXT)
-io/libio.la: io/libio.lo
 io/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: io/check
 
-json/libjson.$(OBJEXT): $(go_json_files) bytes.gox container/vector.gox \
-               fmt.gox io.gox math.gox os.gox reflect.gox runtime.gox \
-               strconv.gox strings.gox unicode.gox utf16.gox utf8.gox
+json/json.lo: $(go_json_files) bytes.gox encoding/base64.gox fmt.gox io.gox \
+               math.gox os.gox reflect.gox runtime.gox strconv.gox \
+               strings.gox unicode.gox utf16.gox utf8.gox
        $(BUILDPACKAGE)
-json/libjson.lo: json/libjson.$(OBJEXT)
-json/libjson.la: json/libjson.lo
 json/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: json/check
 
-log/liblog.$(OBJEXT): $(go_log_files) bytes.gox fmt.gox io.gox runtime.gox \
-               os.gox sync.gox time.gox
+log/log.lo: $(go_log_files) bytes.gox fmt.gox io.gox runtime.gox os.gox \
+               sync.gox time.gox
        $(BUILDPACKAGE)
-log/liblog.lo: log/liblog.$(OBJEXT)
-log/liblog.la: log/liblog.lo
 log/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: log/check
 
-math/libmath.$(OBJEXT): $(go_math_files)
+math/math.lo: $(go_math_files)
        $(BUILDPACKAGE)
-math/libmath.lo: math/libmath.$(OBJEXT)
-math/libmath.la: math/libmath.lo
 math/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: math/check
 
-mime/libmime.$(OBJEXT): $(go_mime_files) bufio.gox bytes.gox os.gox \
-               strings.gox sync.gox unicode.gox
+mail/mail.lo: $(go_mail_files) bufio.gox bytes.gox encoding/base64.gox \
+               fmt.gox io.gox io/ioutil.gox log.gox net/textproto.gox os.gox \
+               strconv.gox strings.gox time.gox
+       $(BUILDPACKAGE)
+mail/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: mail/check
+
+mime/mime.lo: $(go_mime_files) bufio.gox bytes.gox fmt.gox os.gox strings.gox \
+               sync.gox unicode.gox
        $(BUILDPACKAGE)
-mime/libmime.lo: mime/libmime.$(OBJEXT)
-mime/libmime.la: mime/libmime.lo
 mime/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: mime/check
 
-net/libnet.$(OBJEXT): $(go_net_files) bytes.gox fmt.gox io.gox os.gox \
-               reflect.gox strconv.gox strings.gox sync.gox syscall.gox
+net/net.lo: $(go_net_files) bytes.gox fmt.gox io.gox os.gox rand.gox \
+               reflect.gox sort.gox strconv.gox strings.gox sync.gox \
+               syscall.gox time.gox
        $(BUILDPACKAGE)
-net/libnet.lo: net/libnet.$(OBJEXT)
-net/libnet.la: net/libnet.lo
 net/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: net/check
 
-netchan/libnetchan.$(OBJEXT): $(go_netchan_files) gob.gox log.gox net.gox \
-               os.gox reflect.gox strconv.gox sync.gox time.gox
-       $(BUILDPACKAGE)
-netchan/libnetchan.lo: netchan/libnetchan.$(OBJEXT)
-netchan/libnetchan.la: netchan/libnetchan.lo
-netchan/check: $(CHECK_DEPS)
-       $(CHECK)
-.PHONY: netchan/check
-
-os/libos.$(OBJEXT): $(go_os_files) sync.gox syscall.gox
+os/os.lo: $(go_os_files) runtime.gox sync.gox syscall.gox
        $(BUILDPACKAGE)
-os/libos.lo: os/libos.$(OBJEXT)
-os/libos.la: os/libos.lo
 os/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: os/check
 
-patch/libpatch.$(OBJEXT): $(go_patch_files) bytes.gox compress/zlib.gox \
+signal_unix.go: $(srcdir)/go/os/mkunixsignals.sh sysinfo.go
+       $(SHELL) $(srcdir)/go/os/mkunixsignals.sh sysinfo.go > $@.tmp
+       mv -f $@.tmp $@
+
+patch/patch.lo: $(go_patch_files) bytes.gox compress/zlib.gox \
                crypto/sha1.gox encoding/git85.gox fmt.gox io.gox os.gox \
                path.gox strings.gox
        $(BUILDPACKAGE)
-patch/libpatch.lo: patch/libpatch.$(OBJEXT)
-patch/libpatch.la: patch/libpatch.lo
 patch/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: patch/check
 
-path/libpath.$(OBJEXT): $(go_path_files) io/ioutil.gox os.gox sort.gox \
-               strings.gox utf8.gox
+path/path.lo: $(go_path_files) os.gox strings.gox utf8.gox
        $(BUILDPACKAGE)
-path/libpath.lo: path/libpath.$(OBJEXT)
-path/libpath.la: path/libpath.lo
 path/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: path/check
 
-rand/librand.$(OBJEXT): $(go_rand_files) math.gox sync.gox
+rand/rand.lo: $(go_rand_files) math.gox sync.gox
        $(BUILDPACKAGE)
-rand/librand.lo: rand/librand.$(OBJEXT)
-rand/librand.la: rand/librand.lo
 rand/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: rand/check
 
-reflect/libreflect.$(OBJEXT): $(go_reflect_files) math.gox runtime.gox \
-               strconv.gox sync.gox
+reflect/reflect.lo: $(go_reflect_files) math.gox runtime.gox strconv.gox \
+               sync.gox
        $(BUILDPACKAGE)
-reflect/libreflect.lo: reflect/libreflect.$(OBJEXT)
-reflect/libreflect.la: reflect/libreflect.lo
 reflect/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: reflect/check
 
-regexp/libregexp.$(OBJEXT): $(go_regexp_files) bytes.gox io.gox os.gox \
-               strings.gox utf8.gox
+regexp/regexp.lo: $(go_regexp_files) bytes.gox io.gox os.gox \
+               regexp/syntax.gox strconv.gox strings.gox sync.gox utf8.gox
        $(BUILDPACKAGE)
-regexp/libregexp.lo: regexp/libregexp.$(OBJEXT)
-regexp/libregexp.la: regexp/libregexp.lo
 regexp/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: regexp/check
 
-rpc/librpc.$(OBJEXT): $(go_rpc_files) bufio.gox fmt.gox gob.gox http.gox \
-               io.gox log.gox net.gox os.gox reflect.gox sort.gox \
-               strings.gox strconv.gox sync.gox template.gox unicode.gox \
-               utf8.gox
+rpc/rpc.lo: $(go_rpc_files) bufio.gox fmt.gox gob.gox http.gox io.gox log.gox \
+               net.gox os.gox reflect.gox sort.gox strings.gox strconv.gox \
+               sync.gox template.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
-rpc/librpc.lo: rpc/librpc.$(OBJEXT)
-rpc/librpc.la: rpc/librpc.lo
 rpc/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: rpc/check
 
-runtime/libruntime.$(OBJEXT): $(go_runtime_files)
+runtime/runtime.lo: $(go_runtime_files)
        $(BUILDPACKAGE)
-runtime/libruntime.lo: runtime/libruntime.$(OBJEXT)
-runtime/libruntime.la: runtime/libruntime.lo
 runtime/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: runtime/check
 
-scanner/libscanner.$(OBJEXT): $(go_scanner_files) bytes.gox fmt.gox io.gox \
-               os.gox unicode.gox utf8.gox
+scanner/scanner.lo: $(go_scanner_files) bytes.gox fmt.gox io.gox os.gox \
+               unicode.gox utf8.gox
        $(BUILDPACKAGE)
-scanner/libscanner.lo: scanner/libscanner.$(OBJEXT)
-scanner/libscanner.la: scanner/libscanner.lo
 scanner/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: scanner/check
 
-smtp/libsmtp.$(OBJEXT): $(go_smtp_files) crypto/tls.gox encoding/base64.gox \
-               io.gox net.gox net/textproto.gox os.gox strings.gox
+smtp/smtp.lo: $(go_smtp_files) crypto/tls.gox encoding/base64.gox io.gox \
+               net.gox net/textproto.gox os.gox strings.gox
        $(BUILDPACKAGE)
-smtp/libsmtp.lo: smtp/libsmtp.$(OBJEXT)
-smtp/libsmtp.la: smtp/libsmtp.lo
 smtp/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: smtp/check
 
-sort/libsort.$(OBJEXT): $(go_sort_files)
+sort/sort.lo: $(go_sort_files) math.gox
        $(BUILDPACKAGE)
-sort/libsort.lo: sort/libsort.$(OBJEXT)
-sort/libsort.la: sort/libsort.lo
 sort/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: sort/check
 
-strconv/libstrconv.$(OBJEXT): $(go_strconv_files) bytes.gox math.gox os.gox \
-               strings.gox unicode.gox utf8.gox
+strconv/strconv.lo: $(go_strconv_files) bytes.gox math.gox os.gox strings.gox \
+               unicode.gox utf8.gox
        $(BUILDPACKAGE)
-strconv/libstrconv.lo: strconv/libstrconv.$(OBJEXT)
-strconv/libstrconv.la: strconv/libstrconv.lo
 strconv/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: strconv/check
 
-strings/libstrings.$(OBJEXT): $(go_strings_files) os.gox unicode.gox utf8.gox
+strings/strings.lo: $(go_strings_files) io.gox os.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
-strings/libstrings.lo: strings/libstrings.$(OBJEXT)
-strings/libstrings.la: strings/libstrings.lo
 strings/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: strings/check
 
-sync/mutex.$(OBJEXT): $(go_sync_files) $(go_sync_c_files) runtime.gox
-       test -d sync || $(MKDIR_P) sync
-       $(LTGOCOMPILE) -I . -c -o sync/mutex.$(OBJEXT) -fgo-prefix=libgo_sync $(srcdir)/go/sync/mutex.go $(srcdir)/go/sync/once.go $(srcdir)/go/sync/rwmutex.go
-sync/cas.$(OBJEXT): $(srcdir)/go/sync/cas.c sync/mutex.$(OBJEXT)
-       $(LTCOMPILE) -c -o sync/cas.$(OBJEXT) $(srcdir)/go/sync/cas.c
-sync/libsync.la: sync/mutex.$(OBJEXT) sync/cas.$(OBJEXT)
-       $(LINK) sync/mutex.lo sync/cas.lo
+sync/sync.lo: $(go_sync_files) runtime.gox sync/atomic.gox
+       $(BUILDPACKAGE)
 sync/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: sync/check
 
-syslog/libsyslog.$(OBJEXT): $(go_syslog_files) fmt.gox log.gox net.gox os.gox
+syslog/syslog.lo: $(go_syslog_files) fmt.gox log.gox net.gox os.gox syscall.gox
        $(BUILDPACKAGE)
-syslog/libsyslog.lo: syslog/libsyslog.$(OBJEXT)
-syslog/libsyslog.la: syslog/libsyslog.lo
+syslog/syslog_c.lo: $(go_syslog_c_files) syslog/syslog.lo
+       $(LTCOMPILE) -c -o $@ $(srcdir)/go/syslog/syslog_c.c
 syslog/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: syslog/check
 
-tabwriter/libtabwriter.$(OBJEXT): $(go_tabwriter_files) bytes.gox io.gox \
-               os.gox utf8.gox
+tabwriter/tabwriter.lo: $(go_tabwriter_files) bytes.gox io.gox os.gox utf8.gox
        $(BUILDPACKAGE)
-tabwriter/libtabwriter.lo: tabwriter/libtabwriter.$(OBJEXT)
-tabwriter/libtabwriter.la: tabwriter/libtabwriter.lo
 tabwriter/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: tabwriter/check
 
-template/libtemplate.$(OBJEXT): $(go_template_files) bytes.gox fmt.gox io.gox \
-               os.gox reflect.gox runtime.gox strings.gox container/vector.gox
+template/template.lo: $(go_template_files) bytes.gox fmt.gox io.gox \
+               io/ioutil.gox os.gox path/filepath.gox reflect.gox \
+               runtime.gox strings.gox template/parse.gox unicode.gox \
+               url.gox utf8.gox
        $(BUILDPACKAGE)
-template/libtemplate.lo: template/libtemplate.$(OBJEXT)
-template/libtemplate.la: template/libtemplate.lo
 template/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: template/check
 
-testing/libtesting.$(OBJEXT): $(go_testing_files) flag.gox fmt.gox os.gox \
-               regexp.gox runtime.gox time.gox
+testing/testing.lo: $(go_testing_files) bytes.gox flag.gox fmt.gox io.gox \
+               os.gox regexp.gox runtime.gox runtime/pprof.gox strings.gox \
+               strconv.gox time.gox
        $(BUILDPACKAGE)
-testing/libtesting.lo: testing/libtesting.$(OBJEXT)
-testing/libtesting.la: testing/libtesting.lo
 testing/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: testing/check
 
-time/libtime.$(OBJEXT): $(go_time_files) bytes.gox container/heap.gox \
-               io/ioutil.gox os.gox strconv.gox sync.gox syscall.gox
+time/time.lo: $(go_time_files) bytes.gox container/heap.gox io/ioutil.gox \
+               os.gox strconv.gox sync.gox syscall.gox
        $(BUILDPACKAGE)
-time/libtime.lo: time/libtime.$(OBJEXT)
-time/libtime.la: time/libtime.lo
 time/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: time/check
 
-try/libtry.$(OBJEXT): $(go_try_files) fmt.gox io.gox os.gox reflect.gox \
-               unicode.gox
-       $(BUILDPACKAGE)
-try/libtry.lo: try/libtry.$(OBJEXT)
-try/libtry.la: try/libtry.lo
-try/check: $(CHECK_DEPS)
-       $(CHECK)
-.PHONY: try/check
-
-unicode/libunicode.$(OBJEXT): $(go_unicode_files)
+unicode/unicode.lo: $(go_unicode_files)
        $(BUILDPACKAGE)
-unicode/libunicode.lo: unicode/libunicode.$(OBJEXT)
-unicode/libunicode.la: unicode/libunicode.lo
 unicode/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: unicode/check
 
-utf16/libutf16.$(OBJEXT): $(go_utf16_files) unicode.gox
+url/url.lo: $(go_url_files) os.gox strconv.gox strings.gox
+       $(BUILDPACKAGE)
+url/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: url/check
+
+utf16/utf16.lo: $(go_utf16_files) unicode.gox
        $(BUILDPACKAGE)
-utf16/libutf16.lo: utf16/libutf16.$(OBJEXT)
-utf16/libutf16.la: utf16/libutf16.lo
 utf16/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: utf16/check
 
-utf8/libutf8.$(OBJEXT): $(go_utf8_files) unicode.gox
+utf8/utf8.lo: $(go_utf8_files) unicode.gox
        $(BUILDPACKAGE)
-utf8/libutf8.lo: utf8/libutf8.$(OBJEXT)
-utf8/libutf8.la: utf8/libutf8.lo
 utf8/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: utf8/check
 
-websocket/libwebsocket.$(OBJEXT): $(go_websocket_files) bufio.gox bytes.gox \
-               container/vector.gox crypto/md5.gox crypto/tls.gox \
-               encoding/binary.gox fmt.gox http.gox io.gox net.gox os.gox \
-               rand.gox strings.gox
+websocket/websocket.lo: $(go_websocket_files) bufio.gox bytes.gox \
+               crypto/md5.gox crypto/rand.gox crypto/sha1.gox crypto/tls.gox \
+               encoding/base64.gox encoding/binary.gox fmt.gox http.gox \
+               io.gox io/ioutil.gox json.gox net.gox os.gox rand.gox \
+               strings.gox strconv.gox sync.gox url.gox
        $(BUILDPACKAGE)
-websocket/libwebsocket.lo: websocket/libwebsocket.$(OBJEXT)
-websocket/libwebsocket.la: websocket/libwebsocket.lo
 websocket/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: websocket/check
 
-xml/libxml.$(OBJEXT): $(go_xml_files) bufio.gox bytes.gox fmt.gox io.gox \
-               os.gox reflect.gox strconv.gox strings.gox unicode.gox utf8.gox
+xml/xml.lo: $(go_xml_files) bufio.gox bytes.gox fmt.gox io.gox os.gox \
+               reflect.gox strconv.gox strings.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
-xml/libxml.lo: xml/libxml.$(OBJEXT)
-xml/libxml.la: xml/libxml.lo
 xml/check: $(CHECK_DEPS)
-       $(CHECK)
+       @$(CHECK)
 .PHONY: xml/check
 
-archive/libtar.$(OBJEXT): $(go_archive_tar_files) bytes.gox io.gox os.gox \
+archive/tar.lo: $(go_archive_tar_files) bytes.gox io.gox io/ioutil.gox os.gox \
                strconv.gox strings.gox
        $(BUILDPACKAGE)
-archive/libtar.lo: archive/libtar.$(OBJEXT)
-archive/libtar.la: archive/libtar.lo
 archive/tar/check: $(CHECK_DEPS)
        @$(MKDIR_P) archive/tar
-       $(CHECK)
+       @$(CHECK)
 .PHONY: archive/tar/check
 
-archive/libzip.$(OBJEXT): $(go_archive_zip_files) bufio.gox bytes.gox \
-               compress/flate.gox hash.gox hash/crc32.gox \
-               encoding/binary.gox io.gox os.gox
+archive/zip.lo: $(go_archive_zip_files) bufio.gox compress/flate.gox \
+               encoding/binary.gox hash.gox hash/crc32.gox \
+               encoding/binary.gox io.gox io/ioutil.gox os.gox time.gox
        $(BUILDPACKAGE)
-archive/libzip.lo: archive/libzip.$(OBJEXT)
-archive/libzip.la: archive/libzip.lo
 archive/zip/check: $(CHECK_DEPS)
        @$(MKDIR_P) archive/zip
-       $(CHECK)
+       @$(CHECK)
 .PHONY: archive/zip/check
 
-compress/libflate.$(OBJEXT): $(go_compress_flate_files) bufio.gox io.gox \
-               math.gox os.gox sort.gox strconv.gox
+compress/bzip2.lo: $(go_compress_bzip2_files) bufio.gox io.gox os.gox sort.gox
+       $(BUILDPACKAGE)
+compress/bzip2/check: $(CHECK_DEPS)
+       @$(MKDIR_P) compress/bzip2
+       @$(CHECK)
+.PHONY: compress/bzip2/check
+
+compress/flate.lo: $(go_compress_flate_files) bufio.gox io.gox math.gox \
+               os.gox sort.gox strconv.gox
        $(BUILDPACKAGE)
-compress/libflate.lo: compress/libflate.$(OBJEXT)
-compress/libflate.la: compress/libflate.lo
 compress/flate/check: $(CHECK_DEPS)
        @$(MKDIR_P) compress/flate
-       $(CHECK)
+       @$(CHECK)
 .PHONY: compress/flate/check
 
-compress/libgzip.$(OBJEXT): $(go_compress_gzip_files) bufio.gox \
-               compress/flate.gox hash.gox hash/crc32.gox io.gox os.gox
+compress/gzip.lo: $(go_compress_gzip_files) bufio.gox compress/flate.gox \
+               hash.gox hash/crc32.gox io.gox os.gox
        $(BUILDPACKAGE)
-compress/libgzip.lo: compress/libgzip.$(OBJEXT)
-compress/libgzip.la: compress/libgzip.lo
 compress/gzip/check: $(CHECK_DEPS)
        @$(MKDIR_P) compress/gzip
-       $(CHECK)
+       @$(CHECK)
 .PHONY: compress/gzip/check
 
-compress/libzlib.$(OBJEXT): $(go_compress_zlib_files) bufio.gox \
-               compress/flate.gox hash.gox hash/adler32.gox io.gox os.gox
+compress/lzw.lo: $(go_compress_lzw_files) bufio.gox fmt.gox io.gox os.gox
+       $(BUILDPACKAGE)
+compress/lzw/check: $(CHECK_DEPS)
+       @$(MKDIR_P) compress/lzw
+       @$(CHECK)
+.PHONY: compress/lzw/check
+
+compress/zlib.lo: $(go_compress_zlib_files) bufio.gox compress/flate.gox \
+               hash.gox hash/adler32.gox io.gox os.gox
        $(BUILDPACKAGE)
-compress/libzlib.lo: compress/libzlib.$(OBJEXT)
-compress/libzlib.la: compress/libzlib.lo
 compress/zlib/check: $(CHECK_DEPS)
        @$(MKDIR_P) compress/zlib
-       $(CHECK)
+       @$(CHECK)
 .PHONY: compress/zlib/check
 
-container/libheap.$(OBJEXT): $(go_container_heap_files) sort.gox
+container/heap.lo: $(go_container_heap_files) sort.gox
        $(BUILDPACKAGE)
-container/libheap.lo: container/libheap.$(OBJEXT)
-container/libheap.la: container/libheap.lo
 container/heap/check: $(CHECK_DEPS)
        @$(MKDIR_P) container/heap
-       $(CHECK)
+       @$(CHECK)
 .PHONY: container/heap/check
 
-container/liblist.$(OBJEXT): $(go_container_list_files)
+container/list.lo: $(go_container_list_files)
        $(BUILDPACKAGE)
-container/liblist.lo: container/liblist.$(OBJEXT)
-container/liblist.la: container/liblist.lo
 container/list/check: $(CHECK_DEPS)
        @$(MKDIR_P) container/list
-       $(CHECK)
+       @$(CHECK)
 .PHONY: container/list/check
 
-container/libring.$(OBJEXT): $(go_container_ring_files)
+container/ring.lo: $(go_container_ring_files)
        $(BUILDPACKAGE)
-container/libring.lo: container/libring.$(OBJEXT)
-container/libring.la: container/libring.lo
 container/ring/check: $(CHECK_DEPS)
        @$(MKDIR_P) container/ring
-       $(CHECK)
+       @$(CHECK)
 .PHONY: container/ring/check
 
-container/libvector.$(OBJEXT): $(go_container_vector_files)
-       $(BUILDPACKAGE)
-container/libvector.lo: container/libvector.$(OBJEXT)
-container/libvector.la: container/libvector.lo
-container/vector/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/vector
-       $(CHECK)
-.PHONY: container/vector/check
-
-crypto/libaes.$(OBJEXT): $(go_crypto_aes_files) os.gox strconv.gox
+crypto/aes.lo: $(go_crypto_aes_files) os.gox strconv.gox
        $(BUILDPACKAGE)
-crypto/libaes.lo: crypto/libaes.$(OBJEXT)
-crypto/libaes.la: crypto/libaes.lo
 crypto/aes/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/aes
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/aes/check
 
-crypto/libblock.$(OBJEXT): $(go_crypto_block_files) fmt.gox io.gox os.gox \
-               strconv.gox
+crypto/bcrypt.lo: $(go_crypto_bcrypt_files) crypto/blowfish.gox \
+               crypto/rand.gox crypto/subtle.gox encoding/base64.gox \
+               fmt.gox io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-crypto/libblock.lo: crypto/libblock.$(OBJEXT)
-crypto/libblock.la: crypto/libblock.lo
-crypto/block/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/block
-       $(CHECK)
-.PHONY: crypto/block/check
+crypto/bcrypt/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/bcrypt
+       @$(CHECK)
+.PHONY: crypto/bcrypt/check
 
-crypto/libblowfish.$(OBJEXT): $(go_crypto_blowfish_files) os.gox strconv.gox
+crypto/blowfish.lo: $(go_crypto_blowfish_files) os.gox strconv.gox
        $(BUILDPACKAGE)
-crypto/libblowfish.lo: crypto/libblowfish.$(OBJEXT)
-crypto/libblowfish.la: crypto/libblowfish.lo
 crypto/blowfish/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/blowfish
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/blowfish/check
 
-crypto/libcast5.$(OBJEXT): $(go_crypto_cast5_files) os.gox
+crypto/cast5.lo: $(go_crypto_cast5_files) os.gox
        $(BUILDPACKAGE)
-crypto/libcast5.lo: crypto/libcast5.$(OBJEXT)
-crypto/libcast5.la: crypto/libcast5.lo
-crypt/cast5/check: $(CHECK_DEPS)
+crypto/cast5/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/cast5
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/cast5/check
 
-crypto/libcipher.$(OBJEXT): $(go_crypto_cipher_files) io.gox os.gox
+crypto/cipher.lo: $(go_crypto_cipher_files) io.gox os.gox
        $(BUILDPACKAGE)
-crypto/libcipher.lo: crypto/libcipher.$(OBJEXT)
-crypto/libcipher.la: crypto/libcipher.lo
 crypto/cipher/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/cipher
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/cipher/check
 
-crypto/libelliptic.$(OBJEXT): $(go_crypto_elliptic_files) big.gox io.gox \
-               os.gox sync.gox
+crypto/des.lo: $(go_crypto_des_files) encoding/binary.gox os.gox strconv.gox
+       $(BUILDPACKAGE)
+crypto/des/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/des
+       @$(CHECK)
+.PHONY: crypto/des/check
+
+crypto/dsa.lo: $(go_crypto_dsa_files) big.gox io.gox os.gox
+       $(BUILDPACKAGE)
+crypto/dsa/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/dsa
+       @$(CHECK)
+.PHONY: crypto/dsa/check
+
+crypto/ecdsa.lo: $(go_crypto_ecdsa_files) big.gox crypto/elliptic.gox io.gox \
+               os.gox
+       $(BUILDPACKAGE)
+crypto/ecdsa/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/ecdsa
+       @$(CHECK)
+.PHONY: crypto/ecdsa/check
+
+crypto/elliptic.lo: $(go_crypto_elliptic_files) big.gox io.gox os.gox sync.gox
        $(BUILDPACKAGE)
-crypto/libelliptic.lo: crypto/libelliptic.$(OBJEXT)
-crypto/libelliptic.la: crypto/libelliptic.lo
 crypto/elliptic/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/elliptic
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/elliptic/check
 
-crypto/libhmac.$(OBJEXT): $(go_crypto_hmac_files) crypto/md5.gox \
-               crypto/sha1.gox crypto/sha256.gox hash.gox os.gox
+crypto/hmac.lo: $(go_crypto_hmac_files) crypto/md5.gox crypto/sha1.gox \
+               crypto/sha256.gox hash.gox os.gox
        $(BUILDPACKAGE)
-crypto/libhmac.lo: crypto/libhmac.$(OBJEXT)
-crypto/libhmac.la: crypto/libhmac.lo
 crypto/hmac/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/hmac
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/hmac/check
 
-crypto/libmd4.$(OBJEXT): $(go_crypto_md4_files) hash.gox os.gox
+crypto/md4.lo: $(go_crypto_md4_files) crypto.gox hash.gox os.gox
        $(BUILDPACKAGE)
-crypto/libmd4.lo: crypto/libmd4.$(OBJEXT)
-crypto/libmd4.la: crypto/libmd4.lo
 crypto/md4/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/md4
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/md4/check
 
-crypto/libmd5.$(OBJEXT): $(go_crypto_md5_files) hash.gox os.gox
+crypto/md5.lo: $(go_crypto_md5_files) crypto.gox hash.gox os.gox
        $(BUILDPACKAGE)
-crypto/libmd5.lo: crypto/libmd5.$(OBJEXT)
-crypto/libmd5.la: crypto/libmd5.lo
 crypto/md5/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/md5
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/md5/check
 
-crypto/libocsp.$(OBJEXT): $(go_crypto_ocsp_files) asn1.gox crypto/rsa.gox \
-               crypto/sha1.gox crypto/x509.gox os.gox time.gox
+crypto/ocsp.lo: $(go_crypto_ocsp_files) asn1.gox crypto.gox crypto/rsa.gox \
+               crypto/sha1.gox crypto/x509.gox crypto/x509/pkix.gox os.gox \
+               time.gox
        $(BUILDPACKAGE)
-crypto/libocsp.lo: crypto/libocsp.$(OBJEXT)
-crypto/libocsp.la: crypto/libocsp.lo
 crypto/ocsp/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/ocsp
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/ocsp/check
 
-crypto/librand.$(OBJEXT): $(go_crypto_rand_files) crypto/aes.gox io.gox os.gox \
-               sync.gox time.gox
+crypto/openpgp.lo: $(go_crypto_openpgp_files) crypto.gox \
+               crypto/openpgp/armor.gox crypto/openpgp/error.gox \
+               crypto/openpgp/packet.gox crypto/openpgp/s2k.gox \
+               crypto/rand.gox crypto/rsa.gox crypto/sha256.gox hash.gox \
+               io.gox os.gox strconv.gox time.gox
+       $(BUILDPACKAGE)
+crypto/openpgp/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/openpgp
+       @$(CHECK)
+.PHONY: crypto/openpgp/check
+
+crypto/rand.lo: $(go_crypto_rand_files) big.gox bufio.gox crypto/aes.gox \
+               io.gox os.gox sync.gox time.gox
        $(BUILDPACKAGE)
-crypto/librand.lo: crypto/librand.$(OBJEXT)
-crypto/librand.la: crypto/librand.lo
 crypto/rand/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/rand
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/rand/check
 
-crypto/librc4.$(OBJEXT): $(go_crypto_rc4_files) os.gox strconv.gox
+crypto/rc4.lo: $(go_crypto_rc4_files) os.gox strconv.gox
        $(BUILDPACKAGE)
-crypto/librc4.lo: crypto/librc4.$(OBJEXT)
-crypto/librc4.la: crypto/librc4.lo
 crypto/rc4/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/rc4
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/rc4/check
 
-crypto/libripemd160.$(OBJEXT): $(go_crypto_ripemd160_files) hash.gox os.gox
+crypto/ripemd160.lo: $(go_crypto_ripemd160_files) crypto.gox hash.gox os.gox
        $(BUILDPACKAGE)
-crypto/libripemd160.lo: crypto/libripemd160.$(OBJEXT)
-crypto/libripemd160.la: crypto/libripemd160.lo
 crypto/ripemd160/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/ripemd160
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/ripemd160/check
 
-crypto/librsa.$(OBJEXT): $(go_crypto_rsa_files) big.gox crypto/sha1.gox \
-               crypto/subtle.gox encoding/hex.gox hash.gox io.gox os.gox
+crypto/rsa.lo: $(go_crypto_rsa_files) big.gox crypto.gox crypto/rand.gox \
+               crypto/sha1.gox crypto/subtle.gox encoding/hex.gox hash.gox \
+               io.gox os.gox
        $(BUILDPACKAGE)
-crypto/librsa.lo: crypto/librsa.$(OBJEXT)
-crypto/librsa.la: crypto/librsa.lo
 crypto/rsa/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/rsa
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/rsa/check
 
-crypto/libsha1.$(OBJEXT): $(go_crypto_sha1_files) hash.gox os.gox
+crypto/sha1.lo: $(go_crypto_sha1_files) crypto.gox hash.gox os.gox
        $(BUILDPACKAGE)
-crypto/libsha1.lo: crypto/libsha1.$(OBJEXT)
-crypto/libsha1.la: crypto/libsha1.lo
 crypto/sha1/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/sha1
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/sha1/check
 
-crypto/libsha256.$(OBJEXT): $(go_crypto_sha256_files) hash.gox os.gox
+crypto/sha256.lo: $(go_crypto_sha256_files) crypto.gox hash.gox os.gox
        $(BUILDPACKAGE)
-crypto/libsha256.lo: crypto/libsha256.$(OBJEXT)
-crypto/libsha256.la: crypto/libsha256.lo
 crypto/sha256/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/sha256
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/sha256/check
 
-crypto/libsha512.$(OBJEXT): $(go_crypto_sha512_files) hash.gox os.gox
+crypto/sha512.lo: $(go_crypto_sha512_files) crypto.gox hash.gox os.gox
        $(BUILDPACKAGE)
-crypto/libsha512.lo: crypto/libsha512.$(OBJEXT)
-crypto/libsha512.la: crypto/libsha512.lo
 crypto/sha512/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/sha512
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/sha512/check
 
-crypto/libsubtle.$(OBJEXT): $(go_crypto_subtle_files)
+crypto/subtle.lo: $(go_crypto_subtle_files)
        $(BUILDPACKAGE)
-crypto/libsubtle.lo: crypto/libsubtle.$(OBJEXT)
-crypto/libsubtle.la: crypto/libsubtle.lo
 crypto/subtle/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/subtle
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/subtle/check
 
-crypto/libtls.$(OBJEXT): $(go_crypto_tls_files) big.gox bufio.gox bytes.gox \
-               container/list.gox crypto/aes.gox crypto/cipher.gox \
+crypto/tls.lo: $(go_crypto_tls_files) big.gox bytes.gox crypto.gox \
+               crypto/aes.gox crypto/cipher.gox crypto/des.gox \
                crypto/elliptic.gox crypto/hmac.gox crypto/md5.gox \
-               crypto/rc4.gox crypto/rand.gox crypto/rsa.gox crypto/sha1.gox \
-               crypto/subtle.gox crypto/rsa.gox crypto/sha1.gox \
-               crypto/x509.gox encoding/pem.gox fmt.gox hash.gox io.gox \
-               io/ioutil.gox net.gox os.gox strings.gox sync.gox time.gox
+               crypto/rand.gox crypto/rc4.gox crypto/rsa.gox crypto/sha1.gox \
+               crypto/subtle.gox crypto/x509.gox crypto/x509/pkix.gox \
+               encoding/pem.gox hash.gox io.gox io/ioutil.gox net.gox os.gox \
+               strconv.gox strings.gox sync.gox time.gox
        $(BUILDPACKAGE)
-crypto/libtls.lo: crypto/libtls.$(OBJEXT)
-crypto/libtls.la: crypto/libtls.lo
 crypto/tls/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/tls
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/tls/check
 
-crypto/libtwofish.$(OBJEXT): $(go_crypto_twofish_files) os.gox strconv.gox
+crypto/twofish.lo: $(go_crypto_twofish_files) os.gox strconv.gox
        $(BUILDPACKAGE)
-crypto/libtwofish.lo: crypto/libtwofish.$(OBJEXT)
-crypto/libtwofish.la: crypto/libtwofish.lo
 crypto/twofish/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/twofish
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/twofish/check
 
-crypto/libx509.$(OBJEXT): $(go_crypto_x509_files) asn1.gox big.gox \
-               container/vector.gox crypto/rsa.gox crypto/sha1.gox hash.gox \
-               os.gox strings.gox time.gox
+crypto/x509.lo: $(go_crypto_x509_files) asn1.gox big.gox bytes.gox crypto.gox \
+               crypto/dsa.gox crypto/rsa.gox crypto/sha1.gox \
+               crypto/x509/pkix.gox encoding/pem.gox os.gox strings.gox \
+               time.gox
        $(BUILDPACKAGE)
-crypto/libx509.lo: crypto/libx509.$(OBJEXT)
-crypto/libx509.la: crypto/libx509.lo
 crypto/x509/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/x509
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/x509/check
 
-crypto/libxtea.$(OBJEXT): $(go_crypto_xtea_files) os.gox strconv.gox
+crypto/xtea.lo: $(go_crypto_xtea_files) os.gox strconv.gox
        $(BUILDPACKAGE)
-crypto/libxtea.lo: crypto/libxtea.$(OBJEXT)
-crypto/libxtea.la: crypto/libxtea.lo
 crypto/xtea/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/xtea
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/xtea/check
 
-crypto/openpgp/libarmor.$(OBJEXT): $(go_crypto_openpgp_armor_files) bytes.gox \
-               crypto/openpgp/error.gox encoding/base64.gox \
-               encoding/line.gox io.gox os.gox
+crypto/openpgp/armor.lo: $(go_crypto_openpgp_armor_files) bufio.gox bytes.gox \
+               crypto/openpgp/error.gox encoding/base64.gox io.gox os.gox
        $(BUILDPACKAGE)
-crypto/openpgp/libarmor.lo: crypto/openpgp/libarmor.$(OBJEXT)
-crypto/openpgp/libarmor.la: crypto/openpgp/libarmor.lo
 crypto/openpgp/armor/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/openpgp/armor
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/openpgp/armor/check
 
-crypto/openpgp/liberror.$(OBJEXT): $(go_crypto_openpgp_error_files)
+crypto/openpgp/elgamal.lo: $(go_crypto_openpgp_elgamal_files) big.gox \
+               crypto/rand.gox crypto/subtle.gox io.gox os.gox
+       $(BUILDPACKAGE)
+crypto/openpgp/elgamal/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/openpgp/elgamal
+       @$(CHECK)
+.PHONY: crypto/openpgp/elgamal/check
+
+crypto/openpgp/error.lo: $(go_crypto_openpgp_error_files) strconv.gox
        $(BUILDPACKAGE)
-crypto/openpgp/liberror.lo: crypto/openpgp/liberror.$(OBJEXT)
-crypto/openpgp/liberror.la: crypto/openpgp/liberror.lo
 crypto/openpgp/error/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/openpgp/error
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/openpgp/error/check
 
-crypto/openpgp/libs2k.$(OBJEXT): $(go_crypto_openpgp_s2k_files) crypto/md5.gox \
-               crypto/openpgp/error.gox crypto/ripemd160.gox crypto/sha1.gox \
-               crypto/sha256.gox crypto/sha512.gox hash.gox io.gox os.gox
+crypto/openpgp/packet.lo: $(go_crypto_openpgp_packet_files) big.gox bytes.gox \
+               compress/flate.gox compress/zlib.gox crypto.gox \
+               crypto/aes.gox crypto/cast5.gox crypto/cipher.gox \
+               crypto/dsa.gox crypto/openpgp/elgamal.gox \
+               crypto/openpgp/error.gox crypto/openpgp/s2k.gox \
+               crypto/rand.gox crypto/rsa.gox crypto/sha1.gox \
+               crypto/subtle.gox encoding/binary.gox fmt.gox \
+               hash.gox io.gox io/ioutil.gox os.gox strconv.gox strings.gox
+       $(BUILDPACKAGE)
+crypto/openpgp/packet/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/openpgp/packet
+       @$(CHECK)
+.PHONY: crypto/openpgp/packet/check
+
+crypto/openpgp/s2k.lo: $(go_crypto_openpgp_s2k_files) crypto.gox \
+               crypto/md5.gox crypto/openpgp/error.gox crypto/rand.gox \
+               crypto/ripemd160.gox crypto/sha1.gox crypto/sha256.gox \
+               crypto/sha512.gox hash.gox io.gox os.gox
        $(BUILDPACKAGE)
-crypto/openpgp/libs2k.lo: crypto/openpgp/libs2k.$(OBJEXT)
-crypto/openpgp/libs2k.la: crypto/openpgp/libs2k.lo
 crypto/openpgp/s2k/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/openpgp/s2k
-       $(CHECK)
+       @$(CHECK)
 .PHONY: crypto/openpgp/s2k/check
 
-debug/libdwarf.$(OBJEXT): $(go_debug_dwarf_files) encoding/binary.gox os.gox \
-               strconv.gox
+crypto/x509/pkix.lo: $(go_crypto_x509_pkix_files) asn1.gox big.gox time.gox
+       $(BUILDPACKAGE)
+crypto/x509/pkix/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/x509/pkix
+       @$(CHECK)
+.PHONY: crypto/x509/pkix/check
+
+debug/dwarf.lo: $(go_debug_dwarf_files) encoding/binary.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-debug/libdwarf.lo: debug/libdwarf.$(OBJEXT)
-debug/libdwarf.la: debug/libdwarf.lo
 debug/dwarf/check: $(CHECK_DEPS)
        @$(MKDIR_P) debug/dwarf
-       $(CHECK)
+       @$(CHECK)
 .PHONY: debug/dwarf/check
 
-debug/libelf.$(OBJEXT): $(go_debug_elf_files) bytes.gox debug/dwarf.gox \
+debug/elf.lo: $(go_debug_elf_files) bytes.gox debug/dwarf.gox \
                encoding/binary.gox fmt.gox io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-debug/libelf.lo: debug/libelf.$(OBJEXT)
-debug/libelf.la: debug/libelf.lo
 debug/elf/check: $(CHECK_DEPS)
        @$(MKDIR_P) debug/elf
-       $(CHECK)
+       @$(CHECK)
 .PHONY: debug/elf/check
 
-debug/libgosym.$(OBJEXT): $(go_debug_gosym_files) encoding/binary.gox fmt.gox \
-               os.gox strconv.gox strings.gox
+debug/gosym.lo: $(go_debug_gosym_files) encoding/binary.gox fmt.gox os.gox \
+               strconv.gox strings.gox
        $(BUILDPACKAGE)
-debug/libgosym.lo: debug/libgosym.$(OBJEXT)
-debug/libgosym.la: debug/libgosym.lo
 debug/gosym/check: $(CHECK_DEPS)
        @$(MKDIR_P) debug/gosym
-       $(CHECK)
+       @$(CHECK)
 .PHONY: debug/gosym/check
 
-debug/libmacho.$(OBJEXT): $(go_debug_macho_files) bytes.gox debug/dwarf.gox \
+debug/macho.lo: $(go_debug_macho_files) bytes.gox debug/dwarf.gox \
                encoding/binary.gox fmt.gox io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-debug/libmacho.lo: debug/libmacho.$(OBJEXT)
-debug/libmacho.la: debug/libmacho.lo
 debug/macho/check: $(CHECK_DEPS)
        @$(MKDIR_P) debug/macho
-       $(CHECK)
+       @$(CHECK)
 .PHONY: debug/macho/check
 
-debug/libpe.$(OBJEXT): $(go_debug_pe_files) debug/dwarf.gox \
+debug/pe.lo: $(go_debug_pe_files) debug/dwarf.gox \
                encoding/binary.gox fmt.gox io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-debug/libpe.lo: debug/libpe.$(OBJEXT)
-debug/libpe.la: debug/libpe.lo
 debug/pe/check: $(CHECK_DEPS)
        @$(MKDIR_P) debug/pe
-       $(CHECK)
+       @$(CHECK)
 .PHONY: debug/pe/check
 
-debug/libproc.$(OBJEXT): $(go_debug_proc_files) container/vector.gox fmt.gox \
-               io/ioutil.gox os.gox runtime.gox strconv.gox strings.gox \
-               sync.gox syscall.gox
+encoding/ascii85.lo: $(go_encoding_ascii85_files) io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-debug/libproc.lo: debug/libproc.$(OBJEXT)
-debug/libproc.la: debug/libproc.lo
-debug/proc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/proc
-       $(CHECK)
-.PHONY: debug/proc/check
-
-encoding/libascii85.$(OBJEXT): $(go_encoding_ascii85_files) io.gox os.gox \
-               strconv.gox
-       $(BUILDPACKAGE)
-encoding/libascii85.lo: encoding/libascii85.$(OBJEXT)
-encoding/libascii85.la: encoding/libascii85.lo
 encoding/ascii85/check: $(CHECK_DEPS)
        @$(MKDIR_P) encoding/ascii85
-       $(CHECK)
+       @$(CHECK)
 .PHONY: encoding/ascii85/check
 
-encoding/libbase32.$(OBJEXT): $(go_encoding_base32_files) io.gox os.gox \
-               strconv.gox
+encoding/base32.lo: $(go_encoding_base32_files) io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-encoding/libbase32.lo: encoding/libbase32.$(OBJEXT)
-encoding/libbase32.la: encoding/libbase32.lo
 encoding/base32/check: $(CHECK_DEPS)
        @$(MKDIR_P) encoding/base32
-       $(CHECK)
+       @$(CHECK)
 .PHONY: encoding/base32/check
 
-encoding/libbase64.$(OBJEXT): $(go_encoding_base64_files) io.gox os.gox \
-               strconv.gox
+encoding/base64.lo: $(go_encoding_base64_files) io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-encoding/libbase64.lo: encoding/libbase64.$(OBJEXT)
-encoding/libbase64.la: encoding/libbase64.lo
 encoding/base64/check: $(CHECK_DEPS)
        @$(MKDIR_P) encoding/base64
-       $(CHECK)
+       @$(CHECK)
 .PHONY: encoding/base64/check
 
-encoding/libbinary.$(OBJEXT): $(go_encoding_binary_files) io.gox math.gox \
-               os.gox reflect.gox
+encoding/binary.lo: $(go_encoding_binary_files) io.gox math.gox os.gox \
+               reflect.gox
        $(BUILDPACKAGE)
-encoding/libbinary.lo: encoding/libbinary.$(OBJEXT)
-encoding/libbinary.la: encoding/libbinary.lo
 encoding/binary/check: $(CHECK_DEPS)
        @$(MKDIR_P) encoding/binary
-       $(CHECK)
+       @$(CHECK)
 .PHONY: encoding/binary/check
 
-encoding/libgit85.$(OBJEXT): $(go_encoding_git85_files) bytes.gox io.gox \
-               os.gox strconv.gox
+encoding/git85.lo: $(go_encoding_git85_files) bytes.gox io.gox os.gox \
+               strconv.gox
        $(BUILDPACKAGE)
-encoding/libgit85.lo: encoding/libgit85.$(OBJEXT)
-encoding/libgit85.la: encoding/libgit85.lo
 encoding/git85/check: $(CHECK_DEPS)
        @$(MKDIR_P) encoding/git85
-       $(CHECK)
+       @$(CHECK)
 .PHONY: encoding/git85/check
 
-encoding/libhex.$(OBJEXT): $(go_encoding_hex_files) os.gox strconv.gox
+encoding/hex.lo: $(go_encoding_hex_files) bytes.gox io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-encoding/libhex.lo: encoding/libhex.$(OBJEXT)
-encoding/libhex.la: encoding/libhex.lo
 encoding/hex/check: $(CHECK_DEPS)
        @$(MKDIR_P) encoding/hex
-       $(CHECK)
+       @$(CHECK)
 .PHONY: encoding/hex/check
 
-encoding/libline.$(OBJEXT): $(go_encoding_line_files) io.gox os.gox
-       $(BUILDPACKAGE)
-encoding/libline.lo: encoding/libline.$(OBJEXT)
-encoding/libline.la: encoding/libline.lo
-encoding/line/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/line
-       $(CHECK)
-.PHONY: encoding/line/check
-
-encoding/libpem.$(OBJEXT): $(go_encoding_pem_files) bytes.gox \
-               encoding/base64.gox
+encoding/pem.lo: $(go_encoding_pem_files) bytes.gox encoding/base64.gox
        $(BUILDPACKAGE)
-encoding/libpem.lo: encoding/libpem.$(OBJEXT)
-encoding/libpem.la: encoding/libpem.lo
 encoding/pem/check: $(CHECK_DEPS)
        @$(MKDIR_P) encoding/pem
-       $(CHECK)
+       @$(CHECK)
 .PHONY: encoding/pem/check
 
-exp/libdatafmt.$(OBJEXT): $(go_exp_datafmt_files) bytes.gox \
-               container/vector.gox fmt.gox go/scanner.gox go/token.gox \
-               io.gox os.gox reflect.gox runtime.gox strconv.gox strings.gox
-       $(BUILDPACKAGE)
-exp/libdatafmt.lo: exp/libdatafmt.$(OBJEXT)
-exp/libdatafmt.la: exp/libdatafmt.lo
-exp/datafmt/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/datafmt
-       $(CHECK)
-.PHONY: exp/datafmt/check
-
-exp/libdraw.$(OBJEXT): $(go_exp_draw_files) image.gox os.gox
-       $(BUILDPACKAGE)
-exp/libdraw.lo: exp/libdraw.$(OBJEXT)
-exp/libdraw.la: exp/libdraw.lo
-exp/draw/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/draw
-       $(CHECK)
-.PHONY: exp/draw/check
-
-exp/libeval.$(OBJEXT): $(go_exp_eval_files) big.gox go/ast.gox go/parser.gox \
-               go/scanner.gox go/token.gox fmt.gox log.gox strconv.gox \
-               strings.gox os.gox reflect.gox runtime.gox sort.gox template.gox
-       $(BUILDPACKAGE)
-exp/libeval.lo: exp/libeval.$(OBJEXT)
-exp/libeval.la: exp/libeval.lo
-exp/eval/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/eval
-       $(CHECK)
-.PHONY: exp/eval/check
-
-go/libast.$(OBJEXT): $(go_go_ast_files) fmt.gox go/token.gox io.gox os.gox \
-               reflect.gox unicode.gox utf8.gox
-       $(BUILDPACKAGE)
-go/libast.lo: go/libast.$(OBJEXT)
-go/libast.la: go/libast.lo
+exp/ebnf.lo: $(go_exp_ebnf_files) go/scanner.gox go/token.gox os.gox \
+               strconv.gox unicode.gox utf8.gox
+       $(BUILDPACKAGE)
+exp/ebnf/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/ebnf
+       @$(CHECK)
+.PHONY: exp/ebnf/check
+
+exp/gui.lo: $(go_exp_gui_files) image.gox image/draw.gox os.gox
+       $(BUILDPACKAGE)
+exp/gui/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/gui
+       @$(CHECK)
+.PHONY: exp/gui/check
+
+exp/norm.lo: $(go_exp_norm_files) io.gox os.gox utf8.gox
+       $(BUILDPACKAGE)
+exp/norm/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/norm
+       @$(CHECK)
+.PHONY: exp/norm/check
+
+exp/spdy.lo: $(go_exp_spdy_files) bytes.gox compress/zlib.gox \
+               encoding/binary.gox http.gox io.gox os.gox strings.gox
+       $(BUILDPACKAGE)
+exp/spdy/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/spdy
+       @$(CHECK)
+.PHONY: exp/spdy/check
+
+exp/sql.lo: $(go_exp_sql_files) exp/sql/driver.gox fmt.gox os.gox reflect.gox \
+               runtime.gox strconv.gox sync.gox
+       $(BUILDPACKAGE)
+exp/sql/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/sql
+       @$(CHECK)
+.PHONY: exp/sql/check
+
+exp/ssh.lo: $(go_exp_ssh_files) big.gox bufio.gox bytes.gox crypto.gox \
+               crypto/aes.gox crypto/cipher.gox crypto/hmac.gox \
+               crypto/rand.gox crypto/rsa.gox crypto/sha1.gox \
+               crypto/subtle.gox crypto/x509.gox encoding/pem.gox hash.gox \
+               io.gox net.gox os.gox reflect.gox strconv.gox sync.gox
+       $(BUILDPACKAGE)
+exp/ssh/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/ssh
+       @$(CHECK)
+.PHONY: exp/ssh/check
+
+exp/terminal.lo: $(go_exp_terminal_files) io.gox os.gox syscall.gox
+       $(BUILDPACKAGE)
+exp/terminal/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/terminal
+       @$(CHECK)
+.PHONY: exp/terminal/check
+
+exp/types.lo: $(go_exp_types_files) big.gox bufio.gox fmt.gox go/ast.gox \
+               go/token.gox io.gox os.gox path/filepath.gox runtime.gox \
+               scanner.gox sort.gox strconv.gox strings.gox
+       $(BUILDPACKAGE)
+exp/types/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/types
+       @$(CHECK)
+.PHONY: exp/types/check
+
+exp/gui/x11.lo: $(go_exp_gui_x11_files) bufio.gox exp/gui.gox image.gox \
+               image/draw.gox io.gox log.gox net.gox os.gox strconv.gox \
+               strings.gox time.gox
+       $(BUILDPACKAGE)
+exp/gui/x11/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/gui/x11
+       @$(CHECK)
+.PHONY: exp/gui/x11/check
+
+exp/sql/driver.lo: $(go_exp_sql_driver_files) fmt.gox os.gox reflect.gox \
+               strconv.gox
+       $(BUILDPACKAGE)
+exp/sql/driver/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/sql/driver
+       @$(CHECK)
+.PHONY: exp/sql/driver/check
+
+exp/template/html.lo: $(go_exp_template_html_files) bytes.gox fmt.gox \
+               html.gox json.gox os.gox strings.gox template.gox \
+               template/parse.gox unicode.gox utf8.gox 
+       $(BUILDPACKAGE)
+exp/template/html/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/template/html
+       @$(CHECK)
+.PHONY: exp/template/html/check
+
+go/ast.lo: $(go_go_ast_files) bytes.gox fmt.gox go/scanner.gox go/token.gox \
+               io.gox os.gox reflect.gox strconv.gox unicode.gox utf8.gox
+       $(BUILDPACKAGE)
 go/ast/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/ast
-       $(CHECK)
+       @$(CHECK)
 .PHONY: go/ast/check
 
-go/libdoc.$(OBJEXT): $(go_go_doc_files) go/ast.gox go/token.gox io.gox \
-               regexp.gox sort.gox strings.gox template.gox
+go/build.lo: $(go_go_build_files) bytes.gox exec.gox fmt.gox go/ast.gox \
+               go/doc.gox go/parser.gox go/token.gox io/ioutil.gox log.gox \
+               os.gox path.gox path/filepath.gox regexp.gox runtime.gox \
+               sort.gox strconv.gox strings.gox runtime.gox unicode.gox
+       $(BUILDPACKAGE)
+go/build/check: $(CHECK_DEPS)
+       @$(MKDIR_P) go/build
+       @$(CHECK)
+.PHONY: go/build/check
+
+syslist.go: s-syslist; @true
+s-syslist: Makefile
+       echo '// Generated automatically by make.' >syslist.go.tmp
+       echo 'package build' >>syslist.go.tmp
+       echo 'const goosList = "$(GOOS)"' >>syslist.go.tmp
+       echo 'const goarchList = "$(GOARCH)"' >>syslist.go.tmp
+       $(SHELL) $(srcdir)/../move-if-change syslist.go.tmp syslist.go
+       $(STAMP) $@
+
+go/doc.lo: $(go_go_doc_files) go/ast.gox go/token.gox io.gox regexp.gox \
+               sort.gox strings.gox template.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
-go/libdoc.lo: go/libdoc.$(OBJEXT)
-go/libdoc.la: go/libdoc.lo
 go/doc/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/doc
-       $(CHECK)
+       @$(CHECK)
 .PHONY: go/doc/check
 
-go/libparser.$(OBJEXT): $(go_go_parser_files) bytes.gox fmt.gox go/ast.gox \
+go/parser.lo: $(go_go_parser_files) bytes.gox fmt.gox go/ast.gox \
                go/scanner.gox go/token.gox io.gox io/ioutil.gox os.gox \
-               path.gox strings.gox
+               path/filepath.gox strings.gox
        $(BUILDPACKAGE)
-go/libparser.lo: go/libparser.$(OBJEXT)
-go/libparser.la: go/libparser.lo
 go/parser/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/parser
-       $(CHECK)
+       @$(CHECK)
 .PHONY: go/parser/check
 
-go/libprinter.$(OBJEXT): $(go_go_printer_files) bytes.gox fmt.gox go/ast.gox \
-               go/token.gox io.gox os.gox reflect.gox runtime.gox \
+go/printer.lo: $(go_go_printer_files) bytes.gox fmt.gox go/ast.gox \
+               go/token.gox io.gox os.gox path/filepath.gox reflect.gox \
                strings.gox tabwriter.gox
        $(BUILDPACKAGE)
-go/libprinter.lo: go/libprinter.$(OBJEXT)
-go/libprinter.la: go/libprinter.lo
 go/printer/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/printer
-       $(CHECK)
+       @$(CHECK)
 .PHONY: go/printer/check
 
-go/libscanner.$(OBJEXT): $(go_go_scanner_files) bytes.gox \
-               container/vector.gox fmt.gox go/token.gox io.gox os.gox \
-               path.gox sort.gox strconv.gox unicode.gox utf8.gox
+go/scanner.lo: $(go_go_scanner_files) bytes.gox fmt.gox go/token.gox io.gox \
+               os.gox path/filepath.gox sort.gox strconv.gox unicode.gox \
+               utf8.gox
        $(BUILDPACKAGE)
-go/libscanner.lo: go/libscanner.$(OBJEXT)
-go/libscanner.la: go/libscanner.lo
 go/scanner/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/scanner
-       $(CHECK)
+       @$(CHECK)
 .PHONY: go/scanner/check
 
-go/libtoken.$(OBJEXT): $(go_go_token_files) fmt.gox strconv.gox
+go/token.lo: $(go_go_token_files) fmt.gox gob.gox io.gox os.gox sort.gox \
+               strconv.gox sync.gox
        $(BUILDPACKAGE)
-go/libtoken.lo: go/libtoken.$(OBJEXT)
-go/libtoken.la: go/libtoken.lo
 go/token/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/token
-       $(CHECK)
+       @$(CHECK)
 .PHONY: go/token/check
 
-go/libtypechecker.$(OBJEXT): $(go_go_typechecker_files) fmt.gox go/ast.gox \
-               go/token.gox go/scanner.gox os.gox
-       $(BUILDPACKAGE)
-go/libtypechecker.lo: go/libtypechecker.$(OBJEXT)
-go/libtypechecker.la: go/libtypechecker.lo
-go/typechecker/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/typechecker
-       $(CHECK)
-.PHONY: go/typechecker/check
-
-hash/libadler32.$(OBJEXT): $(go_hash_adler32_files) hash.gox os.gox
+hash/adler32.lo: $(go_hash_adler32_files) hash.gox os.gox
        $(BUILDPACKAGE)
-hash/libadler32.lo: hash/libadler32.$(OBJEXT)
-hash/libadler32.la: hash/libadler32.lo
 hash/adler32/check: $(CHECK_DEPS)
        @$(MKDIR_P) hash/adler32
-       $(CHECK)
+       @$(CHECK)
 .PHONY: hash/adler32/check
 
-hash/libcrc32.$(OBJEXT): $(go_hash_crc32_files) hash.gox os.gox
+hash/crc32.lo: $(go_hash_crc32_files) hash.gox os.gox sync.gox
        $(BUILDPACKAGE)
-hash/libcrc32.lo: hash/libcrc32.$(OBJEXT)
-hash/libcrc32.la: hash/libcrc32.lo
 hash/crc32/check: $(CHECK_DEPS)
        @$(MKDIR_P) hash/crc32
-       $(CHECK)
+       @$(CHECK)
 .PHONY: hash/crc32/check
 
-hash/libcrc64.$(OBJEXT): $(go_hash_crc64_files) hash.gox os.gox
+hash/crc64.lo: $(go_hash_crc64_files) hash.gox os.gox
        $(BUILDPACKAGE)
-hash/libcrc64.lo: hash/libcrc64.$(OBJEXT)
-hash/libcrc64.la: hash/libcrc64.lo
 hash/crc64/check: $(CHECK_DEPS)
        @$(MKDIR_P) hash/crc64
-       $(CHECK)
+       @$(CHECK)
 .PHONY: hash/crc64/check
 
-http/libpprof.$(OBJEXT): $(go_http_pprof_files) bufio.gox fmt.gox http.gox \
+hash/fnv.lo: $(go_hash_fnv_files) encoding/binary.gox hash.gox os.gox
+       $(BUILDPACKAGE)
+hash/fnv/check: $(CHECK_DEPS)
+       @$(MKDIR_P) hash/fnv
+       @$(CHECK)
+.PHONY: hash/fnv/check
+
+http/cgi.lo: $(go_http_cgi_files) bufio.gox crypto/tls.gox exec.gox fmt.gox \
+               http.gox net.gox io.gox io/ioutil.gox log.gox os.gox \
+               path/filepath.gox regexp.gox strconv.gox strings.gox url.gox
+       $(BUILDPACKAGE)
+http/cgi/check: $(CHECK_DEPS)
+       @$(MKDIR_P) http/cgi
+       @$(CHECK)
+.PHONY: http/cgi/check
+
+http/fcgi.lo: $(go_http_fcgi_files) bufio.gox bytes.gox encoding/binary.gox \
+               fmt.gox http.gox http/cgi.gox io.gox net.gox os.gox sync.gox \
+               time.gox
+       $(BUILDPACKAGE)
+http/fcgi/check: $(CHECK_DEPS)
+       @$(MKDIR_P) http/fcgi
+       @$(CHECK)
+.PHONY: http/fcgi/check
+
+http/httptest.lo: $(go_http_httptest_files) bytes.gox crypto/rand.gox \
+               crypto/tls.gox flag.gox fmt.gox http.gox net.gox os.gox \
+               time.gox
+       $(BUILDPACKAGE)
+http/httptest/check: $(CHECK_DEPS)
+       @$(MKDIR_P) http/httptest
+       @$(CHECK)
+.PHONY: http/httptest/check
+
+http/pprof.lo: $(go_http_pprof_files) bufio.gox bytes.gox fmt.gox http.gox \
                os.gox runtime.gox runtime/pprof.gox strconv.gox strings.gox
        $(BUILDPACKAGE)
-http/libpprof.lo: http/libpprof.$(OBJEXT)
-http/libpprof.la: http/libpprof.lo
 http/pprof/check: $(CHECK_DEPS)
        @$(MKDIR_P) http/pprof
-       $(CHECK)
+       @$(CHECK)
 .PHONY: http/pprof/check
 
-image/libjpeg.$(OBJEXT): $(go_image_jpeg_files) bufio.gox image.gox io.gox \
-               os.gox
+image/bmp.lo: $(go_image_bmp_files) image.gox image/color.gox io.gox os.gox
+       $(BUILDPACKAGE)
+image/bmp/check: $(CHECK_DEPS)
+       @$(MKDIR_P) image/bmp
+       @$(CHECK)
+.PHONY: image/bmp/check
+
+image/color.lo: $(go_image_color_files)
+       $(BUILDPACKAGE)
+image/color/check: $(CHECK_DEPS)
+       @$(MKDIR_P) image/color
+       @$(CHECK)
+.PHONY: image/color/check
+
+image/draw.lo: $(go_image_draw_files) image.gox image/color.gox image/ycbcr.gox
+       $(BUILDPACKAGE)
+image/draw/check: $(CHECK_DEPS)
+       @$(MKDIR_P) image/draw
+       @$(CHECK)
+.PHONY: image/draw/check
+
+image/gif.lo: $(go_image_gif_files) bufio.gox compress/lzw.gox fmt.gox \
+               image.gox image/color.gox io.gox os.gox
+       $(BUILDPACKAGE)
+image/gif/check: $(CHECK_DEPS)
+       @$(MKDIR_P) image/gif
+       @$(CHECK)
+.PHONY: image/gif/check
+
+image/jpeg.lo: $(go_image_jpeg_files) bufio.gox image.gox image/color.gox \
+               image/ycbcr.gox io.gox os.gox
        $(BUILDPACKAGE)
-image/libjpeg.lo: image/libjpeg.$(OBJEXT)
-image/libjpeg.la: image/libjpeg.lo
 image/jpeg/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/jpeg
-       $(CHECK)
+       @$(CHECK)
 .PHONY: image/jpeg/check
 
-image/libpng.$(OBJEXT): $(go_image_png_files) bufio.gox compress/zlib.gox \
-               fmt.gox hash.gox hash/crc32.gox image.gox io.gox os.gox \
-               strconv.gox
+image/png.lo: $(go_image_png_files) bufio.gox compress/zlib.gox \
+               encoding/binary.gox fmt.gox hash.gox hash/crc32.gox image.gox \
+               image/color.gox io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
-image/libpng.lo: image/libpng.$(OBJEXT)
-image/libpng.la: image/libpng.lo
 image/png/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/png
-       $(CHECK)
+       @$(CHECK)
 .PHONY: image/png/check
 
-index/libsuffixarray.$(OBJEXT): $(go_index_suffixarray_files) bytes.gox \
-               regexp.gox sort.gox
+image/tiff.lo: $(go_image_tiff_files) bufio.gox compress/lzw.gox \
+               compress/zlib.gox encoding/binary.gox image.gox \
+               image/color.gox io.gox io/ioutil.gox os.gox
+       $(BUILDPACKAGE)
+image/tiff/check: $(CHECK_DEPS)
+       @$(MKDIR_P) image/tiff
+       @$(CHECK)
+.PHONY: image/tiff/check
+
+image/ycbcr.lo: $(go_image_ycbcr_files) image.gox image/color.gox
+       $(BUILDPACKAGE)
+image/ycbcr/check: $(CHECK_DEPS)
+       @$(MKDIR_P) image/ycbcr
+       @$(CHECK)
+.PHONY: image/ycbcr/check
+
+index/suffixarray.lo: $(go_index_suffixarray_files) bytes.gox \
+               encoding/binary.gox io.gox os.gox regexp.gox sort.gox
        $(BUILDPACKAGE)
-index/libsuffixarray.lo: index/libsuffixarray.$(OBJEXT)
-index/libsuffixarray.la: index/libsuffixarray.lo
 index/suffixarray/check: $(CHECK_DEPS)
        @$(MKDIR_P) index/suffixarray
-       $(CHECK)
+       @$(CHECK)
 .PHONY: index/suffixarray/check
 
-io/libioutil.$(OBJEXT): $(go_io_ioutil_files) bytes.gox io.gox os.gox sort.gox \
-               strconv.gox
+io/ioutil.lo: $(go_io_ioutil_files) bytes.gox io.gox os.gox path/filepath.gox \
+               sort.gox strconv.gox
        $(BUILDPACKAGE)
-io/libioutil.lo: io/libioutil.$(OBJEXT)
-io/libioutil.la: io/libioutil.lo
 io/ioutil/check: $(CHECK_DEPS)
        @$(MKDIR_P) io/ioutil
-       $(CHECK)
+       @$(CHECK)
 .PHONY: io/ioutil/check
 
-mime/libmultipart.$(OBJEXT): $(go_mime_multipart_files) bufio.gox bytes.gox \
-               io.gox mime.gox os.gox regexp.gox strings.gox
+mime/multipart.lo: $(go_mime_multipart_files) bufio.gox bytes.gox \
+               crypto/rand.gox fmt.gox io.gox io/ioutil.gox mime.gox \
+               net/textproto.gox os.gox strings.gox
        $(BUILDPACKAGE)
-mime/libmultipart.lo: mime/libmultipart.$(OBJEXT)
-mime/libmultipart.la: mime/libmultipart.lo
 mime/multipart/check: $(CHECK_DEPS)
        @$(MKDIR_P) mime/multipart
-       $(CHECK)
+       @$(CHECK)
 .PHONY: mime/multipart/check
 
-net/libdict.$(OBJEXT): $(go_net_dict_files) container/vector.gox \
-               net/textproto.gox os.gox strconv.gox strings.gox
+net/dict.lo: $(go_net_dict_files) net/textproto.gox os.gox strconv.gox \
+               strings.gox
        $(BUILDPACKAGE)
-net/libdict.lo: net/libdict.$(OBJEXT)
-net/libdict.la: net/libdict.lo
 
-net/libtextproto.$(OBJEXT): $(go_net_textproto_files) bufio.gox bytes.gox \
-               container/vector.gox fmt.gox io.gox io/ioutil.gox net.gox \
-               os.gox strconv.gox sync.gox
+net/textproto.lo: $(go_net_textproto_files) bufio.gox bytes.gox fmt.gox \
+               io.gox io/ioutil.gox net.gox os.gox strings.gox strconv.gox \
+               sync.gox
        $(BUILDPACKAGE)
-net/libtextproto.lo: net/libtextproto.$(OBJEXT)
-net/libtextproto.la: net/libtextproto.lo
 net/textproto/check: $(CHECK_DEPS)
        @$(MKDIR_P) net/textproto
-       $(CHECK)
+       @$(CHECK)
 .PHONY: net/textproto/check
 
-os/libinotify.$(OBJEXT): $(go_os_inotify_files) fmt.gox os.gox strings.gox \
-               syscall.gox
+old/netchan.lo: $(go_old_netchan_files) gob.gox io.gox log.gox net.gox os.gox \
+               reflect.gox strconv.gox sync.gox time.gox
+       $(BUILDPACKAGE)
+old/netchan/check: $(CHECK_DEPS)
+       @$(MKDIR_P) old/netchan
+       @$(CHECK)
+.PHONY: old/netchan/check
+
+old/regexp.lo: $(go_old_regexp_files) bytes.gox io.gox os.gox strings.gox \
+               utf8.gox
+       $(BUILDPACKAGE)
+old/regexp/check: $(CHECK_DEPS)
+       @$(MKDIR_P) old/regexp
+       @$(CHECK)
+.PHONY: old/regexp/check
+
+old/template.lo: $(go_old_template_files) bytes.gox fmt.gox io.gox \
+               io/ioutil.gox os.gox reflect.gox strconv.gox strings.gox \
+               unicode.gox utf8.gox
+       $(BUILDPACKAGE)
+old/template/check: $(CHECK_DEPS)
+       @$(MKDIR_P) old/template
+       @$(CHECK)
+.PHONY: old/template/check
+
+os/inotify.lo: $(go_os_inotify_files) fmt.gox os.gox strings.gox syscall.gox
        $(BUILDPACKAGE)
-os/libinotify.lo: os/libinotify.$(OBJEXT)
-os/libinotify.la: os/libinotify.lo
 os/inotify/check: $(CHECK_DEPS)
        @$(MKDIR_P) os/inotify
-       $(CHECK)
+       @$(CHECK)
 .PHONY: os/inotify/check
 
-os/libsignal.$(OBJEXT): $(go_os_signal_files) runtime.gox strconv.gox
+os/user.lo: $(go_os_user_files) fmt.gox os.gox runtime.gox strconv.gox \
+               strings.gox syscall.gox
+       $(BUILDPACKAGE)
+os/user/check: $(CHECK_DEPS)
+       @$(MKDIR_P) os/user
+       @$(CHECK)
+.PHONY: os/user/check
+
+os/signal.lo: $(go_os_signal_files) os.gox runtime.gox
        $(BUILDPACKAGE)
-os/libsignal.lo: os/libsignal.$(OBJEXT)
-os/libsignal.la: os/libsignal.lo
 os/signal/check: $(CHECK_DEPS)
        @$(MKDIR_P) os/signal
-       $(CHECK)
+       @$(CHECK)
 .PHONY: os/signal/check
 
-unix.go: $(srcdir)/go/os/signal/mkunix.sh sysinfo.go
-       $(SHELL) $(srcdir)/go/os/signal/mkunix.sh sysinfo.go > $@.tmp
-       mv -f $@.tmp $@
+path/filepath.lo: $(go_path_filepath_files) bytes.gox os.gox runtime.gox \
+               sort.gox strings.gox utf8.gox
+       $(BUILDPACKAGE)
+path/filepath/check: $(CHECK_DEPS)
+       @$(MKDIR_P) path/filepath
+       @$(CHECK)
+.PHONY: path/filepath/check
+
+regexp/syntax.lo: $(go_regexp_syntax_files) bytes.gox os.gox sort.gox \
+               strconv.gox strings.gox unicode.gox utf8.gox
+       $(BUILDPACKAGE)
+regexp/syntax/check: $(CHECK_DEPS)
+       @$(MKDIR_P) regexp/syntax
+       @$(CHECK)
+.PHONY: regexp/syntax/check
 
-rpc/libjsonrpc.$(OBJEXT): $(go_rpc_jsonrpc_files) fmt.gox io.gox json.gox \
-               net.gox os.gox rpc.gox sync.gox
+rpc/jsonrpc.lo: $(go_rpc_jsonrpc_files) fmt.gox io.gox json.gox net.gox \
+               os.gox rpc.gox sync.gox
        $(BUILDPACKAGE)
-rpc/libjsonrpc.lo: rpc/libjsonrpc.$(OBJEXT)
-rpc/libjsonrpc.la: rpc/libjsonrpc.lo
 rpc/jsonrpc/check: $(CHECK_DEPS)
        @$(MKDIR_P) rpc/jsonrpc
-       $(CHECK)
+       @$(CHECK)
 .PHONY: rpc/jsonrpc/check
 
-runtime/libdebug.$(OBJEXT): $(go_runtime_debug_files) bytes.gox fmt.gox \
-               io/ioutil.gox os.gox runtime.gox
+runtime/debug.lo: $(go_runtime_debug_files) bytes.gox fmt.gox io/ioutil.gox \
+               os.gox runtime.gox
        $(BUILDPACKAGE)
-runtime/libdebug.lo: runtime/libdebug.$(OBJEXT)
-runtime/libdebug.la: runtime/libdebug.lo
 runtime/debug/check: $(CHECK_DEPS)
        @$(MKDIR_P) runtime/debug
-       $(CHECK)
+       @$(CHECK)
 .PHONY: runtime/debug/check
 
-runtime/libpprof.$(OBJEXT): $(go_runtime_pprof_files) bufio.gox fmt.gox \
-               io.gox os.gox runtime.gox
+runtime/pprof.lo: $(go_runtime_pprof_files) bufio.gox fmt.gox io.gox os.gox \
+               runtime.gox sync.gox
        $(BUILDPACKAGE)
-runtime/libpprof.lo: runtime/libpprof.$(OBJEXT)
-runtime/libpprof.la: runtime/libpprof.lo
 runtime/pprof/check: $(CHECK_DEPS)
        @$(MKDIR_P) runtime/pprof
-       $(CHECK)
+       @$(CHECK)
 .PHONY: runtime/pprof/check
 
-testing/libiotest.$(OBJEXT): $(go_testing_iotest_files) io.gox log.gox os.gox
+sync/atomic.lo: $(go_sync_atomic_files)
+       $(BUILDPACKAGE)
+sync/atomic_c.lo: $(go_sync_atomic_c_files) sync/atomic.lo
+       $(LTCOMPILE) -c -o $@ $(srcdir)/go/sync/atomic/atomic.c
+sync/atomic/check: $(CHECK_DEPS)
+       @$(MKDIR_P) sync/atomic
+       @$(CHECK)
+.PHONY: sync/atomic/check
+
+template/parse.lo: $(go_template_parse_files) bytes.gox fmt.gox os.gox \
+               runtime.gox strconv.gox strings.gox unicode.gox utf8.gox
+       $(BUILDPACKAGE)
+template/parse/check: $(CHECK_DEPS)
+       @$(MKDIR_P) template/parse
+       @$(CHECK)
+.PHONY: template/parse/check
+
+testing/iotest.lo: $(go_testing_iotest_files) io.gox log.gox os.gox
        $(BUILDPACKAGE)
-testing/libiotest.lo: testing/libiotest.$(OBJEXT)
-testing/libiotest.la: testing/libiotest.lo
 testing/iotest/check: $(CHECK_DEPS)
        @$(MKDIR_P) testing/iotest
-       $(CHECK)
+       @$(CHECK)
 .PHONY: testing/iotest/check
 
-testing/libquick.$(OBJEXT): $(go_testing_quick_files) flag.gox fmt.gox \
-               math.gox os.gox rand.gox reflect.gox strings.gox
+testing/quick.lo: $(go_testing_quick_files) flag.gox fmt.gox math.gox os.gox \
+               rand.gox reflect.gox strings.gox
        $(BUILDPACKAGE)
-testing/libquick.lo: testing/libquick.$(OBJEXT)
-testing/libquick.la: testing/libquick.lo
 testing/quick/check: $(CHECK_DEPS)
        @$(MKDIR_P) testing/quick
-       $(CHECK)
+       @$(CHECK)
 .PHONY: testing/quick/check
 
-testing/libscript.$(OBJEXT): $(go_testing_script_files) fmt.gox os.gox \
-               rand.gox reflect.gox strings.gox
+testing/script.lo: $(go_testing_script_files) fmt.gox os.gox rand.gox \
+               reflect.gox strings.gox
        $(BUILDPACKAGE)
-testing/libscript.lo: testing/libscript.$(OBJEXT)
-testing/libscript.la: testing/libscript.lo
 testing/script/check: $(CHECK_DEPS)
        @$(MKDIR_P) testing/script
-       $(CHECK)
+       @$(CHECK)
 .PHONY: testing/script/check
 
-sysinfo.go: s-sysinfo; @true
-s-sysinfo: $(srcdir)/mksysinfo.sh config.h
-       CC="$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)" $(SHELL) $(srcdir)/mksysinfo.sh
-       $(SHELL) $(srcdir)/../move-if-change tmp-sysinfo.go sysinfo.go
-       $(STAMP) $@
+syscall/syscall.lo: $(go_syscall_files) sync.gox
+       $(BUILDPACKAGE)
+syscall/errno.lo: go/syscall/errno.c
+       $(LTCOMPILE) -c -o $@ $<
+syscall/wait.lo: go/syscall/wait.c
+       $(LTCOMPILE) -c -o $@ $<
 
-syscalls/syscall.$(OBJEXT): $(go_syscall_files) $(go_syscall_c_files) sync.gox
-       rm -f syscall.gox syscalls/libsyscall.a
-       test -d syscalls || $(MKDIR_P) syscalls
-       files=`echo $^ | sed -e 's/[^ ]*\.gox//g' -e's/[^ ]*\.c//g'`; \
-       $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_syscalls" -o syscalls/syscall.$(OBJEXT) $$files
-syscalls/errno.$(OBJEXT): $(srcdir)/syscalls/errno.c syscalls/syscall.$(OBJEXT)
-       $(LTCOMPILE) -c -o syscalls/errno.$(OBJEXT) $(srcdir)/syscalls/errno.c
-syscalls/libsyscall.la: syscalls/syscall.$(OBJEXT) syscalls/errno.$(OBJEXT)
-       $(LINK) syscalls/syscall.lo syscalls/errno.lo
-
-# How to build a .gox file from a .a file.
+# How to build a .gox file from a .lo file.
 BUILDGOX = \
-       $(OBJCOPY) -j .go_export $< $@.tmp && mv -f $@.tmp $@
+       f=`echo $< | sed -e 's/.lo$$/.o/'`; \
+       $(OBJCOPY) -j .go_export $$f $@.tmp && mv -f $@.tmp $@
 
-asn1.gox: asn1/libasn1.$(OBJEXT)
+asn1.gox: asn1/asn1.lo
+       $(BUILDGOX)
+big.gox: big/big.lo
        $(BUILDGOX)
-big.gox: big/libbig.$(OBJEXT)
+bufio.gox: bufio/bufio.lo
        $(BUILDGOX)
-bufio.gox: bufio/libbufio.$(OBJEXT)
+bytes.gox: bytes/bytes.lo
        $(BUILDGOX)
-bytes.gox: bytes/bytes.$(OBJEXT)
+cmath.gox: cmath/cmath.lo
        $(BUILDGOX)
-cmath.gox: cmath/libcmath.$(OBJEXT)
+crypto.gox: crypto/crypto.lo
        $(BUILDGOX)
-ebnf.gox: ebnf/libebnf.$(OBJEXT)
+csv.gox: csv/csv.lo
        $(BUILDGOX)
-exec.gox: exec/libexec.$(OBJEXT)
+exec.gox: exec/exec.lo
        $(BUILDGOX)
-expvar.gox: expvar/libexpvar.$(OBJEXT)
+expvar.gox: expvar/expvar.lo
        $(BUILDGOX)
-flag.gox: flag/libflag.$(OBJEXT)
+flag.gox: flag/flag.lo
        $(BUILDGOX)
-fmt.gox: fmt/libfmt.$(OBJEXT)
+fmt.gox: fmt/fmt.lo
        $(BUILDGOX)
-gob.gox: gob/libgob.$(OBJEXT)
+gob.gox: gob/gob.lo
        $(BUILDGOX)
-hash.gox: hash/libhash.$(OBJEXT)
+hash.gox: hash/hash.lo
        $(BUILDGOX)
-html.gox: html/libhtml.$(OBJEXT)
+html.gox: html/html.lo
        $(BUILDGOX)
-http.gox: http/libhttp.$(OBJEXT)
+http.gox: http/http.lo
        $(BUILDGOX)
-image.gox: image/libimage.$(OBJEXT)
+image.gox: image/image.lo
        $(BUILDGOX)
-io.gox: io/libio.$(OBJEXT)
+io.gox: io/io.lo
        $(BUILDGOX)
-json.gox: json/libjson.$(OBJEXT)
+json.gox: json/json.lo
        $(BUILDGOX)
-log.gox: log/liblog.$(OBJEXT)
+log.gox: log/log.lo
        $(BUILDGOX)
-math.gox: math/libmath.$(OBJEXT)
+math.gox: math/math.lo
        $(BUILDGOX)
-mime.gox: mime/libmime.$(OBJEXT)
+mail.gox: mail/mail.lo
        $(BUILDGOX)
-net.gox: net/libnet.$(OBJEXT)
+mime.gox: mime/mime.lo
        $(BUILDGOX)
-netchan.gox: netchan/libnetchan.$(OBJEXT)
+net.gox: net/net.lo
        $(BUILDGOX)
-os.gox: os/libos.$(OBJEXT)
+os.gox: os/os.lo
        $(BUILDGOX)
-patch.gox: patch/libpatch.$(OBJEXT)
+patch.gox: patch/patch.lo
        $(BUILDGOX)
-path.gox: path/libpath.$(OBJEXT)
+path.gox: path/path.lo
        $(BUILDGOX)
-rand.gox: rand/librand.$(OBJEXT)
+rand.gox: rand/rand.lo
        $(BUILDGOX)
-reflect.gox: reflect/libreflect.$(OBJEXT)
+reflect.gox: reflect/reflect.lo
        $(BUILDGOX)
-regexp.gox: regexp/libregexp.$(OBJEXT)
+regexp.gox: regexp/regexp.lo
        $(BUILDGOX)
-rpc.gox: rpc/librpc.$(OBJEXT)
+rpc.gox: rpc/rpc.lo
        $(BUILDGOX)
-runtime.gox: runtime/libruntime.$(OBJEXT)
+runtime.gox: runtime/runtime.lo
        $(BUILDGOX)
-scanner.gox: scanner/libscanner.$(OBJEXT)
+scanner.gox: scanner/scanner.lo
        $(BUILDGOX)
-smtp.gox: smtp/libsmtp.$(OBJEXT)
+smtp.gox: smtp/smtp.lo
        $(BUILDGOX)
-sort.gox: sort/libsort.$(OBJEXT)
+sort.gox: sort/sort.lo
        $(BUILDGOX)
-strconv.gox: strconv/libstrconv.$(OBJEXT)
+strconv.gox: strconv/strconv.lo
        $(BUILDGOX)
-strings.gox: strings/libstrings.$(OBJEXT)
+strings.gox: strings/strings.lo
        $(BUILDGOX)
-sync.gox: sync/mutex.$(OBJEXT)
+sync.gox: sync/sync.lo
        $(BUILDGOX)
-syslog.gox: syslog/libsyslog.$(OBJEXT)
+syslog.gox: syslog/syslog.lo
        $(BUILDGOX)
-syscall.gox: syscalls/syscall.$(OBJEXT)
+syscall.gox: syscall/syscall.lo
        $(BUILDGOX)
-tabwriter.gox: tabwriter/libtabwriter.$(OBJEXT)
+tabwriter.gox: tabwriter/tabwriter.lo
        $(BUILDGOX)
-template.gox: template/libtemplate.$(OBJEXT)
+template.gox: template/template.lo
        $(BUILDGOX)
-testing.gox: testing/libtesting.$(OBJEXT)
+testing.gox: testing/testing.lo
        $(BUILDGOX)
-time.gox: time/libtime.$(OBJEXT)
+time.gox: time/time.lo
        $(BUILDGOX)
-try.gox: try/libtry.$(OBJEXT)
+unicode.gox: unicode/unicode.lo
        $(BUILDGOX)
-unicode.gox: unicode/libunicode.$(OBJEXT)
+url.gox: url/url.lo
        $(BUILDGOX)
-utf16.gox: utf16/libutf16.$(OBJEXT)
+utf16.gox: utf16/utf16.lo
        $(BUILDGOX)
-utf8.gox: utf8/libutf8.$(OBJEXT)
+utf8.gox: utf8/utf8.lo
        $(BUILDGOX)
-websocket.gox: websocket/libwebsocket.$(OBJEXT)
+websocket.gox: websocket/websocket.lo
        $(BUILDGOX)
-xml.gox: xml/libxml.$(OBJEXT)
+xml.gox: xml/xml.lo
        $(BUILDGOX)
 
-archive/tar.gox: archive/libtar.$(OBJEXT)
+archive/tar.gox: archive/tar.lo
        $(BUILDGOX)
-archive/zip.gox: archive/libzip.$(OBJEXT)
+archive/zip.gox: archive/zip.lo
        $(BUILDGOX)
 
-compress/flate.gox: compress/libflate.$(OBJEXT)
+compress/bzip2.gox: compress/bzip2.lo
        $(BUILDGOX)
-compress/gzip.gox: compress/libgzip.$(OBJEXT)
+compress/flate.gox: compress/flate.lo
        $(BUILDGOX)
-compress/zlib.gox: compress/libzlib.$(OBJEXT)
+compress/gzip.gox: compress/gzip.lo
        $(BUILDGOX)
-
-container/heap.gox: container/libheap.$(OBJEXT)
+compress/lzw.gox: compress/lzw.lo
        $(BUILDGOX)
-container/list.gox: container/liblist.$(OBJEXT)
+compress/zlib.gox: compress/zlib.lo
+       $(BUILDGOX)
+
+container/heap.gox: container/heap.lo
        $(BUILDGOX)
-container/ring.gox: container/libring.$(OBJEXT)
+container/list.gox: container/list.lo
        $(BUILDGOX)
-container/vector.gox: container/libvector.$(OBJEXT)
+container/ring.gox: container/ring.lo
        $(BUILDGOX)
 
-crypto/aes.gox: crypto/libaes.$(OBJEXT)
+crypto/aes.gox: crypto/aes.lo
+       $(BUILDGOX)
+crypto/bcrypt.gox: crypto/bcrypt.lo
+       $(BUILDGOX)
+crypto/blowfish.gox: crypto/blowfish.lo
+       $(BUILDGOX)
+crypto/cast5.gox: crypto/cast5.lo
+       $(BUILDGOX)
+crypto/cipher.gox: crypto/cipher.lo
+       $(BUILDGOX)
+crypto/des.gox: crypto/des.lo
+       $(BUILDGOX)
+crypto/dsa.gox: crypto/dsa.lo
+       $(BUILDGOX)
+crypto/ecdsa.gox: crypto/ecdsa.lo      
+       $(BUILDGOX)
+crypto/elliptic.gox: crypto/elliptic.lo
+       $(BUILDGOX)
+crypto/hmac.gox: crypto/hmac.lo
+       $(BUILDGOX)
+crypto/md4.gox: crypto/md4.lo
        $(BUILDGOX)
-crypto/block.gox: crypto/libblock.$(OBJEXT)
+crypto/md5.gox: crypto/md5.lo
        $(BUILDGOX)
-crypto/blowfish.gox: crypto/libblowfish.$(OBJEXT)
+crypto/ocsp.gox: crypto/ocsp.lo
        $(BUILDGOX)
-crypto/cast5.gox: crypto/libcast5.$(OBJEXT)
+crypto/openpgp.gox: crypto/openpgp.lo
        $(BUILDGOX)
-crypto/cipher.gox: crypto/libcipher.$(OBJEXT)
+crypto/rand.gox: crypto/rand.lo
        $(BUILDGOX)
-crypto/elliptic.gox: crypto/libelliptic.$(OBJEXT)
+crypto/rc4.gox: crypto/rc4.lo
        $(BUILDGOX)
-crypto/hmac.gox: crypto/libhmac.$(OBJEXT)
+crypto/ripemd160.gox: crypto/ripemd160.lo
        $(BUILDGOX)
-crypto/md4.gox: crypto/libmd4.$(OBJEXT)
+crypto/rsa.gox: crypto/rsa.lo
        $(BUILDGOX)
-crypto/md5.gox: crypto/libmd5.$(OBJEXT)
+crypto/sha1.gox: crypto/sha1.lo
        $(BUILDGOX)
-crypto/ocsp.gox: crypto/libocsp.$(OBJEXT)
+crypto/sha256.gox: crypto/sha256.lo
        $(BUILDGOX)
-crypto/rand.gox: crypto/librand.$(OBJEXT)
+crypto/sha512.gox: crypto/sha512.lo
        $(BUILDGOX)
-crypto/rc4.gox: crypto/librc4.$(OBJEXT)
+crypto/subtle.gox: crypto/subtle.lo
        $(BUILDGOX)
-crypto/ripemd160.gox: crypto/libripemd160.$(OBJEXT)
+crypto/tls.gox: crypto/tls.lo
        $(BUILDGOX)
-crypto/rsa.gox: crypto/librsa.$(OBJEXT)
+crypto/twofish.gox: crypto/twofish.lo
        $(BUILDGOX)
-crypto/sha1.gox: crypto/libsha1.$(OBJEXT)
+crypto/x509.gox: crypto/x509.lo
        $(BUILDGOX)
-crypto/sha256.gox: crypto/libsha256.$(OBJEXT)
+crypto/xtea.gox: crypto/xtea.lo
        $(BUILDGOX)
-crypto/sha512.gox: crypto/libsha512.$(OBJEXT)
+
+crypto/openpgp/armor.gox: crypto/openpgp/armor.lo
        $(BUILDGOX)
-crypto/subtle.gox: crypto/libsubtle.$(OBJEXT)
+crypto/openpgp/elgamal.gox: crypto/openpgp/elgamal.lo
        $(BUILDGOX)
-crypto/tls.gox: crypto/libtls.$(OBJEXT)
+crypto/openpgp/error.gox: crypto/openpgp/error.lo
        $(BUILDGOX)
-crypto/twofish.gox: crypto/libtwofish.$(OBJEXT)
+crypto/openpgp/packet.gox: crypto/openpgp/packet.lo
        $(BUILDGOX)
-crypto/x509.gox: crypto/libx509.$(OBJEXT)
+crypto/openpgp/s2k.gox: crypto/openpgp/s2k.lo
        $(BUILDGOX)
-crypto/xtea.gox: crypto/libxtea.$(OBJEXT)
+
+crypto/x509/pkix.gox: crypto/x509/pkix.lo
        $(BUILDGOX)
 
-crypto/openpgp/armor.gox: crypto/openpgp/libarmor.$(OBJEXT)
+debug/dwarf.gox: debug/dwarf.lo
+       $(BUILDGOX)
+debug/elf.gox: debug/elf.lo
        $(BUILDGOX)
-crypto/openpgp/error.gox: crypto/openpgp/liberror.$(OBJEXT)
+debug/gosym.gox: debug/gosym.lo
        $(BUILDGOX)
-crypto/openpgp/s2k.gox: crypto/openpgp/libs2k.$(OBJEXT)
+debug/macho.gox: debug/macho.lo
+       $(BUILDGOX)
+debug/pe.gox: debug/pe.lo
        $(BUILDGOX)
 
-debug/dwarf.gox: debug/libdwarf.$(OBJEXT)
+encoding/ascii85.gox: encoding/ascii85.lo
+       $(BUILDGOX)
+encoding/base32.gox: encoding/base32.lo
        $(BUILDGOX)
-debug/elf.gox: debug/libelf.$(OBJEXT)
+encoding/base64.gox: encoding/base64.lo
        $(BUILDGOX)
-debug/gosym.gox: debug/libgosym.$(OBJEXT)
+encoding/binary.gox: encoding/binary.lo
        $(BUILDGOX)
-debug/macho.gox: debug/libmacho.$(OBJEXT)
+encoding/git85.gox: encoding/git85.lo
        $(BUILDGOX)
-debug/pe.gox: debug/libpe.$(OBJEXT)
+encoding/hex.gox: encoding/hex.lo
        $(BUILDGOX)
-debug/proc.gox: debug/libproc.$(OBJEXT)
+encoding/pem.gox: encoding/pem.lo
        $(BUILDGOX)
 
-encoding/ascii85.gox: encoding/libascii85.$(OBJEXT)
+exp/ebnf.gox: exp/ebnf.lo
        $(BUILDGOX)
-encoding/base32.gox: encoding/libbase32.$(OBJEXT)
+exp/gui.gox: exp/gui.lo
        $(BUILDGOX)
-encoding/base64.gox: encoding/libbase64.$(OBJEXT)
+exp/norm.gox: exp/norm.lo
        $(BUILDGOX)
-encoding/binary.gox: encoding/libbinary.$(OBJEXT)
+exp/spdy.gox: exp/spdy.lo
        $(BUILDGOX)
-encoding/git85.gox: encoding/libgit85.$(OBJEXT)
+exp/sql.gox: exp/sql.lo
        $(BUILDGOX)
-encoding/hex.gox: encoding/libhex.$(OBJEXT)
+exp/ssh.gox: exp/ssh.lo
        $(BUILDGOX)
-encoding/line.gox: encoding/libline.$(OBJEXT)
+exp/terminal.gox: exp/terminal.lo
        $(BUILDGOX)
-encoding/pem.gox: encoding/libpem.$(OBJEXT)
+exp/types.gox: exp/types.lo
        $(BUILDGOX)
 
-exp/datafmt.gox: exp/libdatafmt.$(OBJEXT)
+exp/gui/x11.gox: exp/gui/x11.lo
        $(BUILDGOX)
-exp/draw.gox: exp/libdraw.$(OBJEXT)
+
+exp/sql/driver.gox: exp/sql/driver.lo
        $(BUILDGOX)
-exp/eval.gox: exp/libeval.$(OBJEXT)
+
+exp/template/html.gox: exp/template/html.lo
        $(BUILDGOX)
 
-go/ast.gox: go/libast.$(OBJEXT)
+go/ast.gox: go/ast.lo
        $(BUILDGOX)
-go/doc.gox: go/libdoc.$(OBJEXT)
+go/build.gox: go/build.lo
        $(BUILDGOX)
-go/parser.gox: go/libparser.$(OBJEXT)
+go/doc.gox: go/doc.lo
        $(BUILDGOX)
-go/printer.gox: go/libprinter.$(OBJEXT)
+go/parser.gox: go/parser.lo
        $(BUILDGOX)
-go/scanner.gox: go/libscanner.$(OBJEXT)
+go/printer.gox: go/printer.lo
        $(BUILDGOX)
-go/token.gox: go/libtoken.$(OBJEXT)
+go/scanner.gox: go/scanner.lo
        $(BUILDGOX)
-go/typechecker.gox: go/libtypechecker.$(OBJEXT)
+go/token.gox: go/token.lo
        $(BUILDGOX)
 
-hash/adler32.gox: hash/libadler32.$(OBJEXT)
+hash/adler32.gox: hash/adler32.lo
+       $(BUILDGOX)
+hash/crc32.gox: hash/crc32.lo
        $(BUILDGOX)
-hash/crc32.gox: hash/libcrc32.$(OBJEXT)
+hash/crc64.gox: hash/crc64.lo
        $(BUILDGOX)
-hash/crc64.gox: hash/libcrc64.$(OBJEXT)
+hash/fnv.gox: hash/fnv.lo
        $(BUILDGOX)
 
-http/pprof.gox: http/libpprof.$(OBJEXT)
+http/cgi.gox: http/cgi.lo
+       $(BUILDGOX)
+http/fcgi.gox: http/fcgi.lo
+       $(BUILDGOX)
+http/httptest.gox: http/httptest.lo
+       $(BUILDGOX)
+http/pprof.gox: http/pprof.lo
        $(BUILDGOX)
 
-image/jpeg.gox: image/libjpeg.$(OBJEXT)
+image/bmp.gox: image/bmp.lo
        $(BUILDGOX)
-image/png.gox: image/libpng.$(OBJEXT)
+image/color.gox: image/color.lo
+       $(BUILDGOX)
+image/draw.gox: image/draw.lo
+       $(BUILDGOX)
+image/gif.gox: image/gif.lo
+       $(BUILDGOX)
+image/jpeg.gox: image/jpeg.lo
+       $(BUILDGOX)
+image/png.gox: image/png.lo
+       $(BUILDGOX)
+image/tiff.gox: image/tiff.lo
+       $(BUILDGOX)
+image/ycbcr.gox: image/ycbcr.lo
        $(BUILDGOX)
 
-index/suffixarray.gox: index/libsuffixarray.$(OBJEXT)
+index/suffixarray.gox: index/suffixarray.lo
        $(BUILDGOX)
 
-io/ioutil.gox: io/libioutil.$(OBJEXT)
+io/ioutil.gox: io/ioutil.lo
        $(BUILDGOX)
 
-mime/multipart.gox: mime/libmultipart.$(OBJEXT)
+mime/multipart.gox: mime/multipart.lo
        $(BUILDGOX)
 
-net/dict.gox: net/libdict.$(OBJEXT)
+net/dict.gox: net/dict.lo
        $(BUILDGOX)
-net/textproto.gox: net/libtextproto.$(OBJEXT)
+net/textproto.gox: net/textproto.lo
        $(BUILDGOX)
 
-os/inotify.gox: os/libinotify.$(OBJEXT)
+old/netchan.gox: old/netchan.lo
+       $(BUILDGOX)
+old/regexp.gox: old/regexp.lo
        $(BUILDGOX)
-os/signal.gox: os/libsignal.$(OBJEXT)
+old/template.gox: old/template.lo
        $(BUILDGOX)
 
-rpc/jsonrpc.gox: rpc/libjsonrpc.$(OBJEXT)
+os/inotify.gox: os/inotify.lo
+       $(BUILDGOX)
+os/user.gox: os/user.lo
+       $(BUILDGOX)
+os/signal.gox: os/signal.lo
        $(BUILDGOX)
 
-runtime/debug.gox: runtime/libdebug.$(OBJEXT)
+path/filepath.gox: path/filepath.lo
        $(BUILDGOX)
-runtime/pprof.gox: runtime/libpprof.$(OBJEXT)
+
+regexp/syntax.gox: regexp/syntax.lo
        $(BUILDGOX)
 
-testing/iotest.gox: testing/libiotest.$(OBJEXT)
+rpc/jsonrpc.gox: rpc/jsonrpc.lo
        $(BUILDGOX)
-testing/quick.gox: testing/libquick.$(OBJEXT)
+
+runtime/debug.gox: runtime/debug.lo
+       $(BUILDGOX)
+runtime/pprof.gox: runtime/pprof.lo
+       $(BUILDGOX)
+
+sync/atomic.gox: sync/atomic.lo
+       $(BUILDGOX)
+
+template/parse.gox: template/parse.lo
+       $(BUILDGOX)
+
+testing/iotest.gox: testing/iotest.lo
        $(BUILDGOX)
-testing/script.gox: testing/libscript.$(OBJEXT)
+testing/quick.gox: testing/quick.lo
+       $(BUILDGOX)
+testing/script.gox: testing/script.lo
        $(BUILDGOX)
 
 if LIBGO_IS_LINUX
@@ -2931,7 +3461,7 @@ TEST_PACKAGES = \
        bufio/check \
        bytes/check \
        cmath/check \
-       ebnf/check \
+       csv/check \
        exec/check \
        expvar/check \
        flag/check \
@@ -2939,13 +3469,14 @@ TEST_PACKAGES = \
        gob/check \
        html/check \
        http/check \
+       image/check \
        io/check \
        json/check \
        log/check \
        math/check \
+       mail/check \
        mime/check \
        net/check \
-       netchan/check \
        os/check \
        patch/check \
        path/check \
@@ -2964,31 +3495,36 @@ TEST_PACKAGES = \
        tabwriter/check \
        template/check \
        time/check \
-       try/check \
        unicode/check \
+       url/check \
        utf16/check \
        utf8/check \
        websocket/check \
        xml/check \
        archive/tar/check \
        archive/zip/check \
+       compress/bzip2/check \
        compress/flate/check \
        compress/gzip/check \
+       compress/lzw/check \
        compress/zlib/check \
        container/heap/check \
        container/list/check \
        container/ring/check \
-       container/vector/check \
        crypto/aes/check \
-       crypto/block/check \
+       crypto/bcrypt/check \
        crypto/blowfish/check \
        crypto/cast5/check \
        crypto/cipher/check \
+       crypto/des/check \
+       crypto/dsa/check \
+       crypto/ecdsa/check \
        crypto/elliptic/check \
        crypto/hmac/check \
        crypto/md4/check \
        crypto/md5/check \
        crypto/ocsp/check \
+       crypto/openpgp/check \
        crypto/rand/check \
        crypto/rc4/check \
        crypto/ripemd160/check \
@@ -3002,6 +3538,8 @@ TEST_PACKAGES = \
        crypto/x509/check \
        crypto/xtea/check \
        crypto/openpgp/armor/check \
+       crypto/openpgp/elgamal/check \
+       crypto/openpgp/packet/check \
        crypto/openpgp/s2k/check \
        debug/dwarf/check \
        debug/elf/check \
@@ -3013,38 +3551,156 @@ TEST_PACKAGES = \
        encoding/binary/check \
        encoding/git85/check \
        encoding/hex/check \
-       encoding/line/check \
        encoding/pem/check \
-       exp/datafmt/check \
-       exp/draw/check \
-       exp/eval/check \
+       exp/ebnf/check \
+       exp/norm/check \
+       exp/spdy/check \
+       exp/sql/check \
+       exp/ssh/check \
+       exp/terminal/check \
+       exp/template/html/check \
+       go/ast/check \
+       $(go_build_check_omitted_since_it_calls_6g) \
        go/parser/check \
        go/printer/check \
        go/scanner/check \
        go/token/check \
-       go/typechecker/check \
+       $(go_types_check_omitted_since_it_calls_6g) \
        hash/adler32/check \
        hash/crc32/check \
        hash/crc64/check \
+       hash/fnv/check \
+       http/cgi/check \
+       http/fcgi/check \
+       image/draw/check \
+       image/jpeg/check \
        image/png/check \
+       image/tiff/check \
+       image/ycbcr/check \
        index/suffixarray/check \
        io/ioutil/check \
        mime/multipart/check \
        net/textproto/check \
+       old/netchan/check \
+       old/regexp/check \
+       old/template/check \
        $(os_inotify_check) \
+       os/user/check \
        os/signal/check \
+       path/filepath/check \
+       regexp/syntax/check \
        rpc/jsonrpc/check \
+       sync/atomic/check \
+       template/parse/check \
        testing/quick/check \
        testing/script/check
 
-check-recursive: $(TEST_PACKAGES)
+check: check-tail
+check-recursive: check-head
+
+check-head:
+       @echo "Test Run By $${USER} on `date`" > libgo.head
+       @echo "Native configuration is $(host_triplet)" >> libgo.head
+       @echo >> libgo.head
+       @echo "         === libgo tests ===" >> libgo.head
+       @echo >> libgo.head
+
+check-tail: check-recursive check-multi
+       @lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
+       for dir in . $(MULTIDIRS); do \
+         mv ../$${dir}/$${lib}/libgo.sum ../$${dir}/$${lib}/libgo.sum.sep; \
+         mv ../$${dir}/$${lib}/libgo.log ../$${dir}/$${lib}/libgo.log.sep; \
+       done; \
+       mv libgo.head libgo.sum; \
+       cp libgo.sum libgo.log; \
+       echo "Schedule of variations:" >> libgo.sum; \
+       for dir in . $(MULTIDIRS); do \
+         multidir=../$${dir}/$${lib}; \
+         multivar=`cat $${multidir}/libgo.var`; \
+         echo "    $${multivar}" >> libgo.sum; \
+       done; \
+       echo >> libgo.sum; \
+       pass=0; fail=0; untested=0; \
+       for dir in . $(MULTIDIRS); do \
+         multidir=../$${dir}/$${lib}; \
+         multivar=`cat $${multidir}/libgo.var`; \
+         echo "Running target $${multivar}" >> libgo.sum; \
+         echo "Running $(srcdir)/libgo.exp ..." >> libgo.sum; \
+         cat $${multidir}/libgo.sum.sep >> libgo.sum; \
+         cat $${multidir}/libgo.log.sep >> libgo.log; \
+         if test -n "${MULTIDIRS}"; then \
+           echo "              === libgo Summary for $${multivar} ===" >> libgo.sum; \
+           echo >> libgo.sum; \
+         fi; \
+         p=`grep -c PASS $${multidir}/libgo.sum.sep`; \
+         pass=`expr $$pass + $$p`; \
+         if test "$$p" -ne "0" && test -n "${MULTIDIRS}"; then \
+           echo "# of expected passes          $$p" >> libgo.sum; \
+         fi; \
+         p=`grep -c FAIL $${multidir}/libgo.sum.sep`; \
+         fail=`expr $$fail + $$p`; \
+         if test "$$p" -ne "0" && test -n "${MULTIDIRS}"; then \
+           echo "# of unexpected failures      $$p" >> libgo.sum; \
+         fi; \
+         p=`grep -c UNTESTED $${multidir}/libgo.sum.sep`; \
+         untested=`expr $$untested + $$p`; \
+         if test "$$p" -ne "0" && test -n "${MULTIDIRS}"; then \
+           echo "# of untested testcases               $$p" >> libgo.sum; \
+         fi; \
+       done; \
+       echo >> libgo.sum; \
+       echo "          === libgo Summary ===" >> libgo.sum; \
+       echo >> libgo.sum; \
+       if test "$$pass" -ne "0"; then \
+         echo "# of expected passes            $$pass" >> libgo.sum; \
+       fi; \
+       if test "$$fail" -ne "0"; then \
+         echo "# of unexpected failures        $$fail" >> libgo.sum; \
+       fi; \
+       if test "$$untested" -ne "0"; then \
+         echo "# of untested testcases         $$untested" >> libgo.sum; \
+       fi; \
+       echo `echo $(GOC) | sed -e 's/ .*//'`  `$(GOC) -v 2>&1 | grep " version" | sed -n -e 's/.* \(version.*$$\)/\1/p'` >> libgo.sum; \
+       echo >> libgo.log; \
+       echo "runtest completed at `date`" >> libgo.log; \
+       if test "$$fail" -ne "0"; then \
+         status=1; \
+       else \
+         status=0; \
+       fi; \
+       exit $$status
+
+check-am:
+       @rm -f libgo.sum libgo.log libgo.tail
+       @multivar="unix"; \
+       [ -z "$(MULTIFLAGS)" ] || multivar="$${multivar}/$(MULTIFLAGS)"; \
+       echo "$${multivar}" > libgo.var
+       @for f in $(TEST_PACKAGES); do \
+          rm -f $$f-testsum $$f-testlog; \
+        done
+       -@$(MAKE) -k $(TEST_PACKAGES)
+       @for f in $(TEST_PACKAGES); do \
+         if test -f $$f-testsum; then \
+           cat $$f-testsum >> libgo.sum; \
+         fi; \
+         if test -f $$f-testlog; then \
+           cat $$f-testlog >> libgo.log; \
+         fi; \
+       done
+
+check-multi:
+       $(MULTIDO) $(AM_MAKEFLAGS) DO=check-am multi-do # $(MAKE)
+
+MOSTLYCLEAN_FILES = libgo.head libgo.sum.sep libgo.log.sep
 
 mostlyclean-local:
        find . -name '*.lo' -print | xargs $(LIBTOOL) --mode=clean rm -f
        find . -name '*.$(OBJEXT)' -print | xargs rm -f
+       find . -name '*-testsum' -print | xargs rm -f
+       find . -name '*-testlog' -print | xargs rm -f
+
+CLEANFILES = *.go *.gox goc2c *.c s-version libgo.sum libgo.log
 
 clean-local:
        find . -name '*.la' -print | xargs $(LIBTOOL) --mode=clean rm -f
        find . -name '*.a' -print | xargs rm -f
-
-CLEANFILES = *.go *.gox goc2c *.c s-version