--- old/make/linux/makefiles/sa.make	Mon Sep 20 08:15:45 2010
+++ new/make/linux/makefiles/sa.make	Mon Sep 20 08:15:44 2010
@@ -68,7 +68,7 @@
 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
 	fi
 
-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
 	$(QUIETLY) echo "Making $@"
 	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
 	  echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -83,6 +83,16 @@
 	  mkdir -p $(SA_CLASSDIR);        \
 	fi
 	
+	# In some environments, cmd processors have limited line length.
+	# To prevent the javac invocation in the next block from using
+	# a very long cmd line, we use javac's @file-list option. We
+	# generate the file lists using make's built-in 'foreach' control
+	# flow which also avoids cmd processor line length issues. Since
+	# the 'foreach' is done as part of make's macro expansion phase,
+	# the initialization of the lists is also done in the same phase
+	# using '$(shell rm ...' instead of using the more traditional
+	# 'rm ...' rule.
+	$(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
 	$(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
 	$(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
 	
@@ -104,9 +114,6 @@
 	$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
 	$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
 
-agent_files_preclean:
-	rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
-
 clean:
 	rm -rf $(SA_CLASSDIR)
 	rm -rf $(GENERATED)/sa-jdi.jar
--- old/make/solaris/makefiles/sa.make	Mon Sep 20 08:15:50 2010
+++ new/make/solaris/makefiles/sa.make	Mon Sep 20 08:15:49 2010
@@ -59,7 +59,7 @@
 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
 	fi
 
-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
 	$(QUIETLY) echo "Making $@";
 	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
 	   echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -74,6 +74,16 @@
 	  mkdir -p $(SA_CLASSDIR);        \
 	fi
 	
+	# In some environments, cmd processors have limited line length.
+	# To prevent the javac invocation in the next block from using
+	# a very long cmd line, we use javac's @file-list option. We
+	# generate the file lists using make's built-in 'foreach' control
+	# flow which also avoids cmd processor line length issues. Since
+	# the 'foreach' is done as part of make's macro expansion phase,
+	# the initialization of the lists is also done in the same phase
+	# using '$(shell rm ...' instead of using the more traditional
+	# 'rm ...' rule.
+	$(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
 	$(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
 	$(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
 	
@@ -92,9 +102,6 @@
 	$(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
 	$(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
 
-agent_files_preclean:
-	rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
-
 clean:
 	rm -rf $(SA_CLASSDIR)
 	rm -rf $(GENERATED)/sa-jdi.jar