about summary refs log tree commit diff
path: root/src/nix-env/Makefile.am
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-03-02T15·58+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-03-02T15·58+0000
commit594eaddd1157db8abe2e1c47cdf2180f027559ad (patch)
tree3dd95f89c19098f9b20a085a04917217602fbb6c /src/nix-env/Makefile.am
parent966ffb29a7a7de00f3521da05f325ae8c7e8e35e (diff)
* When using the included sqlite/aterm libraries, build with
  --enable-shared.
* In libutil/libstore/libexpr etc., link against sqlite and aterm.
* Some more header file hygiene.

Diffstat (limited to 'src/nix-env/Makefile.am')
-rw-r--r--src/nix-env/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am
index 07b29c1862a6..53fea3d9ddc4 100644
--- a/src/nix-env/Makefile.am
+++ b/src/nix-env/Makefile.am
@@ -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}
+ ../boost/format/libformat.la
 
 nix-env.o: help.txt.hh
 
@@ -11,6 +11,7 @@ nix-env.o: help.txt.hh
 	../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
 
 AM_CXXFLAGS = \
- -I$(srcdir)/.. ${aterm_include} \
+ ${aterm_include} \
+ -I$(srcdir)/.. \
  -I$(srcdir)/../libutil -I$(srcdir)/../libstore \
  -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr