From 43326ac25552aae8c46f5780c5aea67574b81f6d Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Thu, 1 May 2014 16:58:02 -0400 Subject: [PATCH] fix/simplify embedding build and libservo build --- Makefile.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4ff905d65e7..3588a384719 100644 --- a/Makefile.in +++ b/Makefile.in @@ -340,20 +340,16 @@ $(BINDINGS_SRC)/ParserResults.pkl: $(globalgen_dependencies) \ ifneq ($(CFG_OSTYPE),linux-androideabi) servo: $(DEPS_servo) @$(call E, compile: $@) - $(Q)$(RUSTC) $(RFLAGS_servo) -o $@ $< - -libservo.dummy: $(DEPS_servo) - @$(call E, compile: $@) + $(Q)$(RUSTC) $(RFLAGS_servo) -o servo $< --crate-type bin $(Q)$(RUSTC) $(RFLAGS_servo) $< --crate-type dylib,rlib - touch libservo.dummy RFLAGS_embedding = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/gfx -L $(B)src/components/util -L $(B)src/components/net -L $(B)src/components/script -L $(B)src/components/style -L $(B)src/components/msg -L $(B).. -L $(B)src/components/main -L $(B)src/components/macros -A non_camel_case_types -A unused_variable SRC_embedding = $(call rwildcard,$(S)src/components/embedding/,*.rs) CRATE_embedding = $(S)src/components/embedding/embedding.rs -servo-embedding: libservo.dummy $(SRC_embedding) $(CRATE_embedding) +servo-embedding: servo $(SRC_embedding) $(CRATE_embedding) @$(call E, compile: $@) - $(Q)$(RUSTC) $(RFLAGS_embedding) $(CRATE_embedding) --crate-type dylib,rlib + $(Q)$(RUSTC) $(RFLAGS_embedding) $(CRATE_embedding) touch servo-embedding else servo: $(DEPS_servo)