cvsuser 01/12/13 11:43:46
Modified: . Configure.pl Makefile.in
Log:
Makefile tweaks to hopefully make WinXP builds work out of the box
Revision Changes Path
1.37 +2 -1 parrot/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/perlcvs/parrot/Configure.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -r1.36 -r1.37
--- Configure.pl 13 Dec 2001 13:11:11 -0000 1.36
+++ Configure.pl 13 Dec 2001 19:43:46 -0000 1.37
@@ -20,7 +20,7 @@
);
if($opt_version) {
- print '$Id: Configure.pl,v 1.36 2001/12/13 13:11:11 gregor Exp $' . "\n";
+ print '$Id: Configure.pl,v 1.37 2001/12/13 19:43:46 dan Exp $' . "\n";
exit;
}
@@ -92,6 +92,7 @@
strlow => '(~0xfff)',
pmclow => '(~0xfff)',
make=> $Config{make},
+ make_set_make=> $Config{make_set_make},
platform => $^O,
cp => 'cp',
1.74 +10 -8 parrot/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/perlcvs/parrot/Makefile.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -w -r1.73 -r1.74
--- Makefile.in 13 Dec 2001 17:05:58 -0000 1.73
+++ Makefile.in 13 Dec 2001 19:43:46 -0000 1.74
@@ -33,7 +33,9 @@
PERL = ${perl}
TEST_PROG = test_parrot${exe}
PDUMP = pdump${exe}
-MAKE_F = ${make}
+# This is set to MAKE=$make if your $make command doesn't
+# do it for you.
+${make_set_make}
.c$(O):
$(CC) $(CFLAGS) ${ld_out}$@ -c $<
@@ -56,7 +58,7 @@
test_main$(O): $(H_FILES)
examples/assembly/mops.pbc: examples/assembly/mops.pasm assemble.pl
- $(MAKE) -C examples/assembly mops.pbc PERL=$(PERL)
+ cd examples && cd assembly && $(MAKE) mops.pbc PERL=$(PERL) && cd .. && cd ..
Parrot/OpLib/core.pm: core.ops ops2pm.pl
$(PERL) ops2pm.pl core.ops vtable.ops
@@ -132,15 +134,15 @@
docs: docs/.dummy
docs/.dummy:
- $(MAKE) -C docs
+ cd docs && $(MAKE) && cd ..
$(CLASS_O_FILES):
- $(MAKE) -C classes
+ cd classes && $(MAKE) && cd ..
languages: languages.dummy
languages.dummy:
- $(MAKE) -C languages
+ cd languages && $(MAKE) && cd ..
clean:
$(RM_F) *$(O) chartypes/*$(O) encodings/*$(O)
@@ -153,9 +155,9 @@
$(RM_F) examples/assembly/mops$(EXE) examples/assembly/mops.c
$(RM_F) examples/assembly/mops$(O) examples/assembly/mops.pbc
$(RM_F) Parrot/OpLib/core.pm
- $(MAKE) -C docs clean
- $(MAKE) -C classes clean
- $(MAKE) -C languages clean
+ cd docs && $(MAKE) clean && cd ..
+ cd classes && $(MAKE) clean && cd ..
+ cd languages && $(MAKE) clean && cd ..
distclean:
$(PERL) -MExtUtils::Manifest=filecheck -le
'$$ExtUtils::Manifest::Quiet=1;unlink $$_ for filecheck()'
