* Move most of Nix into a library (libnix.a).
* Run `test' on `make check'.
This commit is contained in:
parent
1849aa2a72
commit
5079ccb455
|
@ -9,6 +9,7 @@ AC_CANONICAL_HOST
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
AC_PROG_RANLIB
|
||||||
|
|
||||||
# Unix shell scripting should die a slow and painful death.
|
# Unix shell scripting should die a slow and painful death.
|
||||||
AC_DEFINE_UNQUOTED(NIX_VALUES_DIR, "$(eval echo $prefix/values)", Nix values directory.)
|
AC_DEFINE_UNQUOTED(NIX_VALUES_DIR, "$(eval echo $prefix/values)", Nix values directory.)
|
||||||
|
|
|
@ -1,16 +1,22 @@
|
||||||
bin_PROGRAMS = nix # fix
|
bin_PROGRAMS = nix # fix
|
||||||
noinst_PROGRAMS = test
|
check_PROGRAMS = test
|
||||||
|
|
||||||
AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I..
|
AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I..
|
||||||
|
|
||||||
nix_SOURCES = nix.cc util.cc hash.cc archive.cc md5.c eval.cc values.cc globals.cc db.cc
|
nix_SOURCES = nix.cc
|
||||||
nix_LDADD = -ldb_cxx-4 -lATerm
|
nix_LDADD = libnix.a -ldb_cxx-4 -lATerm
|
||||||
|
|
||||||
#fix_SOURCES = fix.cc util.cc hash.cc md5.c
|
#fix_SOURCES = fix.cc util.cc hash.cc md5.c
|
||||||
#fix_LDADD = -lATerm
|
#fix_LDADD = -lATerm
|
||||||
|
|
||||||
test_SOURCES = test.cc util.cc hash.cc archive.cc md5.c eval.cc values.cc globals.cc db.cc
|
TESTS = test
|
||||||
test_LDADD = -ldb_cxx-4 -lATerm
|
|
||||||
|
test_SOURCES = test.cc
|
||||||
|
test_LDADD = libnix.a -ldb_cxx-4 -lATerm
|
||||||
|
|
||||||
|
noinst_LIBRARIES = libnix.a
|
||||||
|
|
||||||
|
libnix_a_SOURCES = util.cc hash.cc archive.cc md5.c eval.cc values.cc globals.cc db.cc
|
||||||
|
|
||||||
install-data-local:
|
install-data-local:
|
||||||
$(INSTALL) -d $(localstatedir)/nix
|
$(INSTALL) -d $(localstatedir)/nix
|
||||||
|
|
Loading…
Reference in a new issue