lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* ADDITIONAL_NETWORK_LIBS -> LIBS.

Browse source
This commit is contained in:
Eelco Dolstra 2010-02-24 12:25:48 +00:00
parent fa6a4fcb11
commit fae0427324
7 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -79,8 +79,7 @@ fi
# Solaris-specific stuff.
if test "$sys_name" = "sunos"; then
# Solaris requires -lsocket -lnsl for network functions
ADDITIONAL_NETWORK_LIBS="-lsocket -lnsl"
AC_SUBST(ADDITIONAL_NETWORK_LIBS)
LIBS="-lsocket -lnsl $LIBS"
fi
AC_PROG_CC

3
src/libstore/Makefile.am
View file

@ -10,8 +10,7 @@ pkginclude_HEADERS = \
globals.hh references.hh pathlocks.hh \
worker-protocol.hh
libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la \
@ADDITIONAL_NETWORK_LIBS@
libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la
BUILT_SOURCES = derivations-ast.cc derivations-ast.hh

2
src/nix-env/Makefile.am
View file

@ -3,7 +3,7 @@ bin_PROGRAMS = nix-env
nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh help.txt
nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
../libstore/libstore.la ../libutil/libutil.la \
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
nix-env.o: help.txt.hh

2
src/nix-hash/Makefile.am
View file

@ -2,7 +2,7 @@ bin_PROGRAMS = nix-hash
nix_hash_SOURCES = nix-hash.cc help.txt
nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
nix-hash.o: help.txt.hh

2
src/nix-instantiate/Makefile.am
View file

@ -3,7 +3,7 @@ bin_PROGRAMS = nix-instantiate
nix_instantiate_SOURCES = nix-instantiate.cc help.txt
nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
../libstore/libstore.la ../libutil/libutil.la \
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
nix-instantiate.o: help.txt.hh

2
src/nix-store/Makefile.am
View file

@ -2,7 +2,7 @@ bin_PROGRAMS = nix-store
nix_store_SOURCES = nix-store.cc dotgraph.cc dotgraph.hh help.txt
nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
nix-store.o: help.txt.hh

2
src/nix-worker/Makefile.am
View file

@ -2,7 +2,7 @@ bin_PROGRAMS = nix-worker
nix_worker_SOURCES = nix-worker.cc help.txt
nix_worker_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@
../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
nix-worker.o: help.txt.hh