15 files changed, 30 insertions, 30 deletions
diff --git a/make/scripts/make.jocl.all.android-aarch64-cross.sh b/make/scripts/make.jocl.all.android-aarch64-cross.sh
index 9a0571e2..9598e46d 100755
--- a/make/scripts/make.jocl.all.android-aarch64-cross.sh
+++ b/make/scripts/make.jocl.all.android-aarch64-cross.sh
@@ -2,8 +2,8 @@
 
 SDIR=$(readlink -f `dirname $0`)
 
-if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 LOGF=make.jocl.all.android-aarch64-cross.log
diff --git a/make/scripts/make.jocl.all.android-armv6-cross.sh b/make/scripts/make.jocl.all.android-armv6-cross.sh
index 69c734d7..59a46dc0 100755
--- a/make/scripts/make.jocl.all.android-armv6-cross.sh
+++ b/make/scripts/make.jocl.all.android-armv6-cross.sh
@@ -2,8 +2,8 @@
 
 SDIR=$(readlink -f `dirname $0`)
 
-if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 LOGF=make.jocl.all.android-armv6-cross.log
diff --git a/make/scripts/make.jocl.all.android-x86-cross.sh b/make/scripts/make.jocl.all.android-x86-cross.sh
index 015752a6..5bc59e89 100755
--- a/make/scripts/make.jocl.all.android-x86-cross.sh
+++ b/make/scripts/make.jocl.all.android-x86-cross.sh
@@ -2,8 +2,8 @@
 
 SDIR=$(readlink -f `dirname $0`)
 
-if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 LOGF=make.jocl.all.android-x86-cross.log
diff --git a/make/scripts/make.jocl.all.linux-aarch64-cross.sh b/make/scripts/make.jocl.all.linux-aarch64-cross.sh
index 7b22c36a..42542425 100755
--- a/make/scripts/make.jocl.all.linux-aarch64-cross.sh
+++ b/make/scripts/make.jocl.all.linux-aarch64-cross.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 # aarch64-linux-gnueabi == aarch64 triplet
diff --git a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
index 8a369b8c..c3cd339e 100755
--- a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0`
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH
diff --git a/make/scripts/make.jocl.all.linux-x86-clang.sh b/make/scripts/make.jocl.all.linux-x86-clang.sh
index 023a79c9..65de5b1d 100755
--- a/make/scripts/make.jocl.all.linux-x86-clang.sh
+++ b/make/scripts/make.jocl.all.linux-x86-clang.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
 LOGF=make.jocl.all.linux-x86-clang.log
diff --git a/make/scripts/make.jocl.all.linux-x86.sh b/make/scripts/make.jocl.all.linux-x86.sh
index 59df6acd..33d7bea9 100755
--- a/make/scripts/make.jocl.all.linux-x86.sh
+++ b/make/scripts/make.jocl.all.linux-x86.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
 LOGF=make.jocl.all.linux-x86.log
diff --git a/make/scripts/make.jocl.all.linux-x86_64-clang.sh b/make/scripts/make.jocl.all.linux-x86_64-clang.sh
index aef8f0ba..71decaff 100755
--- a/make/scripts/make.jocl.all.linux-x86_64-clang.sh
+++ b/make/scripts/make.jocl.all.linux-x86_64-clang.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0`
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 LOGF=make.jocl.all.linux-x86_64-clang.log
diff --git a/make/scripts/make.jocl.all.linux-x86_64.sh b/make/scripts/make.jocl.all.linux-x86_64.sh
index 5fee3199..06c9e8e7 100755
--- a/make/scripts/make.jocl.all.linux-x86_64.sh
+++ b/make/scripts/make.jocl.all.linux-x86_64.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0`
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 LOGF=make.jocl.all.linux-x86_64.log
diff --git a/make/scripts/make.jocl.all.solaris-x86.sh b/make/scripts/make.jocl.all.solaris-x86.sh
index 6e643cb2..0220f47f 100755
--- a/make/scripts/make.jocl.all.solaris-x86.sh
+++ b/make/scripts/make.jocl.all.solaris-x86.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
 export SOURCE_LEVEL=1.6
diff --git a/make/scripts/make.jocl.all.solaris-x86_64.sh b/make/scripts/make.jocl.all.solaris-x86_64.sh
index abca7e2a..cfaa5aeb 100755
--- a/make/scripts/make.jocl.all.solaris-x86_64.sh
+++ b/make/scripts/make.jocl.all.solaris-x86_64.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 export SOURCE_LEVEL=1.6
diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh
index b95a612c..9d16cd0b 100755
--- a/make/scripts/tests-solx32.sh
+++ b/make/scripts/tests-solx32.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
 . $SDIR/tests.sh  `which java` -DummyArg ../build-solaris-x86 $*
diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh
index 9f20e6a4..d4d2eb7b 100755
--- a/make/scripts/tests-solx64.sh
+++ b/make/scripts/tests-solx64.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 . $SDIR/tests.sh  `which java` -DummyArg ../build-solaris-x86_64 $*
diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh
index 0a345cec..32c7f0e1 100755
--- a/make/scripts/tests-x32.sh
+++ b/make/scripts/tests-x32.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
 export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86/swt-debug.jar
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index e116cfd5..527cc3a6 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -11,8 +11,8 @@ SDIR=`dirname $0`
 #export LD_LIBRARY_PATH=/home/sven/libav-10.x/lib:$LD_LIBRARY_PATH
 #export LD_LIBRARY_PATH=/home/sven/ffmpeg-2.x/lib:$LD_LIBRARY_PATH
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 . $SDIR/tests.sh  `which java` -DummyArg ../build-x86_64 $*