summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Noble <nnoble@blizzard.com>2013-07-24 15:31:31 -0700
committerNicolas Noble <nnoble@blizzard.com>2013-07-24 15:31:31 -0700
commit2f89d8ef7815bf1896676ea6e4b02bc2132d9cc7 (patch)
treecdf1ae2f134c25c9ab48f471dabfffda3a56dc18
parent6d886b8ec9bafbbedb266748c86d8a1d68f733ec (diff)
The Makefile is now smarter about Balau.
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 26364af..4f7c082 100644
--- a/Makefile
+++ b/Makefile
@@ -39,12 +39,16 @@ ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(DALOS_CLI_SOURCES))))
TARGET=Dalos-cli.$(BINEXT)
-all: dep $(TARGET)
+all: dep Balau $(TARGET)
strip: $(TARGET)
$(STRIP) $(TARGET)
-Balau: Balau/libBalau.a
+Balau:
+ $(MAKE) -C Balau
+
+tests:
+ $(MAKE) -C Balau tests
Balau/libBalau.a:
$(MAKE) -C Balau
@@ -66,4 +70,4 @@ clean:
rm -f $(ALL_OBJECTS) $(ALL_DEPS) $(TARGET)
$(MAKE) -C Balau clean
-.PHONY: clean strip Balau
+.PHONY: clean strip Balau tests all