* src/vm/jit/powerpc/linux/Makefile.am (LIBS): Added defined empty, as

* this makes problems on darwin and actually we do not need to link
* the configured libraries into convenience libraries.
* src/vm/jit/powerpc/darwin/Makefile.am: Likewise.
* src/vm/jit/powerpc/Makefile.am: Likewise.
* src/vm/jit/alpha/linux/Makefile.am: Likewise.
* src/vm/jit/alpha/Makefile.am: Likewise.
* src/vm/jit/alpha/freebsd/Makefile.am: Likewise.
* src/vm/jit/tools/Makefile.am: Likewise.
* src/vm/jit/verify/Makefile.am: Likewise.
* src/vm/jit/mips/linux/Makefile.am: Likewise.
* src/vm/jit/mips/Makefile.am: Likewise.
* src/vm/jit/mips/irix/Makefile.am: Likewise.
* src/vm/jit/loop/Makefile.am: Likewise.
* src/vm/jit/inline/Makefile.am: Likewise.
* src/vm/jit/allocator/Makefile.am: Likewise.
* src/vm/jit/i386/linux/Makefile.am: Likewise.
* src/vm/jit/i386/Makefile.am: Likewise.
* src/vm/jit/i386/freebsd/Makefile.am: Likewise.
* src/vm/jit/schedule/Makefile.am: Likewise.
* src/vm/jit/intrp/Makefile.am: Likewise.
* src/vm/jit/x86_64/Makefile.am: Likewise.
* src/vm/jit/profile/Makefile.am: Likewise.
* src/vm/jit/Makefile.am: Likewise.
* src/vm/Makefile.am: Likewise.
* src/native/tools/Makefile.am: Likewise.
* src/native/vm/Makefile.am: Likewise.
* src/native/Makefile.am: Likewise.
* src/toolbox/Makefile.am: Likewise.
* src/mm/Makefile.am: Likewise.
* src/threads/native/Makefile.am: Likewise.
* src/fdlibm/Makefile.am: Likewise.

* src/cacaoh/Makefile.am (INCLUDES): Renamed to AM_CPPFLAGS.

diff --git a/src/cacaoh/Makefile.am b/src/cacaoh/Makefile.am
index d60b9ab1a7af82ac932c2afcd5a5abc6b8714fb1..f5a540a5483ebc8307792091324d382bd2afbb65 100644 (file)
--- a/src/cacaoh/Makefile.am
+++ b/src/cacaoh/Makefile.am
@@ -28,17 +28,15 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
 
 if DISABLE_GC
 if NATIVE_THREADS
 GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
-else
-GC_LIB =
 endif
 else
 GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
@@ -50,8 +48,6 @@ THREAD_LIB = $(top_builddir)/src/threads/native/libthreads.la
 else
 THREAD_LIB = $(top_builddir)/src/threads/green/libthreads.la
 endif
-else
-THREAD_LIB =
 endif
 
 noinst_LTLIBRARIES = libcacaoh.la
@@ -76,7 +72,8 @@ cacaoh_LDADD = \
        $(top_builddir)/src/fdlibm/libfdlibm.la \
        $(GC_LIB)
 
-cacaoh_DEPENDENCIES = $(cacaoh_LDADD)
+cacaoh_DEPENDENCIES = \
+       $(cacaoh_LDADD)
 
 
 ## Local variables:

diff --git a/src/fdlibm/Makefile.am b/src/fdlibm/Makefile.am
index 0cb384ce20c3b386d33743a5277cee325633289d..d3f72c241ffe260418cd8e82fe795fe37ab07e0a 100644 (file)
--- a/src/fdlibm/Makefile.am
+++ b/src/fdlibm/Makefile.am
@@ -1,5 +1,7 @@
 INCLUDES = -I$(top_builddir)
 
+LIBS =
+
 noinst_LTLIBRARIES = libfdlibm.la 
 
 libfdlibm_la_SOURCES =  \

diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
index 65c99c4299417630a690a999bf8527956b336b50..f3d7f8f86f4f94e61075057b2970018bf003efcf 100644 (file)
--- a/src/mm/Makefile.am
+++ b/src/mm/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+
+LIBS =
 
 if DISABLE_GC
 GC_FILE = nogc.c

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 5be332446794edc8291b6675202638c54b89a329..f3112e2c415fb3f7c7c9b246d9d33aeb5de077c5 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,12 +28,14 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4530 2006-02-21 09:11:53Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
 
+LIBS =
+
 SUBDIRS = \
        include \
        vm

diff --git a/src/native/tools/Makefile.am b/src/native/tools/Makefile.am
index f72aec2aacbc28f3eb1dbbf6630ba7767aa4adeb..439a29f4e6ebb1567c752a28f415e7da78de0a10 100644 (file)
--- a/src/native/tools/Makefile.am
+++ b/src/native/tools/Makefile.am
@@ -28,18 +28,17 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
+LIBS =
 
 if DISABLE_GC
 if NATIVE_THREADS
 GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
-else
-GC_LIB =
 endif
 else
 GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
@@ -54,7 +53,8 @@ gennativetable_LDADD = \
        $(top_builddir)/src/fdlibm/libfdlibm.la \
        $(GC_LIB)
 
-gennativetable_DEPENDENCIES = $(gennativetable_LDADD)
+gennativetable_DEPENDENCIES = \
+       $(gennativetable_LDADD)
 
 
 ## Local variables:

diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am
index 7a6d009f88244c906ddf2bf511d4ea159085ae13..b0b52cb4ec2d2e29559cc5c1aa704f968299d4f3 100644 (file)
--- a/src/native/vm/Makefile.am
+++ b/src/native/vm/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z 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_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
+
+LIBS =
 
 noinst_LTLIBRARIES = libnativevm.la
 

diff --git a/src/threads/native/Makefile.am b/src/threads/native/Makefile.am
index d53f2e5d492fdca88d6d0ec3deea8ff687faa29b..d66ba0a65178d6f19d01d2714719e7185569ae3b 100644 (file)
--- a/src/threads/native/Makefile.am
+++ b/src/threads/native/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z 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@
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
+
+LIBS =
 
 noinst_LTLIBRARIES = libthreads.la
 

diff --git a/src/toolbox/Makefile.am b/src/toolbox/Makefile.am
index 2863449015def53189e8acaefcfc6dd03be8d052..5818fad2c78d6e5088b3627fcb7f364a59aaa177 100644 (file)
--- a/src/toolbox/Makefile.am
+++ b/src/toolbox/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+
+LIBS =
 
 noinst_LTLIBRARIES = libtoolbox.la
 

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 7585b2234c383e62f35f51753c8d6a61ae0ccdd7..f025dae97369f4c323c6efaad36e534100197f60 100644 (file)
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4530 2006-02-21 09:11:53Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z 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)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
+
+LIBS =
 
 SUBDIRS = jit
 

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index d484a8bed555bf2253530cd75fc888ed43929d31..349e76039015eca639587c88b251ead3fc37112f 100644 (file)
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -28,12 +28,14 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4472 2006-02-06 18:49:53Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
 
+LIBS =
+
 SUBDIRS = \
        allocator \
        loop \

diff --git a/src/vm/jit/allocator/Makefile.am b/src/vm/jit/allocator/Makefile.am
index 9562924cac24b59279024e3aebfa10e333199e45..dff89f0c251545d7ca12beb81cf5ef0bbf1a00ef 100644 (file)
--- a/src/vm/jit/allocator/Makefile.am
+++ b/src/vm/jit/allocator/Makefile.am
@@ -28,12 +28,14 @@
 ##
 ## Changes: Christian Thalinger
 ##
-## $Id: Makefile.am 4465 2006-02-06 18:14:56Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
 
+LIBS =
+
 noinst_LTLIBRARIES = \
        liballocator.la
 

diff --git a/src/vm/jit/alpha/Makefile.am b/src/vm/jit/alpha/Makefile.am
index 1c29d3c1cc8dba0db53874def2f1ee0f3a5ec1bc..449893f4df2e8ccc0553b0ab513412b58829e985 100644 (file)
--- a/src/vm/jit/alpha/Makefile.am
+++ b/src/vm/jit/alpha/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -41,6 +41,8 @@ SUBDIRS = $(OS_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 
+LIBS =
+
 BUILT_SOURCES = offsets.h
 
 CLEANFILES = offsets.h

diff --git a/src/vm/jit/alpha/freebsd/Makefile.am b/src/vm/jit/alpha/freebsd/Makefile.am
index 25c455aef866268208cd68340874c7d1ec302ad0..80b9b5d590a60ca013cc8b0a51a83eff4c3ba47b 100644 (file)
--- a/src/vm/jit/alpha/freebsd/Makefile.am
+++ b/src/vm/jit/alpha/freebsd/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_HEADERS =
 

diff --git a/src/vm/jit/alpha/linux/Makefile.am b/src/vm/jit/alpha/linux/Makefile.am
index 9ffdaf92672da4adf19f09a5bf7597fcc12e9e35..bb1941c82a7c5e36c521ce861a09629732d0c128 100644 (file)
--- a/src/vm/jit/alpha/linux/Makefile.am
+++ b/src/vm/jit/alpha/linux/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_HEADERS =
 

diff --git a/src/vm/jit/i386/Makefile.am b/src/vm/jit/i386/Makefile.am
index c56773779f87c345ec3eba8c6628104f06d78c6b..69eaf846fa4e81b31e4edbfb865762698b28c02c 100644 (file)
--- a/src/vm/jit/i386/Makefile.am
+++ b/src/vm/jit/i386/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -41,6 +41,8 @@ SUBDIRS = $(OS_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 
+LIBS =
+
 BUILT_SOURCES = offsets.h
 
 CLEANFILES = offsets.h

diff --git a/src/vm/jit/i386/freebsd/Makefile.am b/src/vm/jit/i386/freebsd/Makefile.am
index 2611da306c00792b7c9ff2c4eedbfff570097958..04617d4a046ddc8c1615c5ed145abc623b154b99 100644 (file)
--- a/src/vm/jit/i386/freebsd/Makefile.am
+++ b/src/vm/jit/i386/freebsd/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_HEADERS =
 

diff --git a/src/vm/jit/i386/linux/Makefile.am b/src/vm/jit/i386/linux/Makefile.am
index b211b4f8145f8fb855911d2402af39b5ec71f87e..8851c2644f07c14124c0c5febd37922f024c5fb4 100644 (file)
--- a/src/vm/jit/i386/linux/Makefile.am
+++ b/src/vm/jit/i386/linux/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_HEADERS =
 

diff --git a/src/vm/jit/inline/Makefile.am b/src/vm/jit/inline/Makefile.am
index a0cf6baeed908f36b429a6ec612816b581d99afc..7513e5366f915bfa9019598ba33a1d3fadbd76ca 100644 (file)
--- a/src/vm/jit/inline/Makefile.am
+++ b/src/vm/jit/inline/Makefile.am
@@ -28,12 +28,14 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4380 2006-01-28 11:26:28Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
 
+LIBS =
+
 noinst_LTLIBRARIES = libinline.la
 
 libinline_la_SOURCES = \

diff --git a/src/vm/jit/intrp/Makefile.am b/src/vm/jit/intrp/Makefile.am
index 95d9f72410d4da2ba9a0c97402ba6965b61113e5..053f48ef917d26c6849167b3872b0f4da1308459 100644 (file)
--- a/src/vm/jit/intrp/Makefile.am
+++ b/src/vm/jit/intrp/Makefile.am
@@ -28,12 +28,14 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 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
 
+LIBS =
+
 EXTRA_DIST = \
        java.vmg \
        gray.fs \

diff --git a/src/vm/jit/loop/Makefile.am b/src/vm/jit/loop/Makefile.am
index 287a7119a6d06810fffec68e9f537621d02f420e..804d0e31f36b22f2ba1a58307d6d5052c8649139 100644 (file)
--- a/src/vm/jit/loop/Makefile.am
+++ b/src/vm/jit/loop/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_LTLIBRARIES = libloop.la
 

diff --git a/src/vm/jit/mips/Makefile.am b/src/vm/jit/mips/Makefile.am
index 2b8539175558d0b12832a771f16a8801cec95449..a63b0618b94529eae0c84b8d25363c931f556ccf 100644 (file)
--- a/src/vm/jit/mips/Makefile.am
+++ b/src/vm/jit/mips/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -41,6 +41,8 @@ SUBDIRS = $(OS_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 
+LIBS =
+
 BUILT_SOURCES = offsets.h
 
 CLEANFILES = offsets.h

diff --git a/src/vm/jit/mips/irix/Makefile.am b/src/vm/jit/mips/irix/Makefile.am
index 922eef11aff6499c6dde913510d220d93072d349..349b05ee9533f356a1332e56757869d0889a4d16 100644 (file)
--- a/src/vm/jit/mips/irix/Makefile.am
+++ b/src/vm/jit/mips/irix/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_HEADERS =
 

diff --git a/src/vm/jit/mips/linux/Makefile.am b/src/vm/jit/mips/linux/Makefile.am
index f9027ba58ff1c4dff563c311356338f2bf218ca8..e6974c3a84c4b4dd11509f7f78919df3596fa167 100644 (file)
--- a/src/vm/jit/mips/linux/Makefile.am
+++ b/src/vm/jit/mips/linux/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_HEADERS =
 

diff --git a/src/vm/jit/powerpc/Makefile.am b/src/vm/jit/powerpc/Makefile.am
index 620aad5391ec431afe4fe91886440563d530efd1..9f50ce2af19773910c597413353c175de98c3b2d 100644 (file)
--- a/src/vm/jit/powerpc/Makefile.am
+++ b/src/vm/jit/powerpc/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -41,6 +41,8 @@ SUBDIRS = $(OS_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 
+LIBS =
+
 BUILT_SOURCES = offsets.h
 
 CLEANFILES = offsets.h

diff --git a/src/vm/jit/powerpc/darwin/Makefile.am b/src/vm/jit/powerpc/darwin/Makefile.am
index 03f009c6080a5a0caccf5e31455b04df2d18c108..2731fdce736849b0cf5e8c804d3e5b4cc07d7945 100644 (file)
--- a/src/vm/jit/powerpc/darwin/Makefile.am
+++ b/src/vm/jit/powerpc/darwin/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_HEADERS = \
        md-asm.h

diff --git a/src/vm/jit/powerpc/linux/Makefile.am b/src/vm/jit/powerpc/linux/Makefile.am
index efb6707a297bdbfef03b3af4ded598bbceb482d3..c74781524f41ea81a84b522cf60c57e4ff001146 100644 (file)
--- a/src/vm/jit/powerpc/linux/Makefile.am
+++ b/src/vm/jit/powerpc/linux/Makefile.am
@@ -28,12 +28,14 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
 
+LIBS =
+
 noinst_HEADERS = \
        md-asm.h
 

diff --git a/src/vm/jit/profile/Makefile.am b/src/vm/jit/profile/Makefile.am
index c95fbd1f4333ace461025ba22caa9b057ea8cab5..988c03baf7e963f436def184af41a6d8c0d419fa 100644 (file)
--- a/src/vm/jit/profile/Makefile.am
+++ b/src/vm/jit/profile/Makefile.am
@@ -34,6 +34,8 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
 
+LIBS =
+
 noinst_LTLIBRARIES = \
        libprofile.la
 

diff --git a/src/vm/jit/schedule/Makefile.am b/src/vm/jit/schedule/Makefile.am
index fe3f75be642283b48e9a388dcfe4792036ee6e58..85431f132a5d7cec2af3683f0d8457e30b7f6ff7 100644 (file)
--- a/src/vm/jit/schedule/Makefile.am
+++ b/src/vm/jit/schedule/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_LTLIBRARIES = libschedule.la
 

diff --git a/src/vm/jit/tools/Makefile.am b/src/vm/jit/tools/Makefile.am
index d4f85fe8b097caee1fb2a064c35fa58613edbba6..7ce7136276b7e7901670fe9243a264cbdcfdb090 100644 (file)
--- a/src/vm/jit/tools/Makefile.am
+++ b/src/vm/jit/tools/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_PROGRAMS = genoffsets
 

diff --git a/src/vm/jit/verify/Makefile.am b/src/vm/jit/verify/Makefile.am
index 0426a910bd96ddaa9531c1f281e0bf7abdb9540d..d29910e4ff9c2630eabe8c39fd855c8587d60d57 100644 (file)
--- a/src/vm/jit/verify/Makefile.am
+++ b/src/vm/jit/verify/Makefile.am
@@ -28,11 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+
+LIBS =
 
 noinst_LTLIBRARIES = libverify.la
 

diff --git a/src/vm/jit/x86_64/Makefile.am b/src/vm/jit/x86_64/Makefile.am
index 34681d93d3e60e5fbbe6846463f5b71da836bc2c..89dbd326b6e58064845bc48509480e1d8aa932c5 100644 (file)
--- a/src/vm/jit/x86_64/Makefile.am
+++ b/src/vm/jit/x86_64/Makefile.am
@@ -28,13 +28,15 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4563 2006-03-06 13:03:05Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 
+LIBS =
+
 BUILT_SOURCES = offsets.h
 
 CLEANFILES = offsets.h