--- a/ChangeLog	Thu Mar 11 16:35:10 2010 -0500
+++ b/ChangeLog	Tue Jun 01 18:04:46 2010 +0100
@@ -1,3 +1,17 @@
+2010-03-12  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(NETX_EXTRA_DIR): Path to extra NetX resource files.
+	(ICEDTEA_BOOTSTRAP_CLASSES): Explicitly compile BasicDirectoryModel
+	due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003
+	(stamps/icedtea.stamp): Use NETX_RESOURCE_DIR for about.jnlp.
+	(stamps/icedtea-debug.stamp): Likewise.
+	(stamps/netx.stamp): Copy the resources to the build directory.
+	(stamps/extra-class-files.stamp): Use NETX_EXTRA_DIR.
+	(rt-source-files.txt): Don't search rt directory in build tree.
+	Support ICEDTEA_BOOTSTRAP_CLASSES.
+	(netx): New alias.
+
 2010-03-11  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp

--- a/Makefile.am	Thu Mar 11 16:35:10 2010 -0500
+++ b/Makefile.am	Tue Jun 01 18:04:46 2010 +0100
@@ -95,6 +95,7 @@
 
 NETX_SRCDIR = $(abs_top_srcdir)/netx
 NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
+NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
 
 if DTDTYPE_QNAME
 NEED_JAXWS_SRC = true
@@ -136,6 +137,9 @@
 ICEDTEA_BOOTSTRAP_RESOURCES = \
 	$(LANGTOOLS)/com/sun/tools/javac/resources
 
+ICEDTEA_BOOTSTRAP_CLASSES = \
+	$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
+
 endif
 
 # Settings for javac
@@ -1827,11 +1831,9 @@
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
 endif
 if JNLP_ABOUT_NEEDED
-	cp $(NETX_RESOURCE_DIR)/about.jnlp \
-	  extra-lib/about.jar \
+	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp $(NETX_RESOURCE_DIR)/about.jnlp \
-	  extra-lib/about.jar \
+	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 endif
 if ZERO_BUILD
@@ -1911,11 +1913,9 @@
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
 endif
 if JNLP_ABOUT_NEEDED
-	cp $(NETX_RESOURCE_DIR)/default.jnlp \
-	  extra-lib/about.jar \
+	cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp $(NETX_RESOURCE_DIR)/default.jnlp \
-	  extra-lib/about.jar \
+	cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 endif
 if ZERO_BUILD
@@ -2122,7 +2122,7 @@
 
 stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
 	if test "x${LIVECONNECT_DIR}" != x; then \
-	  mkdir -p $(LIVECONNECT_CLASSES) ; \
+	  mkdir -p $(LIVECONNECT_CLASSES) && \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
 	      -d $(LIVECONNECT_CLASSES) \
 	      -classpath $(ICEDTEA_RT):$(NETX_CLASSES) \
@@ -2167,6 +2167,7 @@
 	    -sourcepath $(NETX_SRCDIR):$(SOURCEPATH_DIRS) \
 	    -bootclasspath \'\' \
 	    @netx-source-files.txt ;
+	cp -r $(NETX_RESOURCE_DIR) $(NETX_CLASSES)/net/sourceforge/jnlp
 	mkdir -p stamps
 	touch $@
 
@@ -2199,8 +2200,7 @@
 	  -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
 	  -bootclasspath \'\' \
 	  @extra-source-files.txt
-	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
-	  extra-lib/net/sourceforge/jnlp/about	
+	cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about	
 	find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \
 	  -o -type d -exec chmod 750 '{}' ';'
 	mkdir -p stamps
@@ -2676,12 +2676,14 @@
 # Support classes for non-OpenJDK bootstraps
 
 rt-source-files.txt: $(OPENJDK_BOOT_TREE)
-	$(FIND) $(abs_top_builddir)/rt -name '*.java' \
-	  | sort -u > $@
 	for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
 	do \
 	$(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
 	done
+	for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \
+	do \
+	  echo $$files >> $@ ; \
+	done
 
 stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
 	mkdir -p lib/rt
@@ -2799,6 +2801,8 @@
 
 nbplatform: stamps/nbplatform.stamp
 
+netx: stamps/netx.stamp
+
 netx-dist: stamps/netx-dist.stamp
 
 overlay: stamps/overlay.stamp