X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fcacao%2FMakefile.am;h=34a81cbfbcc2891e912498f4209fa10e1de253d4;hb=731d9b581f78213eeacc14a54fb4c2ef3ccf0d0f;hp=c823692e9e9f4242ab4b4055f5d65c79242005cd;hpb=b76e356b0af200d2568e6fc55e82e233f1808eb9;p=cacao.git

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index c823692e9..34a81cbfb 100644
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -35,11 +35,21 @@ lib_LTLIBRARIES = \
 	libjvm.la
 
 libjvm_la_LDFLAGS = \
-	-version-info 1:0:0
+	-avoid-version
 
-if WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+if WITH_GNU_LD
 libjvm_la_LDFLAGS += \
 	-Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
+else
+# This is for the Solaris LD.
+libjvm_la_LDFLAGS += \
+	-Xlinker -M$(top_srcdir)/contrib/mapfile-vers-product
+endif
+endif
+
+if GCC_PR40134
+libjvm_la_LDFLAGS += -lgcc
 endif
 
 cacao_LDFLAGS += \
@@ -68,6 +78,11 @@ endif
 
 libjvm_la_SOURCES =
 
+# Dummy C++ source to cause C++ linking.
+# http://www.gnu.org/software/automake/manual/automake.html#Libtool-Convenience-Libraries
+nodist_EXTRA_libjvm_la_SOURCES = \
+	dummy.cxx
+
 libjvm_la_LIBADD = \
 	$(top_builddir)/src/fdlibm/libfdlibm.la \
 	$(top_builddir)/src/mm/libmm.la \
@@ -75,14 +90,13 @@ libjvm_la_LIBADD = \
 	$(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)
 
 bin_PROGRAMS = \
 	cacao
 
 cacao_SOURCES = \
-	cacao.c
+	cacao.cpp
 
 cacao_LDADD = \
 	$(CACAO_LIBS)
@@ -91,6 +105,20 @@ cacao_DEPENDENCIES = \
 	$(cacao_LDADD)
 
 
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+install-data-local:
+	$(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
+	$(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
+	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
+
+uninstall-local:
+	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
+	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
+endif
+
+
 ## Local variables:
 ## mode: Makefile
 ## indent-tabs-mode: t