* configure.ac: Some maintenance for make dist.

* doc/Makefile.am: Likewise.
* doc/handbook/Makefile.am: Likewise.
* src/vm/jit/Makefile.am: Likewise.
* src/vm/jit/m68k/Makefile.am: Likewise.
* src/native/include/Makefile: Removed.

--HG--
extra : transplant_source : %5E%21%C0%8C%A00%1E%D8%06%3A%E1%AE%DAx%F7C%B3%8A%C2I

diff --git a/configure.ac b/configure.ac
index d33d8591ad43cda403ced9218b323ead3f02af3f..5acb74857738051ed0de586459a36153bac9f350 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -689,7 +689,6 @@ AC_CONFIG_FILES([Makefile]
                [src/mm/Makefile]
                [src/mm/cacao-gc/Makefile]
                [src/native/Makefile]
-               [src/native/include/Makefile]
                [src/native/jvmti/Makefile]
                [src/native/vm/Makefile]
                [src/native/vm/cldc1.1/Makefile]

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7e878e2b03b7795fe12f0dacb112a98337190284..a84caae7a9912dec432310ce2ffc0d3849fa82a6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,9 +31,11 @@ dist_noinst_DATA = \
        jsr.bib
 
 EXTRA_DIST = \
+       design_onstack_replacement.txt \
        inlining_stacktrace.txt \
        native_threads.txt \
-       stack.txt
+       stack.txt \
+       stack_frames.txt
 
 CLEANFILES = \
        annotations.aux \

diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 2c0d5968c9582fcabda5a553d24b992ebd841b0d..c55dc57e90de6aa6f476806b6e1df37122cc78d8 100644 (file)
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -32,12 +32,15 @@
 
 dist_noinst_DATA = \
        alpha.tex \
+       arch.eps \
        arm.tex \
+       arm-double-memory.png \
        cacao.tex \
        inlining.tex \
        intro.tex \
        java.bib \
        jit.tex \
+       jvmti.tex \
        library.tex \
        loader.tex \
        loopopt.tex \
@@ -47,6 +50,7 @@ dist_noinst_DATA = \
        powerpc.tex \
        reflection.tex \
        runtime.tex \
+       s390.tex \
        threads.tex \
        verification.tex \
        x86.tex \

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
deleted file mode 100644 (file)
index 28a2987..0000000
--- a/src/native/include/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-## src/native/include/Makefile.am
-##
-## Copyright (C) 1996-2005, 2006, 2007, 2008
-## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
-##
-## This file is part of CACAO.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301, USA.
-
-
-JAVAH    = javah
-JAVAHCMD = $(JAVAH) -jni -bootclasspath $(BOOTCLASSPATH)
-
-if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
-IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
-       com_sun_cldc_io_ResourceInputStream.h \
-       com_sun_cldc_io_j2me_socket_Protocol.h \
-       com_sun_cldchi_io_ConsoleOutputStream.h \
-       com_sun_cldchi_jvm_FileDescriptor.h \
-       com_sun_cldchi_jvm_JVM.h \
-       java_lang_Class.h \
-       java_lang_Math.h \
-       java_lang_Runtime.h \
-       java_lang_System.h
-endif
-
-if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
-IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
-       gnu_classpath_VMStackWalker.h \
-       gnu_classpath_VMSystemProperties.h \
-       gnu_java_lang_VMCPStringBuilder.h \
-       gnu_java_lang_management_VMClassLoadingMXBeanImpl.h \
-       gnu_java_lang_management_VMMemoryMXBeanImpl.h \
-       gnu_java_lang_management_VMRuntimeMXBeanImpl.h \
-       gnu_java_lang_management_VMThreadMXBeanImpl.h \
-       java_lang_VMClass.h \
-       java_lang_VMClassLoader.h \
-       java_lang_VMObject.h \
-       java_lang_VMRuntime.h \
-       java_lang_VMString.h \
-       java_lang_VMSystem.h \
-       java_lang_VMThread.h \
-       java_lang_VMThrowable.h \
-       java_lang_management_VMManagementFactory.h \
-       java_lang_reflect_VMConstructor.h \
-       java_lang_reflect_VMField.h \
-       java_lang_reflect_VMMethod.h \
-       java_lang_reflect_VMProxy.h \
-       java_security_VMAccessController.h \
-       java_util_concurrent_atomic_AtomicLong.h \
-       sun_misc_Unsafe.h
-
-if ENABLE_ANNOTATIONS
-IMPLEMENTED_VM_CLASSES_HEADER_FILES += \
-       sun_reflect_ConstantPool.h
-endif
-endif
-
-if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
-IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
-       sun_misc_Unsafe.h
-endif
-
-if ENABLE_JVMTI
-JVMTI_HEADER_FILES = \
-       gnu_classpath_jdwp_VMFrame.h \
-       gnu_classpath_jdwp_VMMethod.h \
-       gnu_classpath_jdwp_VMVirtualMachine.h \
-       gnu_classpath_jdwp_event_EventRequest.h \
-       gnu_classpath_jdwp_util_VariableTable.h
-endif
-
-CLEANFILES = \
-       *.h
-
-DO_HEADER_FILES = \
-       $(IMPLEMENTED_VM_CLASSES_HEADER_FILES)
-
-if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
-if ENABLE_ZLIB
-VM_ZIP = $(top_builddir)/src/classes/vm.zip
-endif
-endif
-
-if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
-if ENABLE_ZLIB
-VM_ZIP = $(top_builddir)/src/classes/vm.zip
-endif
-endif
-
-noinst_DATA = $(DO_HEADER_FILES)
-
-$(DO_HEADER_FILES): $(CACAOH) $(VM_ZIP) $(CLASSPATH_CLASSES)
-       @class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
-       echo "$(JAVAHCMD) -d . $$class"; \
-       $(JAVAHCMD) -d . $$class
-
-
-## Local variables:
-## mode: Makefile
-## indent-tabs-mode: t
-## c-basic-offset: 4
-## tab-width: 8
-## compile-command: "automake --add-missing"
-## End:

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 42368fedd1df433c47b4c0c81c4be1f87d35202e..4570ed8d221e4969bb4856369bf760e7c9f06859 100644 (file)
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -210,7 +210,8 @@ libjit_la_LIBADD = \
 
 if ENABLE_PYTHON
 libjit_la_SOURCES += \
-       python.c
+       python.c \
+       python.h
 AM_CPPFLAGS += \
        @PYTHON_CSPEC@
 LIBS += \

diff --git a/src/vm/jit/m68k/Makefile.am b/src/vm/jit/m68k/Makefile.am
index 85da92d0836156c14b7e58d42d36fdf182d8f04a..5ef248664b038acec92d579eb3fcf1b413ac3cd6 100644 (file)
--- a/src/vm/jit/m68k/Makefile.am
+++ b/src/vm/jit/m68k/Makefile.am
@@ -49,6 +49,7 @@ libarch_la_SOURCES = \
        codegen.h \
        $(DISASS_SOURCES) \
        emit.c \
+       emit.h \
        patcher.c \
        \
        md-stubs.hpp \