* INCLUDES: Replaced with AM_CPPFLAGS as Tom Tromey suggested on irc,

  as this is more common these days.

diff --git a/src/vm/jit/alpha/Makefile.am b/src/vm/jit/alpha/Makefile.am
index 9a0e15152ee397fc893c48f129cbad32faf49cfc..3f7d4c0e215b3f48cedd35ba1da5b4d2d54569d9 100644 (file)
--- a/src/vm/jit/alpha/Makefile.am
+++ b/src/vm/jit/alpha/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4068 2006-01-02 16:03:29Z twisti $
+## $Id: Makefile.am 4297 2006-01-19 09:47:16Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -38,9 +38,8 @@ DIST_SUBDIRS = \
 
 SUBDIRS = $(OS_DIR)
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
+AM_CCASFLAGS = $(AM_CPPFLAGS)
 
 BUILT_SOURCES = offsets.h
 

diff --git a/src/vm/jit/i386/Makefile.am b/src/vm/jit/i386/Makefile.am
index 3bf96aaaf4368cf8223a6d18577f284646f63b89..4bdaffee4c778f2496489a1a3754d2f29304d61a 100644 (file)
--- a/src/vm/jit/i386/Makefile.am
+++ b/src/vm/jit/i386/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4105 2006-01-09 12:10:06Z twisti $
+## $Id: Makefile.am 4297 2006-01-19 09:47:16Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -38,9 +38,8 @@ DIST_SUBDIRS = \
 
 SUBDIRS = $(OS_DIR)
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir) -I$(top_builddir)/src
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
+AM_CCASFLAGS = $(AM_CPPFLAGS)
 
 BUILT_SOURCES = offsets.h
 

diff --git a/src/vm/jit/intrp/Makefile.am b/src/vm/jit/intrp/Makefile.am
index 2ad1c1460f12a219a77687772c56bc3b9a6a4f26..7ed499bb38b53846dc6802747482bf873c219cb2 100644 (file)
--- a/src/vm/jit/intrp/Makefile.am
+++ b/src/vm/jit/intrp/Makefile.am
@@ -28,11 +28,11 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3982 2005-12-21 16:51:30Z anton $
+## $Id: Makefile.am 4297 2006-01-19 09:47:16Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir) -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir) -I$(top_builddir)/src
 
 EXTRA_DIST = \
        java.vmg \

diff --git a/src/vm/jit/mips/Makefile.am b/src/vm/jit/mips/Makefile.am
index 2cea40b2b777316d19cadb572c2735a963eccf8b..5b8319459e86ecaf71308ff9bea6473f371a0543 100644 (file)
--- a/src/vm/jit/mips/Makefile.am
+++ b/src/vm/jit/mips/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4077 2006-01-02 17:11:59Z twisti $
+## $Id: Makefile.am 4297 2006-01-19 09:47:16Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -38,9 +38,8 @@ DIST_SUBDIRS = \
 
 SUBDIRS = $(OS_DIR)
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
+AM_CCASFLAGS = $(AM_CPPFLAGS)
 
 BUILT_SOURCES = offsets.h
 

diff --git a/src/vm/jit/powerpc/Makefile.am b/src/vm/jit/powerpc/Makefile.am
index eb96614df22efc6cd2a0f0d6f484ac71deae12fe..f39fe0c071f041243a8db1c1302647e8fa5f8b3e 100644 (file)
--- a/src/vm/jit/powerpc/Makefile.am
+++ b/src/vm/jit/powerpc/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4113 2006-01-09 20:15:06Z twisti $
+## $Id: Makefile.am 4297 2006-01-19 09:47:16Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -38,9 +38,8 @@ DIST_SUBDIRS = \
 
 SUBDIRS = $(OS_DIR)
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/@OS_DIR@ -I$(top_builddir) -I$(top_builddir)/src
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
+AM_CCASFLAGS = $(AM_CPPFLAGS)
 
 BUILT_SOURCES = offsets.h
 

diff --git a/src/vm/jit/x86_64/Makefile.am b/src/vm/jit/x86_64/Makefile.am
index 342389a99eca955333e3d325ef715e2fc9f60385..5a459f7f49417c14cd5080783161164a22fdf356 100644 (file)
--- a/src/vm/jit/x86_64/Makefile.am
+++ b/src/vm/jit/x86_64/Makefile.am
@@ -28,13 +28,12 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4102 2006-01-09 10:35:28Z twisti $
+## $Id: Makefile.am 4297 2006-01-19 09:47:16Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
+AM_CCASFLAGS = $(AM_CPPFLAGS)
 
 BUILT_SOURCES = offsets.h