Author: jhoblitt
Date: Mon Feb 20 17:31:09 2006
New Revision: 11688
Modified:
trunk/config/gen/makefiles/amber.in
trunk/config/gen/makefiles/dynoplibs.in
trunk/config/gen/makefiles/dynoplibs_pl.in
trunk/config/gen/makefiles/dynpmc.in
trunk/config/gen/makefiles/dynpmc_pl.in
trunk/config/init/defaults.pm
trunk/config/init/hints/mswin32.pm
trunk/config/inter/libparrot.pm
trunk/languages/lua/config/makefiles/root.in
trunk/languages/tcl/config/root.in
Log:
autoconf compat:
rename build_dir -> top_builddir Parrot::Configure::Data key
add top_srcdir Parrot::Configure::Data key
Modified: trunk/config/gen/makefiles/amber.in
==============================================================================
--- trunk/config/gen/makefiles/amber.in (original)
+++ trunk/config/gen/makefiles/amber.in Mon Feb 20 17:31:09 2006
@@ -1,7 +1,7 @@
RM_F = @rm_f@
PERL = @perl@
-BUILDPMC = $(PERL) @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
-DESTDIR = @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
+BUILDPMC = $(PERL) @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
+DESTDIR = @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
O = @o@
CLASSDIR = lib/kernel/pmc
LOAD_EXT = @load_ext@
Modified: trunk/config/gen/makefiles/dynoplibs.in
==============================================================================
--- trunk/config/gen/makefiles/dynoplibs.in (original)
+++ trunk/config/gen/makefiles/dynoplibs.in Mon Feb 20 17:31:09 2006
@@ -1,7 +1,7 @@
PERL = @perl@
RM_F = @rm_f@
LOAD_EXT = @load_ext@
-RUNTIME_DIR = @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
+RUNTIME_DIR = @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
O = @o@
# add your dynamic op libraries here
@@ -10,7 +10,7 @@ OPLIBS = \
myops \
dan
-BUILD = $(PERL) "@build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]"
+BUILD = $(PERL) "@top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]"
all :
@$(BUILD) generate $(OPLIBS)
Modified: trunk/config/gen/makefiles/dynoplibs_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynoplibs_pl.in (original)
+++ trunk/config/gen/makefiles/dynoplibs_pl.in Mon Feb 20 17:31:09 2006
@@ -40,15 +40,15 @@ if ($^O eq 'MSWin32') {
$PATHQUOTE = '"';
unless ($CC =~ /gcc/i) {
- $LIBPARROT = '@build_dir@/[EMAIL PROTECTED]@';
+ $LIBPARROT = '@top_builddir@/[EMAIL PROTECTED]@';
}
}
# OPS2C Config
our $OPS2C = "$PERL -I $PATHQUOTE" .
- [EMAIL PROTECTED]@@[EMAIL PROTECTED] .
+ [EMAIL PROTECTED]@@[EMAIL PROTECTED] .
"$PATHQUOTE $PATHQUOTE" .
- [EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED] .
+ [EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED] .
$PATHQUOTE;
our %cores = (
C => '',
@@ -64,8 +64,8 @@ sub compile_cmd {
return
"$CC $CFLAGS " .
"@cc_o_out@" . $target . " " .
- "-I" . $PATHQUOTE . '@build_dir@@[EMAIL PROTECTED]' . $PATHQUOTE . " "
.
- "-I" . $PATHQUOTE . '@build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]'
. $PATHQUOTE . " " .
+ "-I" . $PATHQUOTE . '@top_builddir@@[EMAIL PROTECTED]' . $PATHQUOTE .
" " .
+ "-I" . $PATHQUOTE . '@top_builddir@@[EMAIL PROTECTED]@[EMAIL
PROTECTED]' . $PATHQUOTE . " " .
$source;
};
Modified: trunk/config/gen/makefiles/dynpmc.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc.in (original)
+++ trunk/config/gen/makefiles/dynpmc.in Mon Feb 20 17:31:09 2006
@@ -1,7 +1,7 @@
PERL = @perl@
RM_F = @rm_f@
LOAD_EXT = @load_ext@
-RUNTIME_DIR = @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
+RUNTIME_DIR = @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
O = @o@
# add your dynamic pmcs here
@@ -46,7 +46,7 @@ DISABLED_PMCS = \
pyproxyclass \
pyiter
-BUILD = $(PERL) "@build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]"
+BUILD = $(PERL) "@top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]"
all :
@$(BUILD) generate $(PMCS)
Modified: trunk/config/gen/makefiles/dynpmc_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc_pl.in (original)
+++ trunk/config/gen/makefiles/dynpmc_pl.in Mon Feb 20 17:31:09 2006
@@ -40,12 +40,12 @@ if ($^O eq 'MSWin32') {
$PATHQUOTE = '"';
unless ($CC =~ /gcc/i) {
- $LIBPARROT = '@build_dir@/[EMAIL PROTECTED]@';
+ $LIBPARROT = '@top_builddir@/[EMAIL PROTECTED]@';
}
}
# PMC2C Config
-our $PMC2C = "$PERL $PATHQUOTE" . [EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@[EMAIL PROTECTED] . $PATHQUOTE;
+our $PMC2C = "$PERL $PATHQUOTE" . [EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@[EMAIL PROTECTED] . $PATHQUOTE;
# Actual commands
sub compile_cmd {
@@ -54,8 +54,8 @@ sub compile_cmd {
return
"$CC $CFLAGS " .
"@cc_o_out@" . $target . " " .
- "-I" . $PATHQUOTE . '@build_dir@@[EMAIL PROTECTED]' . $PATHQUOTE . " "
.
- "-I" . $PATHQUOTE . '@build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]'
. $PATHQUOTE . " " .
+ "-I" . $PATHQUOTE . '@top_builddir@@[EMAIL PROTECTED]' . $PATHQUOTE .
" " .
+ "-I" . $PATHQUOTE . '@top_builddir@@[EMAIL PROTECTED]@[EMAIL
PROTECTED]' . $PATHQUOTE . " " .
$source;
};
Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm (original)
+++ trunk/config/init/defaults.pm Mon Feb 20 17:31:09 2006
@@ -19,7 +19,7 @@ use vars qw($description @args);
use base qw(Parrot::Configure::Step::Base);
use Config;
-use FindBin; # see build_dir
+use FindBin; # see top_builddir
use Parrot::Configure::Step;
$description = "Setting up Configure's default values...";
@@ -32,10 +32,11 @@ sub runstep
# We need a Glossary somewhere!
$conf->data->set(
- debugging => $conf->options->get('debugging') ? 1 : 0,
- optimize => '',
- verbose => $conf->options->get('verbose'),
- build_dir => $FindBin::Bin,
+ debugging => $conf->options->get('debugging') ? 1 : 0,
+ optimize => '',
+ verbose => $conf->options->get('verbose'),
+ top_builddir => $FindBin::Bin,
+ top_srcdir => $FindBin::Bin,
# Compiler -- used to turn .c files into object files.
# (Usually cc or cl, or something like that.)
Modified: trunk/config/init/hints/mswin32.pm
==============================================================================
--- trunk/config/init/hints/mswin32.pm (original)
+++ trunk/config/init/hints/mswin32.pm Mon Feb 20 17:31:09 2006
@@ -192,7 +192,7 @@ sub runstep
has_dynamic_linking => 1,
ld_load_flags => '-shared ',
ld_share_flags => '-shared ',
- libparrot_ldflags => $conf->data->get('build_dir') .
'/libparrot.dll',
+ libparrot_ldflags => $conf->data->get('top_builddir') .
'/libparrot.dll',
ncilib_link_extra => 'src/libnci_test.def',
sym_export => '__declspec(dllexport)',
sym_import => '__declspec(dllimport)',
Modified: trunk/config/inter/libparrot.pm
==============================================================================
--- trunk/config/inter/libparrot.pm (original)
+++ trunk/config/inter/libparrot.pm Mon Feb 20 17:31:09 2006
@@ -55,7 +55,7 @@ sub runstep {
$conf->data->set(
rpath_blib => ($parrot_is_shared && $conf->data->get('rpath'))
? $conf->data->get('rpath')
- . $conf->data->get('build_dir')
+ . $conf->data->get('top_builddir')
. $conf->data->get('slash')
. $conf->data->get('blib_dir')
: ''
@@ -64,7 +64,7 @@ sub runstep {
unless (defined($conf->data->get('libparrot_ldflags'))) {
$conf->data->set(
libparrot_ldflags => ($parrot_is_shared)
- ? '-L' . $conf->data->get('build_dir')
+ ? '-L' . $conf->data->get('top_builddir')
. $conf->data->get('slash')
. $conf->data->get('blib_dir') . ' -lparrot'
: $conf->data->get('libparrot')
Modified: trunk/languages/lua/config/makefiles/root.in
==============================================================================
--- trunk/languages/lua/config/makefiles/root.in (original)
+++ trunk/languages/lua/config/makefiles/root.in Mon Feb 20 17:31:09 2006
@@ -4,8 +4,8 @@ PARROT = [EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@
PBC_MERGE = [EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@
LIBPATH = lib
-BUILD = $(PERL) @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
-DESTDIR = @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
+BUILD = $(PERL) @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
+DESTDIR = @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
O = @o@
CLASSDIR = pmc
LOAD_EXT = @load_ext@
Modified: trunk/languages/tcl/config/root.in
==============================================================================
--- trunk/languages/tcl/config/root.in (original)
+++ trunk/languages/tcl/config/root.in Mon Feb 20 17:31:09 2006
@@ -5,8 +5,8 @@ PBC_MERGE = [EMAIL PROTECTED]@[EMAIL PROTECTED]@pbc_merge@
C_BUILTIN = [EMAIL PROTECTED]@builtin
R_BUILTIN = [EMAIL PROTECTED]@builtin
-BUILD = $(PERL) @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
-DESTDIR = @build_dir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]
+BUILD = $(PERL) @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
+DESTDIR = @top_builddir@@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]
O = @o@
PMCDIR = [EMAIL PROTECTED]@pmc
CLASSDIR = [EMAIL PROTECTED]@class
