diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | native/Makefile.am | 13 | ||||
| -rw-r--r-- | native/jni/classpath/Makefile.am | 20 | ||||
| -rw-r--r-- | native/jni/gtk-peer/Makefile.am | 89 | ||||
| -rw-r--r-- | native/jni/java-io/Makefile.am | 13 | ||||
| -rw-r--r-- | native/jni/java-lang/Makefile.am | 23 | ||||
| -rw-r--r-- | native/jni/java-net/Makefile.am | 19 | ||||
| -rw-r--r-- | native/jni/java-nio/Makefile.am | 23 | ||||
| -rw-r--r-- | native/jni/midi-dssi/Makefile.am | 14 | ||||
| -rw-r--r-- | native/jni/xmlj/Makefile.am | 34 | ||||
| -rw-r--r-- | native/target/Linux/Makefile.am | 18 | ||||
| -rw-r--r-- | native/target/Makefile.am | 37 | ||||
| -rw-r--r-- | native/target/generic/Makefile.am | 24 | ||||
| -rw-r--r-- | native/target/posix/Makefile.am | 34 |
15 files changed, 234 insertions, 153 deletions
@@ -1,3 +1,16 @@ +2006-01-17 Christian Thalinger <twisti@complang.tuwien.ac.at> + + * configure.ac: Set TARGET. + * native/Makefile.am, native/jni/classpath/Makefile.am, + native/jni/gtk-peer/Makefile.am, native/jni/java-io/Makefile.am, + native/jni/java-lang/Makefile.am, native/jni/java-net/Makefile.am, + native/jni/java-nio/Makefile.am, native/jni/midi-dssi/Makefile.am, + native/jni/xmlj/Makefile.am, native/target/Makefile.am, + native/target/Linux/Makefile.am, + native/target/generic/Makefile.am, + native/target/posix/Makefile.am: Build libclasspath.so with jcl + and target stuff linked in and link it against lib*.so libraries. + 2006-01-17 Roman Kennke <kennke@aicas.com> * native/jni/java-net/javanet.c: diff --git a/configure.ac b/configure.ac index cb4c91ec3..9d4cee4ea 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,17 @@ case "$host_os" in ;; esac +dnl get the target for the native layer +case "$target_os" in + linux* ) + TARGET=Linux + ;; + * ) + TARGET=generic + ;; +esac +AC_SUBST(TARGET) + CLASSPATH_MODULE="${cp_module} -version-info ${LIBVERSION} -no-undefined" AC_SUBST(CLASSPATH_MODULE) @@ -277,6 +288,8 @@ if test "x${COMPILE_JNI}" = xyes; then AC_STRUCT_TM AC_STRUCT_TIMEZONE + TYPE_SOCKLEN_T + AC_MSG_CHECKING([for tm_gmtoff in struct tm]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],[[struct tm tim; tim.tm_gmtoff = 0;]])], [AC_DEFINE(STRUCT_TM_HAS_GMTOFF, 1, [Define if struct tm has tm_gmtoff field.]) diff --git a/native/Makefile.am b/native/Makefile.am index 4fa593e03..365749a2a 100644 --- a/native/Makefile.am +++ b/native/Makefile.am @@ -8,6 +8,15 @@ if CREATE_GTK_PEER_LIBRARIES JAWTDIR = jawt endif -SUBDIRS = fdlibm $(JNIDIR) $(JAWTDIR) target -DIST_SUBDIRS = fdlibm jni jawt target +DIST_SUBDIRS = \ + fdlibm \ + jni \ + jawt \ + target +# ATTENTION: target must be built before jni +SUBDIRS = \ + fdlibm \ + target \ + $(JNIDIR) \ + $(JAWTDIR) diff --git a/native/jni/classpath/Makefile.am b/native/jni/classpath/Makefile.am index a26ab832b..43f72fd29 100644 --- a/native/jni/classpath/Makefile.am +++ b/native/jni/classpath/Makefile.am @@ -1,12 +1,22 @@ # Header needed for jawt implementations such as the one found in ../gtk-peer. + EXTRA_DIST = classpath_jawt.h -noinst_LTLIBRARIES = libclasspath.la +nativelib_LTLIBRARIES = \ + libclasspath.la + +libclasspath_la_SOURCES = \ + jcl.c \ + jcl.h \ + jnilink.c \ + jnilink.h \ + native_state.c \ + native_state.h + +libclasspath_la_LIBADD = \ + $(top_builddir)/native/target/libtarget.la -libclasspath_la_SOURCES = jcl.c jcl.h \ - jnilink.c jnilink.h \ - native_state.c native_state.h -AM_LDFLAGS = @CLASSPATH_MODULE@ +AM_LDFLAGS = AM_CPPFLAGS = @CLASSPATH_INCLUDES@ AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am index 46ea172f3..2ec2d47d6 100644 --- a/native/jni/gtk-peer/Makefile.am +++ b/native/jni/gtk-peer/Makefile.am @@ -8,51 +8,52 @@ else gtk_cairo_c_source_files = endif -libgtkpeer_la_SOURCES = $(gtk_cairo_c_source_files) \ - gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \ - gnu_java_awt_peer_gtk_GdkFontPeer.c \ - gnu_java_awt_peer_gtk_GdkGraphics.c \ - gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c \ - gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \ - gnu_java_awt_peer_gtk_GdkRobotPeer.c \ - gnu_java_awt_peer_gtk_GdkTextLayout.c \ - gnu_java_awt_peer_gtk_GtkButtonPeer.c \ - gnu_java_awt_peer_gtk_GtkCanvasPeer.c \ - gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c \ - gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c \ - gnu_java_awt_peer_gtk_GtkCheckboxPeer.c \ - gnu_java_awt_peer_gtk_GtkChoicePeer.c \ - gnu_java_awt_peer_gtk_GtkClipboard.c \ - gnu_java_awt_peer_gtk_GtkComponentPeer.c \ - gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c \ - gnu_java_awt_peer_gtk_GtkFileDialogPeer.c \ - gnu_java_awt_peer_gtk_GtkFramePeer.c \ - gnu_java_awt_peer_gtk_GtkGenericPeer.c \ - gnu_java_awt_peer_gtk_GtkImage.c \ - gnu_java_awt_peer_gtk_GtkLabelPeer.c \ - gnu_java_awt_peer_gtk_GtkListPeer.c \ - gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \ - gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \ - gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \ - gnu_java_awt_peer_gtk_GtkMenuPeer.c \ - gnu_java_awt_peer_gtk_GtkPanelPeer.c \ - gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c \ - gnu_java_awt_peer_gtk_GtkScrollbarPeer.c \ - gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \ - gnu_java_awt_peer_gtk_GtkSelection.c \ - gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \ - gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \ - gnu_java_awt_peer_gtk_GtkToolkit.c \ - gnu_java_awt_peer_gtk_GtkWindowPeer.c \ - gthread-jni.c \ - gdkfont.h \ - gthread-jni.h \ - gtkcairopeer.h \ - gtk_jawt.c \ - gtkpeer.h +libgtkpeer_la_SOURCES = \ + $(gtk_cairo_c_source_files) \ + gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \ + gnu_java_awt_peer_gtk_GdkFontPeer.c \ + gnu_java_awt_peer_gtk_GdkGraphics.c \ + gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c \ + gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \ + gnu_java_awt_peer_gtk_GdkRobotPeer.c \ + gnu_java_awt_peer_gtk_GdkTextLayout.c \ + gnu_java_awt_peer_gtk_GtkButtonPeer.c \ + gnu_java_awt_peer_gtk_GtkCanvasPeer.c \ + gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c \ + gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c \ + gnu_java_awt_peer_gtk_GtkCheckboxPeer.c \ + gnu_java_awt_peer_gtk_GtkChoicePeer.c \ + gnu_java_awt_peer_gtk_GtkClipboard.c \ + gnu_java_awt_peer_gtk_GtkComponentPeer.c \ + gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c \ + gnu_java_awt_peer_gtk_GtkFileDialogPeer.c \ + gnu_java_awt_peer_gtk_GtkFramePeer.c \ + gnu_java_awt_peer_gtk_GtkGenericPeer.c \ + gnu_java_awt_peer_gtk_GtkImage.c \ + gnu_java_awt_peer_gtk_GtkLabelPeer.c \ + gnu_java_awt_peer_gtk_GtkListPeer.c \ + gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \ + gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \ + gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \ + gnu_java_awt_peer_gtk_GtkMenuPeer.c \ + gnu_java_awt_peer_gtk_GtkPanelPeer.c \ + gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c \ + gnu_java_awt_peer_gtk_GtkScrollbarPeer.c \ + gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \ + gnu_java_awt_peer_gtk_GtkSelection.c \ + gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \ + gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \ + gnu_java_awt_peer_gtk_GtkToolkit.c \ + gnu_java_awt_peer_gtk_GtkWindowPeer.c \ + gthread-jni.c \ + gdkfont.h \ + gthread-jni.h \ + gtkcairopeer.h \ + gtk_jawt.c \ + gtkpeer.h -libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \ - $(top_builddir)/native/jni/classpath/jcl.lo +libgtkpeer_la_LIBADD = \ + $(top_builddir)/native/jni/classpath/libclasspath.la AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ \ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 -lXtst diff --git a/native/jni/java-io/Makefile.am b/native/jni/java-io/Makefile.am index 35afaae50..0ea6a975c 100644 --- a/native/jni/java-io/Makefile.am +++ b/native/jni/java-io/Makefile.am @@ -1,10 +1,13 @@ -nativelib_LTLIBRARIES = libjavaio.la +nativelib_LTLIBRARIES = \ + libjavaio.la -libjavaio_la_SOURCES = java_io_VMFile.c \ - java_io_VMObjectInputStream.c \ - java_io_VMObjectStreamClass.c +libjavaio_la_SOURCES = \ + java_io_VMFile.c \ + java_io_VMObjectInputStream.c \ + java_io_VMObjectStreamClass.c -libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo +libjavaio_la_LIBADD = \ + $(top_builddir)/native/jni/classpath/libclasspath.la AM_LDFLAGS = @CLASSPATH_MODULE@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ diff --git a/native/jni/java-lang/Makefile.am b/native/jni/java-lang/Makefile.am index fb8390f08..88d1dca61 100644 --- a/native/jni/java-lang/Makefile.am +++ b/native/jni/java-lang/Makefile.am @@ -1,15 +1,20 @@ -nativelib_LTLIBRARIES = libjavalang.la libjavalangreflect.la +nativelib_LTLIBRARIES = \ + libjavalang.la \ + libjavalangreflect.la -libjavalang_la_SOURCES = java_lang_VMSystem.c \ - java_lang_VMFloat.c \ - java_lang_VMDouble.c \ - java_lang_Math.c \ - java_lang_VMProcess.c +libjavalang_la_SOURCES = \ + java_lang_VMSystem.c \ + java_lang_VMFloat.c \ + java_lang_VMDouble.c \ + java_lang_Math.c \ + java_lang_VMProcess.c -libjavalang_la_LIBADD = $(wildcard $(top_builddir)/native/fdlibm/*.lo) \ - $(top_builddir)/native/jni/classpath/jcl.lo +libjavalang_la_LIBADD = \ + $(wildcard $(top_builddir)/native/fdlibm/*.lo) \ + $(top_builddir)/native/jni/classpath/libclasspath.la -libjavalangreflect_la_SOURCES = java_lang_reflect_Array.c +libjavalangreflect_la_SOURCES = \ + java_lang_reflect_Array.c AM_LDFLAGS = @CLASSPATH_MODULE@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ -I$(top_srcdir)/native/fdlibm diff --git a/native/jni/java-net/Makefile.am b/native/jni/java-net/Makefile.am index 4bca9511e..3d262b4de 100644 --- a/native/jni/java-net/Makefile.am +++ b/native/jni/java-net/Makefile.am @@ -1,13 +1,16 @@ -nativelib_LTLIBRARIES = libjavanet.la +nativelib_LTLIBRARIES = \ + libjavanet.la -libjavanet_la_SOURCES = javanet.c \ - javanet.h \ - java_net_VMInetAddress.c \ - java_net_VMNetworkInterface.c \ - gnu_java_net_VMPlainDatagramSocketImpl.c \ - gnu_java_net_VMPlainSocketImpl.c +libjavanet_la_SOURCES = \ + javanet.c \ + javanet.h \ + java_net_VMInetAddress.c \ + java_net_VMNetworkInterface.c \ + gnu_java_net_VMPlainDatagramSocketImpl.c \ + gnu_java_net_VMPlainSocketImpl.c -libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo +libjavanet_la_LIBADD = \ + $(top_builddir)/native/jni/classpath/libclasspath.la AM_LDFLAGS = @CLASSPATH_MODULE@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ diff --git a/native/jni/java-nio/Makefile.am b/native/jni/java-nio/Makefile.am index 8fd5ba3ae..64e4fc2c1 100644 --- a/native/jni/java-nio/Makefile.am +++ b/native/jni/java-nio/Makefile.am @@ -1,15 +1,18 @@ -nativelib_LTLIBRARIES = libjavanio.la +nativelib_LTLIBRARIES = \ + libjavanio.la -libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \ - gnu_java_nio_VMSelector.c \ - gnu_java_nio_channels_FileChannelImpl.c \ - gnu_java_nio_charset_iconv_IconvDecoder.c \ - gnu_java_nio_charset_iconv_IconvEncoder.c \ - java_nio_MappedByteBufferImpl.c \ - java_nio_VMDirectByteBuffer.c +libjavanio_la_SOURCES = \ + gnu_java_nio_VMPipe.c \ + gnu_java_nio_VMSelector.c \ + gnu_java_nio_channels_FileChannelImpl.c \ + gnu_java_nio_charset_iconv_IconvDecoder.c \ + gnu_java_nio_charset_iconv_IconvEncoder.c \ + java_nio_MappedByteBufferImpl.c \ + java_nio_VMDirectByteBuffer.c -libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \ - $(LTLIBICONV) +libjavanio_la_LIBADD = \ + $(top_builddir)/native/jni/classpath/libclasspath.la \ + $(LTLIBICONV) AM_LDFLAGS = @CLASSPATH_MODULE@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ diff --git a/native/jni/midi-dssi/Makefile.am b/native/jni/midi-dssi/Makefile.am index 6b1ef0407..4417d74d0 100644 --- a/native/jni/midi-dssi/Makefile.am +++ b/native/jni/midi-dssi/Makefile.am @@ -1,10 +1,14 @@ -nativelib_LTLIBRARIES = libgjsmdssi.la +nativelib_LTLIBRARIES = \ + libgjsmdssi.la -libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \ - gnu_javax_sound_midi_dssi_DSSISynthesizer.c \ - dssi_data.h +libgjsmdssi_la_SOURCES = \ + gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \ + gnu_javax_sound_midi_dssi_DSSISynthesizer.c \ + dssi_data.h -libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack +libgjsmdssi_la_LIBADD = \ + $(top_builddir)/native/jni/classpath/libclasspath.la \ + -ljack AM_LDFLAGS = @CLASSPATH_MODULE@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ diff --git a/native/jni/xmlj/Makefile.am b/native/jni/xmlj/Makefile.am index a210a59c7..a5bd88214 100644 --- a/native/jni/xmlj/Makefile.am +++ b/native/jni/xmlj/Makefile.am @@ -1,22 +1,24 @@ -nativelib_LTLIBRARIES = libxmlj.la +nativelib_LTLIBRARIES = \ + libxmlj.la libxmlj_la_SOURCES = \ -xmlj_dom.c \ -xmlj_dom.h \ -xmlj_error.c \ -xmlj_error.h \ -xmlj_io.c \ -xmlj_io.h \ -xmlj_node.c \ -xmlj_node.h \ -xmlj_sax.c \ -xmlj_sax.h \ -xmlj_transform.c \ -xmlj_util.c \ -xmlj_util.h \ -xmlj_xpath.c + xmlj_dom.c \ + xmlj_dom.h \ + xmlj_error.c \ + xmlj_error.h \ + xmlj_io.c \ + xmlj_io.h \ + xmlj_node.c \ + xmlj_node.h \ + xmlj_sax.c \ + xmlj_sax.h \ + xmlj_transform.c \ + xmlj_util.c \ + xmlj_util.h \ + xmlj_xpath.c -libxmlj_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo +libxmlj_la_LIBADD = \ + $(top_builddir)/native/jni/classpath/libclasspath.la AM_LDFLAGS = @CLASSPATH_MODULE@ @XML_LIBS@ @XSLT_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ diff --git a/native/target/Linux/Makefile.am b/native/target/Linux/Makefile.am index a384a74a2..59a9bd7e7 100644 --- a/native/target/Linux/Makefile.am +++ b/native/target/Linux/Makefile.am @@ -1,10 +1,14 @@ ## Input file for automake to generate the Makefile.in used by configure EXTRA_DIST = \ -target_native_io.h \ -target_native_misc.h \ -target_native.h \ -target_native_math.h \ -target_native_memory.h \ -target_native_network.h \ -target_native_file.h + target_native_io.h \ + target_native_misc.h \ + target_native.h \ + target_native_math.h \ + target_native_memory.h \ + target_native_network.h \ + target_native_file.h + +noinst_LTLIBRARIES = libtargetos.la + +libtargetos_la_SOURCES = diff --git a/native/target/Makefile.am b/native/target/Makefile.am index 03648574e..d11e917e7 100644 --- a/native/target/Makefile.am +++ b/native/target/Makefile.am @@ -1,27 +1,24 @@ ## Input file for automake to generate the Makefile.in used by configure -TARGET = Linux -# FIXME: How do I set these variables in configure? -#if TARGET_LINUX -# TARGET = Linux -#endif +DIST_SUBDIRS = \ + Linux \ + SunOS \ + RTEMS \ + MinGW \ + embOS \ + posix \ + generic -#if TARGET_SUNOS -# TARGET = SunOS -#endif +SUBDIRS = \ + $(TARGET) \ + generic -#if TARGET_RTEMS -# TARGET = RTEMS -#endif +EXTRA_DIST = readme.txt -#if TARGET_MINGW -# TARGET = MinGW -#endif +noinst_LTLIBRARIES = libtarget.la -#if TARGET_EMBOS -# TARGET = embOS -#endif +libtarget_la_SOURCES = -SUBDIRS = $(TARGET) generic -DIST_SUBDIRS = Linux SunOS RTEMS MinGW embOS posix generic -EXTRA_DIST = readme.txt +libtarget_la_LIBADD = \ + generic/libtargetgeneric.la + $(TARGET)/libtargetos.la diff --git a/native/target/generic/Makefile.am b/native/target/generic/Makefile.am index b4a78567b..415b40c2d 100644 --- a/native/target/generic/Makefile.am +++ b/native/target/generic/Makefile.am @@ -1,10 +1,20 @@ ## Input file for automake to generate the Makefile.in used by configure +INCLUDES = -I$(top_srcdir)/native/target/$(TARGET) + EXTRA_DIST = \ -target_generic_io.h \ -target_generic_misc.h \ -target_generic.h \ -target_generic_math.h \ -target_generic_memory.h \ -target_generic_network.h \ -target_generic_file.h + target_generic_math.h \ + target_generic_memory.h \ + target_generic_file.h + +noinst_LTLIBRARIES = libtargetgeneric.la + +libtargetgeneric_la_SOURCES = \ + target_generic.c \ + target_generic.h \ + target_generic_io.c \ + target_generic_io.h \ + target_generic_misc.c \ + target_generic_misc.h \ + target_generic_network.c \ + target_generic_network.h diff --git a/native/target/posix/Makefile.am b/native/target/posix/Makefile.am index a19bdd0f3..4bac5b384 100644 --- a/native/target/posix/Makefile.am +++ b/native/target/posix/Makefile.am @@ -1,17 +1,21 @@ ## Input file for automake to generate the Makefile.in used by configure -EXTRA_DIST = \ -target_posix.h \ -target_posix.c \ -target_posix_file.h \ -target_posix_file.c \ -target_posix_io.h \ -target_posix_io.c \ -target_posix_math.h \ -target_posix_math.c \ -target_posix_memory.h \ -target_posix_memory.c \ -target_posix_misc.h \ -target_posix_misc.c \ -target_posix_network.h \ -target_posix_network.c +EXTRA_DIST = + +noinst_LTLIBRARIES = libtargetos.la + +libtargetos_la_SOURCES = \ + target_posix.h \ + target_posix.c \ + target_posix_file.h \ + target_posix_file.c \ + target_posix_io.h \ + target_posix_io.c \ + target_posix_math.h \ + target_posix_math.c \ + target_posix_memory.h \ + target_posix_memory.c \ + target_posix_misc.h \ + target_posix_misc.c \ + target_posix_network.h \ + target_posix_network.c |