diff -ruN nix-0.10pre5896/src/nix-env/Makefile.am nix-0.10pre5896.new/src/nix-env/Makefile.am --- nix-0.10pre5896/src/nix-env/Makefile.am 2006-07-24 20:39:47.000000000 +0200 +++ nix-0.10pre5896.new/src/nix-env/Makefile.am 2006-08-02 12:16:34.000000000 +0200 @@ -5,6 +5,7 @@ nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} +nix_env_LDFLAGS = -all-static main.o: help.txt.hh diff -ruN nix-0.10pre5896/src/nix-hash/Makefile.am nix-0.10pre5896.new/src/nix-hash/Makefile.am --- nix-0.10pre5896/src/nix-hash/Makefile.am 2006-07-24 20:39:47.000000000 +0200 +++ nix-0.10pre5896.new/src/nix-hash/Makefile.am 2006-08-02 12:16:50.000000000 +0200 @@ -3,6 +3,7 @@ nix_hash_SOURCES = nix-hash.cc help.txt nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} +nix_hash_LDFLAGS = -all-static nix-hash.o: help.txt.hh diff -ruN nix-0.10pre5896/src/nix-instantiate/Makefile.am nix-0.10pre5896.new/src/nix-instantiate/Makefile.am --- nix-0.10pre5896/src/nix-instantiate/Makefile.am 2006-07-24 20:39:47.000000000 +0200 +++ nix-0.10pre5896.new/src/nix-instantiate/Makefile.am 2006-08-02 12:17:09.000000000 +0200 @@ -4,6 +4,7 @@ nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} +nix_instantiate_LDFLAGS = -all-static main.o: help.txt.hh diff -ruN nix-0.10pre5896/src/nix-log2xml/Makefile.am nix-0.10pre5896.new/src/nix-log2xml/Makefile.am --- nix-0.10pre5896/src/nix-log2xml/Makefile.am 2006-07-24 20:39:47.000000000 +0200 +++ nix-0.10pre5896.new/src/nix-log2xml/Makefile.am 2006-08-02 12:17:26.000000000 +0200 @@ -1,6 +1,7 @@ bin_PROGRAMS = nix-log2xml nix_log2xml_SOURCES = log2xml.cc +nix_log2xml_LDFLAGS = -all-static %.xml: %.log nix-log2xml ./nix-log2xml < $< > $@ diff -ruN nix-0.10pre5896/src/nix-store/Makefile.am nix-0.10pre5896.new/src/nix-store/Makefile.am --- nix-0.10pre5896/src/nix-store/Makefile.am 2006-07-24 20:39:47.000000000 +0200 +++ nix-0.10pre5896.new/src/nix-store/Makefile.am 2006-08-02 12:17:45.000000000 +0200 @@ -3,6 +3,7 @@ nix_store_SOURCES = main.cc dotgraph.cc dotgraph.hh help.txt nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} +nix_store_LDFLAGS = -all-static main.o: help.txt.hh