Use libtool to compile cacao libraries. We need to combine some libraries to better...

[cacao.git] / src / cacaoh / Makefile.am

diff --git a/src/cacaoh/Makefile.am b/src/cacaoh/Makefile.am
index 588b6c92e56aa37feb8740749ae8e0443563257a..6eb23e069267395b0b604cad15a8ac2ceb696e64 100644 (file)
--- a/src/cacaoh/Makefile.am
+++ b/src/cacaoh/Makefile.am
@@ -1,3 +1,5 @@
+## src/cacaoh/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,
@@ -26,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $
+## $Id: Makefile.am 1699 2004-12-06 12:44:24Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -34,9 +36,9 @@ 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
+THREAD_LIB = $(top_srcdir)/src/threads/native/libthreads.la
 else
-THREAD_LIB = $(top_srcdir)/src/threads/green/libthreads.a
+THREAD_LIB = $(top_srcdir)/src/threads/green/libthreads.la
 endif
 else
 THREAD_LIB =
@@ -50,21 +52,16 @@ cacaoh_SOURCES = \
        headers.c \
        headers.h
 
+# This order is crucial. Don't change it!
 cacaoh_LDADD = \
-       $(top_srcdir)/src/mm/libmm.a \
+       $(top_srcdir)/src/mm/libmm.la \
        $(THREAD_LIB) \
-       $(top_srcdir)/src/vm/libvm.a \
-       $(top_srcdir)/src/toolbox/libtoolbox.a \
-       $(top_srcdir)/src/boehm-gc/.libs/libgc.a \
+       $(top_srcdir)/src/vm/libvmcore.la \
+       $(top_srcdir)/src/toolbox/libtoolbox.la \
+       $(top_srcdir)/src/boehm-gc/libgc.la \
        $(top_srcdir)/src/classpath/native/jni/java-lang/.libs/libjavalang.a
 
-cacaoh_DEPENDENCIES = \
-       $(top_srcdir)/src/mm/libmm.a \
-       $(THREAD_LIB) \
-       $(top_srcdir)/src/vm/libvm.a \
-       $(top_srcdir)/src/toolbox/libtoolbox.a \
-       $(top_srcdir)/src/boehm-gc/.libs/libgc.a \
-       $(top_srcdir)/src/classpath/native/jni/java-lang/.libs/libjavalang.a
+cacaoh_DEPENDENCIES = $(cacaoh_LDADD)
 
 
 ## Local variables: