[svn:ponie] r385 - trunk

Author: nicholas
Date: Mon Jan 30 13:22:49 2006
New Revision: 385

Modified:
   trunk/Configure.pl
   trunk/Makefile
Log:
A more elegant hack to avoid libparrot.so, with which all tests pass
(for me on FreeBSD)


Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl	(original)
+++ trunk/Configure.pl	Mon Jan 30 13:22:49 2006
@@ -111,7 +111,7 @@ unless (-e 'config.sh' && -e 'config.h' 
     system('sh','Configure',@config_args)  && die "error";;
 
     my @inc_path = ("$dir/parrot/include", "$dir/parrot/src/pmc", "$dir/src/pmc");
-    my @lib_path = ("$dir/parrot/blib/lib", "$dir/src/pmc");
+    my @lib_path = ("$dir/perl", "$dir/src/pmc");
 
     open (FH, "config.sh") or die $!;
     local $/;
@@ -126,7 +126,7 @@ unless (-e 'config.sh' && -e 'config.h' 
     # Avoid the dynamic libparrot for now, as using it uninstalled requires
     # messing with the dynamic library load path.
     $bonus_libs
-	.= "-lponie $dir/parrot/blib/lib/libparrot$Config{lib_ext} -lponie";
+	.= "-lponie -lparrot -lponie";
     if (" $Parrot::Config::PConfig{libs} " =~ / -lgmp /) {
 	$bonus_libs .= " -lgmp";
     }

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Jan 30 13:22:49 2006
@@ -19,10 +19,10 @@ lib:
 ponie:  perl/perl
 	cp perl/perl ponie
 
-parrot/parrot:
+parrot/parrot parrot/blib/lib/libparrot.a:
 	cd parrot && $(MAKE)
 
-perl/perl: parrot/parrot src/pmc/libponie.a src/pmc/perl5pmcs.h
+perl/perl: parrot/parrot src/pmc/libponie.a src/pmc/perl5pmcs.h perl/libparrot.a
 	cd perl && $(MAKE)
 
 src/pmc/libponie.a:	src/pmc/Makefile
@@ -31,6 +31,9 @@ src/pmc/libponie.a:	src/pmc/Makefile
 src/pmc/Makefile: write_makefile.pl
 	perl $? >$@
 
+perl/libparrot.a: parrot/blib/lib/libparrot.a
+	cp $? $@
+
 clean:
 	cd parrot && $(MAKE) clean
 	cd perl && $(MAKE) clean