[Terry N.] correct depends

build.xml

@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <!-- Seems to render in Mozilla Firefox the best.  Broken in IE7 -->
 <?xml-stylesheet type="text/xsl" href="./ant2html.xsl"?>
-<project name="Xj3D NPS" default="run" basedir=".">
+<project name="Xj3D NPS" default="all" basedir=".">
     <description>Builds, tests, and runs the project NPS Xj3D 2.3</description>
     <property file="nbproject/private/private.properties"/>
@@ -389,7 +389,6 @@ POSSIBILITY OF SUCH DAMAGE.
             depends="build,compile"
             description="Build the Xj3D src distribution jar files">
-
         <!-- Jar up core and apps source files for debugging reference -->
         <jar destfile="${dist.src.jar}">
             <manifest>
@@ -907,33 +906,28 @@ POSSIBILITY OF SUCH DAMAGE.
             <classpath refid="app.classpath"/>
             <!-- These excludes will avoid most errors, but will have to be
-                 reviewed from time to time to follow Makefile-opengl javadoc
-                 build order -->
+                 reviewed from time to time -->
 			<!-- bugfix: https://stackoverflow.com/questions/16456786/not-able-to-create-javadoc-using-ant -->
             <fileset dir="${src.java.dir}" defaultexcludes="yes" excludes="${xj3d.build.excludes}">
-				<include name="**/*.java" />
-                <exclude name="**/Makefile*"/>
+		<include name="**/*.java" />
                 <exclude name="**/task"/>
                 <exclude name="**/*.html"/>
             </fileset>
             <fileset dir="${browser.src.java.dir}" defaultexcludes="yes" excludes="${browser.build.excludes}">
-				<include name="**/*.java" />
-                <exclude name="**/Makefile*"/>
+		<include name="**/*.java" />
                 <exclude name="**/package.html"/>
                 <exclude name="**/*.properties"/>
                 <exclude name="**/xj3d/browser/renderer/**"/>
             </fileset>
             <fileset dir="${cadfilter.src.java.dir}" defaultexcludes="yes" excludes="${cadfilter.build.excludes}">
-				<include name="**/*.java" />
-                <exclude name="**/Makefile*"/>
+		<include name="**/*.java" />
                 <exclude name="**/package.html"/>
             </fileset>
             <fileset dir="${replica.src.java.dir}" defaultexcludes="yes">
-				<include name="**/*.java" />
-                <exclude name="**/Makefile*"/>
+		<include name="**/*.java" />
                 <exclude name="**/package.html"/>
             </fileset>
@@ -1039,7 +1033,7 @@ POSSIBILITY OF SUCH DAMAGE.
     </target>
     <target name="dist"
-            depends="build,jar,jar.apps,pack.3rd.party.jars"
+            depends="build,jar,jar.apps,jar.src,pack.3rd.party.jars"
             description="Build then create distribution jars">
         <echo message="build dist dependencies complete, starting dist tasks"/>
@@ -1073,14 +1067,12 @@ POSSIBILITY OF SUCH DAMAGE.
         </zip>
         <delete dir="${marshall.dir}"/>
-        <antcall target="jar.src"/>
-
         <echo message="Production note: X3D Examples image capture links to jars via property name=xj3d.dir"/>
         <echo message="Production note: X3D-Edit update requires copying Xj3D jars to module www.web3d.org\x3d/tools/X3dEdit4.0/X3dEditModuleSuite/X3dSourceFilePalette/release/modules/ext"/>
     </target>
-    <target name="all" depends="versions,clean,build,javadoc,dist"
+    <target name="all" depends="versions,clean,dist,javadoc"
             description="complete clean/build ready for distribution and deployment">
         <echo message="build.dist to create a distributable Xj3D complete with documentation"/>
         <!-- build.dist does not include javadoc in installers, but javadoc has ability to detect additional errors..test, -->