From 4709038d641ad009b44ed2bf5980fa3a252d6927 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 5 Oct 2011 17:41:01 -0700
Subject: [PATCH] Bring make distcheck up to date
---
Makefile.in | 14 +++++++++++---
mk/dist.mk | 25 +++++++++++++++++++++++--
mk/rt.mk | 8 ++++++++
mk/tests.mk | 12 ++++++++++--
4 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index cc0b027ac0d..4b6c48779eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,9 +47,17 @@
######################################################################
include config.mk
-MKFILES := Makefile config.mk $(wildcard $(CFG_SRC_DIR)/mk/*.mk)
-MKFILES += $(CFG_SRC_DIR)/src/rt/libuv/Makefile
-MKFILES += $(wildcard $(CFG_SRC_DIR)/src/rt/libuv/*.mk)
+OUR_MKFILES := Makefile config.mk $(wildcard $(CFG_SRC_DIR)/mk/*.mk)
+3RDPARTY_MKFILES := $(CFG_SRC_DIR)/src/rt/libuv/Makefile \
+ $(wildcard $(CFG_SRC_DIR)/src/rt/libuv/*.mk)
+GEN_MKFILES := $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/*) \
+ $(wildcard $(CFG_SRC_DIR)/mk/libuv/unix/*) \
+ $(wildcard $(CFG_SRC_DIR)/mk/libuv/win/*) \
+ $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*) \
+ $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*) \
+ $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*)
+
+MKFILES := $(OUR_MKFILES) $(3RDPARTY_MKFILES) $(GEN_MKFILES)
ifneq ($(MAKE_RESTARTS),)
CFG_INFO := $(info cfg: make restarts: $(MAKE_RESTARTS))
diff --git a/mk/dist.mk b/mk/dist.mk
index ef6d528d9a2..535760b4bf4 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -19,21 +19,42 @@ PKG_3RDPARTY := rt/valgrind.h rt/memcheck.h \
rt/bigint/bigint.h rt/bigint/bigint_int.cpp \
rt/bigint/bigint_ext.cpp rt/bigint/low_primes.h
+PKG_UV := \
+ $(wildcard $(S)src/rt/libuv/*) \
+ $(wildcard $(S)src/rt/libuv/include/*) \
+ $(wildcard $(S)src/rt/libuv/include/*/*) \
+ $(wildcard $(S)src/rt/libuv/src/*) \
+ $(wildcard $(S)src/rt/libuv/src/*/*) \
+ $(wildcard $(S)src/rt/libuv/src/*/*/*)
+
+PKG_PP_EXAMPLES = $(wildcard $(S)src/test/pretty/*.pp)
+
PKG_FILES = \
$(wildcard $(S)src/etc/*.*) \
$(S)LICENSE.txt $(S)README \
$(S)configure $(S)Makefile.in \
+ $(S)src/snapshots.txt \
$(addprefix $(S)src/, \
README comp/README \
$(RUNTIME_CS) $(RUNTIME_HDR) \
+ $(RUNTIME_S) \
+ rt/rustrt.def.in \
+ rt/intrinsics/intrinsics.ll.in \
+ rt/main.ll.in \
$(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
$(RUSTLLVM_HDR) \
+ rustllvm/rustllvm.def.in \
$(PKG_3RDPARTY)) \
- $(GENERATED) \
+ $(PKG_UV) \
$(COMPILER_INPUTS) \
$(STDLIB_INPUTS) \
$(ALL_TEST_INPUTS) \
- $(GENERATED)
+ $(FUZZER_CRATE) \
+ $(FUZZER_INPUTS) \
+ $(COMPILETEST_CRATE) \
+ $(COMPILETEST_INPUTS) \
+ $(PKG_PP_EXAMPLES) \
+ $(MKFILES)
dist: $(PKG_TAR) $(PKG_EXE)
diff --git a/mk/rt.mk b/mk/rt.mk
index 15f5aba566d..414384f0821 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -42,12 +42,20 @@ RUNTIME_S := rt/arch/i386/_context.S \
RUNTIME_HDR := rt/globals.h \
rt/rust.h \
+ rt/rust_abi.h \
+ rt/rust_cc.h \
+ rt/rust_debug.h \
+ rt/rust_gc.h \
rt/rust_internal.h \
rt/rust_util.h \
rt/rust_chan.h \
rt/rust_env.h \
+ rt/rust_obstack.h \
+ rt/rust_unwind.h \
+ rt/rust_upcall.h \
rt/rust_port.h \
rt/rust_scheduler.h \
+ rt/rust_shape.h \
rt/rust_task.h \
rt/rust_task_list.h \
rt/rust_log.h \
diff --git a/mk/tests.mk b/mk/tests.mk
index 184ee9b8c2e..ee0a2a6697b 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -84,8 +84,16 @@ tidy:
$(Q)echo \
$(filter-out $(GENERATED) $(addprefix $(S)src/, $(GENERATED)) \
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
- $(RUSTLLVM_HDR) $(PKG_3RDPARTY)) \
- $(S)src/etc/%, $(PKG_FILES)) \
+ $(RUSTLLVM_HDR) $(PKG_3RDPARTY) \
+ $(RUNTIME_CS) $(RUNTIME_HDR) $(RUNTIME_S)) \
+ $(S)src/etc/%, \
+ $(COMPILER_CRATE) \
+ $(COMPILER_INPUTS) \
+ $(STDLIB_CRATE) \
+ $(STDLIB_INPUTS) \
+ $(COMPILETEST_CRATE) \
+ $(COMPILETEST_INPUTS) \
+ $(ALL_TEST_INPUTS)) \
| xargs -n 10 python $(S)src/etc/tidy.py