From 4aed814123b2582d3ccdc80c1893da4f72849cb9 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 5 Sep 2014 03:22:26 +0200 Subject: begin on test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0f54e92..c67d5f5 100644 --- a/Makefile +++ b/Makefile @@ -105,16 +105,19 @@ JAVA_OBJ = AdjustmentMethod CRTC CRTCInformation GammaRamps Libgamma Partition S # Java classes with native functions JAVA_H = AdjustmentMethod CRTC GammaRamps LibgammaException Partition Ramp Site +# .so files to create +SO_FILES = bin/libgamma-java.$(SO).$(LIB_VERSION) bin/libgamma-java.$(SO).$(LIB_MAJOR) bin/libgamma-java.$(SO) + .PHONY: all -all: lib +all: lib test .PHONY: lib lib: jar so .PHONY: so -so: bin/libgamma-java.$(SO).$(LIB_VERSION) bin/libgamma-java.$(SO).$(LIB_MAJOR) bin/libgamma-java.$(SO) +so: $(SO_FILES) .PHONY: jar jar: bin/jlibgamma.jar @@ -125,6 +128,9 @@ class: $(foreach O,$(JAVA_OBJ),obj/libgamma/$(O).class) .PHONY: header header: $(foreach H,$(JAVA_H),obj/libgamma_$(H).h) +.PHONY: test +test: bin/Test.class + bin/jlibgamma.jar: $(foreach O,$(JAVA_OBJ),obj/libgamma/$(O).class) @mkdir -p bin @@ -154,8 +160,17 @@ bin/libgamma-java.$(SO): @mkdir -p bin ln -sf libgamma-java.$(SO).$(LIB_VERSION) $@ +bin/Test.class: src/Test.java bin/jlibgamma.jar $(SO_FILES) + @mkdir -p bin + $(JAVAC) $(JAVAC_FLAGS) -cp 'src:bin/jlibgamma.jar' -s src -d bin $< + .PHONY: clean clean: -rm -r obj bin + +.PHONY: run-test +run-test: bin/Test.class + @env LD_LIBRARY_PATH=bin java -cp bin:bin/jlibgamma.jar Test + -- cgit v1.2.3-70-g09d2