From aeeff258c6502f9995aa97f3806a1069c4ddc7d1 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 16 Mar 2009 23:39:29 +0100 Subject: non-srcdir build fixes * guile-tools.in: Fix the checks to account for non-srcdir builds. * libguile/frames.c: * libguile/objcodes.c: * libguile/programs.c: * libguile/instructions.c: * libguile/vm.c: Fix snarf-includes to cope with non-srcdir builds. * libguile/instructions.h: * libguile/instructions.c: Fix the stubs inclusion to be non-srcdir compatible. * libguile/vm-expand.h (VM_DEFINE_INSTRUCTION): Fix some things so as not to require the instructions.h defintitions, since we have the codes already. Not important tho :) * pre-inst-guile-env.in: Minor tweak that should have no effect. * test-suite/standalone/Makefile.am (all-local): Remove a chmod +x step, the configure.ac rule should do that if necessary. --- libguile/vm-engine.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libguile/vm-engine.c') diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 175314ce1..58ed43db6 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -103,10 +103,10 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) for (i = 0; i < SCM_VM_NUM_INSTRUCTIONS; i++) jump_table[i] = &&vm_error_bad_instruction; #define VM_INSTRUCTION_TO_LABEL 1 -#include "vm-expand.h" -#include "vm-i-system.i" -#include "vm-i-scheme.i" -#include "vm-i-loader.i" +#include +#include +#include +#include #undef VM_INSTRUCTION_TO_LABEL } #endif -- cgit v1.2.3