From: twisti Date: Fri, 3 Dec 2004 16:52:15 +0000 (+0000) Subject: - build/dist/install changes X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=50d65e6044d0b4ab1139ff7f18d2272d4739c7ed;p=cacao.git - build/dist/install changes - gnu header for cacao makefiles --- diff --git a/Makefile.am b/Makefile.am index 1eda8cac2..fb089f30a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,38 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $ +## Process this file with automake to produce Makefile.in MAINTAINERCLEANFILES = Makefile.in configure -SUBDIRS = doc src tests +SUBDIRS = doc man src tests EXTRA_DIST = \ html/cacaoinstall.html \ diff --git a/configure.in b/configure.in index b52143469..d36890279 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,6 @@ -dnl autoconf; autoheader; automake - dnl Process this file with autoconf to produce a configure script. -AC_INIT(cacao, 0.40, cacao@complang.tuwien.ac.at) + +AC_INIT(cacao, 0.90, cacao@complang.tuwien.ac.at) AC_CONFIG_SRCDIR(src/cacao/cacao.c) AC_CANONICAL_HOST AC_PREREQ(2.59) @@ -11,6 +10,9 @@ AM_CONFIG_HEADER([config.h]) AC_PREFIX_DEFAULT(/usr/local/cacao) +dnl define install prefix +CFLAGS="-DINSTALL_PREFIX=\"\\\"$prefix\\\"\"" + dnl system type case "$host_cpu" in @@ -18,8 +20,6 @@ alpha* ) ARCH_DIR="alpha" STATIC_CLASSPATH="1" CFLAGS="-mieee -D__ALPHA__" - AC_DEFINE([TRACE_ARGS_NUM], 6, [Defines integer argument register count]) - AC_DEFINE([USE_CODEMMAP], 1, [use code mmap]) ;; i386* | i486* | i586* | i686* ) @@ -33,20 +33,18 @@ mips* ) STATIC_CLASSPATH="1" CFLAGS="-64 -O2 -OPT:Olimit=0 -g -woff 1110,1164,1515 -D__MIPS__" LIBS="-lelfutil" - AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count]) ;; powerpc* | ppc* ) ARCH_DIR="powerpc" STATIC_CLASSPATH="1" CFLAGS="-D__POWERPC__" - AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count]) ;; x86_64* ) ARCH_DIR="x86_64" STATIC_CLASSPATH="1" - CFLAGS="-D__X86_64__" + CFLAGS="$CFLAGS -D__X86_64__" ;; sparc* | * ) @@ -252,11 +250,6 @@ else fi -dnl set some essential classpath options, even if their classpath default is -dnl suitable for us -ac_configure_args="$ac_configure_args --enable-jni --disable-cni --disable-regen-headers --enable-static --enable-shared --enable-load-library" - - dnl check arguments AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [[default=no]])]) @@ -284,6 +277,11 @@ else fi +dnl set some essential classpath options, even if their classpath default is +dnl suitable for us +ac_configure_args="$ac_configure_args --enable-jni --disable-cni --disable-regen-headers --enable-static --enable-shared --enable-load-library" + + dnl now configure boehm gc and gnu classpath dnl the export is not my favorite (is there another way?) export CFLAGS @@ -292,6 +290,8 @@ AC_CONFIG_SUBDIRS(src/boehm-gc src/classpath) AC_OUTPUT(Makefile \ doc/Makefile \ + doc/handbook/Makefile \ + man/Makefile \ src/Makefile \ src/cacao/Makefile \ src/cacaoh/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index f8255caf4..3e703f2a4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1 +1,44 @@ -EXTRA_DIST=collect.doc threads.tex cacao.1 gen.doc +## doc/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ + +## Process this file with automake to produce Makefile.in + +SUBDIRS = handbook + + +## Local variables: +## mode: Makefile +## indent-tabs-mode: t +## c-basic-offset: 4 +## tab-width: 8 +## compile-command: "automake --add-missing" +## End: diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am new file mode 100644 index 000000000..59d81f120 --- /dev/null +++ b/doc/handbook/Makefile.am @@ -0,0 +1,72 @@ +## doc/handbook/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ + +## Process this file with automake to produce Makefile.in + +dist_noinst_DATA = \ + alpha.tex \ + cacao.tex \ + inlining.tex \ + intro.tex \ + java.bib \ + jit.tex \ + library.tex \ + loader.tex \ + loopopt.tex \ + mips.tex \ + native.tex \ + overview.tex \ + powerpc.tex \ + reflection.tex \ + runtime.tex \ + threads.tex \ + verification.tex \ + x86.tex \ + x86_64.tex + +handbook: + latex cacao + bibtex cacao + latex cacao + latex cacao + +clean: + rm -f *.aux *.bbl *.blg *.dvi *.lof *.log *.lot *.toc + + +## 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/Makefile.am b/src/Makefile.am index 5101ed010..50e3044c4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,34 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in SUBDIRS = boehm-gc classpath mm toolbox vm threads cacaoh native cacao diff --git a/src/boehm-gc/Makefile.am b/src/boehm-gc/Makefile.am index 2aba24323..fe2e668bf 100644 --- a/src/boehm-gc/Makefile.am +++ b/src/boehm-gc/Makefile.am @@ -30,11 +30,11 @@ extra = libgccpp.la else extra = endif -lib_LTLIBRARIES = libgc.la $(extra) +noinst_LTLIBRARIES = libgc.la $(extra) -include_HEADERS = include/gc.h include/gc_local_alloc.h \ -include/gc_pthread_redirects.h include/gc_config_macros.h \ -include/leak_detector.h include/gc_typed.h @addincludes@ +#include_HEADERS = include/gc.h include/gc_local_alloc.h \ +#include/gc_pthread_redirects.h include/gc_config_macros.h \ +#include/leak_detector.h include/gc_typed.h @addincludes@ EXTRA_HEADERS = include/gc_cpp.h include/gc_allocator.h diff --git a/src/boehm-gc/doc/Makefile.am b/src/boehm-gc/doc/Makefile.am index 9446bcb1a..a849aadad 100644 --- a/src/boehm-gc/doc/Makefile.am +++ b/src/boehm-gc/doc/Makefile.am @@ -15,7 +15,7 @@ # installed documentation # -dist_pkgdata_DATA = barrett_diagram debugging.html gc.man \ +dist_noinst_DATA = barrett_diagram debugging.html gc.man \ gcdescr.html README README.amiga README.arm.cross \ README.autoconf README.changes README.contributors \ README.cords README.DGUX386 README.dj README.environment \ diff --git a/src/boehm-gc/include/Makefile.am b/src/boehm-gc/include/Makefile.am index 306026b0a..4224ba496 100644 --- a/src/boehm-gc/include/Makefile.am +++ b/src/boehm-gc/include/Makefile.am @@ -15,7 +15,7 @@ # installed headers # -pkginclude_HEADERS = gc.h gc_typed.h gc_inl.h \ +dist_noinst_HEADERS = gc.h gc_typed.h gc_inl.h \ gc_inline.h gc_mark.h gc_cpp.h \ weakpointer.h gc_alloc.h new_gc_alloc.h \ gc_allocator.h gc_backptr.h \ @@ -25,7 +25,7 @@ pkginclude_HEADERS = gc.h gc_typed.h gc_inl.h \ # headers which are not installed # -dist_noinst_HEADERS = private/gc_hdrs.h \ +dist_noinst_HEADERS += private/gc_hdrs.h \ private/gc_priv.h private/gcconfig.h \ private/gc_pmark.h private/gc_locks.h \ private/solaris_threads.h private/dbg_mlc.h \ diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am index 6d0c0fcd3..0ab02d3f0 100644 --- a/src/cacao/Makefile.am +++ b/src/cacao/Makefile.am @@ -1,10 +1,39 @@ -## Process this file with automake to produce Makefile.in +## cacao/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1646 2004-12-01 16:02:23Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ - if USE_THREADS if NATIVE_THREADS THREAD_LIB = $(top_srcdir)/src/threads/native/libthreads.a @@ -15,7 +44,6 @@ else THREAD_LIB = endif - if STATIC_CLASSPATH cacao_LDFLAGS = CLASSPATH_LIBS = \ @@ -36,7 +64,6 @@ cacao_LDFLAGS = -ldl -Wl,--export-dynamic CLASSPATH_LIBS = endif - if USE_GTK_PEER cacao_LDFLAGS += \ -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0 \ @@ -44,10 +71,13 @@ cacao_LDFLAGS += \ -lgthread-2.0 -lart_lgpl_2 endif +bindir = $(prefix)/jre/bin bin_PROGRAMS = cacao -cacao_SOURCES = cacao.c +cacao_SOURCES = \ + cacao.c \ + cacao.h cacao_LDADD = \ $(top_srcdir)/src/mm/libmm.a \ diff --git a/src/cacaoh/Makefile.am b/src/cacaoh/Makefile.am index 80f9c399f..588b6c92e 100644 --- a/src/cacaoh/Makefile.am +++ b/src/cacaoh/Makefile.am @@ -1,6 +1,34 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -14,11 +42,13 @@ else THREAD_LIB = endif +bindir = $(prefix)/jre/bin bin_PROGRAMS = cacaoh cacaoh_SOURCES = \ cacaoh.c \ - headers.c + headers.c \ + headers.h cacaoh_LDADD = \ $(top_srcdir)/src/mm/libmm.a \ diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am index 74eb15049..d5eb73c71 100644 --- a/src/mm/Makefile.am +++ b/src/mm/Makefile.am @@ -1,14 +1,44 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ noinst_LIBRARIES = libmm.a -noinst_HEADERS = boehm.h memory.h - -libmm_a_SOURCES = boehm.c memory.c +libmm_a_SOURCES = \ + boehm.c \ + boehm.h \ + memory.c \ + memory.h ## Local variables: diff --git a/src/native/Makefile.am b/src/native/Makefile.am index 37705cfea..8da106a46 100644 --- a/src/native/Makefile.am +++ b/src/native/Makefile.am @@ -1,6 +1,36 @@ -## Process this file with automake to produce Makefile.in +## native/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1655 2004-12-02 16:51:20Z carolyn $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -13,7 +43,10 @@ noinst_LIBRARIES = libnative.a libnative_a_SOURCES = \ jni.c \ - native.c + jni.h \ + native.c \ + native.h \ + nativecalls.inc native.c: nativetable.inc nativecalls.inc @@ -21,7 +54,7 @@ if USE_GTK_PEER AWT_HEADERS_TOUCH_FILE = $(srcdir)/include/awtheaders-generated endif -nativetable.inc: $(top_srcdir)/src/classpath/lib/bootstrap.zip $(top_srcdir)/config.h $(srcdir)/include/headers-generated $(AWT_HEADERS_TOUCH_FILE) +nativetable.inc: $(top_srcdir)/src/classpath/lib/bootstrap.zip $(srcdir)/tools/gennativetable $(top_srcdir)/config.h $(srcdir)/include/headers-generated $(AWT_HEADERS_TOUCH_FILE) CLASSPATH=$(top_srcdir)/src/classpath/lib/bootstrap.zip \ $(top_srcdir)/src/native/tools/gennativetable \ $(NO_REGEN_CLASSES) \ diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am index 558f74276..7b2593371 100644 --- a/src/native/include/Makefile.am +++ b/src/native/include/Makefile.am @@ -1,6 +1,34 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1645 2004-12-01 14:06:44Z twisti $ +## Process this file with automake to produce Makefile.in CLEANFILES = \ headers-generated \ @@ -142,6 +170,17 @@ CLEANFILES = \ # include NO_REGEN_CLASSES, CLASSES and AWT_CLASSES include $(srcdir)/../classes.am +noinst_HEADERS = \ + java_lang_ClassLoader.h \ + java_lang_Cloneable.h \ + java_lang_Object.h \ + java_lang_String.h \ + java_lang_Thread.h \ + java_lang_ThreadGroup.h \ + java_lang_Throwable.h \ + java_lang_VMObject.h \ + java_lang_VMThread.h + noinst_DATA = headers-generated if USE_GTK_PEER diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am index c2186a438..36af5904e 100644 --- a/src/native/vm/Makefile.am +++ b/src/native/vm/Makefile.am @@ -1,6 +1,34 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1645 2004-12-01 14:06:44Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -35,6 +63,7 @@ implementednatives.data: $(libnativevm_a_SOURCES) fi ; \ done ) + ## Local variables: ## mode: Makefile ## indent-tabs-mode: t diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am index 5cced033b..12c417692 100644 --- a/src/threads/Makefile.am +++ b/src/threads/Makefile.am @@ -1,20 +1,45 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in if USE_THREADS if NATIVE_THREADS -THREADS = native +SUBDIRS = native else -THREADS = green +SUBDIRS = green endif else -THREADS = -LIBRARY = +SUBDIRS = endif -SUBDIRS = $(THREADS) - ## Local variables: ## mode: Makefile diff --git a/src/threads/green/Makefile.am b/src/threads/green/Makefile.am index 6b2be3761..53642b85d 100644 --- a/src/threads/green/Makefile.am +++ b/src/threads/green/Makefile.am @@ -1,13 +1,46 @@ +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ + ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $ +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ noinst_LIBRARIES = libthreads.a libthreads_a_SOURCES = \ locks.c \ + locks.h \ threads.c \ - threadio.c + threads.h \ + threadio.c \ + threadio.h ## Local variables: diff --git a/src/threads/native/Makefile.am b/src/threads/native/Makefile.am index d8aead733..d4c1e7ec3 100644 --- a/src/threads/native/Makefile.am +++ b/src/threads/native/Makefile.am @@ -1,12 +1,42 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ noinst_LIBRARIES = libthreads.a -libthreads_a_SOURCES = threads.c +libthreads_a_SOURCES = \ + threads.c \ + threads.h ## Local variables: diff --git a/src/toolbox/Makefile.am b/src/toolbox/Makefile.am index 7fbe098fa..904143bc6 100644 --- a/src/toolbox/Makefile.am +++ b/src/toolbox/Makefile.am @@ -1,6 +1,34 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -8,10 +36,15 @@ noinst_LIBRARIES = libtoolbox.a libtoolbox_a_SOURCES = \ avl.c \ + avl.h \ logging.c \ + logging.h \ chain.c \ + chain.h \ tree.c \ - list.c + tree.h \ + list.c \ + list.h ## Local variables: diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am index 453f44128..99e8e709f 100644 --- a/src/vm/Makefile.am +++ b/src/vm/Makefile.am @@ -1,24 +1,62 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ SUBDIRS = jit if USE_ZLIB -ZLIB_OBJ = unzip.c +ZLIB_OBJ = \ + unzip.c \ + unzip.h endif +noinst_HEADERS = global.h + noinst_LIBRARIES = libvm.a libvm_a_SOURCES = \ builtin.c \ + builtin.h \ exceptions.c \ + exceptions.h \ loader.c \ + loader.h \ options.c \ + options.h \ statistics.c \ + statistics.h \ tables.c \ + tables.h \ $(ZLIB_OBJ) diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am index 49b00bdd0..5d719c47b 100644 --- a/src/vm/jit/Makefile.am +++ b/src/vm/jit/Makefile.am @@ -1,6 +1,34 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -8,17 +36,24 @@ SUBDIRS = inline loop verify tools @ARCH_DIR@ DIST_SUBDIRS = inline loop verify tools alpha i386 mips powerpc x86_64 +noinst_HEADERS = \ + asmpart.h \ + codegen.inc \ + codegen.inc.h \ + lsra.inc \ + lsra.h \ + reg.inc \ + reg.h + noinst_LIBRARIES = libjit.a libjit_a_SOURCES = \ jit.c \ + jit.h \ parse.c \ - stack.c - -libjit_a_LIBADD = \ - inline/libinline.a \ - loop/libloop.a \ - verify/libverify.a + parse.h \ + stack.c \ + stack.h ## Local variables: diff --git a/src/vm/jit/alpha/Makefile.am b/src/vm/jit/alpha/Makefile.am index d8084946f..300b7975c 100644 --- a/src/vm/jit/alpha/Makefile.am +++ b/src/vm/jit/alpha/Makefile.am @@ -1,17 +1,40 @@ -## Process this file with automake to produce Makefile.in +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1624 2004-11-30 14:49:45Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -EXTRA_DIST = \ - asmpart.S \ - disass.c \ - disass.h \ - native-math.h \ +noinst_HEADERS = \ + arch.h \ machine-instr.h \ - codegen.c \ - codegen.h \ types.h noinst_LIBRARIES = libarch.a @@ -19,7 +42,9 @@ noinst_LIBRARIES = libarch.a libarch_a_SOURCES = \ asmpart.S \ codegen.c \ - disass.c + codegen.h \ + disass.c \ + disass.h asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h $(COMPILE) -c $< diff --git a/src/vm/jit/i386/Makefile.am b/src/vm/jit/i386/Makefile.am index 792b49f53..539a06e0c 100644 --- a/src/vm/jit/i386/Makefile.am +++ b/src/vm/jit/i386/Makefile.am @@ -1,19 +1,42 @@ -## Process this file with automake to produce Makefile.in +## vm/jit/i386/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1623 2004-11-30 14:18:19Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -EXTRA_DIST = \ - asmpart.S \ +noinst_HEADERS = \ + arch.h \ bfd.h \ - codegen.c \ - codegen.h \ - dis-asm.h \ - disass.c \ - disass.h \ - emitfuncs.c \ - emitfuncs.h \ machine-instr.h \ types.h @@ -22,15 +45,19 @@ noinst_LIBRARIES = libarch.a libarch_a_SOURCES = \ asmpart.S \ codegen.c \ + codegen.h \ dis-buf.c \ + dis-asm.h \ disass.c \ + disass.h \ emitfuncs.c \ + emitfuncs.h \ i386-dis.c asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h $(COMPILE) -c $< -offsets.h: $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h +offsets.h: $(top_srcdir)/src/vm/jit/tools/genoffsets $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h diff --git a/src/vm/jit/inline/Makefile.am b/src/vm/jit/inline/Makefile.am index ce904c738..2e7a33277 100644 --- a/src/vm/jit/inline/Makefile.am +++ b/src/vm/jit/inline/Makefile.am @@ -1,6 +1,36 @@ -## Process this file with automake to produce Makefile.in +## vm/jit/inline/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -8,9 +38,15 @@ noinst_LIBRARIES = libinline.a libinline_a_SOURCES = \ inline.c \ + inline.h \ parseRT.c \ + parseRT.h \ + parseRTflags.h \ + parseRTprint.h \ parseRTstats.c \ - sets.c + parseRTstats.h \ + sets.c \ + sets.h ## Local variables: diff --git a/src/vm/jit/loop/Makefile.am b/src/vm/jit/loop/Makefile.am index 29ab8c4b8..32987cb82 100644 --- a/src/vm/jit/loop/Makefile.am +++ b/src/vm/jit/loop/Makefile.am @@ -1,6 +1,36 @@ -## Process this file with automake to produce Makefile.in +## vm/jit/loop/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -8,9 +38,13 @@ noinst_LIBRARIES = libloop.a libloop_a_SOURCES = \ analyze.c \ + analyze.h \ graph.c \ + graph.h \ loop.c \ - tracing.c + loop.h \ + tracing.c \ + tracing.h ## Local variables: diff --git a/src/vm/jit/mips/Makefile.am b/src/vm/jit/mips/Makefile.am index 772d8d3f6..2425e233b 100644 --- a/src/vm/jit/mips/Makefile.am +++ b/src/vm/jit/mips/Makefile.am @@ -1,26 +1,58 @@ -## Process this file with automake to produce Makefile.in +## vm/jit/mips/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1638 2004-12-01 10:42:28Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -EXTRA_DIST = \ - asmpart.S \ - disass.c \ - disass.h \ - codegen.c \ - codegen.h \ +noinst_HEADERS = \ + arch.h \ + machine-instr.h \ types.h noinst_LIBRARIES = libarch.a -libarch_a_SOURCES = asmpart.S codegen.c disass.c +libarch_a_SOURCES = \ + asmpart.S \ + codegen.c \ + codegen.h \ + disass.c \ + disass.h -asmpart.o: asmpart.S offsets.h +asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h $(COMPILE) -E asmpart.S > asmpart.s $(AS) -64 -KPIC -O -o asmpart.o asmpart.s -offsets.h: $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h +offsets.h: $(top_srcdir)/src/vm/jit/tools/genoffsets $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h diff --git a/src/vm/jit/powerpc/Makefile.am b/src/vm/jit/powerpc/Makefile.am index 3e12219ea..a0cbd1f9e 100644 --- a/src/vm/jit/powerpc/Makefile.am +++ b/src/vm/jit/powerpc/Makefile.am @@ -1,20 +1,42 @@ -## Process this file with automake to produce Makefile.in +## vm/jit/powerpc/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1635 2004-12-01 09:57:58Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -EXTRA_DIST = \ - asmpart.S \ - codegen.c \ - codegen.h \ - dis-asm.h \ - disass.c \ - disass.h \ +noinst_HEADERS = \ + arch.h \ machine-instr.h \ - ppc-dis.c \ - ppc-opc.c - ppc.h \ types.h noinst_LIBRARIES = libarch.a @@ -22,9 +44,13 @@ noinst_LIBRARIES = libarch.a libarch_a_SOURCES = \ asmpart.S \ codegen.c \ + codegen.h \ + dis-asm.h \ disass.c \ + disass.h \ ppc-dis.c \ - ppc-opc.c + ppc-opc.c \ + ppc.h asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h $(COMPILE) -c $< diff --git a/src/vm/jit/tools/Makefile.am b/src/vm/jit/tools/Makefile.am index 6782ebe0d..028106fff 100644 --- a/src/vm/jit/tools/Makefile.am +++ b/src/vm/jit/tools/Makefile.am @@ -1,6 +1,36 @@ -## Process this file with automake to produce Makefile.in +## vm/jit/tools/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ diff --git a/src/vm/jit/verify/Makefile.am b/src/vm/jit/verify/Makefile.am index 02bfbdfc0..52c02bf12 100644 --- a/src/vm/jit/verify/Makefile.am +++ b/src/vm/jit/verify/Makefile.am @@ -1,6 +1,36 @@ -## Process this file with automake to produce Makefile.in +## vm/jit/verify/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $ +## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@ @@ -8,7 +38,9 @@ noinst_LIBRARIES = libverify.a libverify_a_SOURCES = \ typecheck.c \ - typeinfo.c + typecheck.h \ + typeinfo.c \ + typeinfo.h ## Local variables: diff --git a/src/vm/jit/x86_64/Makefile.am b/src/vm/jit/x86_64/Makefile.am index e50dbff65..6cd82272a 100644 --- a/src/vm/jit/x86_64/Makefile.am +++ b/src/vm/jit/x86_64/Makefile.am @@ -1,11 +1,48 @@ +## vm/jit/x86_64/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ + ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $ +INCLUDES = -I$(top_srcdir)/src +noinst_HEADERS = \ + arch.h \ + machine-instr.h \ + types.h -INCLUDES = -I$(top_srcdir)/src +noinst_LIBRARIES = libarch.a -EXTRA_DIST = \ +libarch_a_SOURCES = \ + ansidecl.h \ asmpart.S \ bfd.h \ codegen.c \ @@ -17,22 +54,12 @@ EXTRA_DIST = \ emitfuncs.c \ emitfuncs.h \ i386-dis.c \ - types.h - -noinst_LIBRARIES = libarch.a - -libarch_a_SOURCES = \ - asmpart.S \ - codegen.c \ - dis-buf.c \ - disass.c \ - emitfuncs.c \ - i386-dis.c + symcat.h asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h $(COMPILE) -c $< -offsets.h: $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h +offsets.h: $(top_srcdir)/src/vm/jit/tools/genoffsets $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h diff --git a/tests/Makefile.am b/tests/Makefile.am index d72e6c579..135643ad3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,38 @@ -SUBDIRS = kaffe +## tests/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ + +## Process this file with automake to produce Makefile.in + +SUBDIRS = jvm98 kaffe EXTRA_DIST = \ x.java x.output \ @@ -10,16 +44,28 @@ EXTRA_DIST = \ extest.java extest.output \ GCBench.java +JAVA = $(top_srcdir)/src/cacao/cacao +JAVAC = jikes -nowarn + check_DATA = checkall checkall: x.tst jctest.tst TestArrayClasses.tst BasicToStrings.tst fp.tst fptest.tst extest.tst GCBench.tstrun %.tst: - ../cacao -classpath . -log /dev/null sun.tools.javac.Main $*.java - ../cacao -classpath . -log /dev/null $* >$*.thisoutput + $(JAVAC) $*.java + $(JAVA) $* > $*.thisoutput diff --brief $*.output $*.thisoutput rm -f $*.thisoutput %.tstrun: - ../cacao -classpath . -log /dev/null sun.tools.javac.Main $*.java - ../cacao -classpath . -log /dev/null $* + $(JAVAC) $*.java + $(JAVA) $* + + +## Local variables: +## mode: Makefile +## indent-tabs-mode: t +## c-basic-offset: 4 +## tab-width: 8 +## compile-command: "automake --add-missing" +## End: diff --git a/tests/jvm98/Makefile.am b/tests/jvm98/Makefile.am index 49a988298..70df15d41 100644 --- a/tests/jvm98/Makefile.am +++ b/tests/jvm98/Makefile.am @@ -1,7 +1,47 @@ -EXTRA_DIST = check.diff compress.diff compress.output db.diff db.output javac.diff javac.output mpegaudio.diff mpegaudio.output raytrace.diff raytrace.output +## tests/jvm98/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ -JAVA = ../../cacao -JAVAC = $(JAVA) at.dms.kjc.Main +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = \ + check.diff \ + compress.diff compress.output \ + db.diff db.output \ + javac.diff javac.output \ + mpegaudio.diff mpegaudio.output \ + raytrace.diff raytrace.output + +JAVA = $(top_srcdir)/src/cacao/cacao +JAVAC = jikes checkjvm: compress db javac mpegaudio raytrace @@ -21,3 +61,12 @@ check compress db javac mpegaudio raytrace: force rm -rf $@ force: + + +## Local variables: +## mode: Makefile +## indent-tabs-mode: t +## c-basic-offset: 4 +## tab-width: 8 +## compile-command: "automake --add-missing" +## End: diff --git a/tests/kaffe/Makefile.am b/tests/kaffe/Makefile.am index 82c376247..96cc4af5a 100644 --- a/tests/kaffe/Makefile.am +++ b/tests/kaffe/Makefile.am @@ -1,3 +1,37 @@ +## tests/kaffe/Makefile.am +## +## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, +## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, +## C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, +## TU Wien +## +## 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., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. +## +## Contact: cacao@complang.tuwien.ac.at +## +## Authors: Christian Thalinger +## +## Changes: +## +## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $ + +## Process this file with automake to produce Makefile.in + TESTS_ENVIRONMENT = $(SHELL) TestScript ALWAYS_TESTS = HelloWorldApp.class.save \ @@ -126,3 +160,12 @@ EXTRA_DIST = TestScript $(ALWAYS_TESTS) \ CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \ ziptest2.zip frozen_serial *.tmp + + +## Local variables: +## mode: Makefile +## indent-tabs-mode: t +## c-basic-offset: 4 +## tab-width: 8 +## compile-command: "automake --add-missing" +## End: