* src/vm/jit/optimizing/profile.c: Added.

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

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 7ee5b14669bbcedc2294076021208b36e5f301ed..51c3f728ae7c648a6960a8b98bebe9576fa2b945 100644 (file)
--- 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,98 +19,110 @@
 ##
 ## 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 2857 2005-06-28 18:35:37Z twisti $
+## $Id: Makefile.am 5884 2006-10-31 20:11:28Z 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
+if ENABLE_THREADS
+THREAD_LIB = \
+       $(top_builddir)/src/threads/native/libthreads.la
 endif
 
-if USE_THREADS
-if NATIVE_THREADS
-THREAD_LIB = $(top_builddir)/src/threads/native/libthreads.la
-else
-THREAD_LIB = $(top_builddir)/src/threads/green/libthreads.la
-endif
+if ENABLE_STATICVM
+cacao_LDFLAGS = \
+       -all-static
 else
-THREAD_LIB =
+cacao_LDFLAGS =
 endif
 
-if ENABLE_STATICVM
-cacao_LDFLAGS = \
-       $(LTLIBICONV)
+if ENABLE_LIBJVM
+lib_LTLIBRARIES = \
+       libjvm.la
 
-CLASSPATH_LIBS = \
-       $(top_builddir)/src/classpath/native/jni/java-io/.libs/libjavaio.a \
-       $(top_builddir)/src/classpath/native/jni/java-nio/.libs/libjavanio.a \
-       $(top_builddir)/src/classpath/native/jni/java-net/.libs/libjavanet.a \
-       $(top_builddir)/src/classpath/native/jni/java-util/.libs/libjavautil.a \
-       $(top_builddir)/src/classpath/native/jni/java-lang/.libs/libjavalang.a \
-       $(top_builddir)/src/classpath/native/jni/java-lang/.libs/libjavalangreflect.a
-
-if USE_GTK_PEER
-cacao_CFLAGS = \
-       $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS) \
-       $(XML_CFLAGS) $(XSLT_CFLAGS)
+libjvm_la_LDFLAGS = \
+       -release $(PACKAGE_VERSION)
+
+cacao_LDFLAGS += \
+       -export-dynamic
+
+CACAO_LIBS =
+else
+noinst_LTLIBRARIES = \
+       libjvm.la
 
 cacao_LDFLAGS += \
-       $(GTK_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) $(X_LIBS) -lXtst \
-       $(XML_LIBS) $(XSLT_LIBS)
+       -export-dynamic
 
-CLASSPATH_LIBS += \
-       $(top_builddir)/src/classpath/native/jni/gtk-peer/.libs/libgtkpeer.a
+CACAO_LIBS = \
+       libjvm.la
 endif
 
-else
-cacao_LDFLAGS = $(EXPORT_SYMBOLS_FLAGS)
+if WITH_STATIC_CLASSPATH
+cacao_LDFLAGS += \
+       $(LTLIBICONV)
+
 CLASSPATH_LIBS = \
-       $(top_builddir)/src/libltdl/libltdlc.la
+       $(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
 
-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
-
-bindir = $(prefix)/jre/bin
+       $(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/classpath/native/fdlibm/libfdlibm.la \
-       $(GC_LIB) \
-       $(CLASSPATH_LIBS)
+       $(CACAO_LIBS)
 
-cacao_DEPENDENCIES = $(cacao_LDADD)
+cacao_DEPENDENCIES = \
+       $(cacao_LDADD)
 
 
 ## Local variables: