Hi!
The target native layer thing seems to be broken for non-linux
architectures. This fixes the issue and defaults to TARGET=Linux, which
is actually generic. This is commited.
TWISTI
2006-01-19 Christian Thalinger <[EMAIL PROTECTED]>
* configure.ac: Set TARGET to Linux per default.
* native/target/Makefile.am (libtarget_la_LIBADD): Removed
libtargetos.la.
* native/target/Linux/Makefile.am: Don't build a libtargetos.la.
* native/target/generic/Makefile.am (INCLUDES): Renamed to
AM_CPPFLAGS.
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.128
diff -u -3 -p -r1.128 configure.ac
--- configure.ac 18 Jan 2006 11:31:14 -0000 1.128
+++ configure.ac 19 Jan 2006 10:23:14 -0000
@@ -36,7 +36,8 @@ case "$target_os" in
TARGET=Linux
;;
* )
- TARGET=generic
+ dnl XXX change me when transition to target native layer is done
+ TARGET=Linux
;;
esac
AC_SUBST(TARGET)
Index: native/target/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/Makefile.am,v
retrieving revision 1.4
diff -u -3 -p -r1.4 Makefile.am
--- native/target/Makefile.am 17 Jan 2006 22:13:06 -0000 1.4
+++ native/target/Makefile.am 19 Jan 2006 10:23:14 -0000
@@ -21,4 +21,3 @@ libtarget_la_SOURCES =
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.4
diff -u -3 -p -r1.4 Makefile.am
--- native/target/Linux/Makefile.am 17 Jan 2006 22:13:06 -0000 1.4
+++ native/target/Linux/Makefile.am 19 Jan 2006 10:23:14 -0000
@@ -8,7 +8,3 @@ EXTRA_DIST = \
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.3
diff -u -3 -p -r1.3 Makefile.am
--- native/target/generic/Makefile.am 17 Jan 2006 22:13:06 -0000 1.3
+++ native/target/generic/Makefile.am 19 Jan 2006 10:23:14 -0000
@@ -1,6 +1,6 @@
## Input file for automake to generate the Makefile.in used by configure
-INCLUDES = -I$(top_srcdir)/native/target/$(TARGET)
+AM_CPPFLAGS = -I$(top_srcdir)/native/target/$(TARGET)
EXTRA_DIST = \
target_generic_math.h \
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
