From c0fe7c511bb292c88c703c4cfb4acb793951a0ca Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 4 Sep 2014 23:16:46 +0200 Subject: m makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d1b3ac0..62689ff 100644 --- a/Makefile +++ b/Makefile @@ -8,16 +8,10 @@ PREFIX ?= /usr # The library path excluding prefix LIB ?= /lib -# The library header path excluding prefix. -INCLUDE ?= /include # The resource path excluding prefix DATA ?= /share # The library path including prefix LIBDIR ?= $(PREFIX)$(LIB) -# The library header path including prefix. -INCLUDEDIR ?= $(PREFIX)$(INCLUDE) -# The pkg-config file path including prefix. -PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig # The resource path including prefix DATADIR ?= $(PREFIX)$(DATA) # The generic documentation path including prefix @@ -33,9 +27,10 @@ PKGNAME = jlibgamma # The Java compiler JAVAC = javac - # The Java archive creator JAR = jar +# The JNI header generator +JAVAH = javah # The version of the library. @@ -57,7 +52,7 @@ endif # Platform dependent flags ifeq ($(PLATFORM),w32) SHARED = -mdll -LDSO = -Wl,-soname,libgammamm.$(SO).$(LIB_MAJOR) +LDSO = -Wl,-soname,jlibgamma.$(SO).$(LIB_MAJOR) PIC = else ifeq ($(PLATFORM),osx) @@ -66,7 +61,7 @@ LDSO = PIC = -fPIC else SHARED = -shared -LDSO = -Wl,-soname,libgammamm.$(SO).$(LIB_MAJOR) +LDSO = -Wl,-soname,jlibgamma.$(SO).$(LIB_MAJOR) PIC = -fPIC endif endif -- cgit v1.2.3-70-g09d2