Fix include paths to support build directories.

diff --git a/jit/loop/Makefile.am b/jit/loop/Makefile.am
index 464ab393edac49501d8b705ee377145b4ac0cbc5..13588bf71294dbd89e0040ad5a7b6769bfad8585 100644 (file)
--- a/jit/loop/Makefile.am
+++ b/jit/loop/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 618 2003-11-13 09:39:28Z stefan $
+# $Id: Makefile.am 1141 2004-06-05 23:19:24Z twisti $
 
-INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@ -I$(top_srcdir)/jit
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit/@ARCH_DIR@
 
 EXTRA_DIST = \
        graph.c \

diff --git a/jit/loop/analyze.c b/jit/loop/analyze.c
index 15f9aa283f30a6efa080e6120a29a1eccca01541..ccc3531e8fdd71b6314a8f864463430d6961dfc4 100644 (file)
--- a/jit/loop/analyze.c
+++ b/jit/loop/analyze.c
@@ -32,7 +32,7 @@
    bounds are never violated. The function to call is
    optimize_loops().
 
-   $Id: analyze.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: analyze.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -40,11 +40,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "analyze.h"
+#include "jit/loop/analyze.h"
 #include "jit/jit.h"
-#include "loop.h"
-#include "graph.h"
-#include "tracing.h"
+#include "jit/loop/loop.h"
+#include "jit/loop/graph.h"
+#include "jit/loop/tracing.h"
 #include "toolbox/logging.h"
 #include "toolbox/memory.h"
 

diff --git a/jit/loop/graph.c b/jit/loop/graph.c
index 0b496d053ef78e5f8696d9f4c2493d3b7fce24dd..1764d2ad4bcd3792013d7b0bd535b1f1c6298723 100644 (file)
--- a/jit/loop/graph.c
+++ b/jit/loop/graph.c
@@ -31,15 +31,15 @@
    Contains the functions which build a list, that represents the
    control flow graph of the procedure, that is being analyzed.
 
-   $Id: graph.c 576 2003-11-09 17:31:38Z twisti $
+   $Id: graph.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
 
 #include <stdio.h>
-#include "graph.h"
-#include "loop.h"
-#include "jit.h"
+#include "jit/jit.h"
+#include "jit/loop/graph.h"
+#include "jit/loop/loop.h"
 #include "toolbox/memory.h"
 
 

diff --git a/jit/loop/loop.c b/jit/loop/loop.c
index cce76ea46e0bc8a8df838a31367981fa81c02457..84f95af559ada0f9ff6f46e008ac82962fec3fa9 100644 (file)
--- a/jit/loop/loop.c
+++ b/jit/loop/loop.c
@@ -30,7 +30,7 @@
    algorithm that uses dominator trees (found eg. in modern compiler
    implementation by a.w. appel)
 
-   $Id: loop.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: loop.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -39,9 +39,9 @@
 #include <stdlib.h>
 #include "global.h"    
 #include "jit/jit.h"   
-#include "loop.h"
-#include "graph.h"
-#include "tracing.h"
+#include "jit/loop/loop.h"
+#include "jit/loop/graph.h"
+#include "jit/loop/tracing.h"
 #include "toolbox/logging.h"
 #include "toolbox/memory.h"
 

diff --git a/jit/loop/tracing.c b/jit/loop/tracing.c
index 7bbd3fa80b23b0035139430b072620ec9138766f..d2290fc6f8a59e2f05d13377ae4a1cc2c60460b2 100644 (file)
--- a/jit/loop/tracing.c
+++ b/jit/loop/tracing.c
@@ -31,14 +31,14 @@
    instruction. For more details see function tracing(basicblock, int,
    int) below.
 
-   $Id: tracing.c 576 2003-11-09 17:31:38Z twisti $
+   $Id: tracing.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
 
 #include <stdio.h>
-#include "tracing.h"
-#include "loop.h"
+#include "jit/loop/tracing.h"
+#include "jit/loop/loop.h"
 #include "toolbox/memory.h"
 
 

diff --git a/jit/loop/tracing.h b/jit/loop/tracing.h
index bbbb9ac6a856d129239cd2404518d41a948ae21c..b97be4e20b448d60a82789cc54449d9351c32f85 100644 (file)
--- a/jit/loop/tracing.h
+++ b/jit/loop/tracing.h
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: tracing.h 665 2003-11-21 18:36:43Z jowenn $
+   $Id: tracing.h 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -34,7 +34,7 @@
 #ifndef _TRACING_H
 #define _TRACING_H
 
-#include "jit.h"
+#include "jit/jit.h"
 
 /*     
    This struct is needed to record the source of operands of intermediate code

diff --git a/src/mm/memory.c b/src/mm/memory.c
index 4766f4c780655049ab5969084bfb4a0cffb89188..6a33e12f27d453e89a02195070f67a5d04948900 100644 (file)
--- a/src/mm/memory.c
+++ b/src/mm/memory.c
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: memory.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: memory.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -39,8 +39,8 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "logging.h"
-#include "memory.h"
+#include "toolbox/logging.h"
+#include "toolbox/memory.h"
 
 
 /********* general types, variables and auxiliary functions *********/

diff --git a/src/toolbox/Makefile.am b/src/toolbox/Makefile.am
index 0a225b779e0bcfc62f0ab621c427972487bcfbbd..7279fe6994ff7b9a617497c6653c2c7bb4286d47 100644 (file)
--- a/src/toolbox/Makefile.am
+++ b/src/toolbox/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1067 2004-05-18 10:25:51Z stefan $
+# $Id: Makefile.am 1141 2004-06-05 23:19:24Z twisti $
 
 noinst_LIBRARIES = libtoolbox.a
 
@@ -18,7 +18,7 @@ libtoolbox_a_SOURCES = \
        list.c \
        list.h
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit -I$(top_srcdir)/jit/@ARCH_DIR@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit/@ARCH_DIR@
 
 
 ## Local variables:

diff --git a/src/toolbox/avl.c b/src/toolbox/avl.c
index f9aef2c2d7d1e60427d46d6b3dc253bee4238c3b..66cce968fbb0c4bc393f967a47e318df1d786692 100644 (file)
--- a/src/toolbox/avl.c
+++ b/src/toolbox/avl.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "avl.h"
+#include "toolbox/avl.h"
 
 /* Creates and returns a new table
    with comparison function |compare| using parameter |param|

diff --git a/src/toolbox/chain.c b/src/toolbox/chain.c
index 0804ce6414302329d1f7eabe6f1221fd6ad70b54..92652d2b56eecea3ab18da8b4fc9b6b75aebb7d6 100644 (file)
--- a/src/toolbox/chain.c
+++ b/src/toolbox/chain.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: chain.c 684 2003-12-02 16:50:17Z twisti $
+   $Id: chain.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -37,8 +37,8 @@
 #include <assert.h>
 
 #include "global.h"
-#include "memory.h"
-#include "chain.h"
+#include "toolbox/memory.h"
+#include "toolbox/chain.h"
 
 
 chain *chain_new()

diff --git a/src/toolbox/list.c b/src/toolbox/list.c
index 24b59f4f1f88044d777f05812e84f4270c9bfeeb..5ab4fa44f760e6fc71632babaadebe2368fba159 100644 (file)
--- a/src/toolbox/list.c
+++ b/src/toolbox/list.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: list.c 684 2003-12-02 16:50:17Z twisti $
+   $Id: list.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -37,7 +37,7 @@
 #include <assert.h>
 
 #include "global.h"
-#include "list.h"
+#include "toolbox/list.h"
 
 
 void list_init(list *l, int nodeoffset)

diff --git a/src/toolbox/tree.c b/src/toolbox/tree.c
index b0d65549493858449fe5d2ac6eb68e40ca46d933..c7502a2a0663c15c7ea66592a14a388b42a2bf54 100644 (file)
--- a/src/toolbox/tree.c
+++ b/src/toolbox/tree.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: tree.c 684 2003-12-02 16:50:17Z twisti $
+   $Id: tree.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -36,8 +36,8 @@
 #include <assert.h>
 
 #include "global.h"
-#include "memory.h"
-#include "tree.h"
+#include "toolbox/memory.h"
+#include "toolbox/tree.h"
 
 
 tree *tree_new(treeelementcomperator comperator)

diff --git a/src/vm/jit/loop/Makefile.am b/src/vm/jit/loop/Makefile.am
index 464ab393edac49501d8b705ee377145b4ac0cbc5..13588bf71294dbd89e0040ad5a7b6769bfad8585 100644 (file)
--- a/src/vm/jit/loop/Makefile.am
+++ b/src/vm/jit/loop/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 618 2003-11-13 09:39:28Z stefan $
+# $Id: Makefile.am 1141 2004-06-05 23:19:24Z twisti $
 
-INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@ -I$(top_srcdir)/jit
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit/@ARCH_DIR@
 
 EXTRA_DIST = \
        graph.c \

diff --git a/src/vm/jit/loop/analyze.c b/src/vm/jit/loop/analyze.c
index 15f9aa283f30a6efa080e6120a29a1eccca01541..ccc3531e8fdd71b6314a8f864463430d6961dfc4 100644 (file)
--- a/src/vm/jit/loop/analyze.c
+++ b/src/vm/jit/loop/analyze.c
@@ -32,7 +32,7 @@
    bounds are never violated. The function to call is
    optimize_loops().
 
-   $Id: analyze.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: analyze.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -40,11 +40,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "analyze.h"
+#include "jit/loop/analyze.h"
 #include "jit/jit.h"
-#include "loop.h"
-#include "graph.h"
-#include "tracing.h"
+#include "jit/loop/loop.h"
+#include "jit/loop/graph.h"
+#include "jit/loop/tracing.h"
 #include "toolbox/logging.h"
 #include "toolbox/memory.h"
 

diff --git a/src/vm/jit/loop/graph.c b/src/vm/jit/loop/graph.c
index 0b496d053ef78e5f8696d9f4c2493d3b7fce24dd..1764d2ad4bcd3792013d7b0bd535b1f1c6298723 100644 (file)
--- a/src/vm/jit/loop/graph.c
+++ b/src/vm/jit/loop/graph.c
@@ -31,15 +31,15 @@
    Contains the functions which build a list, that represents the
    control flow graph of the procedure, that is being analyzed.
 
-   $Id: graph.c 576 2003-11-09 17:31:38Z twisti $
+   $Id: graph.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
 
 #include <stdio.h>
-#include "graph.h"
-#include "loop.h"
-#include "jit.h"
+#include "jit/jit.h"
+#include "jit/loop/graph.h"
+#include "jit/loop/loop.h"
 #include "toolbox/memory.h"
 
 

diff --git a/src/vm/jit/loop/loop.c b/src/vm/jit/loop/loop.c
index cce76ea46e0bc8a8df838a31367981fa81c02457..84f95af559ada0f9ff6f46e008ac82962fec3fa9 100644 (file)
--- a/src/vm/jit/loop/loop.c
+++ b/src/vm/jit/loop/loop.c
@@ -30,7 +30,7 @@
    algorithm that uses dominator trees (found eg. in modern compiler
    implementation by a.w. appel)
 
-   $Id: loop.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: loop.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -39,9 +39,9 @@
 #include <stdlib.h>
 #include "global.h"    
 #include "jit/jit.h"   
-#include "loop.h"
-#include "graph.h"
-#include "tracing.h"
+#include "jit/loop/loop.h"
+#include "jit/loop/graph.h"
+#include "jit/loop/tracing.h"
 #include "toolbox/logging.h"
 #include "toolbox/memory.h"
 

diff --git a/src/vm/jit/loop/tracing.c b/src/vm/jit/loop/tracing.c
index 7bbd3fa80b23b0035139430b072620ec9138766f..d2290fc6f8a59e2f05d13377ae4a1cc2c60460b2 100644 (file)
--- a/src/vm/jit/loop/tracing.c
+++ b/src/vm/jit/loop/tracing.c
@@ -31,14 +31,14 @@
    instruction. For more details see function tracing(basicblock, int,
    int) below.
 
-   $Id: tracing.c 576 2003-11-09 17:31:38Z twisti $
+   $Id: tracing.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
 
 #include <stdio.h>
-#include "tracing.h"
-#include "loop.h"
+#include "jit/loop/tracing.h"
+#include "jit/loop/loop.h"
 #include "toolbox/memory.h"
 
 

diff --git a/src/vm/jit/loop/tracing.h b/src/vm/jit/loop/tracing.h
index bbbb9ac6a856d129239cd2404518d41a948ae21c..b97be4e20b448d60a82789cc54449d9351c32f85 100644 (file)
--- a/src/vm/jit/loop/tracing.h
+++ b/src/vm/jit/loop/tracing.h
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: tracing.h 665 2003-11-21 18:36:43Z jowenn $
+   $Id: tracing.h 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -34,7 +34,7 @@
 #ifndef _TRACING_H
 #define _TRACING_H
 
-#include "jit.h"
+#include "jit/jit.h"
 
 /*     
    This struct is needed to record the source of operands of intermediate code

diff --git a/toolbox/Makefile.am b/toolbox/Makefile.am
index 0a225b779e0bcfc62f0ab621c427972487bcfbbd..7279fe6994ff7b9a617497c6653c2c7bb4286d47 100644 (file)
--- a/toolbox/Makefile.am
+++ b/toolbox/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1067 2004-05-18 10:25:51Z stefan $
+# $Id: Makefile.am 1141 2004-06-05 23:19:24Z twisti $
 
 noinst_LIBRARIES = libtoolbox.a
 
@@ -18,7 +18,7 @@ libtoolbox_a_SOURCES = \
        list.c \
        list.h
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit -I$(top_srcdir)/jit/@ARCH_DIR@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/jit/@ARCH_DIR@
 
 
 ## Local variables:

diff --git a/toolbox/avl.c b/toolbox/avl.c
index f9aef2c2d7d1e60427d46d6b3dc253bee4238c3b..66cce968fbb0c4bc393f967a47e318df1d786692 100644 (file)
--- a/toolbox/avl.c
+++ b/toolbox/avl.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "avl.h"
+#include "toolbox/avl.h"
 
 /* Creates and returns a new table
    with comparison function |compare| using parameter |param|

diff --git a/toolbox/chain.c b/toolbox/chain.c
index 0804ce6414302329d1f7eabe6f1221fd6ad70b54..92652d2b56eecea3ab18da8b4fc9b6b75aebb7d6 100644 (file)
--- a/toolbox/chain.c
+++ b/toolbox/chain.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: chain.c 684 2003-12-02 16:50:17Z twisti $
+   $Id: chain.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -37,8 +37,8 @@
 #include <assert.h>
 
 #include "global.h"
-#include "memory.h"
-#include "chain.h"
+#include "toolbox/memory.h"
+#include "toolbox/chain.h"
 
 
 chain *chain_new()

diff --git a/toolbox/list.c b/toolbox/list.c
index 24b59f4f1f88044d777f05812e84f4270c9bfeeb..5ab4fa44f760e6fc71632babaadebe2368fba159 100644 (file)
--- a/toolbox/list.c
+++ b/toolbox/list.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: list.c 684 2003-12-02 16:50:17Z twisti $
+   $Id: list.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -37,7 +37,7 @@
 #include <assert.h>
 
 #include "global.h"
-#include "list.h"
+#include "toolbox/list.h"
 
 
 void list_init(list *l, int nodeoffset)

diff --git a/toolbox/memory.c b/toolbox/memory.c
index 4766f4c780655049ab5969084bfb4a0cffb89188..6a33e12f27d453e89a02195070f67a5d04948900 100644 (file)
--- a/toolbox/memory.c
+++ b/toolbox/memory.c
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: memory.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: memory.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -39,8 +39,8 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "logging.h"
-#include "memory.h"
+#include "toolbox/logging.h"
+#include "toolbox/memory.h"
 
 
 /********* general types, variables and auxiliary functions *********/

diff --git a/toolbox/tree.c b/toolbox/tree.c
index b0d65549493858449fe5d2ac6eb68e40ca46d933..c7502a2a0663c15c7ea66592a14a388b42a2bf54 100644 (file)
--- a/toolbox/tree.c
+++ b/toolbox/tree.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: tree.c 684 2003-12-02 16:50:17Z twisti $
+   $Id: tree.c 1141 2004-06-05 23:19:24Z twisti $
 
 */
 
@@ -36,8 +36,8 @@
 #include <assert.h>
 
 #include "global.h"
-#include "memory.h"
-#include "tree.h"
+#include "toolbox/memory.h"
+#include "toolbox/tree.h"
 
 
 tree *tree_new(treeelementcomperator comperator)