4 files changed, 10 insertions, 8 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 57f9d1e26..c7a8a1853 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -59,6 +59,7 @@
        setup.noAWT
        setup.noCDC
 
+   - Skip gluegen: java.generate.skip
    -->
 <project name="JOGL" basedir="." default="all">
 
@@ -2073,7 +2074,7 @@
     <!--
        - Build/run junit.
       -->
-    <target name="junit.compile">
+    <target name="junit.compile" depends="init">
         <!-- Perform the junit pass Java compile -->
         <javac destdir="${classes}"
                source="${junit.sourcelevel}"
diff --git a/make/lib/gluegen.compiler.intelgdl.xml b/make/lib/gluegen.compiler.intelgdl.xml
index d0a1c50e2..9691a39d5 100644
--- a/make/lib/gluegen.compiler.intelgdl.xml
+++ b/make/lib/gluegen.compiler.intelgdl.xml
@@ -4,17 +4,18 @@
     This is an example of how to add custom compiler/linker arguments
     for a crosscompiler and a custom NEWT windowing implementation.
 
-    You can use such files with setting the property 'gluegen.user.compiler.file', ie:
+    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
 
-        -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.intelgdl.xml
+        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen.compiler.intelgdl.xml
 
-    or by having such file in your home directory, ie:
-
-            ~/gluegen.compiler.xml
   -->
       
 <project name="GlueGen-cpptasks" basedir=".">
+
+    <import file="../gluegen-cpptasks-base.xml" optional="false" />
+
     <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
+        <echo message="Custom forced linker.cfg.linux, linker.cfg.linux.amd64" />
         <linker id="linker.cfg.linux" name="gcc">
             <linkerarg value="-m32" />
             <linkerarg value="-L/usr/lib" />
diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index ef12088ff..32f48a80f 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -17,7 +17,7 @@ fi
 #    -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
 
 ant \
-    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
     -Drootrel.build=build-x86 \
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index 4f51136fb..ad80f194d 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -15,7 +15,7 @@ fi
 BUILD_SUBDIR=build-cdcfp-x86
 
 ant -v \
-    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Drootrel.build=$BUILD_SUBDIR \
     -Dsetup.cdcfp=true \