From d7562307ee30fe007cfa9cf691b5dd7cc745a5a5 Mon Sep 17 00:00:00 2001 From: twisti Date: Mon, 6 Mar 2006 13:03:05 +0000 Subject: [PATCH] * 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. --- src/cacaoh/Makefile.am | 11 ++++------- src/fdlibm/Makefile.am | 2 ++ src/mm/Makefile.am | 6 ++++-- src/native/Makefile.am | 4 +++- src/native/tools/Makefile.am | 10 +++++----- src/native/vm/Makefile.am | 6 ++++-- src/threads/native/Makefile.am | 6 ++++-- src/toolbox/Makefile.am | 6 ++++-- src/vm/Makefile.am | 6 ++++-- src/vm/jit/Makefile.am | 4 +++- src/vm/jit/allocator/Makefile.am | 4 +++- src/vm/jit/alpha/Makefile.am | 4 +++- src/vm/jit/alpha/freebsd/Makefile.am | 6 ++++-- src/vm/jit/alpha/linux/Makefile.am | 6 ++++-- src/vm/jit/i386/Makefile.am | 4 +++- src/vm/jit/i386/freebsd/Makefile.am | 6 ++++-- src/vm/jit/i386/linux/Makefile.am | 6 ++++-- src/vm/jit/inline/Makefile.am | 4 +++- src/vm/jit/intrp/Makefile.am | 4 +++- src/vm/jit/loop/Makefile.am | 6 ++++-- src/vm/jit/mips/Makefile.am | 4 +++- src/vm/jit/mips/irix/Makefile.am | 6 ++++-- src/vm/jit/mips/linux/Makefile.am | 6 ++++-- src/vm/jit/powerpc/Makefile.am | 4 +++- src/vm/jit/powerpc/darwin/Makefile.am | 6 ++++-- src/vm/jit/powerpc/linux/Makefile.am | 4 +++- src/vm/jit/profile/Makefile.am | 2 ++ src/vm/jit/schedule/Makefile.am | 6 ++++-- src/vm/jit/tools/Makefile.am | 6 ++++-- src/vm/jit/verify/Makefile.am | 6 ++++-- src/vm/jit/x86_64/Makefile.am | 4 +++- 31 files changed, 110 insertions(+), 55 deletions(-) diff --git a/src/cacaoh/Makefile.am b/src/cacaoh/Makefile.am index d60b9ab1a..f5a540a54 100644 --- 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 0cb384ce2..d3f72c241 100644 --- 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 65c99c429..f3d7f8f86 100644 --- 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 5be332446..f3112e2c4 100644 --- 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 f72aec2aa..439a29f4e 100644 --- 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 7a6d009f8..b0b52cb4e 100644 --- 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 d53f2e5d4..d66ba0a65 100644 --- 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 286344901..5818fad2c 100644 --- 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 7585b2234..f025dae97 100644 --- 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 d484a8bed..349e76039 100644 --- 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 9562924ca..dff89f0c2 100644 --- 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 1c29d3c1c..449893f4d 100644 --- 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 25c455aef..80b9b5d59 100644 --- 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 9ffdaf926..bb1941c82 100644 --- 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 c56773779..69eaf846f 100644 --- 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 2611da306..04617d4a0 100644 --- 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 b211b4f81..8851c2644 100644 --- 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 a0cf6baee..7513e5366 100644 --- 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 95d9f7241..053f48ef9 100644 --- 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 287a7119a..804d0e31f 100644 --- 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 2b8539175..a63b0618b 100644 --- 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 922eef11a..349b05ee9 100644 --- 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 f9027ba58..e6974c3a8 100644 --- 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 620aad539..9f50ce2af 100644 --- 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 03f009c60..2731fdce7 100644 --- 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 efb6707a2..c74781524 100644 --- 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 c95fbd1f4..988c03baf 100644 --- 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 fe3f75be6..85431f132 100644 --- 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 d4f85fe8b..7ce713627 100644 --- 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 0426a910b..d29910e4f 100644 --- 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 34681d93d..89dbd326b 100644 --- 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 -- 2.25.1