make later versions of automake work

diff --git a/Makefile.am b/Makefile.am
index 6a9bdd1eceb8940848b2cf7c6f2a0b67b5e7917c..7c0dce2105fc1033fa87d1fa61b2939d806c3571 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 284 2003-05-12 19:09:05Z stefan $
+# $Id: Makefile.am 311 2003-05-16 15:30:23Z stefan $
 
 @SET_MAKE@
 
@@ -27,7 +27,6 @@ cacao_SOURCES = \
        builtin.c \
        builtin.h \
        callargs.h \
-       @COMPILER_SOURCES@ \
        global.h \
        jit.c \
        jit.h \

diff --git a/configure.in b/configure.in
index 33b4d63cf8d1814298f5f65551b6146b6088f28d..f573989efde3ba0d4bdb4cd6a7941456d897e4c0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,8 +16,7 @@ case "$host_cpu" in
 alpha* )
        SYSDEP_DIR="alpha"
        CFLAGS="-ieee -O2 -g3"
-       COMPILER_SOURCES="compiler.h compiler.c"
-       COMPILER_OBJECTS="compiler.o"
+       COMPILER_OBJECTS="compiler.$(OBJEXT)"
        AC_DEFINE(OLD_COMPILER)
        AC_DEFINE(TRACE_ARGS_NUM, 6)
        AC_DEFINE(USE_CODEMMAP)
@@ -28,7 +27,6 @@ mips* )
        ASMPART="asmpart.s"
         CFLAGS="-64 -g -DMAP_ANONYMOUS=0 -woff 1048,1110,1164,1515"
        LIBS="-lelfutil"
-       COMPILER_SOURCES=""
        COMPILER_OBJECTS=""
        AC_DEFINE(TRACE_ARGS_NUM, 8)
        ;;
@@ -36,7 +34,6 @@ mips* )
 i386* | i486* | i586* | i686* )
        SYSDEP_DIR="i386"
        CFLAGS="-O0 -g3 -D__I386__"
-       COMPILER_SOURCES=""
        COMPILER_OBJECTS="i386/libdisass.a"
        AC_DEFINE(TRACE_ARGS_NUM, 6)
        AC_DEFINE(USE_CODEMMAP)
@@ -47,7 +44,6 @@ sparc* | powerpc* | ppc* | * )
 
 esac
 
-AC_SUBST(COMPILER_SOURCES)
 AC_SUBST(COMPILER_OBJECTS)
 AC_SUBST(ASMPART)