X-Git-Url: https://git.distorted.org.uk/~mdw/tripe-android/blobdiff_plain/2a02a846336b5f89794661b0569655b74ec1e509..c8292b34485a2e00e676023d4164dd5841e4659f:/Makefile

diff --git a/Makefile b/Makefile
index 873380a..ff2a65c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,28 @@ JDK			 = /usr/lib/jvm/default-java
 JDK_PLAT		 = linux
 INCLUDES		 = $(JDK)/include $(JDK)/include/$(JDK_PLAT)
 
+PKGS			 = mLib catacomb
+PKGS_CFLAGS		:= $(foreach p,$(PKGS),$(shell pkg-config --cflags $p))
+PKGS_LIBS		:= $(foreach p,$(PKGS),$(shell pkg-config --libs $p))
+
 CC			 = gcc
-CFLAGS			 = -O0 -g -Wall -fPIC $(addprefix -I,$(INCLUDES))
+CFLAGS			 = -O2 -g -Wall -pedantic -Werror \
+				-fPIC $(addprefix -I,$(INCLUDES))
+CFLAGS			+= $(PKGS_CFLAGS)
 
 LD			 = gcc
+LIBS			 = $(PKGS_LIBS)
 LDFLAGS.so		 = -shared
 
 JAVAC			 = javac
 JAVAFLAGS		 =
 
 SCALAC			 = fsc
-SCALAFLAGS		 = -optimise
+SCALAFLAGS		 = -optimise -Xlint -Xlint:-package-object-classes \
+				-Yinline-warnings:false
+
+## Hack around https://issues.scala-lang.org/browse/SI-9689
+SCALAFLAGS		+= -Yno-load-impl-class
 
 all::
 .PHONY: all
@@ -34,6 +45,7 @@ CLASSDIR		 = cls/
 	$(call v_tag,JAVAC)mkdir -p $(CLASSDIR) && \
 		$(JAVAC) -d $(CLASSDIR) -cp $(CLASSDIR) $(JAVAFLAGS) $< && \
 		echo built >$@
+	$(V_AT)$(SCALAC) -reset
 %.stamp: %.scala
 	$(call v_tag,SCALAC)mkdir -p $(CLASSDIR) && \
 		$(SCALAC) -d $(CLASSDIR) -cp $(CLASSDIR) $(SCALAFLAGS) $< && \
@@ -46,15 +58,24 @@ objects			 = $(patsubst %.c,%$2,$1)
 TARGETS += libtoy.so
 libtoy.so_SOURCES	 = jni.c
 libtoy.so: $(call objects,$(libtoy.so_SOURCES),.o)
-	$(call v_tag,LD)$(LD) $(LDFLAGS.so) -o$@ $^
+	$(call v_tag,LD)$(LD) $(LDFLAGS.so) -o$@ $^ $(LIBS)
+
+TARGETS			+= util.stamp
+
+TARGETS			+= sys.stamp
+sys.stamp: util.stamp
+
+TARGETS			+= admin.stamp
+admin.stamp: sys.stamp util.stamp
 
-TARGETS			+= jni.stamp
+TARGETS			+= tar.stamp
+tar.stamp: sys.stamp util.stamp
 
-TARGETS			+= sock.stamp
-sock.stamp: jni.stamp
+TARGETS			+= keys.stamp
+keys.stamp: tar.stamp sys.stamp util.stamp
 
 TARGETS			+= main.stamp
-main.stamp: jni.stamp sock.stamp
+main.stamp: sys.stamp
 
 all:: $(TARGETS)
 ALLSOURCES		+= $(foreach t,$(TARGETS),$($t_SOURCES))