* configure.in: Set up PLATFORMOBJS not PLATFORM_SPECIFIC_SOURCES.
Symlink PLATFORMH to platform.h.
* Makefile.am (libgcj_la_DEPENDENCIES, libgcj_la_LIBADD): Add
PLATFORMOBJS.
* java/lang/natSystem.cc: #include platform.h not posix.h.
* Makefile.in: Rebuilt with libgcj automake.
* configure: Rebuilt.
From-SVN: r49534
+2002-02-05 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
+
+ * configure.in: Set up PLATFORMOBJS not PLATFORM_SPECIFIC_SOURCES.
+ Symlink PLATFORMH to platform.h.
+ * Makefile.am (libgcj_la_DEPENDENCIES, libgcj_la_LIBADD): Add
+ PLATFORMOBJS.
+ * java/lang/natSystem.cc: #include platform.h not posix.h.
+ * Makefile.in: Rebuilt with libgcj automake.
+ * configure: Rebuilt.
+
2002-02-05 Richard Henderson <rth@redhat.com>
* Makefile.in: Undo munging last change.
$(built_java_source_files:.java=.lo)
x_javao_files = $(x_java_source_files:.java=.lo)
-libgcj_la_SOURCES = prims.cc $(PLATFORM_SPECIFIC_SOURCES) jni.cc exception.cc \
+libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
resolve.cc defineclass.cc interpret.cc name-finder.cc verify.cc \
$(nat_source_files)
EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
+ win32-threads.cc posix.cc win32.cc \
$(c_source_files) $(java_source_files) $(built_java_source_files)
libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) \
- $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
+ $(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL)
libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
- $(THREADOBJS)
+ $(THREADOBJS) $(PLATFORMOBJS)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLIBS) $(LIBLTDL) \
TARGET_ECOS="$with_ecos"
)
-PLATFORM_SPECIFIC_SOURCES=
+PLATFORMOBJS=
case "$TARGET_ECOS" in
no) case "$host" in
mingw)
PLATFORM=Win32
- PLATFORM_SPECIFIC_SOURCES=win32.cc
+ PLATFORMOBJS=win32.lo
+ PLATFORMH=win32.h
;;
*)
PLATFORM=Posix
- PLATFORM_SPECIFIC_SOURCES=posix.cc
+ PLATFORMOBJS=posix.lo
+ PLATFORMH=posix.h
;;
esac
;;
*)
PLATFORM=Ecos
AC_DEFINE(ECOS)
- PLATFORM_SPECIFIC_SOURCES=posix.cc
+ PLATFORMOBJS=posix.lo
+ PLATFORMH=posix.h
;;
esac
-AC_SUBST(PLATFORM_SPECIFIC_SOURCES)
-
+AC_SUBST(PLATFORMOBJS)
+AC_LINK_FILES(include/$PLATFORMH, include/platform.h)
AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED))
AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED))
#include <string.h>
#include <stdlib.h>
-#include "posix.h"
+#include "platform.h"
#ifdef HAVE_PWD_H
#include <pwd.h>