Chris Morgan
›
Git
›
anymap
› blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commit
grep
author
committer
pickaxe
?
search:
re
Rust syntax update in README.
[anymap]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 863c9612870f96a6edcf114ccf4c192e7e5c81b3..882cd3004d25ed63f168564fa6c15529ed9a2f3d 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,44
+12,47
@@
rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) \
$(filter $(subst *,%,$2),$d))
SRC := $(call rwildcard,src/,*.rs)
$(filter $(subst *,%,$2),$d))
SRC := $(call rwildcard,src/,*.rs)
-LIB :=
build/$(shell rustc --crate-file-name src/lib.rs --crate-type rlib
)
-ifeq ($(LIB),
build
/)
+LIB :=
target/$(shell rustc --print-file-name src/lib.rs
)
+ifeq ($(LIB),
target
/)
# We may not have rustc or the lib.rs file may be broken.
# But don't break the rules on that account.
# We may not have rustc or the lib.rs file may be broken.
# But don't break the rules on that account.
-LIB :=
build
/libanymap.dummy
+LIB :=
target
/libanymap.dummy
endif
anymap: $(LIB)
$(LIB): $(SRC)
endif
anymap: $(LIB)
$(LIB): $(SRC)
- @mkdir -p
build
/
- $(RUSTC) $(RUSTFLAGS) src/lib.rs --out-dir=
build -L build
+ @mkdir -p
target
/
+ $(RUSTC) $(RUSTFLAGS) src/lib.rs --out-dir=
target -L target
doc/anymap/index.html: $(SRC)
doc/anymap/index.html: $(SRC)
- $(RUSTDOC) src/lib.rs -L
build
+ $(RUSTDOC) src/lib.rs -L
target
-
build
/test: $(SRC)
- $(RUSTC) $(RUSTFLAGS) --test -o
build/test src/lib.rs -L build
+
target
/test: $(SRC)
+ $(RUSTC) $(RUSTFLAGS) --test -o
target/test src/lib.rs -L target
-
build
/quicktest: $(SRC)
- $(RUSTC) --test -o
build/quicktest src/lib.rs -L build
+
target
/quicktest: $(SRC)
+ $(RUSTC) --test -o
target/quicktest src/lib.rs -L target
# There are no tests to run this way at present. It’s all doctests.
# There are no tests to run this way at present. It’s all doctests.
-# test: anymap doctest
build
/test
-#
build
/test --test
+# test: anymap doctest
target
/test
+#
target
/test --test
test: anymap doctest
test: anymap doctest
+bench: anymap target/test
+ target/test --bench
+
doctest: $(SRC) $(LIB)
doctest: $(SRC) $(LIB)
- $(RUSTDOC) -L
build
--test src/lib.rs
+ $(RUSTDOC) -L
target
--test src/lib.rs
-# Can't wait for everything to
build
, optimised too? OK, you can save some time here.
-quicktest:
build
/quicktest
-
build
/quicktest --test
+# Can't wait for everything to
target
, optimised too? OK, you can save some time here.
+quicktest:
target
/quicktest
+
target
/quicktest --test
docs: doc/anymap/index.html
clean:
docs: doc/anymap/index.html
clean:
- rm -rf
build
/ doc/
+ rm -rf
target
/ doc/
TAGS: $(SRC)
ctags -f TAGS --options="$(RUST_CTAGS)" --language=rust -R src/
TAGS: $(SRC)
ctags -f TAGS --options="$(RUST_CTAGS)" --language=rust -R src/