Build a libcacaoh.a to overcome linker resolving issue.

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

diff --git a/src/cacaoh/Makefile.am b/src/cacaoh/Makefile.am
index 261e45fe7e6a3bae73c7a2aca4aeb13e7f37c665..b7891161051d425e04df272724cfd4dcdf0baa9b 100644 (file)
--- a/src/cacaoh/Makefile.am
+++ b/src/cacaoh/Makefile.am
@@ -3,7 +3,7 @@
 ## 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
+## Institut f. Computersprachen - TU Wien
 ##
 ## This file is part of CACAO.
 ##
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 1705 2004-12-06 15:26:02Z twisti $
+## $Id: Makefile.am 1909 2005-02-10 09:55:14Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -36,15 +36,26 @@ 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.la
+THREAD_LIB = $(top_builddir)/src/threads/native/libthreads.la
 else
-THREAD_LIB = $(top_srcdir)/src/threads/green/libthreads.la
+THREAD_LIB = $(top_builddir)/src/threads/green/libthreads.la
 endif
 else
 THREAD_LIB =
 endif
 
-bindir = $(prefix)/jre/bin
+noinst_LTLIBRARIES = libcacaoh.la
+
+libcacaoh_la_SOURCES =
+
+libcacaoh_la_LIBADD = \
+       $(top_builddir)/src/mm/libmm.la \
+       $(THREAD_LIB) \
+       $(top_builddir)/src/toolbox/libtoolbox.la \
+       $(top_builddir)/src/vm/libvmcore.la
+
+bindir = $(prefix)/bin
+
 bin_PROGRAMS = cacaoh
 
 cacaoh_SOURCES = \
@@ -52,20 +63,13 @@ cacaoh_SOURCES = \
        headers.c \
        headers.h
 
-# This order is crucial. Don't change it!
 cacaoh_LDADD = \
-       $(top_srcdir)/src/mm/libmm.la \
-       $(THREAD_LIB) \
-       $(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
+       libcacaoh.la \
+       $(top_builddir)/src/boehm-gc/libgc.la \
+       $(top_builddir)/src/classpath/native/jni/java-lang/.libs/libjavalang.a
 
 cacaoh_DEPENDENCIES = $(cacaoh_LDADD)
 
-install-exec-hook:
-       $(mkinstalldirs) $(DESTDIR)$(prefix)/bin
-       $(LN_S) $(DESTDIR)$(bindir)/cacaoh $(DESTDIR)$(prefix)/bin
 
 ## Local variables:
 ## mode: Makefile