diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:25:39 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:25:39 +0200 |
| commit | 1edb02101a9306fc711cd422ed507d18165b1691 (patch) | |
| tree | bd2d48a139bfbe869f4f49359b63097931a45e7b /japi/Makefile.am | |
| parent | 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff) | |
move from support/1.0.27 to feature/1.0.27
Diffstat (limited to 'japi/Makefile.am')
| -rw-r--r-- | japi/Makefile.am | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/japi/Makefile.am b/japi/Makefile.am index 5d66e82..cc7ac4a 100644 --- a/japi/Makefile.am +++ b/japi/Makefile.am @@ -8,19 +8,15 @@ # Makefile for a Java project with native methods. # -V_MAJOR = @V_MAJOR@ -V_MINOR = @V_MINOR@ -V_REV = @V_REV@ - JAVAROOT=. -CLASSPATH_ENV=. -JAVAH=javah -jni -cp $(CLASSPATH_ENV) +MY_CLASSPATH=. +JAVAH=javah -jni -cp $(MY_CLASSPATH) # We'll need something in 'configure' for the Java includes. -AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \ +AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include \ -I$(top_srcdir)/include -I${JDK_HOME}/include \ -I${JDK_HOME}/include/genunix -AM_LDFLAGS = @STRICT_LDFLAGS@ -version-number $(V_MAJOR):$(V_MINOR):$(VREV) +AM_LDFLAGS += $(STRICT_LDFLAGS) -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) JAVA_SRC = SaneDevice.java SaneOption.java SaneRange.java\ Sane.java SaneParameters.java ScanIt.java \ @@ -31,7 +27,7 @@ dist_noinst_JAVA = $(JAVA_SRC) LIBSANE = ../backend/libsane.la -EXTRA_DIST = Makefile.in README.JAVA +EXTRA_DIST = README.JAVA lib_LTLIBRARIES = libsanej.la |