* m4/cacaoh.m4 (AC_CHECK_WITH_CACAOH): Don't set ENABLE_CACAOH.

[cacao.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b1c82505acbbe59212e51ea6cb518c6afcf7b754..b2cb8bf2aec61d7f8be3544a1bc6438da5a63e88 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,7 @@
 ## src/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006, 2007 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, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -26,8 +24,8 @@
 DIST_SUBDIRS = \
        cacao \
        cacaoh \
+       classes \
        fdlibm \
-       lib \
        mm \
        native \
        scripts \
@@ -36,27 +34,17 @@ DIST_SUBDIRS = \
        vm \
        vmcore
 
-if ENABLE_THREADS
-THREADS_DIR = \
-       threads
-endif
-
-if ENABLE_CACAOH
-CACAOH_DIR = \
-       cacaoh 
-endif
-
 # DON'T CHANGE THIS ORDER!!!
 
 SUBDIRS = \
        toolbox \
        vmcore \
-       $(CACAOH_DIR) \
-       lib \
+       cacaoh \
+       classes \
        native \
        fdlibm \
        mm \
-       $(THREADS_DIR) \
+       threads \
        vm \
        cacao \
        scripts