OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bring make distcheck up to date

Browse Source
This commit is contained in:
Brian Anderson 2011-10-05 17:41:01 -07:00
parent ed5a962d6f
commit 4709038d64
4 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

@ -47,9 +47,17 @@
###################################################################### ######################################################################
include config.mk include config.mk
MKFILES := Makefile config.mk $(wildcard $(CFG_SRC_DIR)/mk/*.mk) OUR_MKFILES := Makefile config.mk $(wildcard $(CFG_SRC_DIR)/mk/*.mk)
MKFILES += $(CFG_SRC_DIR)/src/rt/libuv/Makefile 3RDPARTY_MKFILES := $(CFG_SRC_DIR)/src/rt/libuv/Makefile \
MKFILES += $(wildcard $(CFG_SRC_DIR)/src/rt/libuv/*.mk) $(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),) ifneq ($(MAKE_RESTARTS),)
CFG_INFO := $(info cfg: make restarts: $(MAKE_RESTARTS)) CFG_INFO := $(info cfg: make restarts: $(MAKE_RESTARTS))

25
mk/dist.mk
View File

@ -19,21 +19,42 @@ PKG_3RDPARTY := rt/valgrind.h rt/memcheck.h \
rt/bigint/bigint.h rt/bigint/bigint_int.cpp \ rt/bigint/bigint.h rt/bigint/bigint_int.cpp \
rt/bigint/bigint_ext.cpp rt/bigint/low_primes.h 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 = \ PKG_FILES = \
$(wildcard $(S)src/etc/*.*) \ $(wildcard $(S)src/etc/*.*) \
$(S)LICENSE.txt $(S)README \ $(S)LICENSE.txt $(S)README \
$(S)configure $(S)Makefile.in \ $(S)configure $(S)Makefile.in \
$(S)src/snapshots.txt \
$(addprefix $(S)src/, \ $(addprefix $(S)src/, \
README comp/README \ README comp/README \
$(RUNTIME_CS) $(RUNTIME_HDR) \ $(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_LIB_CS) $(RUSTLLVM_OBJS_CS) \
$(RUSTLLVM_HDR) \ $(RUSTLLVM_HDR) \
rustllvm/rustllvm.def.in \
$(PKG_3RDPARTY)) \ $(PKG_3RDPARTY)) \
$(GENERATED) \ $(PKG_UV) \
$(COMPILER_INPUTS) \ $(COMPILER_INPUTS) \
$(STDLIB_INPUTS) \ $(STDLIB_INPUTS) \
$(ALL_TEST_INPUTS) \ $(ALL_TEST_INPUTS) \
$(GENERATED) $(FUZZER_CRATE) \
$(FUZZER_INPUTS) \
$(COMPILETEST_CRATE) \
$(COMPILETEST_INPUTS) \
$(PKG_PP_EXAMPLES) \
$(MKFILES)
dist: $(PKG_TAR) $(PKG_EXE) dist: $(PKG_TAR) $(PKG_EXE)

8
mk/rt.mk
View File

@ -42,12 +42,20 @@ RUNTIME_S := rt/arch/i386/_context.S \
RUNTIME_HDR := rt/globals.h \ RUNTIME_HDR := rt/globals.h \
rt/rust.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_internal.h \
rt/rust_util.h \ rt/rust_util.h \
rt/rust_chan.h \ rt/rust_chan.h \
rt/rust_env.h \ rt/rust_env.h \
rt/rust_obstack.h \
rt/rust_unwind.h \
rt/rust_upcall.h \
rt/rust_port.h \ rt/rust_port.h \
rt/rust_scheduler.h \ rt/rust_scheduler.h \
rt/rust_shape.h \
rt/rust_task.h \ rt/rust_task.h \
rt/rust_task_list.h \ rt/rust_task_list.h \
rt/rust_log.h \ rt/rust_log.h \

12
mk/tests.mk
View File

@ -84,8 +84,16 @@ tidy:
$(Q)echo \ $(Q)echo \
$(filter-out $(GENERATED) $(addprefix $(S)src/, $(GENERATED)) \ $(filter-out $(GENERATED) $(addprefix $(S)src/, $(GENERATED)) \
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \ $(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
$(RUSTLLVM_HDR) $(PKG_3RDPARTY)) \ $(RUSTLLVM_HDR) $(PKG_3RDPARTY) \
$(S)src/etc/%, $(PKG_FILES)) \ $(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 | xargs -n 10 python $(S)src/etc/tidy.py