From 6ef32bddc1f10034322966b3a5b85af7b9cdc4d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 1 Feb 2014 14:28:31 +0100
Subject: Fix "make dist"

---
 src/bsdiff-4.3/local.mk | 2 --
 src/libexpr/local.mk    | 6 ++++--
 src/libstore/local.mk   | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/bsdiff-4.3/local.mk b/src/bsdiff-4.3/local.mk
index 320795a94c1b..c957ceab0c0f 100644
--- a/src/bsdiff-4.3/local.mk
+++ b/src/bsdiff-4.3/local.mk
@@ -9,5 +9,3 @@ bspatch_DIR := $(d)
 bspatch_SOURCES := $(d)/bspatch.c
 bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
 bspatch_INSTALL_DIR = $(libexecdir)/nix
-
-dist-files += $(d)/compat-include/*
diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk
index ff35155b1a96..85e476e39b21 100644
--- a/src/libexpr/local.mk
+++ b/src/libexpr/local.mk
@@ -14,7 +14,9 @@ libexpr_LIBS = libutil libstore libformat
 libexpr_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS)
 
 $(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
-	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
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index a9ae53270076..2dddce740dcc 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -23,4 +23,6 @@ libstore_CXXFLAGS = \
 $(d)/local-store.cc: $(d)/schema.sql.hh
 
 %.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
-- 
cgit 1.4.1