diff options
Diffstat (limited to 'chapter25/Makefile')
| -rw-r--r-- | chapter25/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chapter25/Makefile b/chapter25/Makefile index 886354d3..fb71fc6b 100644 --- a/chapter25/Makefile +++ b/chapter25/Makefile @@ -65,10 +65,7 @@ main_javas := $(wildcard $(SRC)/$(SIMPLE)/*java $(SRC)/$(SIMPLE)/*/*java $(SRC test_javas := $(wildcard $(TST)/$(SIMPLE)/*java $(TST)/$(SIMPLE)/*/*java) simple_driver := $(TST)/$(SIMPLE)/Simple.java main_classes := $(patsubst $(SRC)/%java,$(CLZDIR)/main/%class,$(main_javas)) -# Compile the common adapter into this chapter without copying its sources. -GRAPH_DIR := $(firstword $(wildcard ../graph graph)) -graph_javas := $(wildcard $(GRAPH_DIR)/src/main/java/com/seaofnodes/graph/*.java) -main_javas += $(graph_javas) +include $(firstword $(wildcard ../graph/graph.mk graph/graph.mk)) test_classes := $(patsubst $(TST)/%java,$(CLZDIR)/test/%class,$(test_javas)) # These tests do not rely on the stdlib test_alone := com.seaofnodes.simple.BrainFuckTest com.seaofnodes.simple.MergeSortTest com.seaofnodes.simple.TypeTest @@ -218,11 +215,6 @@ build/release/Simple.jar: $(CLZDIR)/main/.mtag $(CLZDIR)/test/.ttag @printf "Main-Class: com.seaofnodes.simple.Simple\nClass-Path: ../../lib/junit-4.12.jar ../../lib/hamcrest-core-1.3.jar\n\n" > build/release/MANIFEST.MF @jar cfm $@ build/release/MANIFEST.MF -C $(CLZDIR)/main . -C $(CLZDIR)/test . -C $(SRC)/$(SIMPLE) . -C $(TST)/$(SIMPLE) . -# Launch viewer -.PHONY: view -view: $(CLZDIR)/main/.mtag - @echo "viewing " - @$(JVM) com.seaofnodes.simple.print.JSViewer ####################################################### .PHONY: clean |