RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

move rust-crypto to deps/

Browse source
This commit is contained in:
Michael Gehring 2014-06-20 14:47:39 +02:00
parent 5c501cc815
commit 30ee539ec0
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "md5sum/rust-crypto"] [submodule "md5sum/rust-crypto"]
path = md5sum/rust-crypto path = deps/rust-crypto
url = git://github.com/DaGenix/rust-crypto.git url = git://github.com/DaGenix/rust-crypto.git

19
Makefile
View file

@ -95,12 +95,13 @@ TESTS := \
EXES_PATHS := $(addprefix build/,$(EXES)) EXES_PATHS := $(addprefix build/,$(EXES))
command = sh -c '$(1)' command = sh -c '$(1)'
# Main exe build rule # Main exe build rule
define EXE_BUILD define EXE_BUILD
-include build/$(1).d -include build/$(1).d
ifeq ($(wildcard $(1)/Makefile),) ifeq ($(wildcard $(1)/Makefile),)
build/$(1): $(1)/$(1).rs | build build/$(1): $(1)/$(1).rs | build
$(call command,$(RUSTC) $(RUSTCFLAGS) --dep-info build/$(1).d -o build/$(1) $(1)/$(1).rs) $(call command,$(RUSTC) $(RUSTCFLAGS) -L build/ --dep-info build/$(1).d -o build/$(1) $(1)/$(1).rs)
clean_$(1): clean_$(1):
else else
build/$(1): $(1)/$(1).rs | build build/$(1): $(1)/$(1).rs | build
@ -113,7 +114,7 @@ endef
define CRATE_BUILD define CRATE_BUILD
-include build/$(1).d -include build/$(1).d
build/$(2): $(1)/$(1).rs | build build/$(2): $(1)/$(1).rs | build
$(call command,$(RUSTC) $(RUSTCFLAGS) --crate-type rlib --dep-info build/$(1).d $(1)/$(1).rs --out-dir build) $(call command,$(RUSTC) $(RUSTCFLAGS) -L build/ --crate-type rlib --dep-info build/$(1).d $(1)/$(1).rs --out-dir build)
endef endef
# Test exe built rules # Test exe built rules
@ -127,9 +128,9 @@ endef
# Main rules # Main rules
ifneq ($(MULTICALL), 1) ifneq ($(MULTICALL), 1)
all: $(EXES_PATHS) all: deps $(EXES_PATHS)
else else
all: build/uutils all: deps build/uutils
-include build/uutils.d -include build/uutils.d
@ -137,6 +138,14 @@ build/uutils: uutils/uutils.rs $(addprefix build/, $(foreach crate,$(CRATES),$(s
$(RUSTC) $(RUSTCFLAGS) -L build/ --dep-info $@.d uutils/uutils.rs -o $@ $(RUSTC) $(RUSTCFLAGS) -L build/ --dep-info $@.d uutils/uutils.rs -o $@
endif endif
# Dependencies
LIBCRYPTO := $(shell $(RUSTC) --crate-file-name --crate-type rlib deps/rust-crypto/src/rust-crypto/lib.rs)
-include build/rust-crypto.d
build/$(LIBCRYPTO):
$(RUSTC) $(RUSTCFLAGS) --crate-type rlib --dep-info build/rust-crypto.d deps/rust-crypto/src/rust-crypto/lib.rs --out-dir build/
deps: build build/$(LIBCRYPTO)
test: tmp $(addprefix test_,$(TESTS)) test: tmp $(addprefix test_,$(TESTS))
$(RM) -rf tmp $(RM) -rf tmp
@ -200,4 +209,4 @@ busytest: build/busybox build/.config
endif endif
endif endif
.PHONY: all test clean busytest install uninstall .PHONY: all deps test clean busytest install uninstall

0
md5sum/rust-crypto → deps/rust-crypto vendored
View file