* More `make dist' fixes.

This commit is contained in:
Eelco Dolstra 2003-11-25 13:01:21 +00:00
parent c3ee8c9166
commit 66c115ef5f
6 changed files with 14 additions and 18 deletions

View file

@ -1,8 +1,8 @@
noinst_LIBRARIES = libformat.a noinst_LIBRARIES = libformat.a
libformat_a_SOURCES = format_implementation.cc free_funcs.cc parsing.cc libformat_a_SOURCES = format_implementation.cc free_funcs.cc \
parsing.cc exceptions.hpp feed_args.hpp format_class.hpp \
format_fwd.hpp group.hpp internals.hpp internals_fwd.hpp \
macros_default.hpp
AM_CXXFLAGS = -Wall -I../.. AM_CXXFLAGS = -Wall -I../..
EXTRA_DIST = exceptions.hpp feed_args.hpp format_class.hpp format_fwd.hpp \
group.hpp internals.hpp internals_fwd.hpp macros_default.hpp

View file

@ -1,6 +1,7 @@
noinst_LIBRARIES = libexpr.a noinst_LIBRARIES = libexpr.a
libexpr_a_SOURCES = nixexpr.cc parser.cc eval.cc primops.cc libexpr_a_SOURCES = nixexpr.cc nixexpr.hh parser.cc parser.hh \
eval.cc eval.hh primops.cc primops.hh nix.sdf
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-I.. -I../../externals/inst/include -I../libutil -I../libstore -I.. -I../../externals/inst/include -I../libutil -I../libstore

View file

@ -1,6 +1,6 @@
noinst_LIBRARIES = libmain.a noinst_LIBRARIES = libmain.a
libmain_a_SOURCES = shared.cc libmain_a_SOURCES = shared.cc shared.hh
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-DNIX_STORE_DIR=\"$(prefix)/store\" \ -DNIX_STORE_DIR=\"$(prefix)/store\" \
@ -8,5 +8,3 @@ AM_CXXFLAGS = \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
-I.. -I../../externals/inst/include -I../libutil -I../libstore -I.. -I../../externals/inst/include -I../libutil -I../libstore
EXTRA_DIST = *.hh

View file

@ -1,10 +1,10 @@
noinst_LIBRARIES = libstore.a noinst_LIBRARIES = libstore.a
libstore_a_SOURCES = \ libstore_a_SOURCES = \
store.cc storeexpr.cc normalise.cc exec.cc \ store.cc store.hh storeexpr.cc storeexpr.hh \
globals.cc db.cc references.cc pathlocks.cc normalise.cc normalise.hh exec.cc exec.hh \
globals.cc globals.hh db.cc db.hh \
references.cc references.hh pathlocks.cc pathlocks.hh
AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall \ AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall \
-I.. -I../../externals/inst/include -I../libutil -I.. -I../../externals/inst/include -I../libutil
EXTRA_DIST = *.hh *.h test-builder-*.sh test.cc

View file

@ -1,11 +1,10 @@
noinst_LIBRARIES = libutil.a noinst_LIBRARIES = libutil.a
libutil_a_SOURCES = util.cc hash.cc archive.cc md5.c aterm.cc libutil_a_SOURCES = util.cc util.hh hash.cc hash.hh \
archive.cc archive.hh md5.c md5.h aterm.cc aterm.hh
AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I.. -I../../externals/inst/include AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I.. -I../../externals/inst/include
EXTRA_DIST = *.hh *.h
check_PROGRAMS = test-aterm check_PROGRAMS = test-aterm
test_aterm_SOURCES = test-aterm.cc test_aterm_SOURCES = test-aterm.cc

View file

@ -1,6 +1,6 @@
bin_PROGRAMS = nix-store bin_PROGRAMS = nix-store
nix_store_SOURCES = main.cc dotgraph.cc nix_store_SOURCES = main.cc dotgraph.cc dotgraph.hh help.txt.hh
nix_store_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \ nix_store_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
@ -21,5 +21,3 @@ install-data-local:
$(INSTALL) -d $(localstatedir)/log/nix $(INSTALL) -d $(localstatedir)/log/nix
$(INSTALL) -d $(prefix)/store $(INSTALL) -d $(prefix)/store
$(bindir)/nix-store --init $(bindir)/nix-store --init
EXTRA_DIST = *.hh