Hi Andrew,
On Sat, 2006-12-16 at 17:37 +0000, Andrew Haley wrote:
> > OK. But I assume you do the second pass in some libgcj specific
> > Makefile. Can't you create the list there?
>
> I need to know which source files went into making the jar. How am I
> to know that? I just use Classpath's makefile. When I'm building
> libgcj, I get the list of source files from classpath/lib/classes.
>
> > > We need the full source pathnames for gcj to create correct debug
> > > information. We use the file classpath/lib/classes to so this for the
> > > main jarfile. You don't delete that file
> >
> > I believe we do. It is in the CLEANFILES like other generated files.
>
> Surely CLEANFILES are not deleted 'til 'make clean'. Can't
> all-classes.lst be added to CLEANFILES?
Aha. OK. We don't need to clean the .lst files eagerly. Having them
removed in the clean target is enough. Done with the following patch:
2006-12-17 Mark Wielaard <[EMAIL PROTECTED]>
* tools/Makefile.am (TOOLS_ZIP): Don't remove .lst files immediately.
(clean-local): Remove all .lst files
* tools/.cvsignore: Add *.lst.
This makesmake distcheck happy and leaves the *.lst files around during
a normal build so you can pick them up in post-processing for libgcj.
Committed,
Mark
Index: tools/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/.cvsignore,v
retrieving revision 1.12
diff -u -r1.12 .cvsignore
--- tools/.cvsignore 25 Sep 2006 19:29:42 -0000 1.12
+++ tools/.cvsignore 17 Dec 2006 16:16:10 -0000
@@ -17,3 +17,4 @@
grmid
grmiregistry
gtnameserv
+*.lst
Index: tools/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.35
diff -u -r1.35 Makefile.am
--- tools/Makefile.am 16 Dec 2006 14:34:44 -0000 1.35
+++ tools/Makefile.am 17 Dec 2006 16:16:10 -0000
@@ -175,11 +175,11 @@
if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \
if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \
cd ..)
- rm -rf classes classes.lst asm.lst all-classes.lst
+ rm -rf classes
# Zip file be gone! (and make sure the classes are gone too)
clean-local:
- rm -rf $(TOOLS_ZIP) classes asm asm.lst all-classes.lst
+ rm -rf $(TOOLS_ZIP) classes classes.lst asm asm.lst all-classes.lst
# FIXME: remove this when GNU Classpath includes a bootstrap VM.
installcheck-binSCRIPTS:
