diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T13·59+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T13·59+0000 |
| commit | 8032f26ca0bd2233de066ce5786ff976bbd641ae (patch) | |
| tree | 954b2ecdce037dcf47b0376616ac05dbad8542ab /src/nix-env/Makefile.am | |
| parent | 4750065ada362bd46e85879975a3148e18df5b0c (diff) | |
| parent | bd25ac2260267abd2181324e1650820da70e5e60 (diff) | |
* Merged the `fast-eval' branch.
Diffstat (limited to 'src/nix-env/Makefile.am')
| -rw-r--r-- | src/nix-env/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am index 900524f76ed1..7dfa7425a062 100644 --- a/src/nix-env/Makefile.am +++ b/src/nix-env/Makefile.am @@ -1,9 +1,10 @@ bin_PROGRAMS = nix-env -nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh help.txt +nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh help.txt + nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@ + ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@ nix-env.o: help.txt.hh @@ -11,6 +12,6 @@ nix-env.o: help.txt.hh ../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1) AM_CXXFLAGS = \ - -I$(srcdir)/.. ${aterm_include} \ + -I$(srcdir)/.. \ -I$(srcdir)/../libutil -I$(srcdir)/../libstore \ -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr |