Applied.
--Josh At 23:25 on 06/20/2002 -0000, Kevin Falcone (via RT) <[EMAIL PROTECTED]> wrote: > # New Ticket Created by Kevin Falcone > # Please include the string: [netlabs #719] > # in the subject line of all future correspondence about this issue. > # <URL: http://bugs6.perl.org/rt2/Ticket/Display.html?id=719 > > > > > When I wrote the patch in #709, I failed to notice that the root > Makefile links against the classes, so things bomb when you add a new > ...pmc to the classes directory. This fixes that. > > -kevin > > Index: config/gen/makefiles/root.in > =================================================================== > RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v > retrieving revision 1.11 > diff -u -r1.11 root.in > --- config/gen/makefiles/root.in 12 Jun 2002 22:12:20 -0000 1.11 > +++ config/gen/makefiles/root.in 20 Jun 2002 23:18:22 -0000 > @@ -71,11 +71,7 @@ > > ALL_H_FILES = $(GENERAL_H_FILES) > > -CLASS_O_FILES = classes/default$(O) classes/array$(O) \ > -classes/perlint$(O) classes/perlstring$(O) classes/perlnum$(O) \ > -classes/perlarray$(O) classes/perlundef$(O) \ > -classes/perlhash$(O) classes/parrotpointer$(O) classes/parrotsub$(O) \ > -classes/parrotcoroutine$(O) classes/intqueue$(O) > +CLASS_O_FILES = ${pmc_classes_o} > > ENCODING_O_FILES = encodings/singlebyte$(O) encodings/utf8$(O) \ > encodings/utf16$(O) \ > Index: config/inter/pmc.pl > =================================================================== > RCS file: /cvs/public/parrot/config/inter/pmc.pl,v > retrieving revision 1.1 > diff -u -r1.1 pmc.pl > --- config/inter/pmc.pl 17 Jun 2002 05:00:00 -0000 1.1 > +++ config/inter/pmc.pl 20 Jun 2002 23:18:22 -0000 > @@ -32,13 +32,18 @@ > } > } > > + # names of class files for classes/Makefile > (my $pmc_o = $pmc) =~ s/\.pmc/\$(O)/g; > + # calls to pmc2c.pl for classes/Makefile > (my $pmc_build = $pmc) =~ s/(.*?)\.pmc ?/$1.c $1.h: $1.pmc\n\t\$(PMC2C) $1 ..pmc\n\n$1\$(O): \$(H_FILES)\n\n/g; > + # build list of libraries for link line in Makfile > + (my $pmc_classes_o = $pmc_o) =~ s/^| / classes\//g; > > Configure::Data->set( > - pmc => $pmc, > - pmc_o => $pmc_o, > - pmc_build => $pmc_build > + pmc => $pmc, > + pmc_o => $pmc_o, > + pmc_build => $pmc_build, > + pmc_classes_o => $pmc_classes_o > ); > } > > > > -- > "I wrote a reply saying that I was sorry that he did not have the time > to read the FAQ, and I'm sure he'd understand that I didn't have the > time to read it to him." -- Terry Carroll > >
