* configure.ac (--with-classpath-glibj-zip): Renamed to

[cacao.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e7ee3b0348d1e8522e7cdb3ad5bf01d56d5547b..d64def12fc745168d8fa3bf9336afad7b4a76e6c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,9 @@
 ## src/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,
-## Institut f. Computersprachen - TU Wien
+## Copyright (C) 1996-2005, 2006 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, Institut f. Computersprachen - TU Wien
 ##
 ## This file is part of CACAO.
 ##
@@ -19,26 +19,21 @@
 ##
 ## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 ##
-## Contact: cacao@complang.tuwien.ac.at
+## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
 ##
-## Changes:
-##
-## $Id: Makefile.am 3146 2005-09-05 20:00:15Z twisti $
+## $Id: Makefile.am 6243 2006-12-27 13:56:31Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 DIST_SUBDIRS = \
-       boehm-gc \
-       classpath \
-       ffcall \
-       lib \
-       libltdl \
        mm \
+       lib \
+       fdlibm \
        toolbox \
        vm \
        threads \
@@ -47,32 +42,17 @@ DIST_SUBDIRS = \
        cacao \
        scripts
 
-if ENABLE_INTRP
-FFCALL = ffcall
-endif
-
-if DISABLE_GC
-BOEHM =
-else
-BOEHM = boehm-gc
-endif
-
-if WITH_EXTERNAL_CLASSPATH
-CLASSPATH = \
-       lib \
-       classpath/native/fdlibm
-else
-CLASSPATH = classpath
+if WITH_CLASSPATH_GNU
+VM_DIR = \
+       lib
 endif
 
 # Keep this order!!!
 
 SUBDIRS = \
-       $(BOEHM) \
-       $(CLASSPATH) \
-       $(FFCALL) \
-       libltdl \
        mm \
+       $(VM_DIR) \
+       fdlibm \
        toolbox \
        vm \
        threads \