about summary refs log tree commit diff
path: root/src/nix-instantiate/Makefile.am
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-11-18T12·06+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-11-18T12·06+0000
commitdfc9c64ead7f24d51ed1a232e4b3ecafa8384f2e (patch)
treeab0d5b381eb01bec46a66174b3b09b60ea439bb7 /src/nix-instantiate/Makefile.am
parentb1117ef29d35822647bda32f8cd3887f4f6eaede (diff)
* "Fix expression" -> "Nix expression".
* More refactoring.

Diffstat (limited to 'src/nix-instantiate/Makefile.am')
-rw-r--r--src/nix-instantiate/Makefile.am12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am
index cdaec1390d9e..3a09add0c645 100644
--- a/src/nix-instantiate/Makefile.am
+++ b/src/nix-instantiate/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = nix-instantiate
 
-nix_instantiate_SOURCES = fixexpr.cc parser.cc eval.cc primops.cc fix.cc
+nix_instantiate_SOURCES = nixexpr.cc parser.cc eval.cc primops.cc main.cc
 nix_instantiate_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
  ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \
  -lsglr -lATB -lconversion -lasfix2 -lmept -lATerm
@@ -13,14 +13,10 @@ AM_CXXFLAGS = \
 
 parser.o: parse-table.h
 
-parse-table.h: fix.tbl bin2c
-	./bin2c fixParseTable < $< > $@ || (rm $@ && exit 1)
-
-noinst_PROGRAMS = bin2c
-
-bin2c_SOURCES = bin2c.c
+parse-table.h: nix.tbl
+	../bin2c/bin2c nixParseTable < $< > $@ || (rm $@ && exit 1)
 
 %.tbl: %.sdf
 	../../externals/inst/bin/sdf2table -i $< -o $@
 
-CLEANFILES = parse-table.h fix.tbl
+CLEANFILES = parse-table.h nix.tbl