Index: c/src/wrapup/Makefile.am
===================================================================
RCS file: /usr1/CVS/rtems/c/src/wrapup/Makefile.am,v
retrieving revision 1.68
diff -u -r1.68 Makefile.am
--- c/src/wrapup/Makefile.am	15 May 2008 15:56:58 -0000	1.68
+++ c/src/wrapup/Makefile.am	26 Mar 2009 11:18:23 -0000
@@ -61,9 +61,7 @@
 	    ;; \
 	  esac; \
 	done
-	ls o-optimize/*.$(OBJEXT) > $@-list
-	-ls o-optimize/*.rel >> $@-list
-	$(AR) rc $@ @$@-list
+	$(AR) rc $@ o-optimize/*.$(OBJEXT)
 	rm -f $@-list o-optimize/*.$(OBJEXT) o-optimize/*.rel
 	$(RANLIB) $@
 
Index: cpukit/score/cpu/Makefile.am
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/score/cpu/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- cpukit/score/cpu/Makefile.am	4 Dec 2008 22:53:33 -0000	1.19
+++ cpukit/score/cpu/Makefile.am	26 Mar 2009 11:18:26 -0000
@@ -4,9 +4,8 @@
 
 SUBDIRS = @RTEMS_CPU@
 
-DIST_SUBDIRS = arm bfin h8300 i386 lm32 m68k m32c m32r mips no_cpu \
+DIST_SUBDIRS = arm avr bfin h8300 i386 lm32 m68k m32c m32r mips nios2 no_cpu \
     powerpc sh sparc unix
-DIST_SUBDIRS += avr
 
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
Index: cpukit/wrapup/Makefile.am
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/wrapup/Makefile.am,v
retrieving revision 1.65
diff -u -r1.65 Makefile.am
--- cpukit/wrapup/Makefile.am	30 Jun 2008 14:49:37 -0000	1.65
+++ cpukit/wrapup/Makefile.am	26 Mar 2009 11:18:27 -0000
@@ -104,9 +104,8 @@
 	    ;; \
 	  esac; \
 	done
-	ls $(ARCH)/* > $@-list
-	$(AR) rc $@ @$@-list
-	rm -f $@-list $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
+	$(AR) rc $@ $(ARCH)/*
+	rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
 	$(RANLIB) $@
 
 all-local: $(TMPINSTALL_FILES)
