Fix "make dist"

This commit is contained in:
Eelco Dolstra 2014-02-01 14:28:31 +01:00
parent 0c6d62cf27
commit 6ef32bddc1
9 changed files with 19 additions and 15 deletions

View file

@ -1,4 +1,5 @@
makefiles = \ makefiles = \
local.mk \
src/boost/format/local.mk \ src/boost/format/local.mk \
src/libutil/local.mk \ src/libutil/local.mk \
src/libstore/local.mk \ src/libstore/local.mk \
@ -18,8 +19,6 @@ makefiles = \
doc/manual/local.mk \ doc/manual/local.mk \
tests/local.mk tests/local.mk
GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
include Makefile.config include Makefile.config
include mk/lib.mk include mk/lib.mk

View file

@ -28,6 +28,8 @@ $(d)/manual.is-valid: $(d)/manual.xmli
clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
# Generate man pages. # Generate man pages.
man-pages := $(foreach n, \ man-pages := $(foreach n, \
@ -64,6 +66,8 @@ all: $(d)/manual.html
clean-files += $(d)/manual.html clean-files += $(d)/manual.html
dist-files += $(d)/manual.html
# Generate the PDF manual. # Generate the PDF manual.
$(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid $(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid
@ -77,3 +81,4 @@ $(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid
fi fi
clean-files += $(d)/manual.pdf clean-files += $(d)/manual.pdf

3
local.mk Normal file
View file

@ -0,0 +1,3 @@
dist-files += $(shell git ls-files) $(shell git ls-files)
GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr

View file

@ -15,7 +15,7 @@ $(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllib
ifeq ($(perlbindings), yes) ifeq ($(perlbindings), yes)
$(d)/lib/Nix/Store.cc: $(d)/lib/Nix/Store.xs $(d)/lib/Nix/Store.cc: $(d)/lib/Nix/Store.xs
xsubpp $^ -output $@ $(trace-gen) xsubpp $^ -output $@
libraries += Store libraries += Store
@ -38,5 +38,3 @@ ifeq ($(perlbindings), yes)
endif endif
clean-files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc clean-files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc
dist-files += $(nix_perl_sources)

View file

@ -30,7 +30,6 @@ let
configureFlags = '' configureFlags = ''
--with-docbook-rng=${docbook5}/xml/rng/docbook --with-docbook-rng=${docbook5}/xml/rng/docbook
--with-docbook-xsl=${docbook5_xsl}/xml/xsl/docbook --with-docbook-xsl=${docbook5_xsl}/xml/xsl/docbook
--with-xml-flags=--nonet
--with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
@ -56,9 +55,9 @@ let
''; '';
preDist = '' preDist = ''
make -C doc/manual install prefix=$out make install prefix=$out makefiles=doc/manual/local.mk
make -C doc/manual manual.pdf prefix=$out make doc/manual/manual.pdf
cp doc/manual/manual.pdf $out/manual.pdf cp doc/manual/manual.pdf $out/manual.pdf
# The PDF containes filenames of included graphics (see # The PDF containes filenames of included graphics (see

View file

@ -35,5 +35,3 @@ $(foreach prog, $(nix_substituters), $(eval $(call install-program-in, $(prog),
$(eval $(call install-symlink, nix-build, $(bindir)/nix-shell)) $(eval $(call install-symlink, nix-build, $(bindir)/nix-shell))
clean-files += $(nix_bin_scripts) $(nix_noinst_scripts) clean-files += $(nix_bin_scripts) $(nix_noinst_scripts)
dist-files += $(d)/*.in

View file

@ -9,5 +9,3 @@ bspatch_DIR := $(d)
bspatch_SOURCES := $(d)/bspatch.c bspatch_SOURCES := $(d)/bspatch.c
bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
bspatch_INSTALL_DIR = $(libexecdir)/nix bspatch_INSTALL_DIR = $(libexecdir)/nix
dist-files += $(d)/compat-include/*

View file

@ -14,7 +14,9 @@ libexpr_LIBS = libutil libstore libformat
libexpr_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS) libexpr_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS)
$(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y $(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y
bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d $(trace-gen) bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d
$(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l $(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l
flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $< $(trace-gen) flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $<
clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh

View file

@ -23,4 +23,6 @@ libstore_CXXFLAGS = \
$(d)/local-store.cc: $(d)/schema.sql.hh $(d)/local-store.cc: $(d)/schema.sql.hh
%.sql.hh: %.sql %.sql.hh: %.sql
sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $< > $@ || (rm $@ && exit 1) $(trace-gen) sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $< > $@ || (rm $@ && exit 1)
clean-files += $(d)/schema.sql.hh