From 0ad1de1dd3a8e1af0d5b2e3b531fb5ece170e565 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Tue, 8 Apr 2014 11:15:23 +0200
Subject: modify build to better conform to debian policies

---
 flow-native/Makefile  | 15 +++++++++------
 flow-native/common.mk |  9 ++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/flow-native/Makefile b/flow-native/Makefile
index a768bd3..8827b5e 100644
--- a/flow-native/Makefile
+++ b/flow-native/Makefile
@@ -5,11 +5,15 @@
 # Include common settings
 include common.mk
 
-# Name of library to build
-LIB=lib$(NAME).so
+# Canonical name of library
+CNAME=lib$(NAME).so
+
+# Java library link, used to enable loading of
+# semanticaly versioned librraies from java
+JAVALIB=lib$(NAME)$(MAJOR).so
 
 # soname of library
-SONAME=$(LIB).$(MAJOR)
+SONAME=$(CNAME).$(MAJOR)
 
 # Actual file name of library
 TARGET=$(SONAME).$(MINOR).$(MICRO)
@@ -19,8 +23,7 @@ LDFLAGS+=-shared -Wl,-soname,$(SONAME)
 INCLUDES+=$(JNI_INCLUDE)
 
 # All final products that should be installed
-PRODUCTS=$(TARGET) $(SONAME) $(LIB)
-
+PRODUCTS=$(TARGET) $(SONAME) $(JAVALIB)
 
 # Build library and all appropriate links
 all: $(PRODUCTS)
@@ -34,7 +37,7 @@ $(SONAME): $(TARGET)
 	ln -s $< $@
 
 # Create dev link
-$(LIB): $(SONAME)
+$(JAVALIB): $(SONAME)
 	ln -s $< $@
 
 # Compile objects
diff --git a/flow-native/common.mk b/flow-native/common.mk
index 1db2e22..df7f389 100644
--- a/flow-native/common.mk
+++ b/flow-native/common.mk
@@ -3,17 +3,12 @@
 
 # Name of the library to produce
 #
-NAME=flow3
+NAME=flow
 
 
 # Library versions
 #
-# 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.
-#
-MAJOR=0# always zero
+MAJOR=3# public API changes
 MINOR=0# backwards-compatible changes
 MICRO=0# bugfixes
 
-- 
cgit v1.2.3