diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml 2017-02-08 22:06:28.220720753 +0100
@@ -22,8 +22,8 @@
${parent.relativePath}/TuxGuitar-alsa/jni/
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -fPIC
- -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC
+ ${LDFLAGS} -fPIC
-lasound
${tuxguitar.jni.ldpath}
tuxguitar-alsa-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml 2017-02-08 22:06:28.220720753 +0100
@@ -22,8 +22,8 @@
${parent.relativePath}/TuxGuitar-alsa/jni/
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m32 -fPIC
- -m32 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC
+ ${LDFLAGS} -m32 -fPIC
-lasound
${tuxguitar.jni.ldpath}
tuxguitar-alsa-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml 2017-02-08 22:06:28.220720753 +0100
@@ -22,8 +22,8 @@
${parent.relativePath}/TuxGuitar-alsa/jni/
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m64 -fPIC
- -m64 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC
+ ${LDFLAGS} -m64 -fPIC
-lasound
${tuxguitar.jni.ldpath}
tuxguitar-alsa-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml 2017-02-08 22:06:28.220720753 +0100
@@ -24,8 +24,8 @@
${parent.relativePath}/TuxGuitar-fluidsynth/jni/
${tuxguitar.jni.rm}
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -fPIC
- -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC
+ ${LDFLAGS} -fPIC
-lfluidsynth
${tuxguitar.jni.ldpath}
tuxguitar-fluidsynth-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
${parent.relativePath}/TuxGuitar-fluidsynth/jni/
${tuxguitar.jni.rm}
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m32 -fPIC
- -m32 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC
+ ${LDFLAGS} -m32 -fPIC
-lfluidsynth
${tuxguitar.jni.ldpath}
tuxguitar-fluidsynth-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
${parent.relativePath}/TuxGuitar-fluidsynth/jni/
${tuxguitar.jni.rm}
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m64 -fPIC
- -m64 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC
+ ${LDFLAGS} -m64 -fPIC
-lfluidsynth
${tuxguitar.jni.ldpath}
tuxguitar-fluidsynth-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
${parent.relativePath}/TuxGuitar-jack/jni/
${tuxguitar.jni.rm}
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -fPIC
- -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC
+ ${LDFLAGS} -fPIC
`pkg-config --libs jack`
${tuxguitar.jni.ldpath}
tuxguitar-jack-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
${parent.relativePath}/TuxGuitar-jack/jni/
${tuxguitar.jni.rm}
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m32 -fPIC
- -m32 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC
+ ${LDFLAGS} -m32 -fPIC
`pkg-config --libs jack`
${tuxguitar.jni.ldpath}
tuxguitar-jack-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
${parent.relativePath}/TuxGuitar-jack/jni/
${tuxguitar.jni.rm}
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m64 -fPIC
- -m64 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC
+ ${LDFLAGS} -m64 -fPIC
`pkg-config --libs jack`
${tuxguitar.jni.ldpath}
tuxguitar-jack-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -22,8 +22,8 @@
${parent.relativePath}/TuxGuitar-oss/jni/
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -fPIC
- -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC
+ ${LDFLAGS} -fPIC
${tuxguitar.jni.ldpath}
tuxguitar-oss-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -22,8 +22,8 @@
${parent.relativePath}/TuxGuitar-oss/jni/
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m32 -fPIC
- -m32 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC
+ ${LDFLAGS} -m32 -fPIC
${tuxguitar.jni.ldpath}
tuxguitar-oss-jni
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml 2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml 2017-02-08 22:06:28.224054080 +0100
@@ -22,8 +22,8 @@
${parent.relativePath}/TuxGuitar-oss/jni/
${tuxguitar.jni.cc}
- -I$(shell gcj -print-file-name=include/) -m64 -fPIC
- -m64 -fPIC
+ ${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC
+ ${LDFLAGS} -m64 -fPIC
${tuxguitar.jni.ldpath}
tuxguitar-oss-jni