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.

4 files changed, 64 insertions, 49 deletions

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