On Tue, 2006-01-17 at 23:02 +0100, Mark Wielaard wrote:
> Please do! A working CVS is much better then a non-working/broken one.
Ok.
>
> Although I wish you hadn't also re-indented all the files. It was a bit
> hard to see the actual changes you made (a ChangeLog entry would have
> helped. Hint, hint...)
Yeah, sorry, i was a bit overeager :-) Here the corrected patch _with_
changelog entry.
TWISTI
2006-01-17 Christian Thalinger <[EMAIL PROTECTED]>
* 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.
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.126
diff -u -3 -p -r1.126 configure.ac
--- configure.ac 16 Jan 2006 15:58:15 -0000 1.126
+++ configure.ac 17 Jan 2006 22:03:47 -0000
@@ -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.])
Index: native/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/Makefile.am,v
retrieving revision 1.25
diff -u -3 -p -r1.25 Makefile.am
--- native/Makefile.am 19 Aug 2005 15:24:48 -0000 1.25
+++ native/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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)
Index: native/jni/classpath/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/classpath/Makefile.am,v
retrieving revision 1.6
diff -u -3 -p -r1.6 Makefile.am
--- native/jni/classpath/Makefile.am 24 Oct 2005 22:16:10 -0000 1.6
+++ native/jni/classpath/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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@
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.32
diff -u -3 -p -r1.32 Makefile.am
--- native/jni/gtk-peer/Makefile.am 7 Nov 2005 14:25:55 -0000 1.32
+++ native/jni/gtk-peer/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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
Index: native/jni/java-io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/Makefile.am,v
retrieving revision 1.21
diff -u -3 -p -r1.21 Makefile.am
--- native/jni/java-io/Makefile.am 26 Nov 2005 13:28:25 -0000 1.21
+++ native/jni/java-io/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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@
Index: native/jni/java-lang/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/Makefile.am,v
retrieving revision 1.12
diff -u -3 -p -r1.12 Makefile.am
--- native/jni/java-lang/Makefile.am 23 Oct 2005 16:59:07 -0000 1.12
+++ native/jni/java-lang/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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
Index: native/jni/java-net/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-net/Makefile.am,v
retrieving revision 1.11
diff -u -3 -p -r1.11 Makefile.am
--- native/jni/java-net/Makefile.am 4 Jan 2006 20:46:16 -0000 1.11
+++ native/jni/java-net/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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@
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.19
diff -u -3 -p -r1.19 Makefile.am
--- native/jni/java-nio/Makefile.am 23 Oct 2005 16:59:08 -0000 1.19
+++ native/jni/java-nio/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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@
Index: native/jni/midi-dssi/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/midi-dssi/Makefile.am,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Makefile.am
--- native/jni/midi-dssi/Makefile.am 10 Nov 2005 11:06:34 -0000 1.3
+++ native/jni/midi-dssi/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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@
Index: native/jni/xmlj/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/xmlj/Makefile.am,v
retrieving revision 1.5
diff -u -3 -p -r1.5 Makefile.am
--- native/jni/xmlj/Makefile.am 8 Jan 2006 12:14:26 -0000 1.5
+++ native/jni/xmlj/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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@
Index: native/target/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/Makefile.am,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Makefile.am
--- native/target/Makefile.am 16 Jan 2006 15:50:35 -0000 1.3
+++ native/target/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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
Index: native/target/Linux/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/Linux/Makefile.am,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Makefile.am
--- native/target/Linux/Makefile.am 16 Jan 2006 13:47:13 -0000 1.3
+++ native/target/Linux/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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 =
Index: native/target/generic/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/generic/Makefile.am,v
retrieving revision 1.2
diff -u -3 -p -r1.2 Makefile.am
--- native/target/generic/Makefile.am 16 Jan 2006 13:47:13 -0000 1.2
+++ native/target/generic/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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
Index: native/target/posix/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/posix/Makefile.am,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Makefile.am
--- native/target/posix/Makefile.am 16 Jan 2006 15:50:35 -0000 1.3
+++ native/target/posix/Makefile.am 17 Jan 2006 22:03:47 -0000
@@ -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
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
