* m4/classpath.m4: Renamed --with-classpath* options to

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

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 5c2d2f9a7dc6c6a38cc77fa20eb0f36118c27990..2a5247afd4a716069e0ad0873e79e608858173be 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -1,9 +1,7 @@
 ## src/cacao/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.
 ##
@@ -21,20 +19,10 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## $Id: Makefile.am 7356 2007-02-14 11:00:28Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
 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 ENABLE_THREADS
-THREAD_LIB = \
-       $(top_builddir)/src/threads/libthreads.la
-endif
-
 if ENABLE_STATICVM
 cacao_LDFLAGS = \
        -all-static
@@ -47,7 +35,12 @@ lib_LTLIBRARIES = \
        libjvm.la
 
 libjvm_la_LDFLAGS = \
-       -release $(PACKAGE_VERSION)
+       -version-info 1:0:0
+
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+libjvm_la_LDFLAGS += \
+       -Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
+endif
 
 cacao_LDFLAGS += \
        -export-dynamic
@@ -64,50 +57,26 @@ CACAO_LIBS = \
        libjvm.la
 endif
 
-if WITH_STATIC_CLASSPATH
-cacao_LDFLAGS += \
-       $(LTLIBICONV)
-
-CLASSPATH_LIBS = \
-       $(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 = \
-#      $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS) \
-#      $(XML_CFLAGS) $(XSLT_CFLAGS)
-#
-#cacao_LDFLAGS += \
-#      $(GTK_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) $(X_LIBS) -lXtst \
-#      $(XML_LIBS) $(XSLT_LIBS)
-#
-#CLASSPATH_LIBS += \
-#      $(CLASSPATH_LIBDIR)/classpath/libgtkpeer.a
-#endif
-endif
-
 if ENABLE_RT_TIMING
 cacao_LDFLAGS += -lrt
 endif
 
+if ENABLE_PYTHON
+cacao_LDFLAGS += \
+    @PYTHON_LSPEC@
+endif
+
 libjvm_la_SOURCES =
 
 libjvm_la_LIBADD = \
        $(top_builddir)/src/fdlibm/libfdlibm.la \
        $(top_builddir)/src/mm/libmm.la \
        $(top_builddir)/src/native/libnative.la \
+       $(top_builddir)/src/threads/libthreads.la \
        $(top_builddir)/src/toolbox/libtoolbox.la \
        $(top_builddir)/src/vm/libvm.la \
        $(top_builddir)/src/vmcore/libvmcore.la \
-       $(GC_LIB) \
-       $(THREAD_LIB)
+       $(GC_LIB)
 
 bin_PROGRAMS = \
        cacao