From 30f0aed3905e0f1d5a75fec2df767b5ee1d60955 Mon Sep 17 00:00:00 2001 From: twisti Date: Thu, 19 Jan 2006 09:47:16 +0000 Subject: [PATCH] * INCLUDES: Replaced with AM_CPPFLAGS as Tom Tromey suggested on irc, as this is more common these days. --- src/vm/jit/alpha/Makefile.am | 7 +++---- src/vm/jit/i386/Makefile.am | 7 +++---- src/vm/jit/intrp/Makefile.am | 4 ++-- src/vm/jit/mips/Makefile.am | 7 +++---- src/vm/jit/powerpc/Makefile.am | 7 +++---- src/vm/jit/x86_64/Makefile.am | 7 +++---- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/vm/jit/alpha/Makefile.am b/src/vm/jit/alpha/Makefile.am index 9a0e15152..3f7d4c0e2 100644 --- 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 3bf96aaaf..4bdaffee4 100644 --- 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 2ad1c1460..7ed499bb3 100644 --- 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 2cea40b2b..5b8319459 100644 --- 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 eb96614df..f39fe0c07 100644 --- 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 342389a99..5a459f7f4 100644 --- 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 -- 2.25.1