Back out makefile changes since they are causing problems for some people. Go back to copying source files around.

modules/libjar/standalone/.cvsignore

@@ -1 +1,14 @@
 Makefile
+nsZipArchive.cpp
+nsZipArchive.h
+zipfile.h
+zipstruct.h
+zipstub.h
+nsJARInputStream.h
+nsWildCard.h
+nsJAR.h
+nsIJARFactory.h
+nsJARInputStream.cpp
+nsWildCard.cpp
+nsJARFactory.cpp
+nsJAR.cpp

modules/libjar/standalone/Makefile.in

@@ -23,7 +23,7 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@/..
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -46,3 +46,17 @@ SHARED_LIBRARY_LIBS = $(DIST)/lib/libzlib_s.a
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DSTANDALONE
+
+export::	copysrcs
+
+copysrcs::
+	cp $(srcdir)/../*.cpp .
+	cp $(srcdir)/../*.h .
+
+clean::
+	$(RM) -f *.cpp *.h *.o *.a
+
+clobber::	clean
+
+clobber_all::	clean
+

modules/zlib/standalone/.cvsignore

@@ -1 +1,26 @@
 Makefile
+adler32.c
+compress.c
+crc32.c
+deflate.c
+example.c
+gzio.c
+infblock.c
+infcodes.c
+inffast.c
+inflate.c
+inftrees.c
+infutil.c
+minigzip.c
+trees.c
+uncompr.c
+zutil.c
+deflate.h
+infblock.h
+infcodes.h
+inffast.h
+inftrees.h
+infutil.h
+zconf.h
+zlib.h
+zutil.h

modules/zlib/standalone/Makefile.in

@@ -23,7 +23,7 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@/../src
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -55,3 +55,16 @@ endif
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
+export::	copysrcs
+
+copysrcs::
+	cp $(srcdir)/../src/*.c .
+	cp $(srcdir)/../src/*.h .
+
+clean::
+	$(RM) *.h *.c *.o *.a
+
+clobber::	clean
+
+clobber_all::	clean