From fedf5454fa29f24aee9c564cf64207baf642fe64 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Wed, 7 Jul 2004 17:33:12 -0700 Subject: [PATCH] * Makefile.am: Add rules to build libgij from just gij.cc. From-SVN: r84251 --- libjava/ChangeLog | 2 ++ libjava/Makefile.am | 4 +++- libjava/Makefile.in | 16 ++++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index adcf27512f9..aded40bd634 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,7 @@ 2004-07-07 Per Bothner + * Makefile.am: Add rules to build libgij from just gij.cc. + * include/jvm.h (namespace jcj): Declare verbose_class_flag * java/lang/natClass.cc (gcj::verbose_class_flag): New variable. (initializeClass): If verbose_class_flag, print message. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 9a2d8f4b8e1..9d100a713a7 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -40,7 +40,7 @@ else cond_gtk_ltlibrary = endif -toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la \ +toolexeclib_LTLIBRARIES = libgcj.la libgij.la lib-org-xml-sax.la lib-org-w3c-dom.la \ $(cond_gtk_ltlibrary) $(cond_x_ltlibrary) toolexecmainlib_DATA = libgcj.spec @@ -152,6 +152,8 @@ javao_files = $(java_source_files:.java=.lo) \ $(built_java_source_files:.java=.lo) x_javao_files = $(x_java_source_files:.java=.lo) +libgij_la_SOURCES = gij.cc + libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 894c853ac5e..a36ee19647e 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -175,7 +175,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o @GTK_AWT_TRUE@cond_gtk_ltlibrary = @GTK_AWT_TRUE@lib-gnu-java-awt-peer-gtk.la @GTK_AWT_FALSE@cond_gtk_ltlibrary = -toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la \ +toolexeclib_LTLIBRARIES = libgcj.la libgij.la lib-org-xml-sax.la lib-org-w3c-dom.la \ $(cond_gtk_ltlibrary) $(cond_x_ltlibrary) toolexecmainlib_DATA = libgcj.spec @@ -245,6 +245,8 @@ javao_files = $(java_source_files:.java=.lo) \ x_javao_files = $(x_java_source_files:.java=.lo) +libgij_la_SOURCES = gij.cc + libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) @@ -2819,6 +2821,9 @@ java/net/natInetAddress.lo java/nio/channels/natChannels.lo \ java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \ java/util/natResourceBundle.lo java/util/natTimeZone.lo \ java/util/zip/natDeflater.lo java/util/zip/natInflater.lo +libgij_la_LDFLAGS = +libgij_la_LIBADD = +libgij_la_OBJECTS = gij.lo lib_org_xml_sax_la_DEPENDENCIES = libgcj.la lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \ org/xml/sax/ext/LexicalHandler.lo \ @@ -3065,7 +3070,7 @@ libgcj-test.spec.in libgcj.pc.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ @@ -4862,8 +4867,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/org/xml/sax/helpers/XMLReaderFactory.P .deps/posix-threads.P \ .deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P \ .deps/win32-threads.P .deps/win32.P -SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) -OBJECTS = $(libgcj_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) +SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgij_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) +OBJECTS = $(libgcj_la_OBJECTS) $(libgij_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) all: all-redirect .SUFFIXES: @@ -4953,6 +4958,9 @@ distclean-libtool: maintainer-clean-libtool: +libgij.la: $(libgij_la_OBJECTS) $(libgij_la_DEPENDENCIES) + $(CXXLINK) -rpath $(toolexeclibdir) $(libgij_la_LDFLAGS) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS) + lib-org-xml-sax.la: $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_DEPENDENCIES) $(LINK) -rpath $(toolexeclibdir) $(lib_org_xml_sax_la_LDFLAGS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_LIBADD) $(LIBS) -- 2.30.2