freshlybakedca.ke
Git fork
Merge branch 'da/cargo-serialize'
Makefile tried to run multiple "cargo build" which would not work
very well; serialize their execution to work it around.
* da/cargo-serialize:
Makefile: build libgit-rs and libgit-sys serially
+5
-6
Makefile
+5
-6
Makefile
···
3945
3945
$(MAKE) -C t/ unit-tests
3946
3946
3947
3947
.PHONY: libgit-sys libgit-rs
3948
-
libgit-sys libgit-rs:
3949
-
$(QUIET)(\
3950
-
cd contrib/$@ && \
3951
-
cargo build \
3952
-
)
3948
+
libgit-sys:
3949
+
$(QUIET)cargo build --manifest-path contrib/libgit-sys/Cargo.toml
3950
+
libgit-rs: libgit-sys
3951
+
$(QUIET)cargo build --manifest-path contrib/libgit-rs/Cargo.toml
3953
3952
ifdef INCLUDE_LIBGIT_RS
3954
-
all:: libgit-sys libgit-rs
3953
+
all:: libgit-rs
3955
3954
endif
3956
3955
3957
3956
LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o
+4
-10
t/Makefile
+4
-10
t/Makefile
···
189
189
190
190
.PHONY: libgit-sys-test libgit-rs-test
191
191
libgit-sys-test:
192
-
$(QUIET)(\
193
-
cd ../contrib/libgit-sys && \
194
-
cargo test \
195
-
)
196
-
libgit-rs-test:
197
-
$(QUIET)(\
198
-
cd ../contrib/libgit-rs && \
199
-
cargo test \
200
-
)
192
+
$(QUIET)cargo test --manifest-path ../contrib/libgit-sys/Cargo.toml
193
+
libgit-rs-test: libgit-sys-test
194
+
$(QUIET)cargo test --manifest-path ../contrib/libgit-rs/Cargo.toml
201
195
ifdef INCLUDE_LIBGIT_RS
202
-
all:: libgit-sys-test libgit-rs-test
196
+
all:: libgit-rs-test
203
197
endif