X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2FMakefile.in;h=b64b68ca2ce52e0c170be055e6ed62154810c9b6;hb=66806be2b0c32b412faae054523ac1a8957551a1;hp=279ec6ec8009b3cc225f2dc000957a7f906f4da8;hpb=18d4bf91d8d9c44d31997a02e482a96351af9c5f;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 279ec6ec800..b64b68ca2ce 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -75,18 +75,19 @@ DIVIDESPEC = @DIVIDESPEC@ DLLTOOL = @DLLTOOL@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ -FORCELIBGCCSPEC = @FORCELIBGCCSPEC@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ +GCJVERSION = @GCJVERSION@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ GCSPEC = @GCSPEC@ GCTESTSPEC = @GCTESTSPEC@ +HASH_SYNC_SPEC = @HASH_SYNC_SPEC@ INCLTDL = @INCLTDL@ JC1GCSPEC = @JC1GCSPEC@ -LIBDATASTARTSPEC = @LIBDATASTARTSPEC@ +LIBFFI = @LIBFFI@ LIBGCJDEBUG = @LIBGCJDEBUG@ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ @@ -119,7 +120,7 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ here = @here@ libgcj_basedir = @libgcj_basedir@ -AUTOMAKE_OPTIONS = foreign no-installinfo +AUTOMAKE_OPTIONS = foreign @TESTSUBDIR_TRUE@SUBDIRS = \ @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include @TESTSUBDIR_FALSE@SUBDIRS = \ @@ -130,46 +131,46 @@ AUTOMAKE_OPTIONS = foreign no-installinfo @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) @USE_LIBDIR_FALSE@toolexecdir = \ @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) -@NO_X_TRUE@cond_x_ltlibrary = \ -@NO_X_FALSE@cond_x_ltlibrary = \ -@NO_X_FALSE@libgcjx.la +@XLIB_AWT_TRUE@cond_x_ltlibrary = \ +@XLIB_AWT_TRUE@libgcjx.la +@XLIB_AWT_FALSE@cond_x_ltlibrary = \ toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) toolexeclib_DATA = libgcj.spec -data_DATA = libgcj.zip - -@NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = \ -@NEEDS_DATA_START_TRUE@libgcjdata.a -@NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = \ -@NEEDS_DATA_START_TRUE@libgcjdata.c +data_DATA = libgcj.jar @NATIVE_TRUE@bin_PROGRAMS = \ @NATIVE_TRUE@jv-convert gij bin_SCRIPTS = addr2name.awk @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \ -@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) +@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT) @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \ -@CANADIAN_TRUE@@NULL_TARGET_FALSE@zip +@CANADIAN_TRUE@@NULL_TARGET_FALSE@jar @CANADIAN_FALSE@ZIP = \ -@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) +@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT) @CANADIAN_TRUE@GCJH = \ @CANADIAN_TRUE@gcjh @CANADIAN_FALSE@GCJH = \ @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) -GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c +GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 + +GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ -JAVAC = $(GCJ) -C +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + +JAVAC = $(GCJ_WITH_FLAGS) -C -EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ +GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ WARNINGS = -W -Wall -AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fasynchronous-exceptions \ +AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \ -fdollars-in-identifiers \ - @LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE + @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \ + -DPREFIX="\"$(prefix)\"" @USING_GCC_TRUE@AM_CFLAGS = \ @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS) @@ -177,13 +178,13 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fasynchronous-exceptions \ @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ JCFLAGS = -g -JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ +JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) -LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include +LIBFFIINCS = @LIBFFIINCS@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ $(GCINCS) $(THREADINCS) $(INCLTDL) \ - $(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS) + $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) nat_files = $(nat_source_files:.cc=.lo) @@ -194,8 +195,6 @@ javao_files = $(java_source_files:.java=.lo) \ x_javao_files = $(x_java_source_files:.java=.lo) -libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'` - libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc name-finder.cc \ $(nat_source_files) @@ -203,29 +202,32 @@ libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \ EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ $(c_source_files) $(java_source_files) $(built_java_source_files) -libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) \ +libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) \ $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL) + libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \ - $(THREADOBJS) $(libffi_files) $(LIBLTDL) + $(THREADOBJS) -libgcj_la_LDFLAGS = -lsupc++ -rpath $(toolexeclibdir) \ +# Include THREADLIBS here to ensure that the correct version of +# certain linuxthread functions get linked: +libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLIBS) $(LIBLTDL) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` libgcj_la_LINK = $(LIBLINK) libgcjx_la_SOURCES = $(x_nat_source_files) EXTRA_libgcjx_la_SOURCES = $(x_java_source_files) -libgcjx_la_DEPENDENCIES = libgcj.zip $(x_javao_files) +libgcjx_la_DEPENDENCIES = libgcj.jar $(x_javao_files) libgcjx_la_LIBADD = $(x_javao_files) libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ - -lsupc++ -rpath $(toolexeclibdir) \ + -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` libgcjx_la_LINK = $(LIBLINK) MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) -CLEANFILES = tmp-list libgcj.zip +CLEANFILES = tmp-list libgcj.jar SUFFIXES = .class .java .h @@ -249,7 +251,7 @@ CONVERT_DIR = gnu/gcj/convert jv_convert_SOURCES = EXTRA_jv_convert_SOURCES = $(convert_source_files) jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ - -rpath $(toolexeclibdir) + -rpath $(toolexeclibdir) -shared-libgcc jv_convert_LINK = $(GCJLINK) jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ @@ -260,7 +262,7 @@ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ gij_SOURCES = gij.cc -gij_LDFLAGS = -rpath $(toolexeclibdir) +gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc gij_LINK = $(GCJLINK) gij_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec @@ -334,11 +336,13 @@ java/awt/AWTError.java \ java/awt/AWTEvent.java \ java/awt/AWTEventMulticaster.java \ java/awt/AWTException.java \ +java/awt/AWTPermission.java \ java/awt/ActiveEvent.java \ java/awt/Adjustable.java \ java/awt/BorderLayout.java \ java/awt/Button.java \ java/awt/Canvas.java \ +java/awt/CardLayout.java \ java/awt/Checkbox.java \ java/awt/CheckboxGroup.java \ java/awt/CheckboxMenuItem.java \ @@ -354,12 +358,15 @@ java/awt/Event.java \ java/awt/EventDispatchThread.java \ java/awt/EventQueue.java \ java/awt/FileDialog.java \ +java/awt/FlowLayout.java \ java/awt/Font.java \ java/awt/FontMetrics.java \ java/awt/Frame.java \ java/awt/Graphics.java \ java/awt/Graphics2D.java \ java/awt/GraphicsConfiguration.java \ +java/awt/GridBagConstraints.java \ +java/awt/GridLayout.java \ java/awt/IllegalComponentStateException.java \ java/awt/Image.java \ java/awt/Insets.java \ @@ -378,12 +385,14 @@ java/awt/Paint.java \ java/awt/PaintContext.java \ java/awt/Panel.java \ java/awt/Point.java \ +java/awt/Polygon.java \ java/awt/PopupMenu.java \ java/awt/Rectangle.java \ java/awt/RenderingHints.java \ java/awt/ScrollPane.java \ java/awt/Scrollbar.java \ java/awt/Shape.java \ +java/awt/SystemColor.java \ java/awt/TextArea.java \ java/awt/TextComponent.java \ java/awt/TextField.java \ @@ -436,11 +445,13 @@ java/awt/geom/AffineTransform.java \ java/awt/geom/Dimension2D.java \ java/awt/geom/Ellipse2D.java \ java/awt/geom/IllegalPathStateException.java \ +java/awt/geom/Line2D.java \ java/awt/geom/NoninvertibleTransformException.java \ java/awt/geom/PathIterator.java \ java/awt/geom/Point2D.java \ java/awt/geom/Rectangle2D.java \ java/awt/geom/RectangularShape.java \ +java/awt/geom/RoundRectangle2D.java \ java/awt/image/BufferedImage.java \ java/awt/image/ColorModel.java \ java/awt/image/ComponentColorModel.java \ @@ -580,6 +591,7 @@ java/lang/NullPointerException.java \ java/lang/Number.java \ java/lang/NumberFormatException.java \ java/lang/OutOfMemoryError.java \ +java/lang/Package.java \ java/lang/Process.java \ java/lang/Runnable.java \ java/lang/Runtime.java \ @@ -603,16 +615,6 @@ java/lang/UnsupportedOperationException.java \ java/lang/VerifyError.java \ java/lang/VirtualMachineError.java \ java/lang/Void.java \ -java/lang/reflect/AccessibleObject.java \ -java/lang/reflect/Array.java \ -java/lang/reflect/Constructor.java \ -java/lang/reflect/Field.java \ -java/lang/reflect/InvocationTargetException.java \ -java/lang/reflect/Member.java \ -java/lang/reflect/Method.java \ -java/lang/reflect/Modifier.java \ -java/lang/reflect/ReflectPermission.java \ -java/io/BlockDataException.java \ java/io/BufferedInputStream.java \ java/io/BufferedOutputStream.java \ java/io/BufferedReader.java \ @@ -696,7 +698,6 @@ java/util/ArrayList.java \ java/util/Arrays.java \ java/util/BasicMapEntry.java \ java/util/BitSet.java \ -java/util/Bucket.java \ java/util/Calendar.java \ java/util/Collection.java \ java/util/Collections.java \ @@ -710,6 +711,7 @@ java/util/EventListener.java \ java/util/EventObject.java \ java/util/GregorianCalendar.java \ java/util/HashMap.java \ +java/util/HashSet.java \ java/util/Hashtable.java \ java/util/Iterator.java \ java/util/LinkedList.java \ @@ -736,8 +738,11 @@ java/util/StringTokenizer.java \ java/util/TimeZone.java \ java/util/Timer.java \ java/util/TimerTask.java \ +java/util/TreeMap.java \ +java/util/TreeSet.java \ java/util/TooManyListenersException.java \ -java/util/Vector.java +java/util/Vector.java \ +java/util/WeakHashMap.java ordinary_java_source_files = $(core_java_source_files) \ @@ -745,7 +750,6 @@ gnu/gcj/RawData.java \ gnu/gcj/io/DefaultMimeTypes.java \ gnu/gcj/io/MimeTypes.java \ gnu/gcj/io/SimpleSHSStream.java \ -gnu/gcj/jni/NativeThread.java \ gnu/gcj/math/MPN.java \ gnu/gcj/protocol/file/Connection.java \ gnu/gcj/protocol/file/Handler.java \ @@ -774,9 +778,24 @@ gnu/java/locale/Calendar.java \ gnu/java/locale/Calendar_de.java \ gnu/java/locale/Calendar_en.java \ gnu/java/locale/Calendar_nl.java \ +gnu/java/security/provider/DefaultPolicy.java \ gnu/java/security/provider/Gnu.java \ gnu/java/security/provider/SHA.java \ gnu/java/security/provider/SHA1PRNG.java \ +java/lang/ref/PhantomReference.java \ +java/lang/ref/Reference.java \ +java/lang/ref/ReferenceQueue.java \ +java/lang/ref/SoftReference.java \ +java/lang/ref/WeakReference.java \ +java/lang/reflect/AccessibleObject.java \ +java/lang/reflect/Array.java \ +java/lang/reflect/Constructor.java \ +java/lang/reflect/Field.java \ +java/lang/reflect/InvocationTargetException.java \ +java/lang/reflect/Member.java \ +java/lang/reflect/Method.java \ +java/lang/reflect/Modifier.java \ +java/lang/reflect/ReflectPermission.java \ java/math/BigDecimal.java \ java/math/BigInteger.java \ java/net/BindException.java \ @@ -792,6 +811,7 @@ java/net/InetAddress.java \ java/net/JarURLConnection.java \ java/net/MalformedURLException.java \ java/net/MulticastSocket.java \ +java/net/NetPermission.java \ java/net/NoRouteToHostException.java \ java/net/PlainDatagramSocketImpl.java \ java/net/PlainSocketImpl.java \ @@ -802,6 +822,7 @@ java/net/SocketException.java \ java/net/SocketImpl.java \ java/net/SocketImplFactory.java \ java/net/SocketOptions.java \ +java/net/SocketPermission.java \ java/net/URL.java \ java/net/URLClassLoader.java \ java/net/URLConnection.java \ @@ -811,34 +832,80 @@ java/net/URLStreamHandler.java \ java/net/URLStreamHandlerFactory.java \ java/net/UnknownHostException.java \ java/net/UnknownServiceException.java \ +java/security/AccessControlContext.java \ +java/security/AccessControlException.java \ +java/security/AccessController.java \ +java/security/AlgorithmParameterGenerator.java \ +java/security/AlgorithmParameters.java \ java/security/AlgorithmParameterGeneratorSpi.java \ +java/security/AlgorithmParametersSpi.java \ +java/security/AllPermission.java \ java/security/BasicPermission.java \ +java/security/Certificate.java \ +java/security/CodeSource.java \ java/security/DigestException.java \ java/security/DigestOutputStream.java \ +java/security/DummyKeyPairGenerator.java \ +java/security/DummySignature.java \ +java/security/DigestInputStream.java \ +java/security/DomainCombiner.java \ +java/security/DummyMessageDigest.java \ java/security/GeneralSecurityException.java \ java/security/Guard.java \ +java/security/GuardedObject.java \ +java/security/Identity.java \ +java/security/IdentityScope.java \ java/security/InvalidAlgorithmParameterException.java \ java/security/InvalidKeyException.java \ java/security/InvalidParameterException.java \ java/security/Key.java \ -java/security/KeyException.java \ -java/security/KeyPair.java \ +java/security/KeyFactorySpi.java \ java/security/KeyPairGenerator.java \ +java/security/KeyStoreException.java \ +java/security/KeyException.java \ +java/security/KeyManagementException.java \ java/security/KeyPairGeneratorSpi.java \ +java/security/KeyStoreSpi.java \ +java/security/KeyFactory.java \ +java/security/KeyPair.java \ +java/security/KeyStore.java \ java/security/MessageDigest.java \ +java/security/MessageDigestSpi.java \ java/security/NoSuchAlgorithmException.java \ java/security/NoSuchProviderException.java \ java/security/Permission.java \ -java/security/PermissionCollection.java \ java/security/Principal.java \ +java/security/PrivilegedExceptionAction.java \ +java/security/PublicKey.java \ +java/security/PermissionCollection.java \ java/security/PrivateKey.java \ +java/security/ProtectionDomain.java \ +java/security/Permissions.java \ +java/security/PrivilegedAction.java \ java/security/Provider.java \ -java/security/PublicKey.java \ +java/security/Policy.java \ +java/security/PrivilegedActionException.java \ +java/security/ProviderException.java \ java/security/SecureClassLoader.java \ -java/security/SecureRandom.java \ +java/security/SecureRandomSpi.java \ +java/security/SecurityPermission.java \ +java/security/SignatureException.java \ +java/security/SignedObject.java \ +java/security/SecureRandom.java \ java/security/Security.java \ java/security/Signature.java \ -java/security/SignatureException.java \ +java/security/SignatureSpi.java \ +java/security/Signer.java \ +java/security/UnrecoverableKeyException.java \ +java/security/UnresolvedPermission.java \ +java/security/acl/Acl.java \ +java/security/acl/AclNotFoundException.java \ +java/security/acl/LastOwnerException.java \ +java/security/acl/Owner.java \ +java/security/acl/AclEntry.java \ +java/security/acl/Group.java \ +java/security/acl/NotOwnerException.java \ +java/security/acl/Permission.java \ java/security/cert/CRL.java \ java/security/cert/CRLException.java \ java/security/cert/Certificate.java \ @@ -854,20 +921,33 @@ java/security/cert/X509CRLEntry.java \ java/security/cert/X509Certificate.java \ java/security/cert/X509Extension.java \ java/security/interfaces/DSAKey.java \ -java/security/interfaces/DSAParams.java \ +java/security/interfaces/DSAKeyPairGenerator.java \ +java/security/interfaces/DSAParams.java \ java/security/interfaces/DSAPrivateKey.java \ java/security/interfaces/DSAPublicKey.java \ +java/security/interfaces/RSAKey.java \ java/security/interfaces/RSAPrivateCrtKey.java \ java/security/interfaces/RSAPrivateKey.java \ java/security/interfaces/RSAPublicKey.java \ java/security/spec/AlgorithmParameterSpec.java \ -java/security/spec/InvalidKeySpecException.java \ +java/security/spec/DSAParameterSpec.java \ +java/security/spec/DSAPrivateKeySpec.java \ +java/security/spec/DSAPublicKeySpec.java \ +java/security/spec/EncodedKeySpec.java \ +java/security/spec/InvalidKeySpecException.java \ java/security/spec/InvalidParameterSpecException.java \ -java/security/spec/KeySpec.java \ +java/security/spec/KeySpec.java \ +java/security/spec/PKCS8EncodedKeySpec.java \ +java/security/spec/RSAKeyGenParameterSpec.java \ java/security/spec/RSAPrivateCrtKeySpec.java \ java/security/spec/RSAPrivateKeySpec.java \ java/security/spec/RSAPublicKeySpec.java \ +java/security/spec/X509EncodedKeySpec.java \ +java/sql/Array.java \ +java/sql/BatchUpdateException.java \ +java/sql/Blob.java \ java/sql/CallableStatement.java \ +java/sql/Clob.java \ java/sql/Connection.java \ java/sql/DataTruncation.java \ java/sql/DatabaseMetaData.java \ @@ -876,11 +956,16 @@ java/sql/Driver.java \ java/sql/DriverManager.java \ java/sql/DriverPropertyInfo.java \ java/sql/PreparedStatement.java \ +java/sql/Ref.java \ java/sql/ResultSet.java \ java/sql/ResultSetMetaData.java \ +java/sql/SQLData.java \ java/sql/SQLException.java \ +java/sql/SQLInput.java \ +java/sql/SQLOutput.java \ java/sql/SQLWarning.java \ java/sql/Statement.java \ +java/sql/Struct.java \ java/sql/Time.java \ java/sql/Timestamp.java \ java/sql/Types.java \ @@ -947,7 +1032,7 @@ c_source_files = \ java/lang/e_remainder.c java/lang/s_floor.c java/lang/w_remainder.c \ java/lang/e_scalb.c java/lang/s_rint.c java/lang/w_sqrt.c \ java/lang/e_sqrt.c java/lang/s_scalbn.c java/lang/sf_rint.c \ - java/lang/k_cos.c java/lang/s_sin.c + java/lang/k_cos.c java/lang/s_sin.c java/lang/sf_fabs.c #java/awt/natToolkit.cc @@ -963,8 +1048,6 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/shs.cc \ -gnu/gcj/jni/natNativeThread.cc \ -gnu/gcj/runtime/natFirstThread.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/io/natObjectInputStream.cc \ @@ -979,6 +1062,7 @@ java/lang/natMath.cc \ java/lang/natObject.cc \ java/lang/natRuntime.cc \ java/lang/natString.cc \ +java/lang/natStringBuffer.cc \ java/lang/natSystem.cc \ java/lang/natThread.cc \ java/lang/natThrowable.cc \ @@ -990,7 +1074,6 @@ java/net/natInetAddress.cc \ java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainSocketImpl.cc \ java/text/natCollator.cc \ -java/util/natGregorianCalendar.cc \ java/util/zip/natDeflater.cc \ java/util/zip/natInflater.cc @@ -1092,7 +1175,7 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" -CONFIG_STATUS_DEPENDENCIES = $(libgcj_basedir)/configure.host +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host MAKEOVERRIDES = @@ -1105,12 +1188,12 @@ MULTIDO = true MULTICLEAN = true ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -CONFIG_HEADER = ./include/config.h +CONFIG_HEADER = ./include/config.h ./gcj/libgcj-config.h CONFIG_CLEAN_FILES = libgcj.spec libgcj-test.spec -LIBRARIES = $(toolexeclib_LIBRARIES) +LTLIBRARIES = $(toolexeclib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I./include +DEFS = @DEFS@ -I. -I$(srcdir) -I./include -I./gcj CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -1118,10 +1201,6 @@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -libgcjdata_a_LIBADD = -@NEEDS_DATA_START_TRUE@libgcjdata_a_OBJECTS = libgcjdata.$(OBJEXT) -LTLIBRARIES = $(toolexeclib_LTLIBRARIES) - libgcj_la_OBJECTS = prims.lo posix.lo jni.lo exception.lo resolve.lo \ defineclass.lo interpret.lo name-finder.lo \ gnu/gcj/convert/JIS0208_to_Unicode.lo \ @@ -1129,21 +1208,19 @@ gnu/gcj/convert/JIS0212_to_Unicode.lo gnu/gcj/convert/Unicode_to_JIS.lo \ gnu/gcj/convert/natIconv.lo gnu/gcj/convert/natInput_EUCJIS.lo \ gnu/gcj/convert/natInput_SJIS.lo gnu/gcj/convert/natOutput_EUCJIS.lo \ gnu/gcj/convert/natOutput_SJIS.lo gnu/gcj/io/natSimpleSHSStream.lo \ -gnu/gcj/io/shs.lo gnu/gcj/jni/natNativeThread.lo \ -gnu/gcj/runtime/natFirstThread.lo java/io/natFile.lo \ -java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \ -java/io/natObjectOutputStream.lo java/lang/natCharacter.lo \ -java/lang/natClass.lo java/lang/natClassLoader.lo \ -java/lang/natConcreteProcess.lo java/lang/natDouble.lo \ -java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \ -java/lang/natRuntime.lo java/lang/natString.lo java/lang/natSystem.lo \ +gnu/gcj/io/shs.lo java/io/natFile.lo java/io/natFileDescriptor.lo \ +java/io/natObjectInputStream.lo java/io/natObjectOutputStream.lo \ +java/lang/natCharacter.lo java/lang/natClass.lo \ +java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \ +java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \ +java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \ +java/lang/natStringBuffer.lo java/lang/natSystem.lo \ java/lang/natThread.lo java/lang/natThrowable.lo \ java/lang/reflect/natArray.lo java/lang/reflect/natConstructor.lo \ java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \ java/net/natInetAddress.lo java/net/natPlainDatagramSocketImpl.lo \ java/net/natPlainSocketImpl.lo java/text/natCollator.lo \ -java/util/natGregorianCalendar.lo java/util/zip/natDeflater.lo \ -java/util/zip/natInflater.lo +java/util/zip/natDeflater.lo java/util/zip/natInflater.lo libgcjx_la_OBJECTS = gnu/gcj/xlib/natClip.lo \ gnu/gcj/xlib/natColormap.lo gnu/gcj/xlib/natDisplay.lo \ gnu/gcj/xlib/natDrawable.lo gnu/gcj/xlib/natFont.lo \ @@ -1168,7 +1245,6 @@ SCRIPTS = $(bin_SCRIPTS) CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ @@ -1231,7 +1307,6 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/gcj/io/DefaultMimeTypes.P .deps/gnu/gcj/io/MimeTypes.P \ .deps/gnu/gcj/io/SimpleSHSStream.P \ .deps/gnu/gcj/io/natSimpleSHSStream.P .deps/gnu/gcj/io/shs.P \ -.deps/gnu/gcj/jni/NativeThread.P .deps/gnu/gcj/jni/natNativeThread.P \ .deps/gnu/gcj/math/MPN.P .deps/gnu/gcj/protocol/file/Connection.P \ .deps/gnu/gcj/protocol/file/Handler.P \ .deps/gnu/gcj/protocol/http/Connection.P \ @@ -1240,7 +1315,6 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/gcj/protocol/jar/Handler.P \ .deps/gnu/gcj/runtime/FileDeleter.P .deps/gnu/gcj/runtime/FirstThread.P \ .deps/gnu/gcj/runtime/VMClassLoader.P \ -.deps/gnu/gcj/runtime/natFirstThread.P \ .deps/gnu/gcj/text/BaseBreakIterator.P \ .deps/gnu/gcj/text/CharacterBreakIterator.P \ .deps/gnu/gcj/text/LineBreakIterator.P \ @@ -1293,6 +1367,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/lang/reflect/TypeSignature.P \ .deps/gnu/java/locale/Calendar.P .deps/gnu/java/locale/Calendar_de.P \ .deps/gnu/java/locale/Calendar_en.P .deps/gnu/java/locale/Calendar_nl.P \ +.deps/gnu/java/security/provider/DefaultPolicy.P \ .deps/gnu/java/security/provider/Gnu.P \ .deps/gnu/java/security/provider/SHA.P \ .deps/gnu/java/security/provider/SHA1PRNG.P .deps/interpret.P \ @@ -1300,9 +1375,10 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/applet/AppletStub.P .deps/java/applet/AudioClip.P \ .deps/java/awt/AWTError.P .deps/java/awt/AWTEvent.P \ .deps/java/awt/AWTEventMulticaster.P .deps/java/awt/AWTException.P \ -.deps/java/awt/ActiveEvent.P .deps/java/awt/Adjustable.P \ -.deps/java/awt/BorderLayout.P .deps/java/awt/Button.P \ -.deps/java/awt/Canvas.P .deps/java/awt/Checkbox.P \ +.deps/java/awt/AWTPermission.P .deps/java/awt/ActiveEvent.P \ +.deps/java/awt/Adjustable.P .deps/java/awt/BorderLayout.P \ +.deps/java/awt/Button.P .deps/java/awt/Canvas.P \ +.deps/java/awt/CardLayout.P .deps/java/awt/Checkbox.P \ .deps/java/awt/CheckboxGroup.P .deps/java/awt/CheckboxMenuItem.P \ .deps/java/awt/Choice.P .deps/java/awt/Color.P \ .deps/java/awt/Component.P .deps/java/awt/ComponentOrientation.P \ @@ -1310,9 +1386,11 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/awt/Dialog.P .deps/java/awt/Dimension.P \ .deps/java/awt/Event.P .deps/java/awt/EventDispatchThread.P \ .deps/java/awt/EventQueue.P .deps/java/awt/FileDialog.P \ -.deps/java/awt/Font.P .deps/java/awt/FontMetrics.P \ -.deps/java/awt/Frame.P .deps/java/awt/Graphics.P \ -.deps/java/awt/Graphics2D.P .deps/java/awt/GraphicsConfiguration.P \ +.deps/java/awt/FlowLayout.P .deps/java/awt/Font.P \ +.deps/java/awt/FontMetrics.P .deps/java/awt/Frame.P \ +.deps/java/awt/Graphics.P .deps/java/awt/Graphics2D.P \ +.deps/java/awt/GraphicsConfiguration.P \ +.deps/java/awt/GridBagConstraints.P .deps/java/awt/GridLayout.P \ .deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \ .deps/java/awt/Insets.P .deps/java/awt/ItemSelectable.P \ .deps/java/awt/Label.P .deps/java/awt/LayoutManager.P \ @@ -1321,14 +1399,15 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/awt/MenuComponent.P .deps/java/awt/MenuContainer.P \ .deps/java/awt/MenuItem.P .deps/java/awt/MenuShortcut.P \ .deps/java/awt/Paint.P .deps/java/awt/PaintContext.P \ -.deps/java/awt/Panel.P .deps/java/awt/Point.P \ +.deps/java/awt/Panel.P .deps/java/awt/Point.P .deps/java/awt/Polygon.P \ .deps/java/awt/PopupMenu.P .deps/java/awt/Rectangle.P \ .deps/java/awt/RenderingHints.P .deps/java/awt/ScrollPane.P \ .deps/java/awt/Scrollbar.P .deps/java/awt/Shape.P \ -.deps/java/awt/TextArea.P .deps/java/awt/TextComponent.P \ -.deps/java/awt/TextField.P .deps/java/awt/Toolkit.P \ -.deps/java/awt/Transparency.P .deps/java/awt/Window.P \ -.deps/java/awt/color/ColorSpace.P .deps/java/awt/color/ICC_ColorSpace.P \ +.deps/java/awt/SystemColor.P .deps/java/awt/TextArea.P \ +.deps/java/awt/TextComponent.P .deps/java/awt/TextField.P \ +.deps/java/awt/Toolkit.P .deps/java/awt/Transparency.P \ +.deps/java/awt/Window.P .deps/java/awt/color/ColorSpace.P \ +.deps/java/awt/color/ICC_ColorSpace.P \ .deps/java/awt/color/ICC_Profile.P \ .deps/java/awt/datatransfer/Clipboard.P \ .deps/java/awt/event/AWTEventListener.P \ @@ -1365,10 +1444,12 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/awt/geom/AffineTransform.P .deps/java/awt/geom/Dimension2D.P \ .deps/java/awt/geom/Ellipse2D.P \ .deps/java/awt/geom/IllegalPathStateException.P \ +.deps/java/awt/geom/Line2D.P \ .deps/java/awt/geom/NoninvertibleTransformException.P \ .deps/java/awt/geom/PathIterator.P .deps/java/awt/geom/Point2D.P \ .deps/java/awt/geom/Rectangle2D.P \ .deps/java/awt/geom/RectangularShape.P \ +.deps/java/awt/geom/RoundRectangle2D.P \ .deps/java/awt/image/BufferedImage.P .deps/java/awt/image/ColorModel.P \ .deps/java/awt/image/ComponentColorModel.P \ .deps/java/awt/image/ComponentSampleModel.P \ @@ -1433,7 +1514,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/beans/beancontext/BeanContextServiceRevokedListener.P \ .deps/java/beans/beancontext/BeanContextServices.P \ .deps/java/beans/beancontext/BeanContextServicesListener.P \ -.deps/java/io/BlockDataException.P .deps/java/io/BufferedInputStream.P \ +.deps/java/io/BufferedInputStream.P \ .deps/java/io/BufferedOutputStream.P .deps/java/io/BufferedReader.P \ .deps/java/io/BufferedWriter.P .deps/java/io/ByteArrayInputStream.P \ .deps/java/io/ByteArrayOutputStream.P .deps/java/io/CharArrayReader.P \ @@ -1513,12 +1594,13 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/lang/NoSuchMethodException.P \ .deps/java/lang/NullPointerException.P .deps/java/lang/Number.P \ .deps/java/lang/NumberFormatException.P .deps/java/lang/Object.P \ -.deps/java/lang/OutOfMemoryError.P .deps/java/lang/Process.P \ -.deps/java/lang/Runnable.P .deps/java/lang/Runtime.P \ -.deps/java/lang/RuntimeException.P .deps/java/lang/RuntimePermission.P \ -.deps/java/lang/SecurityException.P .deps/java/lang/SecurityManager.P \ -.deps/java/lang/Short.P .deps/java/lang/StackOverflowError.P \ -.deps/java/lang/String.P .deps/java/lang/StringBuffer.P \ +.deps/java/lang/OutOfMemoryError.P .deps/java/lang/Package.P \ +.deps/java/lang/Process.P .deps/java/lang/Runnable.P \ +.deps/java/lang/Runtime.P .deps/java/lang/RuntimeException.P \ +.deps/java/lang/RuntimePermission.P .deps/java/lang/SecurityException.P \ +.deps/java/lang/SecurityManager.P .deps/java/lang/Short.P \ +.deps/java/lang/StackOverflowError.P .deps/java/lang/String.P \ +.deps/java/lang/StringBuffer.P \ .deps/java/lang/StringIndexOutOfBoundsException.P \ .deps/java/lang/System.P .deps/java/lang/Thread.P \ .deps/java/lang/ThreadDeath.P .deps/java/lang/ThreadGroup.P \ @@ -1539,8 +1621,11 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/lang/natDouble.P .deps/java/lang/natFloat.P \ .deps/java/lang/natMath.P .deps/java/lang/natObject.P \ .deps/java/lang/natRuntime.P .deps/java/lang/natString.P \ -.deps/java/lang/natSystem.P .deps/java/lang/natThread.P \ -.deps/java/lang/natThrowable.P \ +.deps/java/lang/natStringBuffer.P .deps/java/lang/natSystem.P \ +.deps/java/lang/natThread.P .deps/java/lang/natThrowable.P \ +.deps/java/lang/ref/PhantomReference.P .deps/java/lang/ref/Reference.P \ +.deps/java/lang/ref/ReferenceQueue.P \ +.deps/java/lang/ref/SoftReference.P .deps/java/lang/ref/WeakReference.P \ .deps/java/lang/reflect/AccessibleObject.P \ .deps/java/lang/reflect/Array.P .deps/java/lang/reflect/Constructor.P \ .deps/java/lang/reflect/Field.P \ @@ -1556,58 +1641,94 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/lang/s_fabs.P .deps/java/lang/s_floor.P \ .deps/java/lang/s_rint.P .deps/java/lang/s_scalbn.P \ .deps/java/lang/s_sin.P .deps/java/lang/s_tan.P \ -.deps/java/lang/sf_rint.P .deps/java/lang/strtod.P \ -.deps/java/lang/w_acos.P .deps/java/lang/w_asin.P \ -.deps/java/lang/w_atan2.P .deps/java/lang/w_exp.P \ -.deps/java/lang/w_fmod.P .deps/java/lang/w_log.P \ -.deps/java/lang/w_pow.P .deps/java/lang/w_remainder.P \ -.deps/java/lang/w_sqrt.P .deps/java/math/BigDecimal.P \ -.deps/java/math/BigInteger.P .deps/java/net/BindException.P \ -.deps/java/net/ConnectException.P .deps/java/net/ContentHandler.P \ -.deps/java/net/ContentHandlerFactory.P .deps/java/net/DatagramPacket.P \ -.deps/java/net/DatagramSocket.P .deps/java/net/DatagramSocketImpl.P \ -.deps/java/net/FileNameMap.P .deps/java/net/HttpURLConnection.P \ -.deps/java/net/InetAddress.P .deps/java/net/JarURLConnection.P \ +.deps/java/lang/sf_fabs.P .deps/java/lang/sf_rint.P \ +.deps/java/lang/strtod.P .deps/java/lang/w_acos.P \ +.deps/java/lang/w_asin.P .deps/java/lang/w_atan2.P \ +.deps/java/lang/w_exp.P .deps/java/lang/w_fmod.P \ +.deps/java/lang/w_log.P .deps/java/lang/w_pow.P \ +.deps/java/lang/w_remainder.P .deps/java/lang/w_sqrt.P \ +.deps/java/math/BigDecimal.P .deps/java/math/BigInteger.P \ +.deps/java/net/BindException.P .deps/java/net/ConnectException.P \ +.deps/java/net/ContentHandler.P .deps/java/net/ContentHandlerFactory.P \ +.deps/java/net/DatagramPacket.P .deps/java/net/DatagramSocket.P \ +.deps/java/net/DatagramSocketImpl.P .deps/java/net/FileNameMap.P \ +.deps/java/net/HttpURLConnection.P .deps/java/net/InetAddress.P \ +.deps/java/net/JarURLConnection.P \ .deps/java/net/MalformedURLException.P .deps/java/net/MulticastSocket.P \ -.deps/java/net/NoRouteToHostException.P \ +.deps/java/net/NetPermission.P .deps/java/net/NoRouteToHostException.P \ .deps/java/net/PlainDatagramSocketImpl.P \ .deps/java/net/PlainSocketImpl.P .deps/java/net/ProtocolException.P \ .deps/java/net/ServerSocket.P .deps/java/net/Socket.P \ .deps/java/net/SocketException.P .deps/java/net/SocketImpl.P \ .deps/java/net/SocketImplFactory.P .deps/java/net/SocketOptions.P \ -.deps/java/net/URL.P .deps/java/net/URLClassLoader.P \ -.deps/java/net/URLConnection.P .deps/java/net/URLDecoder.P \ -.deps/java/net/URLEncoder.P .deps/java/net/URLStreamHandler.P \ +.deps/java/net/SocketPermission.P .deps/java/net/URL.P \ +.deps/java/net/URLClassLoader.P .deps/java/net/URLConnection.P \ +.deps/java/net/URLDecoder.P .deps/java/net/URLEncoder.P \ +.deps/java/net/URLStreamHandler.P \ .deps/java/net/URLStreamHandlerFactory.P \ .deps/java/net/UnknownHostException.P \ .deps/java/net/UnknownServiceException.P \ .deps/java/net/natInetAddress.P \ .deps/java/net/natPlainDatagramSocketImpl.P \ .deps/java/net/natPlainSocketImpl.P \ +.deps/java/security/AccessControlContext.P \ +.deps/java/security/AccessControlException.P \ +.deps/java/security/AccessController.P \ +.deps/java/security/AlgorithmParameterGenerator.P \ .deps/java/security/AlgorithmParameterGeneratorSpi.P \ -.deps/java/security/BasicPermission.P \ -.deps/java/security/DigestException.P \ +.deps/java/security/AlgorithmParameters.P \ +.deps/java/security/AlgorithmParametersSpi.P \ +.deps/java/security/AllPermission.P \ +.deps/java/security/BasicPermission.P .deps/java/security/Certificate.P \ +.deps/java/security/CodeSource.P .deps/java/security/DigestException.P \ +.deps/java/security/DigestInputStream.P \ .deps/java/security/DigestOutputStream.P \ +.deps/java/security/DomainCombiner.P \ +.deps/java/security/DummyKeyPairGenerator.P \ +.deps/java/security/DummyMessageDigest.P \ +.deps/java/security/DummySignature.P \ .deps/java/security/GeneralSecurityException.P \ -.deps/java/security/Guard.P \ +.deps/java/security/Guard.P .deps/java/security/GuardedObject.P \ +.deps/java/security/Identity.P .deps/java/security/IdentityScope.P \ .deps/java/security/InvalidAlgorithmParameterException.P \ .deps/java/security/InvalidKeyException.P \ .deps/java/security/InvalidParameterException.P \ .deps/java/security/Key.P .deps/java/security/KeyException.P \ +.deps/java/security/KeyFactory.P .deps/java/security/KeyFactorySpi.P \ +.deps/java/security/KeyManagementException.P \ .deps/java/security/KeyPair.P .deps/java/security/KeyPairGenerator.P \ .deps/java/security/KeyPairGeneratorSpi.P \ -.deps/java/security/MessageDigest.P \ +.deps/java/security/KeyStore.P .deps/java/security/KeyStoreException.P \ +.deps/java/security/KeyStoreSpi.P .deps/java/security/MessageDigest.P \ +.deps/java/security/MessageDigestSpi.P \ .deps/java/security/NoSuchAlgorithmException.P \ .deps/java/security/NoSuchProviderException.P \ .deps/java/security/Permission.P \ .deps/java/security/PermissionCollection.P \ +.deps/java/security/Permissions.P .deps/java/security/Policy.P \ .deps/java/security/Principal.P .deps/java/security/PrivateKey.P \ -.deps/java/security/Provider.P .deps/java/security/PublicKey.P \ +.deps/java/security/PrivilegedAction.P \ +.deps/java/security/PrivilegedActionException.P \ +.deps/java/security/PrivilegedExceptionAction.P \ +.deps/java/security/ProtectionDomain.P .deps/java/security/Provider.P \ +.deps/java/security/ProviderException.P .deps/java/security/PublicKey.P \ .deps/java/security/SecureClassLoader.P \ -.deps/java/security/SecureRandom.P .deps/java/security/Security.P \ +.deps/java/security/SecureRandom.P \ +.deps/java/security/SecureRandomSpi.P .deps/java/security/Security.P \ +.deps/java/security/SecurityPermission.P \ .deps/java/security/Signature.P \ -.deps/java/security/SignatureException.P .deps/java/security/cert/CRL.P \ -.deps/java/security/cert/CRLException.P \ +.deps/java/security/SignatureException.P \ +.deps/java/security/SignatureSpi.P .deps/java/security/SignedObject.P \ +.deps/java/security/Signer.P \ +.deps/java/security/UnrecoverableKeyException.P \ +.deps/java/security/UnresolvedPermission.P \ +.deps/java/security/acl/Acl.P .deps/java/security/acl/AclEntry.P \ +.deps/java/security/acl/AclNotFoundException.P \ +.deps/java/security/acl/Group.P \ +.deps/java/security/acl/LastOwnerException.P \ +.deps/java/security/acl/NotOwnerException.P \ +.deps/java/security/acl/Owner.P .deps/java/security/acl/Permission.P \ +.deps/java/security/cert/CRL.P .deps/java/security/cert/CRLException.P \ .deps/java/security/cert/Certificate.P \ .deps/java/security/cert/CertificateEncodingException.P \ .deps/java/security/cert/CertificateException.P \ @@ -1621,26 +1742,39 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/security/cert/X509Certificate.P \ .deps/java/security/cert/X509Extension.P \ .deps/java/security/interfaces/DSAKey.P \ +.deps/java/security/interfaces/DSAKeyPairGenerator.P \ .deps/java/security/interfaces/DSAParams.P \ .deps/java/security/interfaces/DSAPrivateKey.P \ .deps/java/security/interfaces/DSAPublicKey.P \ +.deps/java/security/interfaces/RSAKey.P \ .deps/java/security/interfaces/RSAPrivateCrtKey.P \ .deps/java/security/interfaces/RSAPrivateKey.P \ .deps/java/security/interfaces/RSAPublicKey.P \ .deps/java/security/spec/AlgorithmParameterSpec.P \ +.deps/java/security/spec/DSAParameterSpec.P \ +.deps/java/security/spec/DSAPrivateKeySpec.P \ +.deps/java/security/spec/DSAPublicKeySpec.P \ +.deps/java/security/spec/EncodedKeySpec.P \ .deps/java/security/spec/InvalidKeySpecException.P \ .deps/java/security/spec/InvalidParameterSpecException.P \ .deps/java/security/spec/KeySpec.P \ +.deps/java/security/spec/PKCS8EncodedKeySpec.P \ +.deps/java/security/spec/RSAKeyGenParameterSpec.P \ .deps/java/security/spec/RSAPrivateCrtKeySpec.P \ .deps/java/security/spec/RSAPrivateKeySpec.P \ .deps/java/security/spec/RSAPublicKeySpec.P \ -.deps/java/sql/CallableStatement.P .deps/java/sql/Connection.P \ -.deps/java/sql/DataTruncation.P .deps/java/sql/DatabaseMetaData.P \ -.deps/java/sql/Date.P .deps/java/sql/Driver.P \ -.deps/java/sql/DriverManager.P .deps/java/sql/DriverPropertyInfo.P \ -.deps/java/sql/PreparedStatement.P .deps/java/sql/ResultSet.P \ -.deps/java/sql/ResultSetMetaData.P .deps/java/sql/SQLException.P \ -.deps/java/sql/SQLWarning.P .deps/java/sql/Statement.P \ +.deps/java/security/spec/X509EncodedKeySpec.P .deps/java/sql/Array.P \ +.deps/java/sql/BatchUpdateException.P .deps/java/sql/Blob.P \ +.deps/java/sql/CallableStatement.P .deps/java/sql/Clob.P \ +.deps/java/sql/Connection.P .deps/java/sql/DataTruncation.P \ +.deps/java/sql/DatabaseMetaData.P .deps/java/sql/Date.P \ +.deps/java/sql/Driver.P .deps/java/sql/DriverManager.P \ +.deps/java/sql/DriverPropertyInfo.P .deps/java/sql/PreparedStatement.P \ +.deps/java/sql/Ref.P .deps/java/sql/ResultSet.P \ +.deps/java/sql/ResultSetMetaData.P .deps/java/sql/SQLData.P \ +.deps/java/sql/SQLException.P .deps/java/sql/SQLInput.P \ +.deps/java/sql/SQLOutput.P .deps/java/sql/SQLWarning.P \ +.deps/java/sql/Statement.P .deps/java/sql/Struct.P \ .deps/java/sql/Time.P .deps/java/sql/Timestamp.P .deps/java/sql/Types.P \ .deps/java/text/BreakIterator.P .deps/java/text/CharacterIterator.P \ .deps/java/text/ChoiceFormat.P \ @@ -1657,19 +1791,19 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/util/AbstractMap.P .deps/java/util/AbstractSequentialList.P \ .deps/java/util/AbstractSet.P .deps/java/util/ArrayList.P \ .deps/java/util/Arrays.P .deps/java/util/BasicMapEntry.P \ -.deps/java/util/BitSet.P .deps/java/util/Bucket.P \ -.deps/java/util/Calendar.P .deps/java/util/Collection.P \ -.deps/java/util/Collections.P .deps/java/util/Comparator.P \ +.deps/java/util/BitSet.P .deps/java/util/Calendar.P \ +.deps/java/util/Collection.P .deps/java/util/Collections.P \ +.deps/java/util/Comparator.P \ .deps/java/util/ConcurrentModificationException.P \ .deps/java/util/Date.P .deps/java/util/Dictionary.P \ .deps/java/util/EmptyStackException.P .deps/java/util/Enumeration.P \ .deps/java/util/EventListener.P .deps/java/util/EventObject.P \ .deps/java/util/GregorianCalendar.P .deps/java/util/HashMap.P \ -.deps/java/util/Hashtable.P .deps/java/util/Iterator.P \ -.deps/java/util/LinkedList.P .deps/java/util/List.P \ -.deps/java/util/ListIterator.P .deps/java/util/ListResourceBundle.P \ -.deps/java/util/Locale.P .deps/java/util/Map.P \ -.deps/java/util/MissingResourceException.P \ +.deps/java/util/HashSet.P .deps/java/util/Hashtable.P \ +.deps/java/util/Iterator.P .deps/java/util/LinkedList.P \ +.deps/java/util/List.P .deps/java/util/ListIterator.P \ +.deps/java/util/ListResourceBundle.P .deps/java/util/Locale.P \ +.deps/java/util/Map.P .deps/java/util/MissingResourceException.P \ .deps/java/util/NoSuchElementException.P .deps/java/util/Observable.P \ .deps/java/util/Observer.P .deps/java/util/Properties.P \ .deps/java/util/PropertyPermission.P \ @@ -1679,13 +1813,14 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/util/SortedSet.P .deps/java/util/Stack.P \ .deps/java/util/StringTokenizer.P .deps/java/util/TimeZone.P \ .deps/java/util/Timer.P .deps/java/util/TimerTask.P \ -.deps/java/util/TooManyListenersException.P .deps/java/util/Vector.P \ -.deps/java/util/jar/Attributes.P .deps/java/util/jar/JarEntry.P \ -.deps/java/util/jar/JarException.P .deps/java/util/jar/JarFile.P \ -.deps/java/util/jar/JarInputStream.P \ +.deps/java/util/TooManyListenersException.P .deps/java/util/TreeMap.P \ +.deps/java/util/TreeSet.P .deps/java/util/Vector.P \ +.deps/java/util/WeakHashMap.P .deps/java/util/jar/Attributes.P \ +.deps/java/util/jar/JarEntry.P .deps/java/util/jar/JarException.P \ +.deps/java/util/jar/JarFile.P .deps/java/util/jar/JarInputStream.P \ .deps/java/util/jar/JarOutputStream.P .deps/java/util/jar/Manifest.P \ -.deps/java/util/natGregorianCalendar.P .deps/java/util/zip/Adler32.P \ -.deps/java/util/zip/CRC32.P .deps/java/util/zip/CheckedInputStream.P \ +.deps/java/util/zip/Adler32.P .deps/java/util/zip/CRC32.P \ +.deps/java/util/zip/CheckedInputStream.P \ .deps/java/util/zip/CheckedOutputStream.P \ .deps/java/util/zip/Checksum.P \ .deps/java/util/zip/DataFormatException.P \ @@ -1698,11 +1833,11 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/util/zip/ZipException.P .deps/java/util/zip/ZipFile.P \ .deps/java/util/zip/ZipInputStream.P \ .deps/java/util/zip/ZipOutputStream.P .deps/java/util/zip/natDeflater.P \ -.deps/java/util/zip/natInflater.P .deps/jni.P .deps/libgcjdata.P \ -.deps/name-finder.P .deps/no-threads.P .deps/nogc.P \ -.deps/posix-threads.P .deps/posix.P .deps/prims.P .deps/resolve.P -SOURCES = $(libgcjdata_a_SOURCES) $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) -OBJECTS = $(libgcjdata_a_OBJECTS) $(libgcj_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(gen_from_JIS_OBJECTS) +.deps/java/util/zip/natInflater.P .deps/jni.P .deps/name-finder.P \ +.deps/no-threads.P .deps/nogc.P .deps/posix-threads.P .deps/posix.P \ +.deps/prims.P .deps/resolve.P +SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) +OBJECTS = $(libgcj_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(gen_from_JIS_OBJECTS) all: all-redirect .SUFFIXES: @@ -1726,36 +1861,29 @@ libgcj.spec: $(top_builddir)/config.status libgcj.spec.in libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -mostlyclean-toolexeclibLIBRARIES: +mostlyclean-toolexeclibLTLIBRARIES: -clean-toolexeclibLIBRARIES: - -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES) +clean-toolexeclibLTLIBRARIES: + -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES) -distclean-toolexeclibLIBRARIES: +distclean-toolexeclibLTLIBRARIES: -maintainer-clean-toolexeclibLIBRARIES: +maintainer-clean-toolexeclibLTLIBRARIES: -install-toolexeclibLIBRARIES: $(toolexeclib_LIBRARIES) +install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) - @list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \ + @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(RANLIB) $(DESTDIR)$(toolexeclibdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(toolexeclibdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \ else :; fi; \ done -uninstall-toolexeclibLIBRARIES: +uninstall-toolexeclibLTLIBRARIES: @$(NORMAL_UNINSTALL) - list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \ + list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \ done # FIXME: We should only use cygpath when building on Windows, @@ -1796,42 +1924,6 @@ distclean-libtool: maintainer-clean-libtool: -libgcjdata.a: $(libgcjdata_a_OBJECTS) $(libgcjdata_a_DEPENDENCIES) - -rm -f libgcjdata.a - $(AR) cru libgcjdata.a $(libgcjdata_a_OBJECTS) $(libgcjdata_a_LIBADD) - $(RANLIB) libgcjdata.a - -mostlyclean-toolexeclibLTLIBRARIES: - -clean-toolexeclibLTLIBRARIES: - -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES) - -distclean-toolexeclibLTLIBRARIES: - -maintainer-clean-toolexeclibLTLIBRARIES: - -install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) - @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \ - else :; fi; \ - done - -uninstall-toolexeclibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \ - done - -libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) - $(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS) - -libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES) - $(libgcjx_la_LINK) -rpath $(toolexeclibdir) $(libgcjx_la_LDFLAGS) $(libgcjx_la_OBJECTS) $(libgcjx_la_LIBADD) $(LIBS) - mostlyclean-binPROGRAMS: clean-binPROGRAMS: @@ -1951,7 +2043,7 @@ uninstall-toolexeclibDATA: @SET_MAKE@ all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive install-info-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ @@ -2152,10 +2244,7 @@ check-am: all-am check: check-recursive installcheck-am: installcheck: installcheck-recursive -install-info-am: -install-info: install-info-recursive -install-exec-am: install-toolexeclibLIBRARIES \ - install-toolexeclibLTLIBRARIES install-binPROGRAMS \ +install-exec-am: install-toolexeclibLTLIBRARIES install-binPROGRAMS \ install-binSCRIPTS install-toolexeclibDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook @@ -2167,20 +2256,17 @@ install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-toolexeclibLIBRARIES \ - uninstall-toolexeclibLTLIBRARIES uninstall-binPROGRAMS \ +uninstall-am: uninstall-toolexeclibLTLIBRARIES uninstall-binPROGRAMS \ uninstall-binSCRIPTS uninstall-dataDATA \ uninstall-toolexeclibDATA uninstall: uninstall-recursive -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ - $(DATA) +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) \ - $(DESTDIR)$(toolexeclibdir) $(DESTDIR)$(bindir) \ + $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \ $(DESTDIR)$(toolexeclibdir) @@ -2196,33 +2282,30 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-toolexeclibLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-toolexeclibLTLIBRARIES \ - mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ - mostlyclean-tags mostlyclean-depend mostlyclean-generic +mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \ + mostlyclean-libtool mostlyclean-binPROGRAMS \ + mostlyclean-noinstPROGRAMS mostlyclean-tags \ + mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-toolexeclibLIBRARIES clean-compile clean-libtool \ - clean-toolexeclibLTLIBRARIES clean-binPROGRAMS \ - clean-noinstPROGRAMS clean-tags clean-depend \ - clean-generic mostlyclean-am clean-local +clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \ + clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \ + clean-depend clean-generic mostlyclean-am clean-local clean: clean-recursive -distclean-am: distclean-toolexeclibLIBRARIES distclean-compile \ - distclean-libtool distclean-toolexeclibLTLIBRARIES \ - distclean-binPROGRAMS distclean-noinstPROGRAMS \ - distclean-tags distclean-depend distclean-generic \ - clean-am +distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \ + distclean-libtool distclean-binPROGRAMS \ + distclean-noinstPROGRAMS distclean-tags \ + distclean-depend distclean-generic clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \ +maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ maintainer-clean-depend maintainer-clean-generic \ @@ -2233,35 +2316,32 @@ maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \ maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \ -clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \ -uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \ +.PHONY: mostlyclean-toolexeclibLTLIBRARIES \ +distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \ +maintainer-clean-toolexeclibLTLIBRARIES \ +uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool \ -mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \ -clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \ -uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ -mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ -uninstall-binSCRIPTS install-binSCRIPTS uninstall-dataDATA \ -install-dataDATA uninstall-toolexeclibDATA install-toolexeclibDATA \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +clean-libtool maintainer-clean-libtool mostlyclean-binPROGRAMS \ +distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \ +uninstall-binPROGRAMS install-binPROGRAMS mostlyclean-noinstPROGRAMS \ +distclean-noinstPROGRAMS clean-noinstPROGRAMS \ +maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ +uninstall-dataDATA install-dataDATA uninstall-toolexeclibDATA \ +install-toolexeclibDATA install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir \ mostlyclean-depend distclean-depend clean-depend \ maintainer-clean-depend info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-info-am install-info \ -install-exec-am install-exec install-data-local install-data-am \ -install-data install-am install uninstall-am uninstall all-redirect \ -all-am all installdirs-am installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +installcheck-am installcheck install-exec-am install-exec \ +install-data-local install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean install-exec-hook: @@ -2271,9 +2351,9 @@ install-exec-hook: $(LN_S) libgcjx.la gnu-awt-xlib.la; \ fi -$(java_source_files:.java=.class): libgcj.zip +$(java_source_files:.java=.class): libgcj.jar -$(x_java_source_files:.java=.class): libgcj.zip +$(x_java_source_files:.java=.class): libgcj.jar $(built_java_source_files:.java=.class): $(built_java_source_files) @javac="$(JAVAC)"; \ @@ -2283,7 +2363,7 @@ $(built_java_source_files:.java=.class): $(built_java_source_files) -d $(here) $$f; \ done -libgcj.zip: $(java_source_files) $(x_java_source_files) +libgcj.jar: $(java_source_files) $(x_java_source_files) @: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$(subst $(srcdir)/,,$?),$(shell echo $(source) >> tmp-list)) $(MAKE) $(built_java_source_files:.java=.class) @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ @@ -2294,10 +2374,10 @@ libgcj.zip: $(java_source_files) $(x_java_source_files) || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ done; \ test "$$fail" = no - -@rm -f tmp-list libgcj.zip + -@rm -f tmp-list libgcj.jar find java gnu -type d -o -type f -name '*.class' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \ - $(ZIP) libgcj -@ -n .class + $(ZIP) cfM0E@ $@ clean-local: find . -name '*.class' -print | xargs rm -f @@ -2326,33 +2406,46 @@ $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h $(javao_files) $(x_javao_files): %.lo: %.java $(GCJCOMPILE) -o $@ $< +libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) + @echo $(libgcj_la_OBJECTS) > libgcj.objectlist; + @echo $(libgcj_la_LIBADD) >> libgcj.objectlist; + $(libgcj_la_LINK) -objectlist libgcj.objectlist \ + @LIBFFI@ \ + -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) + +libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES) + @echo $(libgcjx_la_OBJECTS) > libgcjx.objectlist; + @echo $(libgcjx_la_LIBADD) >> libgcjx.objectlist; + $(libgcjx_la_LINK) -objectlist libgcjx.objectlist \ + -rpath $(toolexeclibdir) $(libgcjx_la_LDFLAGS) $(LIBS) + .class.h: $(GCJH) -classpath $(top_builddir) $(basename $<) -java/lang/ClassLoader.h: java/lang/ClassLoader.class libgcj.zip +java/lang/ClassLoader.h: java/lang/ClassLoader.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ -friend 'void _Jv_RunMain (const char *name, int argc, const char **argv, bool is_jar);' \ $(basename $<) -gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip +gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -friend 'void JvRunMain (jclass, int, const char **);' \ -friend 'void _Jv_RunMain (const char*, int, const char **);' \ $(basename $<) -java/lang/Thread.h: java/lang/Thread.class libgcj.zip +java/lang/Thread.h: java/lang/Thread.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -prepend 'class _Jv_JNIEnv;' \ - -prepend 'extern "Java" { namespace gnu { namespace gcj { namespace jni { class NativeThread; } } } };' \ -prepend '#define _JV_NOT_OWNER 1' \ -prepend '#define _JV_INTERRUPTED 2' \ -friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ -friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ - -friend 'class gnu::gcj::jni::NativeThread;' \ + -friend 'java::lang::Thread* _Jv_AttachCurrentThread(jstring name, java::lang::ThreadGroup* group);' \ + -friend 'jint _Jv_DetachCurrentThread ();' \ $(basename $<) -java/lang/String.h: java/lang/String.class libgcj.zip +java/lang/String.h: java/lang/String.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -friend 'jchar* _Jv_GetStringChars (jstring str);' \ -friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \ @@ -2362,40 +2455,43 @@ java/lang/String.h: java/lang/String.class libgcj.zip -friend 'jstring _Jv_AllocString (jsize);' \ $(basename $<) -java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class libgcj.zip +java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \ -friend 'class java::lang::Class;' \ -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ $(basename $<) -java/lang/reflect/Field.h: java/lang/reflect/Field.class libgcj.zip +java/lang/reflect/Field.h: java/lang/reflect/Field.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \ -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \ -friend 'class java::lang::Class;' \ $(basename $<) -java/lang/reflect/Method.h: java/lang/reflect/Method.class libgcj.zip +java/lang/reflect/Method.h: java/lang/reflect/Method.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \ -friend 'class java::lang::Class;' \ -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ $(basename $<) -gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class libgcj.zip +gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class libgcj.jar $(GCJH) -classpath $(top_builddir) \ -friend 'class java::lang::ClassLoader;' \ $(basename $<) -java/io/ObjectInputStream$$GetField.h: libgcj.zip +java/io/ObjectInputStream$$GetField.h: libgcj.jar $(GCJH) -classpath $(top_builddir) \ 'java/io/ObjectInputStream$$GetField' -java/io/ObjectOutputStream$$PutField.h: libgcj.zip +java/io/ObjectOutputStream$$PutField.h: libgcj.jar $(GCJH) -classpath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' +$(extra_headers): + @: + install-data-local: $(PRE_INSTALL) @for f in $(nat_headers) $(extra_headers); do \ @@ -2412,7 +2508,7 @@ maintainer-check: libgcj.la | grep -v 'Jv' \ | grep -v 'terminate__Fv' | grep -v 'unexpected__Fv' -header-check: libgcj.zip $(nat_headers) +header-check: libgcj.jar $(nat_headers) rm -f htest.cc; \ for h in $(nat_headers); do \ echo "#include \"$$h\"" >> htest.cc; \ @@ -2469,6 +2565,38 @@ $(CONVERT_DIR)/make-trie.o: $(srcdir)/$(CONVERT_DIR)/make-trie.c @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc: ./gen-from-JIS$(EXEEXT) @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@ ./gen-from-JIS toJIS>$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc +TexinfoDoclet.class: $(srcdir)/scripts/TexinfoDoclet.java + javac -d . $(srcdir)/scripts/TexinfoDoclet.java + +texinfo: TexinfoDoclet.class + langsource=`ls $(srcdir)/java/lang/*.java`; \ + lang=`echo $$langsource | sed -e 's/[^ ].*EcosProcess.java//g' | sed -e 's/[^ ].*PosixProcess.java//g'`; \ + javadoc -outfile $(srcdir)/doc/java-lang.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $$lang + javadoc -outfile $(srcdir)/doc/java-lang-ref.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/lang/ref/*.java + javadoc -outfile $(srcdir)/doc/java-lang-reflect.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/lang/reflect/*.java + javadoc -outfile $(srcdir)/doc/java-applet.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/applet/*.java + javadoc -outfile $(srcdir)/doc/java-awt.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/*.java + javadoc -outfile $(srcdir)/doc/java-awt-color.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/color/*.java + javadoc -outfile $(srcdir)/doc/java-awt-datatransfer.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/datatransfer/*.java + javadoc -outfile $(srcdir)/doc/java-awt-event.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/event/*.java + javadoc -outfile $(srcdir)/doc/java-awt-geom.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/geom/*.java + javadoc -outfile $(srcdir)/doc/java-awt-image.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/image/*.java + javadoc -outfile $(srcdir)/doc/java-awt-peer.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/peer/*.java + javadoc -outfile $(srcdir)/doc/java-beans.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/beans/*.java + javadoc -outfile $(srcdir)/doc/java-beans-beancontext.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/beans/beancontext/*.java + javadoc -outfile $(srcdir)/doc/java-io.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/io/*.java + javadoc -outfile $(srcdir)/doc/java-math.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/math/*.java + javadoc -outfile $(srcdir)/doc/java-net.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/net/*.java + javadoc -outfile $(srcdir)/doc/java-security.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security/*.java + javadoc -outfile $(srcdir)/doc/java-security-cert.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security-cert/*.java + javadoc -outfile $(srcdir)/doc/java-security-spec.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security/spec/*.java + javadoc -outfile $(srcdir)/doc/java-security-interfaces.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security/spec/interfaces/*.java + javadoc -outfile $(srcdir)/doc/java-sql.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/sql/*.java + javadoc -outfile $(srcdir)/doc/java-text.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/text/*.java + javadoc -outfile $(srcdir)/doc/java-util.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/*.java + javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/jar/*.java + javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/zip/*.java + -include deps.mk all-recursive: $(nat_headers) $(x_nat_headers)