Mercurial > hg > mxe-octave-anirudha

changeset 3203:7159c6416eb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/octave.mk: Move Java configuration code for MinGW to separate multiline variables
author Anirudha Bose <ani07nov@gmail.com>
date Sun, 15 Sep 2013 22:11:27 +0530
parents e3a857c4f6b7
children 210ba2447fed
files src/octave.mk
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -32,6 +32,16 @@
     $(PKG)_CROSS_CONFIG_OPTIONS := \
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
       gl_cv_func_gettimeofday_clobber=no
+    define MINGW_JAVA_CONFIG =
+      mkdir -p '$(HOST_PREFIX)/include/java/include'
+      wget -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h -O $(HOST_PREFIX)/include/java/include/jni.h
+      mkdir -p '$(HOST_PREFIX)/include/java/include/win32'
+      wget -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h -O $(HOST_PREFIX)/include/java/include/win32/jni_md.h
+    endef
+    $MINGW_JAVA_CONFIG_OPTIONS := \
+      --with-java-homedir="$(HOST_PREFIX)/include/java" \
+      --with-java-includedir="$(HOST_PREFIX)/include/java" \
+
     ifeq ($(ENABLE_64),yes)
       $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 ax_blas_f77_func_ok=yes
     endif
@@ -86,18 +96,13 @@
 endef
 else
 define $(PKG)_BUILD
-    mkdir '$(1)/.build'
-    mkdir -p '$(HOST_PREFIX)/include/java/include'
-    wget -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h -O $(HOST_PREFIX)/include/java/include/jni.h
-    mkdir -p '$(HOST_PREFIX)/include/java/include/win32'
-    wget -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h -O $(HOST_PREFIX)/include/java/include/win32/jni_md.h
+    mkdir '$(1)/.build' && $(MINGW_JAVA_CONFIG)
     cd '$(1)' && autoreconf -W none
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
-	--with-java-homedir="$(HOST_PREFIX)/include/java" \
-	--with-java-includedir="$(HOST_PREFIX)/include/java" \
+	$($MINGW_JAVA_CONFIG_OPTIONS) \
 	--enable-docs \
         $($(PKG)_BLAS_OPTION) \
 	$($(PKG)_CROSS_CONFIG_OPTIONS) \