[svn:parrot] r42320 - in branches/pmc_headers_move: compilers/imcc config/auto config/gen/makefiles config/init include/parrot lib/Parrot/OpTrans lib/Parrot/Ops2c lib/Parrot/Pmc2c src/call src/interp src/io src/pmc src/runcore

bacek at svn.parrot.org bacek at svn.parrot.org
Sat Nov 7 09:25:02 UTC 2009


Author: bacek
Date: Sat Nov  7 09:24:58 2009
New Revision: 42320
URL: https://trac.parrot.org/parrot/changeset/42320

Log:
Generate pmc_foo.h files inside include/pmc instead of src.

1. Change lib/Parrot/Pmc2c/UtilFunctions.pm to generate different
pmc_foo.h files for core and dynpmc.
2. Change all #include "../src/pmc/pmc_foo.h" to just #include
"pmc/pmc_foo.h"
3. Change dependencies in root.in and dynpmc.in

This bring build-tree closer to installed parrot and allows to use
consistent #include "pmc/pmc_foo.h" across codebase.

Modified:
   branches/pmc_headers_move/compilers/imcc/imcc.y
   branches/pmc_headers_move/compilers/imcc/imcparser.c
   branches/pmc_headers_move/compilers/imcc/instructions.c
   branches/pmc_headers_move/compilers/imcc/main.c
   branches/pmc_headers_move/compilers/imcc/optimizer.c
   branches/pmc_headers_move/compilers/imcc/parser_util.c
   branches/pmc_headers_move/compilers/imcc/pbc.c
   branches/pmc_headers_move/config/auto/cgoto.pm
   branches/pmc_headers_move/config/auto/pmc.pm
   branches/pmc_headers_move/config/gen/makefiles/dynpmc.in
   branches/pmc_headers_move/config/gen/makefiles/pirc.in
   branches/pmc_headers_move/config/gen/makefiles/root.in
   branches/pmc_headers_move/config/init/defaults.pm
   branches/pmc_headers_move/include/parrot/context.h
   branches/pmc_headers_move/lib/Parrot/OpTrans/C.pm
   branches/pmc_headers_move/lib/Parrot/Ops2c/Utils.pm
   branches/pmc_headers_move/lib/Parrot/Pmc2c/PMC.pm
   branches/pmc_headers_move/lib/Parrot/Pmc2c/PMCEmitter.pm
   branches/pmc_headers_move/lib/Parrot/Pmc2c/UtilFunctions.pm
   branches/pmc_headers_move/src/call/args.c
   branches/pmc_headers_move/src/call/context.c
   branches/pmc_headers_move/src/call/context_accessors.c
   branches/pmc_headers_move/src/call/ops.c
   branches/pmc_headers_move/src/call/pcc.c
   branches/pmc_headers_move/src/interp/inter_create.c
   branches/pmc_headers_move/src/interp/inter_misc.c
   branches/pmc_headers_move/src/io/api.c
   branches/pmc_headers_move/src/io/filehandle.c
   branches/pmc_headers_move/src/io/socket_api.c
   branches/pmc_headers_move/src/io/socket_unix.c
   branches/pmc_headers_move/src/io/socket_win32.c
   branches/pmc_headers_move/src/pmc/addrregistry.pmc
   branches/pmc_headers_move/src/pmc/class.pmc
   branches/pmc_headers_move/src/pmc/context.pmc
   branches/pmc_headers_move/src/pmc/continuation.pmc
   branches/pmc_headers_move/src/pmc/eval.pmc
   branches/pmc_headers_move/src/pmc/exception.pmc
   branches/pmc_headers_move/src/pmc/hash.pmc
   branches/pmc_headers_move/src/pmc/hashiterator.pmc
   branches/pmc_headers_move/src/pmc/integer.pmc
   branches/pmc_headers_move/src/pmc/lexinfo.pmc
   branches/pmc_headers_move/src/pmc/multisub.pmc
   branches/pmc_headers_move/src/pmc/namespace.pmc
   branches/pmc_headers_move/src/pmc/object.pmc
   branches/pmc_headers_move/src/pmc/orderedhashiterator.pmc
   branches/pmc_headers_move/src/pmc/packfile.pmc
   branches/pmc_headers_move/src/pmc/packfileannotations.pmc
   branches/pmc_headers_move/src/pmc/parrotinterpreter.pmc
   branches/pmc_headers_move/src/pmc/role.pmc
   branches/pmc_headers_move/src/pmc/scalar.pmc
   branches/pmc_headers_move/src/pmc/undef.pmc
   branches/pmc_headers_move/src/runcore/cores.c
   branches/pmc_headers_move/src/runcore/main.c
   branches/pmc_headers_move/src/runcore/profiling.c
   branches/pmc_headers_move/src/runcore/trace.c

Modified: branches/pmc_headers_move/compilers/imcc/imcc.y
==============================================================================
--- branches/pmc_headers_move/compilers/imcc/imcc.y	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/compilers/imcc/imcc.y	Sat Nov  7 09:24:58 2009	(r42320)
@@ -21,7 +21,7 @@
 #define PARSER_MAIN
 #include "imc.h"
 #include "parrot/dynext.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 #include "optimizer.h"

Modified: branches/pmc_headers_move/compilers/imcc/imcparser.c
==============================================================================
--- branches/pmc_headers_move/compilers/imcc/imcparser.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/compilers/imcc/imcparser.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -103,7 +103,7 @@
 #define PARSER_MAIN
 #include "imc.h"
 #include "parrot/dynext.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 #include "optimizer.h"

Modified: branches/pmc_headers_move/compilers/imcc/instructions.c
==============================================================================
--- branches/pmc_headers_move/compilers/imcc/instructions.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/compilers/imcc/instructions.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -9,7 +9,7 @@
 #include "imc.h"
 #include "pbc.h"
 #include "optimizer.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 
 /*
 

Modified: branches/pmc_headers_move/compilers/imcc/main.c
==============================================================================
--- branches/pmc_headers_move/compilers/imcc/main.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/compilers/imcc/main.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -34,7 +34,7 @@
 #include "parrot/longopt.h"
 #include "parrot/imcc.h"
 #include "parrot/runcore_api.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 

Modified: branches/pmc_headers_move/compilers/imcc/optimizer.c
==============================================================================
--- branches/pmc_headers_move/compilers/imcc/optimizer.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/compilers/imcc/optimizer.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -73,7 +73,7 @@
 #include "imc.h"
 #include "pbc.h"
 #include "optimizer.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 
 /* HEADERIZER HFILE: compilers/imcc/optimizer.h */
 

Modified: branches/pmc_headers_move/compilers/imcc/parser_util.c
==============================================================================
--- branches/pmc_headers_move/compilers/imcc/parser_util.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/compilers/imcc/parser_util.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -21,8 +21,8 @@
 #include "imc.h"
 #include "parrot/dynext.h"
 #include "parrot/embed.h"
-#include "../../src/pmc/pmc_sub.h"
-#include "../../src/pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 #include "optimizer.h"

Modified: branches/pmc_headers_move/compilers/imcc/pbc.c
==============================================================================
--- branches/pmc_headers_move/compilers/imcc/pbc.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/compilers/imcc/pbc.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -6,8 +6,8 @@
 #include "imc.h"
 #include "pbc.h"
 #include "parrot/packfile.h"
-#include "../src/pmc/pmc_sub.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 
 /* HEADERIZER HFILE: compilers/imcc/pbc.h */
 

Modified: branches/pmc_headers_move/config/auto/cgoto.pm
==============================================================================
--- branches/pmc_headers_move/config/auto/cgoto.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/config/auto/cgoto.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -63,9 +63,9 @@
 # generated by config/auto/cgoto.pm
 
 $(OPS_DIR)/core_ops_cg$(O): $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_cg.c \
-	$(SRC_DIR)/pmc/pmc_parrotlibrary.h
+	$(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
 $(OPS_DIR)/core_ops_cgp$(O): $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_cgp.c \
-	$(SRC_DIR)/pmc/pmc_parrotlibrary.h
+	$(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
 $(SRC_DIR)/runcore/cores.c: $(INC_DIR)/oplib/core_ops_cgp.h
 
 $(INC_DIR)/oplib/core_ops_cg.h: $(OPS_DIR)/core_ops_cg.c

Modified: branches/pmc_headers_move/config/auto/pmc.pm
==============================================================================
--- branches/pmc_headers_move/config/auto/pmc.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/config/auto/pmc.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -77,7 +77,7 @@
         $parent_dumps .= "src/pmc/$_.dump "
             foreach reverse( ( $self->pmc_parents($pmc) ) );
         my $parent_headers = '';
-        $parent_headers .= "src/pmc/pmc_$_.h "
+        $parent_headers .= "include/pmc/pmc_$_.h "
             for $self->pmc_parents($pmc);
 
         # add dependencies that result from METHOD usage.
@@ -86,7 +86,7 @@
         if (contains_pccmethod($pmc_fname)) {
             $pccmethod_depend = 'lib/Parrot/Pmc2c/PCCMETHOD.pm';
             if ($pmc ne 'fixedintegerarray') {
-                $pccmethod_depend .= ' src/pmc/pmc_fixedintegerarray.h';
+                $pccmethod_depend .= ' include/pmc/pmc_fixedintegerarray.h';
             }
         }
         my $include_headers = get_includes($pmc_fname);
@@ -98,11 +98,11 @@
 src/pmc/$pmc.dump : vtable.dump $parent_dumps src/pmc/$pmc.pmc \$(PMC2C_FILES) $pccmethod_depend
 \t\$(PMC2CD) src/pmc/$pmc.pmc
 
-src/pmc/pmc_$pmc.h: src/pmc/$pmc.c
+include/pmc/pmc_$pmc.h: src/pmc/$pmc.c
 
 src/pmc/$pmc\$(O): src/pmc/pmc_${pmc}.h src/pmc/$pmc.str \$(NONGEN_HEADERS) \\
     $parent_headers $include_headers src/pmc/pmc_continuation.h \\
-    src/pmc/pmc_context.h src/pmc/pmc_fixedintegerarray.h
+    include/pmc/pmc_context.h include/pmc/pmc_fixedintegerarray.h
 
 END
     }
@@ -173,6 +173,7 @@
         TEMP_pmc_classes_o   => $TEMP_pmc_classes_o,
         TEMP_pmc_classes_str => $TEMP_pmc_classes_str,
         TEMP_pmc_classes_pmc => $TEMP_pmc_classes_pmc,
+        pmc_inc              => 'include',
     );
 
     return 1;
@@ -272,6 +273,8 @@
           $include = "include/" . $include;
         } elsif ($include =~ m/^pmc_|\.str$/) { # local pmc header
           $include = "src/pmc/" . $include;
+        } elsif ($include =~ m/^pmc\/pmc_|\.h$/) { # local pmc header
+          $include = "include/" . $include;
         } # else it's probably a system header, don't depend on it.
         push @retval, $include;
     }

Modified: branches/pmc_headers_move/config/gen/makefiles/dynpmc.in
==============================================================================
--- branches/pmc_headers_move/config/gen/makefiles/dynpmc.in	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/config/gen/makefiles/dynpmc.in	Sat Nov  7 09:24:58 2009	(r42320)
@@ -20,7 +20,7 @@
 BUILD_TOOLS_DIR := $(BUILD_DIR)@slash at tools@slash at build
 BUILD_LIB_DIR   := $(BUILD_DIR)@slash at blib@slash at lib
 PMC2C           := $(PERL) $(BUILD_TOOLS_DIR)@slash at pmc2c.pl
-INCLUDES        := -I$(BUILD_DIR)@slash at include -I at build_dir@@slash at src@slash at pmc
+INCLUDES        := -I$(BUILD_DIR)@slash at include -I at build_dir@@slash at include@slash at pmc
 LINKARGS        := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
 
 PMC2CD := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump

Modified: branches/pmc_headers_move/config/gen/makefiles/pirc.in
==============================================================================
--- branches/pmc_headers_move/config/gen/makefiles/pirc.in	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/config/gen/makefiles/pirc.in	Sat Nov  7 09:24:58 2009	(r42320)
@@ -14,7 +14,7 @@
 CC            := @cc@
 O             := @o@
 EXE           := @exe@
-CC_INC        := -I../../include
+CC_INC        := -I../../include -I../../include/pmc
 C_LIBS        := @libs@
 CC_SHARED     := @cc_shared@
 CFLAGS        := $(CC_INC) @ccflags@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ $(CC_SHARED)

Modified: branches/pmc_headers_move/config/gen/makefiles/root.in
==============================================================================
--- branches/pmc_headers_move/config/gen/makefiles/root.in	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/config/gen/makefiles/root.in	Sat Nov  7 09:24:58 2009	(r42320)
@@ -62,6 +62,9 @@
 # directory for header files
 INC_DIR         := @inc@
 
+# directory for PMC generated header files
+PMC_INC_DIR     := @pmc_inc@
+
 # directory for the IO subsystem
 IO_DIR          := src/io
 
@@ -867,14 +870,14 @@
 
 $(SRC_DIR)/null_config$(O) : $(INC_DIR)/parrot.h $(SRC_DIR)/null_config.c
 
-$(SRC_DIR)/oo$(O) : $(INC_DIR)/parrot.h $(SRC_DIR)/pmc/pmc_class.h $(SRC_DIR)/pmc/pmc_object.h $(SRC_DIR)/pmc/pmc_context.h $(INC_DIR)/pbcversion.h $(SRC_DIR)/oo.str
+$(SRC_DIR)/oo$(O) : $(INC_DIR)/parrot.h $(PMC_INC_DIR)/pmc/pmc_class.h $(PMC_INC_DIR)/pmc/pmc_object.h $(PMC_INC_DIR)/pmc/pmc_context.h $(INC_DIR)/pbcversion.h $(SRC_DIR)/oo.str
 
 $(SRC_DIR)/scheduler$(O) : $(INC_DIR)/parrot.h \
-                           $(SRC_DIR)/scheduler.str \
-                           $(SRC_DIR)/pmc/pmc_scheduler.h \
-                           $(SRC_DIR)/pmc/pmc_context.h \
-                           $(SRC_DIR)/pmc/pmc_task.h \
-                           $(SRC_DIR)/pmc/pmc_timer.h \
+                           $(SRC_DIR)/scheduler.str   \
+                           $(SRC_DIR)/pmc/scheduler.c \
+                           $(PMC_INC_DIR)/pmc/pmc_context.h \
+                           $(SRC_DIR)/pmc/task.c      \
+                           $(SRC_DIR)/pmc/timer.c     \
                            $(INC_DIR)/pbcversion.h
 
 $(IO_DIR)/core$(O) : $(INC_DIR)/parrot.h $(SRC_DIR)/pmc/socket.c
@@ -971,7 +974,7 @@
 #
 # Parrot Dump
 #
-$(SRC_DIR)/packdump$(O) : $(INC_DIR)/parrot.h $(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_key.h
+$(SRC_DIR)/packdump$(O) : $(INC_DIR)/parrot.h $(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_key.h
 
 $(PDUMP) : $(SRC_DIR)/pbc_dump$(O) $(SRC_DIR)/packdump$(O) $(LIBPARROT)
 	$(LINK) @ld_out@$@ \
@@ -1063,18 +1066,18 @@
 
 $(SRC_DIR)/extend_vtable$(O) : $(INC_DIR)/parrot.h
 
-$(SRC_DIR)/global_setup$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/global_setup.str $(SRC_DIR)/pmc/pmc_context.h
+$(SRC_DIR)/global_setup$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/global_setup.str $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/global$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/global.str \
-	$(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_context.h
 
-$(SRC_DIR)/pmc$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc/pmc_class.h \
-	$(SRC_DIR)/pmc.str $(SRC_DIR)/pmc/pmc_context.h
+$(SRC_DIR)/pmc$(O) : $(GENERAL_H_FILES) $(PMC_INC_DIR)/pmc/pmc_class.h \
+	$(SRC_DIR)/pmc.str $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/pmc_freeze$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc_freeze.str \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
-$(SRC_DIR)/hash$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc/pmc_key.h
+$(SRC_DIR)/hash$(O) : $(GENERAL_H_FILES) $(PMC_INC_DIR)/pmc/pmc_key.h
 
 $(SRC_DIR)/list$(O) : $(GENERAL_H_FILES)
 
@@ -1084,7 +1087,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/vtable_extend.pl
 
 $(SRC_DIR)/key$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/key.str \
-        $(SRC_DIR)/pmc/pmc_key.h $(SRC_DIR)/pmc/pmc_context.h
+        $(PMC_INC_DIR)/pmc/pmc_key.h $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/gc/mark_sweep$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/gc/gc_private.h
 
@@ -1099,7 +1102,7 @@
 $(SRC_DIR)/gc/alloc_resources$(O) : $(GENERAL_H_FILES) \
         $(SRC_DIR)/gc/gc_private.h
 
-$(SRC_DIR)/hll$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/hll.str $(SRC_DIR)/pmc/pmc_context.h
+$(SRC_DIR)/hll$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/hll.str $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/platform$(O) : $(GENERAL_H_FILES)
 
@@ -1107,17 +1110,17 @@
 #IF(platform_asm):
 $(SRC_DIR)/core_pmcs$(O) : $(GENERAL_H_FILES)
 
-$(SRC_DIR)/runcore/trace$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc/pmc_sub.h \
-        $(SRC_DIR)/pmc/pmc_context.h
+$(SRC_DIR)/runcore/trace$(O) : $(GENERAL_H_FILES) $(PMC_INC_DIR)/pmc/pmc_sub.h \
+        $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/debug$(O) : $(GENERAL_H_FILES) $(INC_DIR)/debugger.h \
-    $(SRC_DIR)/debug.str $(SRC_DIR)/pmc/pmc_key.h \
-    $(SRC_DIR)/pmc/pmc_continuation.h \
-    $(SRC_DIR)/pmc/pmc_context.h
+    $(SRC_DIR)/debug.str $(PMC_INC_DIR)/pmc/pmc_key.h \
+    $(PMC_INC_DIR)/pmc/pmc_continuation.h \
+    $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/sub$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/sub.str \
-	$(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_continuation.h \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_continuation.h \
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/string/api$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/string/api.str \
         $(SRC_DIR)/string/private_cstring.h
@@ -1127,60 +1130,60 @@
 $(SRC_DIR)/longopt$(O) : $(GENERAL_H_FILES)
 
 $(SRC_DIR)/dynext$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/dynext.str \
-	$(SRC_DIR)/pmc/pmc_parrotlibrary.h $(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/exceptions$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/exceptions.str \
-	$(SRC_DIR)/pmc/pmc_continuation.h \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_continuation.h \
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/events$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/events.str
 
-$(SRC_DIR)/thread$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc/pmc_sub.h \
-	$(SRC_DIR)/pmc/pmc_parrotinterpreter.h
+$(SRC_DIR)/thread$(O) : $(GENERAL_H_FILES) $(PMC_INC_DIR)/pmc/pmc_sub.h \
+	$(PMC_INC_DIR)/pmc/pmc_parrotinterpreter.h
 
 $(SRC_DIR)/extend$(O) : $(GENERAL_H_FILES) $(INC_DIR)/extend.h \
-	$(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/runcore/main$(O) : $(SRC_DIR)/runcore/main.c \
 	$(SRC_DIR)/runcore/main.str $(GENERAL_H_FILES) \
-	$(SRC_DIR)/pmc/pmc_parrotlibrary.h \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h \
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/runcore/profiling$(O) : $(SRC_DIR)/runcore/profiling.str $(GENERAL_H_FILES) \
-	$(SRC_DIR)/pmc/pmc_sub.h \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h \
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/call/args$(O) : $(SRC_DIR)/call/args.c $(GENERAL_H_FILES) \
 	$(SRC_DIR)/call/args.str \
-	$(SRC_DIR)/pmc/pmc_key.h $(SRC_DIR)/pmc/pmc_callsignature.h \
-	$(SRC_DIR)/pmc/pmc_fixedintegerarray.h $(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_key.h $(PMC_INC_DIR)/pmc/pmc_callsignature.h \
+	$(PMC_INC_DIR)/pmc/pmc_fixedintegerarray.h $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/call/context_accessors$(O): $(GENERAL_H_FILES) \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/call/pcc$(O) : $(SRC_DIR)/call/pcc.c $(GENERAL_H_FILES) \
-	$(SRC_DIR)/call/pcc.str $(SRC_DIR)/pmc/pmc_fixedintegerarray.h \
-	$(SRC_DIR)/pmc/pmc_key.h $(SRC_DIR)/pmc/pmc_continuation.h \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(SRC_DIR)/call/pcc.str $(PMC_INC_DIR)/pmc/pmc_fixedintegerarray.h \
+	$(PMC_INC_DIR)/pmc/pmc_key.h $(PMC_INC_DIR)/pmc/pmc_continuation.h \
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/call/context$(O) : $(SRC_DIR)/call/context.c $(GENERAL_H_FILES) \
-	$(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/interp/inter_cb$(O) : $(SRC_DIR)/interp/inter_cb.c \
 	$(GENERAL_H_FILES) $(SRC_DIR)/interp/inter_cb.str
 
 $(SRC_DIR)/interp/inter_misc$(O) : $(SRC_DIR)/interp/inter_misc.c \
 	$(GENERAL_H_FILES) $(SRC_DIR)/interp/inter_misc.str \
-        $(SRC_DIR)/pmc/pmc_context.h
+        $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/interp/inter_create$(O) : $(SRC_DIR)/interp/inter_create.c \
 	$(GENERAL_H_FILES) $(SRC_DIR)/interp/inter_create.str \
-        $(SRC_DIR)/pmc/pmc_context.h
+        $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/call/ops$(O) : $(SRC_DIR)/call/ops.c $(GENERAL_H_FILES) \
-	$(SRC_DIR)/pmc/pmc_continuation.h
+	$(PMC_INC_DIR)/pmc/pmc_continuation.h
 
-$(IO_DIR)/api$(O) : $(GENERAL_H_FILES) $(IO_DIR)/io_private.h $(IO_DIR)/api.str $(SRC_DIR)/pmc/pmc_filehandle.h
+$(IO_DIR)/api$(O) : $(GENERAL_H_FILES) $(IO_DIR)/io_private.h $(IO_DIR)/api.str $(PMC_INC_DIR)/pmc/pmc_filehandle.h
 
 $(IO_DIR)/buffer$(O) : $(GENERAL_H_FILES) $(IO_DIR)/io_private.h
 
@@ -1197,26 +1200,26 @@
 $(SRC_DIR)/main$(O) : $(SRC_DIR)/main.c $(GENERAL_H_FILES)
 
 $(SRC_DIR)/multidispatch$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/multidispatch.str \
-	$(SRC_DIR)/pmc/pmc_nci.h $(SRC_DIR)/pmc/pmc_sub.h \
-	$(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_nci.h $(PMC_INC_DIR)/pmc/pmc_sub.h \
+	$(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/packfile$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/packfile.str \
-	$(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_key.h \
-        $(SRC_DIR)/pmc/pmc_context.h compilers/imcc/imc.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_key.h \
+        $(PMC_INC_DIR)/pmc/pmc_context.h compilers/imcc/imc.h
 
 $(PF_DIR)/pf_items$(O) : $(GENERAL_H_FILES)
 
-$(SRC_DIR)/packout$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc/pmc_key.h
+$(SRC_DIR)/packout$(O) : $(GENERAL_H_FILES) $(PMC_INC_DIR)/pmc/pmc_key.h
 
 $(SRC_DIR)/parrot$(O) : $(GENERAL_H_FILES)
 
 $(SRC_DIR)/runcore/cores$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/runcore/cores.str \
-	$(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_context.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/tsq$(O) : $(GENERAL_H_FILES)
 
 $(SRC_DIR)/embed$(O) : $(GENERAL_H_FILES) $(INC_DIR)/debugger.h \
-	$(SRC_DIR)/pmc/pmc_sub.h $(SRC_DIR)/pmc/pmc_context.h \
+	$(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_context.h \
         compilers/imcc/imc.h
 
 $(SRC_DIR)/dataypes$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/dataypes.c
@@ -1225,32 +1228,32 @@
 
 $(SRC_DIR)/nci$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/nci.c $(SRC_DIR)/nci.str \
         $(SRC_DIR)/frame_builder.h \
-        $(SRC_DIR)/pmc/pmc_context.h \
-        $(SRC_DIR)/pmc/pmc_unmanagedstruct.h \
-        $(SRC_DIR)/pmc/pmc_managedstruct.h \
-        $(SRC_DIR)/pmc/pmc_nci.h \
-        $(SRC_DIR)/pmc/pmc_pointer.h
+        $(PMC_INC_DIR)/pmc/pmc_context.h \
+        $(PMC_INC_DIR)/pmc/pmc_unmanagedstruct.h \
+        $(PMC_INC_DIR)/pmc/pmc_managedstruct.h \
+        $(PMC_INC_DIR)/pmc/pmc_nci.h \
+        $(PMC_INC_DIR)/pmc/pmc_pointer.h
 
 $(SRC_DIR)/frame_builder$(O) : $(SRC_DIR)/frame_builder.h $(GENERAL_H_FILES) \
         $(SRC_DIR)/frame_builder.c \
         $(SRC_DIR)/frame_builder.str \
-        $(SRC_DIR)/pmc/pmc_fixedintegerarray.h \
-        $(SRC_DIR)/pmc/pmc_unmanagedstruct.h \
-        $(SRC_DIR)/pmc/pmc_managedstruct.h
+        $(PMC_INC_DIR)/pmc/pmc_fixedintegerarray.h \
+        $(PMC_INC_DIR)/pmc/pmc_unmanagedstruct.h \
+        $(PMC_INC_DIR)/pmc/pmc_managedstruct.h
 
 $(SRC_DIR)/vtables$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/vtables.c
 
 $(SRC_DIR)/gc/system$(O) : $(GENERAL_H_FILES)  $(SRC_DIR)/gc/gc_private.h
 
 $(SRC_DIR)/nci.c : $(SRC_DIR)/call_list.txt $(BUILD_TOOLS_DIR)/nativecall.pl \
-	$(SRC_DIR)/pmc/pmc_nci.h
+	$(PMC_INC_DIR)/pmc/pmc_nci.h
 	$(PERL) $(BUILD_TOOLS_DIR)/nativecall.pl $(SRC_DIR)/call_list.txt
 
-$(SRC_DIR)/warnings$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc/pmc_context.h
+$(SRC_DIR)/warnings$(O) : $(GENERAL_H_FILES) $(PMC_INC_DIR)/pmc/pmc_context.h
 
 $(SRC_DIR)/misc$(O) : $(GENERAL_H_FILES)
 
-$(SRC_DIR)/utils$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/pmc/pmc_nci.h
+$(SRC_DIR)/utils$(O) : $(GENERAL_H_FILES) $(PMC_INC_DIR)/pmc/pmc_nci.h
 
 $(SRC_DIR)/spf_render$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/spf_render.str
 
@@ -1270,12 +1273,12 @@
         $(SRC_DIR)/string/charset/unicode.h
 
 $(SRC_DIR)/pbc_merge$(O) : $(SRC_DIR)/pbc_merge.c $(GENERAL_H_FILES) \
-	$(SRC_DIR)/pmc/pmc_sub.h
+	$(PMC_INC_DIR)/pmc/pmc_sub.h
 
-$(IO_DIR)/filehandle$(O) : $(INC_DIR)/parrot.h $(SRC_DIR)/pmc/pmc_filehandle.h $(SRC_DIR)/io/io_private.h
+$(IO_DIR)/filehandle$(O) : $(INC_DIR)/parrot.h $(PMC_INC_DIR)/pmc/pmc_filehandle.h $(SRC_DIR)/io/io_private.h
 
 $(OPS_DIR)/core_ops$(O) : $(GENERAL_H_FILES) $(OPS_DIR)/core_ops.c \
-	$(SRC_DIR)/pmc/pmc_continuation.h $(SRC_DIR)/pmc/pmc_parrotlibrary.h
+	$(PMC_INC_DIR)/pmc/pmc_continuation.h $(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
 
 # core_ops depends upon config.h so that it gets updated along with
 # updates to config.h's version numbers
@@ -1286,11 +1289,11 @@
 $(OPS_DIR)/core_ops.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl \
 	lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC_DIR)/config.h \
 	lib/Parrot/OpLib/core.pm lib/Parrot/OpTrans/C.pm \
-	$(SRC_DIR)/pmc/pmc_continuation.h
+	$(PMC_INC_DIR)/pmc/pmc_continuation.h
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl C --core @no_lines_flag@
 
 $(OPS_DIR)/core_ops_switch$(O) : $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_switch.c \
-	$(SRC_DIR)/pmc/pmc_parrotlibrary.h
+	$(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
 
 $(INC_DIR)/oplib/core_ops_switch.h : $(OPS_DIR)/core_ops_switch.c
 
@@ -1704,7 +1707,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --init
 	$(RM_F) \
     $(STR_FILES) \
-    $(SRC_DIR)/string/private_cstring.h "src/pmc/*.c" "src/pmc/pmc_*.h" \
+    $(SRC_DIR)/string/private_cstring.h "src/pmc/*.c" "include/pmc/pmc_*.h" \
     "src/pmc/*.dump" vtable.dump "*.def" "*.lib" "*.exp"
 
 archclean: dynoplibs-clean dynpmc-clean dynext-clean
@@ -1902,7 +1905,7 @@
 
 sunlint :
 	rm -f *.ln
-	$(SUNLINT) $(CC_INC) "-Isrc/pmc" $(SUNLINTOPTS) $(LINTABLE_CFILES)
+	$(SUNLINT) $(CC_INC) "-Iinclude/pmc" $(SUNLINTOPTS) $(LINTABLE_CFILES)
 
 BSD_LINT_FLAGS := -a -aa -b -c -e -h -n -p -r -u -x -z -F -H -V
 
@@ -1921,7 +1924,7 @@
 
 bsdlint : $(PARROT)
 	rm -f *.ln
-	$(LINT) $(CC_INC) "-Isrc/pmc" $(BSD_LINT_FLAGS) $(BSD_LINT_EXCLUSIONS) $(LINTABLE_CFILES)
+	$(LINT) $(CC_INC) "-Iinclude/pmc" $(BSD_LINT_FLAGS) $(BSD_LINT_EXCLUSIONS) $(LINTABLE_CFILES)
 
 # For checking with splint see also http:////www.perlfoundation.org//parrot//index.cgi?splint
 # Splint: http:////splint.org
@@ -2062,7 +2065,7 @@
 
 splint-all : $(PARROT)
 	$(MKPATH) $(SPLINT_TMP)
-	$(SPLINT) $(CC_INC) "-Isrc/pmc" "-Icompilers/ast" $(SPLINTFLAGS) $(SPLINTFLAGS_TEST) \
+	$(SPLINT) $(CC_INC) "-Iinclude/pmc" "-Icompilers/ast" $(SPLINTFLAGS) $(SPLINTFLAGS_TEST) \
 	$(SPLINT_SOURCE) \
 	$(SPLINT) $(CC_INC) $(SPLINTFLAGS) $(SPLINTFLAGS_TEST) $(IMCC_DIR)/main.c
 
@@ -2073,7 +2076,7 @@
 
 splint : all
 	$(MKPATH) $(SPLINT_TMP)
-	$(SPLINT) $(CC_INC) "-Isrc/pmc" "-Icompilers/ast" $(SPLINTFLAGS) $(SPLINTFLAGS_TEST) \
+	$(SPLINT) $(CC_INC) "-Iinclude/pmc" "-Icompilers/ast" $(SPLINTFLAGS) $(SPLINTFLAGS_TEST) \
 	+partial -DNDEBUG \
 	$(SPLINT_SOURCE) \
 		| grep -v 'Source code error generation point'

Modified: branches/pmc_headers_move/config/init/defaults.pm
==============================================================================
--- branches/pmc_headers_move/config/init/defaults.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/config/init/defaults.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -135,7 +135,7 @@
 
         libs => $Config{libs},
 
-        cc_inc     => "-I./include",
+        cc_inc     => "-I./include -I./include/pmc",
         cc_debug   => '-g',
         link_debug => '',
 

Modified: branches/pmc_headers_move/include/parrot/context.h
==============================================================================
--- branches/pmc_headers_move/include/parrot/context.h	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/include/parrot/context.h	Sat Nov  7 09:24:58 2009	(r42320)
@@ -24,13 +24,7 @@
     INTVAL       *regs_i;
 } Regs_ni;
 
-/* Ugly cheat to include Context definition for installed parrot. Directory
- * structure is sooo different and there is no way to include pmc_context.h in
- * sane way.
- */
-#ifndef PARROT_IN_CORE
-#  include "pmc/pmc_context.h"
-#endif
+#include <pmc/pmc_context.h>
 typedef struct Parrot_Context_attributes Parrot_Context;
 
 /*

Modified: branches/pmc_headers_move/lib/Parrot/OpTrans/C.pm
==============================================================================
--- branches/pmc_headers_move/lib/Parrot/OpTrans/C.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/lib/Parrot/OpTrans/C.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -52,7 +52,7 @@
 sub defines {
     my $type = __PACKAGE__;
     return <<END;
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 
 /* defines - $0 -> $type */
 #undef CONST

Modified: branches/pmc_headers_move/lib/Parrot/Ops2c/Utils.pm
==============================================================================
--- branches/pmc_headers_move/lib/Parrot/Ops2c/Utils.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/lib/Parrot/Ops2c/Utils.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -550,8 +550,8 @@
     print $fh $self->{preamble};
     print $fh <<END_C;
 #include "$self->{include}"
-#include "../pmc/pmc_parrotlibrary.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_parrotlibrary.h"
+#include "pmc/pmc_context.h"
 
 $self->{defines}
 

Modified: branches/pmc_headers_move/lib/Parrot/Pmc2c/PMC.pm
==============================================================================
--- branches/pmc_headers_move/lib/Parrot/Pmc2c/PMC.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/lib/Parrot/Pmc2c/PMC.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -225,9 +225,9 @@
 }
 
 sub filename {
-    my ( $self, $type ) = @_;
+    my ( $self, $type, $is_dynamic ) = @_;
     return $self->{filename} unless $type;
-    return Parrot::Pmc2c::UtilFunctions::filename( $self->{filename}, $type );
+    return Parrot::Pmc2c::UtilFunctions::filename( $self->{filename}, $type, $is_dynamic );
 }
 
 sub get_flags {

Modified: branches/pmc_headers_move/lib/Parrot/Pmc2c/PMCEmitter.pm
==============================================================================
--- branches/pmc_headers_move/lib/Parrot/Pmc2c/PMCEmitter.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/lib/Parrot/Pmc2c/PMCEmitter.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -50,7 +50,7 @@
     $emitter->write_to_file;
 
     $emitter = $self->{emitter} =
-        Parrot::Pmc2c::Emitter->new( $self->filename(".h") );
+        Parrot::Pmc2c::Emitter->new( $self->filename(".h", $self->is_dynamic) );
 
     $self->generate_h_file;
     $emitter->write_to_file;
@@ -76,8 +76,8 @@
     $self->gen_includes;
 
     # The PCC code needs Continuation-related macros from these headers.
-    $c->emit("#include \"pmc_continuation.h\"\n");
-    $c->emit("#include \"pmc_context.h\"\n");
+    $c->emit("#include \"pmc/pmc_continuation.h\"\n");
+    $c->emit("#include \"pmc/pmc_context.h\"\n");
 
     $c->emit( $self->preamble );
 

Modified: branches/pmc_headers_move/lib/Parrot/Pmc2c/UtilFunctions.pm
==============================================================================
--- branches/pmc_headers_move/lib/Parrot/Pmc2c/UtilFunctions.pm	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/lib/Parrot/Pmc2c/UtilFunctions.pm	Sat Nov  7 09:24:58 2009	(r42320)
@@ -275,9 +275,17 @@
 }
 
 sub filename {
-    my ( $filename, $type ) = @_;
+    my ( $filename, $type, $is_dynamic ) = @_;
 
-    $filename =~ s/(\w+)\.\w+$/pmc_$1.h/ if ( $type eq ".h" );
+    # Core PMC emit header files inside include/pmc. All others in original directory
+    if ($type eq '.h') {
+        if (defined ($is_dynamic) && $is_dynamic) {
+            $filename =~ s{(\w+)\.\w+$}{pmc_$1.h};
+        }
+        else {
+            $filename =~ s{(?:.*/)?(\w+)\.\w+$}{include/pmc/pmc_$1.h};
+        }
+    }
     $filename =~ s/\.\w+$/.c/            if ( $type eq ".c" );
     $filename =~ s/\.\w+$/.dump/         if ( $type eq ".dump" );
     $filename =~ s/\.\w+$/.pmc/          if ( $type eq ".pmc" );

Modified: branches/pmc_headers_move/src/call/args.c
==============================================================================
--- branches/pmc_headers_move/src/call/args.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/call/args.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -21,10 +21,10 @@
 #include "parrot/oplib/ops.h"
 #include "parrot/runcore_api.h"
 #include "args.str"
-#include "../pmc/pmc_key.h"
-#include "../pmc/pmc_callsignature.h"
-#include "../pmc/pmc_fixedintegerarray.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_key.h"
+#include "pmc/pmc_callsignature.h"
+#include "pmc/pmc_fixedintegerarray.h"
+#include "pmc/pmc_context.h"
 
 /* HEADERIZER HFILE: include/parrot/call.h */
 

Modified: branches/pmc_headers_move/src/call/context.c
==============================================================================
--- branches/pmc_headers_move/src/call/context.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/call/context.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -14,8 +14,8 @@
 
 #include "parrot/parrot.h"
 #include "parrot/call.h"
-#include "../pmc/pmc_sub.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 
 /*
 

Modified: branches/pmc_headers_move/src/call/context_accessors.c
==============================================================================
--- branches/pmc_headers_move/src/call/context_accessors.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/call/context_accessors.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -14,7 +14,7 @@
 
 #include "parrot/parrot.h"
 #include "parrot/call.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 
 #ifndef NDEBUG
 

Modified: branches/pmc_headers_move/src/call/ops.c
==============================================================================
--- branches/pmc_headers_move/src/call/ops.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/call/ops.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -19,7 +19,7 @@
 
 #include "parrot/parrot.h"
 #include "parrot/oplib/ops.h"
-#include "../pmc/pmc_continuation.h"
+#include "pmc/pmc_continuation.h"
 
 /* HEADERIZER HFILE: include/parrot/call.h */
 

Modified: branches/pmc_headers_move/src/call/pcc.c
==============================================================================
--- branches/pmc_headers_move/src/call/pcc.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/call/pcc.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -21,9 +21,9 @@
 #include "parrot/oplib/ops.h"
 #include "parrot/runcore_api.h"
 #include "pcc.str"
-#include "../pmc/pmc_key.h"
-#include "../pmc/pmc_continuation.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_key.h"
+#include "pmc/pmc_continuation.h"
+#include "pmc/pmc_context.h"
 
 /* HEADERIZER HFILE: include/parrot/call.h */
 

Modified: branches/pmc_headers_move/src/interp/inter_create.c
==============================================================================
--- branches/pmc_headers_move/src/interp/inter_create.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/interp/inter_create.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -23,7 +23,7 @@
 #include "parrot/runcore_api.h"
 #include "parrot/oplib/core_ops.h"
 #include "../compilers/imcc/imc.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 #include "inter_create.str"
 
 /* HEADERIZER HFILE: include/parrot/interpreter.h */

Modified: branches/pmc_headers_move/src/interp/inter_misc.c
==============================================================================
--- branches/pmc_headers_move/src/interp/inter_misc.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/interp/inter_misc.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -23,7 +23,7 @@
 #include "inter_misc.str"
 #include "../compilers/imcc/imc.h"
 #include "parrot/runcore_api.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 
 #include "parrot/has_header.h"
 

Modified: branches/pmc_headers_move/src/io/api.c
==============================================================================
--- branches/pmc_headers_move/src/io/api.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/io/api.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -30,8 +30,8 @@
 #include "parrot/parrot.h"
 #include "io_private.h"
 #include "api.str"
-#include "../pmc/pmc_filehandle.h"
-#include "../pmc/pmc_stringhandle.h"
+#include "pmc/pmc_filehandle.h"
+#include "pmc/pmc_stringhandle.h"
 
 #include <stdarg.h>
 

Modified: branches/pmc_headers_move/src/io/filehandle.c
==============================================================================
--- branches/pmc_headers_move/src/io/filehandle.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/io/filehandle.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -17,7 +17,7 @@
 
 #include "parrot/parrot.h"
 #include "io_private.h"
-#include "../pmc/pmc_filehandle.h"
+#include "pmc/pmc_filehandle.h"
 
 /* HEADERIZER HFILE: include/parrot/io.h */
 

Modified: branches/pmc_headers_move/src/io/socket_api.c
==============================================================================
--- branches/pmc_headers_move/src/io/socket_api.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/io/socket_api.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -21,7 +21,7 @@
 #include "parrot/parrot.h"
 #include "io_private.h"
 #include "api.str"
-#include "../pmc/pmc_socket.h"
+#include "pmc/pmc_socket.h"
 
 #include <stdarg.h>
 

Modified: branches/pmc_headers_move/src/io/socket_unix.c
==============================================================================
--- branches/pmc_headers_move/src/io/socket_unix.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/io/socket_unix.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -30,7 +30,7 @@
 
 #include "parrot/parrot.h"
 #include "io_private.h"
-#include "../pmc/pmc_socket.h"
+#include "pmc/pmc_socket.h"
 
 #ifdef PIO_OS_UNIX
 

Modified: branches/pmc_headers_move/src/io/socket_win32.c
==============================================================================
--- branches/pmc_headers_move/src/io/socket_win32.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/io/socket_win32.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -28,7 +28,7 @@
 
 #include "parrot/parrot.h"
 #include "io_private.h"
-#include "../pmc/pmc_socket.h"
+#include "pmc/pmc_socket.h"
 
 #ifdef PIO_OS_WIN32
 

Modified: branches/pmc_headers_move/src/pmc/addrregistry.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/addrregistry.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/addrregistry.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -27,7 +27,7 @@
 
 /* included manually to prevent breaking C++ builds -- see RT #56534 */
 #include "parrot/hash.h"
-#include "pmc_hash.h"
+#include "pmc/pmc_hash.h"
 
 pmclass AddrRegistry extends Hash provides hash auto_attrs {
 /*

Modified: branches/pmc_headers_move/src/pmc/class.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/class.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/class.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -91,8 +91,8 @@
 
 #define PARROT_IN_OBJECTS_C /* To get the vtable.h imports we want. */
 #include "parrot/oo_private.h"
-#include "pmc_object.h"
-#include "pmc_namespace.h"
+#include "pmc/pmc_object.h"
+#include "pmc/pmc_namespace.h"
 
 static int
 cache_class_attribs(PARROT_INTERP, PMC *cur_class, PMC *attrib_index,

Modified: branches/pmc_headers_move/src/pmc/context.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/context.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/context.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -21,7 +21,7 @@
 
 
 #include "parrot/packfile.h"
-#include "pmc_sub.h"
+#include "pmc/pmc_sub.h"
 
 pmclass Context auto_attrs {
     ATTR PMC     *caller_ctx;      /* caller context */

Modified: branches/pmc_headers_move/src/pmc/continuation.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/continuation.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/continuation.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -22,7 +22,7 @@
 
 
 #include "parrot/oplib/ops.h"
-#include "pmc_sub.h"
+#include "pmc/pmc_sub.h"
 
 /*
 

Modified: branches/pmc_headers_move/src/pmc/eval.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/eval.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/eval.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -19,7 +19,7 @@
 
 */
 
-#include "pmc_sub.h"
+#include "pmc/pmc_sub.h"
 
 static void
 clear_fixups(PARROT_INTERP, Parrot_Sub_attributes *sub_data)

Modified: branches/pmc_headers_move/src/pmc/exception.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/exception.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/exception.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -50,7 +50,7 @@
 */
 
 #include "parrot/exceptions.h"
-#include "pmc_sub.h"
+#include "pmc/pmc_sub.h"
 
 pmclass Exception auto_attrs {
 

Modified: branches/pmc_headers_move/src/pmc/hash.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/hash.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/hash.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -44,9 +44,9 @@
 
 */
 
-#include "pmc_iterator.h"
-#include "pmc_key.h"
-#include "pmc_hashiteratorkey.h"
+#include "pmc/pmc_iterator.h"
+#include "pmc/pmc_key.h"
+#include "pmc/pmc_hashiteratorkey.h"
 
 pmclass Hash provides hash auto_attrs {
     ATTR Hash *hash;

Modified: branches/pmc_headers_move/src/pmc/hashiterator.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/hashiterator.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/hashiterator.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -46,8 +46,8 @@
 
 */
 
-#include "pmc_hash.h"
-#include "pmc_hashiteratorkey.h"
+#include "pmc/pmc_hash.h"
+#include "pmc/pmc_hashiteratorkey.h"
 
 /*
 

Modified: branches/pmc_headers_move/src/pmc/integer.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/integer.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/integer.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -19,7 +19,7 @@
 
 */
 
-#include "pmc_bigint.h"
+#include "pmc/pmc_bigint.h"
 
 static void
 maybe_throw_overflow_error(PARROT_INTERP)

Modified: branches/pmc_headers_move/src/pmc/lexinfo.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/lexinfo.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/lexinfo.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -19,7 +19,7 @@
 */
 
 /* included manually to prevent breaking C++ builds -- see RT #56534*/
-#include "pmc_hash.h"
+#include "pmc/pmc_hash.h"
 
 /*
  * LexInfo contains a constant Hash with constant string

Modified: branches/pmc_headers_move/src/pmc/multisub.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/multisub.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/multisub.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -19,7 +19,7 @@
 
 */
 
-#include "pmc_context.h"
+#include "pmc/pmc_context.h"
 
 pmclass MultiSub extends ResizablePMCArray auto_attrs provides array {
 

Modified: branches/pmc_headers_move/src/pmc/namespace.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/namespace.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/namespace.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -18,7 +18,7 @@
 
 */
 
-#include "pmc_sub.h"
+#include "pmc/pmc_sub.h"
 
 static void add_to_class(
         Interp *interp,

Modified: branches/pmc_headers_move/src/pmc/object.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/object.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/object.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -19,7 +19,7 @@
 */
 
 #include "parrot/oo_private.h"
-#include "pmc_class.h"
+#include "pmc/pmc_class.h"
 
 /* This finds the index of an attribute in an object's attribute store and
  * returns it. Returns -1 if the attribute does not exist. */

Modified: branches/pmc_headers_move/src/pmc/orderedhashiterator.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/orderedhashiterator.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/orderedhashiterator.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -18,8 +18,8 @@
 
 */
 
-#include "pmc_hash.h"
-#include "pmc_hashiteratorkey.h"
+#include "pmc/pmc_hash.h"
+#include "pmc/pmc_hashiteratorkey.h"
 
 pmclass OrderedHashIterator extends Iterator no_ro auto_attrs {
     ATTR PMC        *pmc_hash;      /* the Hash which this Iterator iterates */

Modified: branches/pmc_headers_move/src/pmc/packfile.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/packfile.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/packfile.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -19,7 +19,7 @@
 
 */
 
-#include "pmc_packfiledirectory.h"
+#include "pmc/pmc_packfiledirectory.h"
 
 /*
 Copy attributes from PackFile* to Packfile PMC.

Modified: branches/pmc_headers_move/src/pmc/packfileannotations.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/packfileannotations.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/packfileannotations.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -27,7 +27,7 @@
 
 */
 
-#include "pmc_packfileannotation.h"
+#include "pmc/pmc_packfileannotation.h"
 
 pmclass PackfileAnnotations auto_attrs extends PackfileSegment {
     /* ConstantTable used for names lookup */

Modified: branches/pmc_headers_move/src/pmc/parrotinterpreter.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/parrotinterpreter.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/parrotinterpreter.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -29,8 +29,8 @@
 #include "parrot/dynext.h"
 #include "parrot/io.h"
 #include "parrot/runcore_api.h"
-#include "pmc_class.h"
-#include "pmc_sub.h"
+#include "pmc/pmc_class.h"
+#include "pmc/pmc_sub.h"
 
 #define PMC_interp(x) ((Parrot_ParrotInterpreter_attributes *)PMC_data(x))->interp
 #define PMC_args(x)   ((Parrot_ParrotInterpreter_attributes *)PMC_data(x))->args

Modified: branches/pmc_headers_move/src/pmc/role.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/role.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/role.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -48,7 +48,7 @@
 
 */
 
-#include "pmc_namespace.h"
+#include "pmc/pmc_namespace.h"
 
 /* Takes a hash and initializes the role based on it. */
 static void init_role_from_hash(PARROT_INTERP, PMC *self, PMC *info)

Modified: branches/pmc_headers_move/src/pmc/scalar.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/scalar.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/scalar.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -18,7 +18,7 @@
 
 */
 
-#include "pmc_bigint.h"
+#include "pmc/pmc_bigint.h"
 
 static PMC *
 bitwise_left_shift_internal(PARROT_INTERP, PMC *self,

Modified: branches/pmc_headers_move/src/pmc/undef.pmc
==============================================================================
--- branches/pmc_headers_move/src/pmc/undef.pmc	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/pmc/undef.pmc	Sat Nov  7 09:24:58 2009	(r42320)
@@ -23,7 +23,7 @@
 
 */
 
-#include "pmc_object.h"
+#include "pmc/pmc_object.h"
 #define UNDEF_STRING_CLASS enum_class_String
 
 pmclass Undef no_ro {

Modified: branches/pmc_headers_move/src/runcore/cores.c
==============================================================================
--- branches/pmc_headers_move/src/runcore/cores.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/runcore/cores.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -248,8 +248,8 @@
 #include "parrot/oplib/core_ops_switch.h"
 #include "parrot/dynext.h"
 
-#include "../pmc/pmc_sub.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 
 #ifdef HAVE_COMPUTED_GOTO
 #  include "parrot/oplib/core_ops_cg.h"

Modified: branches/pmc_headers_move/src/runcore/main.c
==============================================================================
--- branches/pmc_headers_move/src/runcore/main.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/runcore/main.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -45,8 +45,8 @@
 #  include "parrot/oplib/core_ops_cgp.h"
 #endif
 #include "parrot/dynext.h"
-#include "../pmc/pmc_parrotlibrary.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_parrotlibrary.h"
+#include "pmc/pmc_context.h"
 
 
 /* HEADERIZER HFILE: include/parrot/runcore_api.h */

Modified: branches/pmc_headers_move/src/runcore/profiling.c
==============================================================================
--- branches/pmc_headers_move/src/runcore/profiling.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/runcore/profiling.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -17,8 +17,8 @@
 
 #include "profiling.str"
 
-#include "../pmc/pmc_sub.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 
 #ifdef WIN32
 #  define getpid _getpid

Modified: branches/pmc_headers_move/src/runcore/trace.c
==============================================================================
--- branches/pmc_headers_move/src/runcore/trace.c	Sat Nov  7 09:21:23 2009	(r42319)
+++ branches/pmc_headers_move/src/runcore/trace.c	Sat Nov  7 09:24:58 2009	(r42320)
@@ -25,8 +25,8 @@
 
 #include "parrot/runcore_trace.h"
 #include "parrot/oplib/ops.h"
-#include "../pmc/pmc_sub.h"
-#include "../pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 
 /* HEADERIZER HFILE: include/parrot/runcore_trace.h */
 


More information about the parrot-commits mailing list