X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fcacao%2FMakefile.am;h=a35d863b3367cc220165025b827c70a13457fffa;hb=eacf034d7de3bfc758026226d2f1c656e7addf11;hp=6b72b56c03b5a6e3c5a2cb6c5ece7e8ec28e192e;hpb=13975dbabda81037626a1e7a5e0e6a0a7c5bb2e7;p=cacao.git

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 6b72b56c0..a35d863b3 100644
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -1,9 +1,9 @@
 ## src/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,
-## 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,52 +19,74 @@
 ##
 ## 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 4218 2006-01-17 16:55:21Z twisti $
+## $Id: Makefile.am 5579 2006-09-29 11:37:12Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
 
 if DISABLE_GC
-if NATIVE_THREADS
-GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
-else
 GC_LIB =
-endif
 else
 GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
 endif
 
-if USE_THREADS
-if NATIVE_THREADS
+if ENABLE_THREADS
 THREAD_LIB = $(top_builddir)/src/threads/native/libthreads.la
+endif
+
+if ENABLE_STATICVM
+cacao_LDFLAGS = \
+	-all-static
 else
-THREAD_LIB = $(top_builddir)/src/threads/green/libthreads.la
+cacao_LDFLAGS =
 endif
+
+if ENABLE_LIBJVM
+lib_LTLIBRARIES = \
+	libjvm.la
+
+libjvm_la_LDFLAGS = \
+	-release $(PACKAGE_VERSION)
+
+cacao_LDFLAGS += \
+	-export-dynamic
+
+CACAO_LIBS =
 else
-THREAD_LIB =
+noinst_LTLIBRARIES = \
+	libjvm.la
+
+cacao_LDFLAGS += \
+	-export-dynamic
+
+CACAO_LIBS = \
+	libjvm.la
 endif
 
-if ENABLE_STATICVM
-cacao_LDFLAGS = \
+if WITH_STATIC_CLASSPATH
+cacao_LDFLAGS += \
 	$(LTLIBICONV)
 
 CLASSPATH_LIBS = \
-	$(CLASSPATH_PREFIX)/classpath/libjavaio.a \
-	$(CLASSPATH_PREFIX)/classpath/libjavanio.a \
-	$(CLASSPATH_PREFIX)/classpath/libjavanet.a \
-	$(CLASSPATH_PREFIX)/classpath/libjavautil.a \
-	$(CLASSPATH_PREFIX)/classpath/libjavalang.a \
-	$(CLASSPATH_PREFIX)/classpath/libjavalangreflect.a
+	$(CLASSPATH_LIBDIR)/classpath/libjavaio.a \
+	$(CLASSPATH_LIBDIR)/classpath/libjavanio.a \
+	$(CLASSPATH_LIBDIR)/classpath/libjavanet.a \
+	$(CLASSPATH_LIBDIR)/classpath/libjavautil.a \
+	$(CLASSPATH_LIBDIR)/classpath/libjavalang.a \
+	$(CLASSPATH_LIBDIR)/classpath/libjavalangreflect.a
+
+CACAO_LIBS += \
+	$(CLASSPATH_LIBS)
 
 #if USE_GTK_PEER
 #cacao_CFLAGS = \
@@ -76,38 +98,36 @@ CLASSPATH_LIBS = \
 #	$(XML_LIBS) $(XSLT_LIBS)
 #
 #CLASSPATH_LIBS += \
-#	$(CLASSPATH_PREFIX)/classpath/libgtkpeer.a
+#	$(CLASSPATH_LIBDIR)/classpath/libgtkpeer.a
 #endif
-
-else
-cacao_LDFLAGS = $(EXPORT_SYMBOLS_FLAGS)
-CLASSPATH_LIBS =
 endif
 
-noinst_LTLIBRARIES = libcacao.la
+if ENABLE_RT_TIMING
+cacao_LDFLAGS += -lrt
+endif
 
-libcacao_la_SOURCES =
+libjvm_la_SOURCES =
 
-libcacao_la_LIBADD = \
+libjvm_la_LIBADD = \
+	$(top_builddir)/src/fdlibm/libfdlibm.la \
 	$(top_builddir)/src/mm/libmm.la \
 	$(top_builddir)/src/native/libnative.la \
-	$(THREAD_LIB) \
 	$(top_builddir)/src/toolbox/libtoolbox.la \
-	$(top_builddir)/src/vm/libvm.la
+	$(top_builddir)/src/vm/libvm.la \
+	$(GC_LIB) \
+	$(THREAD_LIB)
 
-bin_PROGRAMS = cacao
+bin_PROGRAMS = \
+	cacao
 
 cacao_SOURCES = \
-	cacao.c \
-	cacao.h
+	cacao.c
 
 cacao_LDADD = \
-	libcacao.la \
-	$(top_builddir)/src/fdlibm/libfdlibm.la \
-	$(GC_LIB) \
-	$(CLASSPATH_LIBS)
+	$(CACAO_LIBS)
 
-cacao_DEPENDENCIES = $(cacao_LDADD)
+cacao_DEPENDENCIES = \
+	$(cacao_LDADD)
 
 
 ## Local variables: