Here is the parrot/config.h patch
It fixes Makefile.in, but not in the correct way. Brent, if you could look
at this and fix it the right way I would really appreciate it (note that I
have no clue what the right way is :)
Index: Makefile.in
===================================================================
RCS file: /home/perlcvs/parrot/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- Makefile.in 2001/09/14 09:57:01 1.1
+++ Makefile.in 2001/09/14 13:22:35
@@ -4,7 +4,7 @@
O_FILES = global_setup$(O) interpreter$(O) parrot$(O) register$(O)
basic_opcodes$(O) memory$(O) bytecode$(O) string$(O) strnative$(O)
-C_FLAGS = ${ccflags}
+C_FLAGS = ${ccflags} -I..
C_LIBS = ${libs}
Index: basic_opcodes.ops
===================================================================
RCS file: /home/perlcvs/parrot/basic_opcodes.ops,v
retrieving revision 1.14
diff -u -r1.14 basic_opcodes.ops
--- basic_opcodes.ops 2001/09/13 16:16:38 1.14
+++ basic_opcodes.ops 2001/09/14 13:22:36
@@ -4,8 +4,8 @@
*
*/
-#include "parrot.h"
-#include "math.h"
+#include "parrot/parrot.h"
+#include <math.h>
/* SET Ix, CONSTANT */
AUTO_OP set_i_ic {
Index: bytecode.c
===================================================================
RCS file: /home/perlcvs/parrot/bytecode.c,v
retrieving revision 1.7
diff -u -r1.7 bytecode.c
--- bytecode.c 2001/09/14 09:57:01 1.7
+++ bytecode.c 2001/09/14 13:22:36
@@ -19,7 +19,7 @@
*/
-#include "parrot.h"
+#include "parrot/parrot.h"
#define GRAB_IV(x) *((IV*)*x)++
Index: global_setup.c
===================================================================
RCS file: /home/perlcvs/parrot/global_setup.c,v
retrieving revision 1.3
diff -u -r1.3 global_setup.c
--- global_setup.c 2001/09/14 09:03:43 1.3
+++ global_setup.c 2001/09/14 13:22:36
@@ -7,7 +7,7 @@
*/
#define INSIDE_GLOBAL_SETUP
-#include "parrot.h"
+#include "parrot/parrot.h"
void
init_world() {
Index: interpreter.c
===================================================================
RCS file: /home/perlcvs/parrot/interpreter.c,v
retrieving revision 1.9
diff -u -r1.9 interpreter.c
--- interpreter.c 2001/09/14 10:54:23 1.9
+++ interpreter.c 2001/09/14 13:22:36
@@ -5,8 +5,8 @@
*/
-#include "parrot.h"
-#include "interp_guts.h"
+#include "parrot/parrot.h"
+#include "parrot/interp_guts.h"
void
runops (struct Perl_Interp *interpreter, IV *code) {
Index: interpreter.h
===================================================================
RCS file: /home/perlcvs/parrot/interpreter.h,v
retrieving revision 1.4
diff -u -r1.4 interpreter.h
--- interpreter.h 2001/09/13 08:44:08 1.4
+++ interpreter.h 2001/09/14 13:22:36
@@ -9,7 +9,7 @@
#if !defined(PARROT_INTERPRETER_H_GUARD)
#define PARROT_INTERPRETER_H_GUARD
-#include "parrot.h"
+#include "parrot/parrot.h"
struct Perl_Interp {
struct IReg *int_reg; /* Current top of int reg stack */
Index: memory.c
===================================================================
RCS file: /home/perlcvs/parrot/memory.c,v
retrieving revision 1.5
diff -u -r1.5 memory.c
--- memory.c 2001/09/14 11:01:40 1.5
+++ memory.c 2001/09/14 13:22:36
@@ -4,7 +4,7 @@
*
*/
-#include "parrot.h"
+#include "parrot/parrot.h"
/* Allocate a chunk of memory aligned on a power-of-2 boundary */
void *
Index: parrot.c
===================================================================
RCS file: /home/perlcvs/parrot/parrot.c,v
retrieving revision 1.1
diff -u -r1.1 parrot.c
--- parrot.c 2001/08/29 12:07:03 1.1
+++ parrot.c 2001/09/14 13:22:36
@@ -4,4 +4,4 @@
*
*/
-#include "parrot.h"
+#include "parrot/parrot.h"
Index: parrot.h
===================================================================
RCS file: /home/perlcvs/parrot/parrot.h,v
retrieving revision 1.5
diff -u -r1.5 parrot.h
--- parrot.h 2001/09/13 08:44:08 1.5
+++ parrot.h 2001/09/14 13:22:36
@@ -13,7 +13,7 @@
#define VAR_SCOPE extern
#endif
-#include "config.h"
+#include "parrot/config.h"
#include <stdlib.h>
#include <stdio.h>
@@ -46,15 +46,15 @@
typedef void STRING_FUNCS;
-#include "global_setup.h"
-#include "string.h"
-#include "interpreter.h"
-#include "register.h"
-#include "exceptions.h"
-#include "memory.h"
-#include "bytecode.h"
-#include "io.h"
-#include "op.h"
-#include "events.h"
+#include "parrot/global_setup.h"
+#include "parrot/string.h"
+#include "parrot/interpreter.h"
+#include "parrot/register.h"
+#include "parrot/exceptions.h"
+#include "parrot/memory.h"
+#include "parrot/bytecode.h"
+#include "parrot/io.h"
+#include "parrot/op.h"
+#include "parrot/events.h"
#endif
Index: register.c
===================================================================
RCS file: /home/perlcvs/parrot/register.c,v
retrieving revision 1.4
diff -u -r1.4 register.c
--- register.c 2001/09/14 09:03:44 1.4
+++ register.c 2001/09/14 13:22:37
@@ -4,7 +4,7 @@
*
*/
-#include "parrot.h"
+#include "parrot/parrot.h"
void
Parrot_push_i(struct Perl_Interp *interpreter) {
Index: register.h
===================================================================
RCS file: /home/perlcvs/parrot/register.h,v
retrieving revision 1.2
diff -u -r1.2 register.h
--- register.h 2001/09/10 15:49:26 1.2
+++ register.h 2001/09/14 13:22:37
@@ -7,7 +7,7 @@
#if !defined(__PARROT_REGISTER_H_GUARD)
#define __PARROT_REGISTER_H_GUARD
-#include "parrot.h"
+#include "parrot/parrot.h"
struct IReg {
IV registers[NUM_REGISTERS];
Index: string.c
===================================================================
RCS file: /home/perlcvs/parrot/string.c,v
retrieving revision 1.5
diff -u -r1.5 string.c
--- string.c 2001/09/14 09:03:44 1.5
+++ string.c 2001/09/14 13:22:37
@@ -4,7 +4,7 @@
*
*/
-#include "parrot.h"
+#include "parrot/parrot.h"
/* Basic string stuff - creation, enlargement, destruction, etc. */
Index: string.h
===================================================================
RCS file: /home/perlcvs/parrot/string.h,v
retrieving revision 1.4
diff -u -r1.4 string.h
--- string.h 2001/09/13 07:14:24 1.4
+++ string.h 2001/09/14 13:22:37
@@ -66,5 +66,5 @@
STRING_VTABLE Parrot_string_vtable[enc_max];
-#include "strnative.h"
+#include "parrot/strnative.h"
#endif
Index: strnative.c
===================================================================
RCS file: /home/perlcvs/parrot/strnative.c,v
retrieving revision 1.8
diff -u -r1.8 strnative.c
--- strnative.c 2001/09/14 11:05:05 1.8
+++ strnative.c 2001/09/14 13:22:37
@@ -6,7 +6,7 @@
we don't make any assumptions about what those bytes *mean*.
*/
-#include "parrot.h"
+#include "parrot/parrot.h"
static IV
string_native_compute_strlen (STRING *s) {
Index: test_main.c
===================================================================
RCS file: /home/perlcvs/parrot/test_main.c,v
retrieving revision 1.5
diff -u -r1.5 test_main.c
--- test_main.c 2001/09/14 09:03:44 1.5
+++ test_main.c 2001/09/14 13:22:37
@@ -4,7 +4,7 @@
*
*/
-#include "parrot.h"
+#include "parrot/parrot.h"
IV opcodes[] = {3, 1, /* put the time in reg 1 */
0, 2, 0, /* Set reg 2 to 0 */
