* src/cacao/Makefile.am (ENABLE_STATICVM): Added cacao_LDFLAGS,

otherwise the sumbols are not exported.

* src/native/include/Makefile.am (ENABLE_STATICVM): Renamed to
WITH_STATIC_CLASSPATH.

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 6cf8b9d85e72f677830605846bae2f18726c9360..29c7644dfee80aebfa7934db5ef31f90a10e9588 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4530 2006-02-21 09:11:53Z twisti $
+## $Id: Makefile.am 4594 2006-03-14 16:40:32Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -58,19 +58,21 @@ if ENABLE_STATICVM
 noinst_LTLIBRARIES = \
        libcacaovm.la
 
-else
 cacao_LDFLAGS = \
        $(EXPORT_SYMBOLS_FLAGS)
-
+else
 lib_LTLIBRARIES = \
        libcacaovm.la
 
 libcacaovm_la_LDFLAGS = \
        -release $(PACKAGE_VERSION)
+
+cacao_LDFLAGS = \
+       $(EXPORT_SYMBOLS_FLAGS)
 endif
 
 if WITH_STATIC_CLASSPATH
-cacao_LDFLAGS = \
+cacao_LDFLAGS += \
        $(LTLIBICONV)
 
 CLASSPATH_LIBS = \

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index db8fd4bd177773e565af643cf54412ba69850d2b..41fe92fd59df7d9e0fc8952627c440c3e64bb4a7 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4424 2006-02-04 00:33:39Z twisti $
+## $Id: Makefile.am 4594 2006-03-14 16:40:32Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -122,7 +122,7 @@ DO_HEADER_FILES += \
        $(GEN_JVMTI_HEADER_FILES)
 endif
 
-if ENABLE_STATICVM
+if WITH_STATIC_CLASSPATH
 DO_HEADER_FILES += \
        $(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES)
 endif