From 26b3deaba4e029a6aaea49c6652f7156ec17bbc0 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Mon, 31 Mar 2014 19:22:18 +0200
Subject: update makefile

---
 flow-native/Makefile  | 3 ++-
 flow-native/common.mk | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/flow-native/Makefile b/flow-native/Makefile
index 0a64190..29080a3 100644
--- a/flow-native/Makefile
+++ b/flow-native/Makefile
@@ -14,8 +14,9 @@ SONAME=$(LIB).$(MAJOR)
 # Actual file name of library
 TARGET=$(SONAME).$(MINOR).$(MICRO)
 
-# Linux-specific linker flags
+# Linux-specific flags
 LDFLAGS+=-shared -Wl,-soname,$(SONAME)
+INCLUDES+=$(JAVA_HOME)/include/ $(JAVA_HOME)/include/linux/
 
 # All final products that should be installed
 PRODUCTS=$(TARGET) $(SONAME) $(LIB)
diff --git a/flow-native/common.mk b/flow-native/common.mk
index be9f980..1ce66a6 100644
--- a/flow-native/common.mk
+++ b/flow-native/common.mk
@@ -8,7 +8,7 @@ NAME=flow3
 
 # Library versions
 #
-# Note that MAJOR should always be set tozero
+# Note that MAJOR should always be set to zero
 # since java does not allow loading semantically
 # versioned libraries, include the major version
 # in the name instead.
@@ -18,7 +18,7 @@ MINOR=0# backwards-compatible changes
 MICRO=0# bugfixes
 
 
-# Directory where the library will be installed
+# Directory where the library will be installed (without /lib)
 #
 PREFIX?=/usr
 
@@ -41,7 +41,7 @@ JAVA_HOME?=/usr/lib/jvm/java-7-oracle
 
 # Include directories
 #
-INCLUDES=./include/ $(JAVA_HOME)/include/ $(JAVA_HOME)/include/linux/
+INCLUDES=./include
 
 
 # Objects that will be compiled from respective .c files
-- 
cgit v1.2.3