configure: Rebuilt.

* configure: Rebuilt.
	* configure.in: Build include/Makefile.
	* Makefile.in: Rebuilt.
	* Makefile.am (SUBDIRS): Added gcj and include.
	(install-data-local): New target.
	(extra_headers): New macro.
	* include/Makefile.in: New file.
	* include/Makefile.am: New file.

	* interpret.cc: Don't include gcj/field.h or gcj/cni.h.
	* java/lang/reflect/natField.cc: Don't include gcj/field.h or
	gcj/cni.h.
	* boehm.cc: Don't include java-threads.h or gcj/field.h.
	* resolve.cc: Include config.h.
	* defineclass.cc: Include config.h.
	* include/java-interp.h: Don't include config.h.
	* include/jvm.h: Include java-threads.h, Object.h, java-gc.h,
	cni.h.

	* gcj/javaprims.h: Regenerated namespace decls.
	* classes.pl (scan): Don't put `;' after closing brace.

	* Makefile.in: Rebuilt.
	* Makefile.am (INCLUDES): Added -I for top_srcdir.
	* configure.in: Create gcj/Makefile.
	* gcj/Makefile.in: New file.
	* gcj/Makefile.am: New file.
	* java/lang/Object.h: Don't include any other headers.
	* gcj/array.h: Renamed from include/java-array.h.
	* gcj/field.h: Renamed from include/java-field.h.
	* gcj/method.h: Renamed from include/java-method.h.
	* gcj/cni.h, gcj/javaprims.h: Moved from include/.
	Updated all files to reflect new include structure.

From-SVN: r29278
This commit is contained in:
Tom Tromey 1999-09-10 22:03:10 +00:00 committed by Tom Tromey
parent 512d594b4f
commit 27e934d8ba
65 changed files with 739 additions and 155 deletions

View file

@ -10,7 +10,7 @@ details. */
/*#define ENABLE_GTK*/
#include <cni.h>
#include <gcj/cni.h>
#include <java/awt/Toolkit.h>
#ifdef ENABLE_GTK
#include <java/awt/peer/GtkToolkit.h>

View file

@ -29,7 +29,7 @@ details. */
#endif
#include <string.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/io/File.h>
#include <java/io/IOException.h>

View file

@ -16,7 +16,7 @@ details. */
#include <sys/stat.h>
#include <sys/param.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/io/FileDescriptor.h>
#include <java/io/SyncFailedException.h>

View file

@ -34,7 +34,7 @@ details. */
#include <sys/filio.h>
#endif
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/io/FileDescriptor.h>
#include <java/io/SyncFailedException.h>

View file

@ -18,7 +18,7 @@ details. */
#include <java/lang/String.h>
#include <java/net/URL.h>
// We declare these here to avoid including cni.h.
// We declare these here to avoid including gcj/cni.h.
extern "C" void _Jv_InitClass (jclass klass);
extern "C" void _Jv_RegisterClasses (jclass *classes);

View file

@ -13,10 +13,7 @@ details. */
#pragma interface
#include <javaprims.h>
#include <java-assert.h>
#include <java-threads.h>
#include <java-gc.h>
#include <gcj/javaprims.h>
// This class is mainly here as a kludge to get G++ to allocate
// vtable pointer as the *first* word of each Object, instead of

View file

@ -10,7 +10,7 @@ details. */
#include <config.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Character.h>

View file

@ -15,7 +15,7 @@ details. */
#pragma implementation "Class.h"
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Class.h>
#include <java/lang/ClassLoader.h>

View file

@ -15,8 +15,12 @@ details. */
#include <stdlib.h>
#include <string.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java-threads.h>
#include <java-interp.h>
#include <java/lang/Character.h>
#include <java/lang/Thread.h>
#include <java/lang/ClassLoader.h>
@ -31,8 +35,6 @@ details. */
#include <java/lang/IncompatibleClassChangeError.h>
#include <java/lang/reflect/Modifier.h>
#include <java-interp.h>
#define CloneableClass _CL_Q34java4lang9Cloneable
extern java::lang::Class CloneableClass;
#define ObjectClass _CL_Q34java4lang6Object

View file

@ -25,7 +25,7 @@ char *alloca ();
#include <stdlib.h>
#include <cni.h>
#include <gcj/cni.h>
#include <java/lang/String.h>
#include <java/lang/Double.h>
#include <java/lang/NumberFormatException.h>

View file

@ -14,7 +14,7 @@ details. */
#include <config.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/ConcreteProcess.h>

View file

@ -12,7 +12,7 @@ details. */
#include <stdlib.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/FirstThread.h>

View file

@ -23,7 +23,7 @@ details. */
#include <java/lang/Integer.h>
#include <java/lang/Long.h>
#include <java/lang/Math.h>
#include <java-array.h>
#include <gcj/array.h>
#include "fdlibm.h"

View file

@ -14,7 +14,7 @@ details. */
#pragma implementation "Object.h"
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Object.h>
#include <java-threads.h>

View file

@ -22,7 +22,7 @@ details. */
#include <stdlib.h>
#include <stdio.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/ConcreteProcess.h>

View file

@ -12,7 +12,7 @@ details. */
#include <stdlib.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Runtime.h>
#include <java/lang/UnknownError.h>

View file

@ -13,7 +13,7 @@ details. */
#include <string.h>
#include <stdlib.h>
#include <cni.h>
#include <gcj/cni.h>
#include <java/lang/Character.h>
#include <java/lang/String.h>
#include <java/lang/IndexOutOfBoundsException.h>

View file

@ -38,7 +38,7 @@ details. */
#include <sys/utsname.h>
#endif
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/System.h>
#include <java/lang/Class.h>

View file

@ -12,8 +12,10 @@ details. */
#include <stdlib.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java-threads.h>
#include <java/lang/Thread.h>
#include <java/lang/ThreadGroup.h>
#include <java/lang/IllegalArgumentException.h>

View file

@ -13,7 +13,7 @@ details. */
#include <stdlib.h>
#include <jvm.h>
#include <cni.h>
#include <gcj/cni.h>
#include <java/lang/reflect/Array.h>
#include <java/lang/IllegalArgumentException.h>
#include <java/lang/Byte.h>

View file

@ -12,7 +12,6 @@ details. */
#include <stdlib.h>
#include <cni.h>
#include <jvm.h>
#include <java/lang/reflect/Field.h>
#include <java/lang/reflect/Modifier.h>
@ -26,7 +25,6 @@ details. */
#include <java/lang/Double.h>
#include <java/lang/Boolean.h>
#include <java/lang/Character.h>
#include <java-field.h>
jint
java::lang::reflect::Field::getModifiers ()

View file

@ -12,9 +12,8 @@ details. */
#include <config.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java-array.h>
#include <java/lang/reflect/Method.h>
#include <java/lang/reflect/InvocationTargetException.h>
@ -32,7 +31,7 @@ details. */
#include <java/lang/IllegalArgumentException.h>
#include <java/lang/NullPointerException.h>
#include <java/lang/Class.h>
#include <java-method.h>
#include <gcj/method.h>
#define ClassClass _CL_Q34java4lang5Class
extern java::lang::Class ClassClass;

View file

@ -35,7 +35,7 @@ details. */
#include <netdb.h>
#endif
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/net/InetAddress.h>
#include <java/net/UnknownHostException.h>

View file

@ -33,7 +33,7 @@ details. */
#include <bstring.h>
#endif
#include <cni.h>
#include <gcj/cni.h>
#include <java/io/IOException.h>
#include <java/io/FileDescriptor.h>
#include <java/io/InterruptedIOException.h>

View file

@ -25,8 +25,8 @@ details. */
#include <bstring.h>
#endif
#include <cni.h>
#include <javaprims.h>
#include <gcj/cni.h>
#include <gcj/javaprims.h>
#include <java/io/IOException.h>
#include <java/io/FileDescriptor.h>
#include <java/io/InterruptedIOException.h>

View file

@ -12,7 +12,7 @@ details. */
#include <config.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/text/Collator.h>

View file

@ -14,7 +14,7 @@ details. */
#define _POSIX_PTHREAD_SEMANTICS
#endif
#include <cni.h>
#include <gcj/cni.h>
#include <java/util/Date.h>
#include <java/lang/String.h>

View file

@ -22,7 +22,7 @@ details. */
#include <string.h>
#endif
#include <cni.h>
#include <gcj/cni.h>
#include <java/util/TimeZone.h>
#include <java/util/GregorianCalendar.h>
#include <time.h>

View file

@ -15,7 +15,7 @@ details. */
#include <zlib.h>
#include <stdlib.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/util/zip/Deflater.h>

View file

@ -15,7 +15,7 @@ details. */
#include <zlib.h>
#include <stdlib.h>
#include <cni.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/util/zip/Inflater.h>