From ff78c80b8281aa2878793a7bd994418f98849e16 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 4 Aug 2004 18:02:00 +0000 Subject: [PATCH] acconfig.h: Removed. 2004-08-04 Thomas Fitzsimmons Michael Koch * acconfig.h: Removed. * Makefile.am: Rename variables for xlib peer to include xlib and gtk_c_headers to gtk_jni_headers. * Makefile.in: Regenerated. Co-Authored-By: Michael Koch From-SVN: r85566 --- libjava/ChangeLog | 8 +++++++ libjava/Makefile.am | 53 +++++++++++++++++++++++---------------------- libjava/Makefile.in | 44 ++++++++++++++++++------------------- libjava/acconfig.h | 2 -- 4 files changed, 57 insertions(+), 50 deletions(-) delete mode 100644 libjava/acconfig.h diff --git a/libjava/ChangeLog b/libjava/ChangeLog index db4f37c981a..a75781a3497 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2004-08-04 Thomas Fitzsimmons + Michael Koch + + * acconfig.h: Removed. + * Makefile.am: Rename variables for xlib peer to include xlib and + gtk_c_headers to gtk_jni_headers. + * Makefile.in: Regenerated. + 2004-08-04 Andrew Haley * testsuite/lib/libjava.exp (bytecompile_file): Byte compile with diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 100d456c51a..e179a75b9d0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -29,11 +29,11 @@ target_noncanonical = @target_noncanonical@ ## if XLIB_AWT -cond_x_ltlibrary = lib-gnu-awt-xlib.la +cond_xlib_ltlibrary = lib-gnu-awt-xlib.la ## We require libstdc++-v3 to be in the same build tree. xlib_includes = -I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_noncanonical) -I$(srcdir)/../libstdc++-v3/libsupc++ else -cond_x_ltlibrary = +cond_xlib_ltlibrary = xlib_includes = endif @@ -44,7 +44,7 @@ cond_gtk_ltlibrary = endif toolexeclib_LTLIBRARIES = libgcj.la libgij.la lib-org-xml-sax.la lib-org-w3c-dom.la \ - $(cond_gtk_ltlibrary) $(cond_x_ltlibrary) + $(cond_gtk_ltlibrary) $(cond_xlib_ltlibrary) toolexecmainlib_DATA = libgcj.spec pkgconfigdir = $(libdir)/pkgconfig @@ -132,7 +132,7 @@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ ## Objects from C++ sources in subdirs. nat_files = $(nat_source_files:.cc=.lo) -x_nat_files = $(x_nat_source_files:.cc=.lo) +xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) ## Objects from C sources in subdirs. c_files = $(c_source_files:.c=.lo) extra_cc_files = $(extra_cc_source_files:.cc=.lo) @@ -141,7 +141,7 @@ gtk_c_files = $(gtk_c_source_files:.c=.lo) ## Objects from Java sources in subdirs. javao_files = $(java_source_files:.java=.lo) \ $(built_java_source_files:.java=.lo) -x_javao_files = $(x_java_source_files:.java=.lo) +xlib_javao_files = $(xlib_java_source_files:.java=.lo) libgij_la_SOURCES = gij.cc @@ -160,9 +160,9 @@ libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \ $(THREADOBJS) $(PLATFORMOBJS) $(propertyo_files) # Include THREADLIBS here to ensure that the correct version of # certain linuxthread functions get linked: +## The mysterious backslash in the grep pattern is consumed by make. libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ $(LIBLTDL) $(SYS_ZLIBS) \ -## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` libgcj_la_LINK = $(LIBLINK) @@ -265,9 +265,9 @@ gnu/java/awt/peer/gtk/GtkTextFieldPeer.java \ gnu/java/awt/peer/gtk/GtkToolkit.java \ gnu/java/awt/peer/gtk/GtkWindowPeer.java -gtk_c_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) +gtk_jni_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) -$(gtk_c_headers): $(gtk_awt_peer_sources) +$(gtk_jni_headers): $(gtk_awt_peer_sources) @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input @@ -283,8 +283,9 @@ jni/classpath/native_state.h \ jni/classpath/primlib.h lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) +lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) +## The mysterious backslash in the grep pattern is consumed by make. lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ -## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \ @@ -314,8 +315,8 @@ org/w3c/dom/traversal/NodeIterator.java \ org/w3c/dom/traversal/TreeWalker.java ## See jv_convert_LDADD. lib_org_w3c_dom_la_LIBADD = -L$(here)/.libs libgcj.la +## The mysterious backslash in the grep pattern is consumed by make. lib_org_w3c_dom_la_LDFLAGS = -rpath $(toolexeclibdir) \ -## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \ @@ -350,18 +351,18 @@ org/xml/sax/XMLFilter.java \ org/xml/sax/XMLReader.java ## See jv_convert_LDADD. lib_org_xml_sax_la_LIBADD = -L$(here)/.libs libgcj.la +## The mysterious backslash in the grep pattern is consumed by make. lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \ -## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lib_gnu_awt_xlib_la_SOURCES = $(x_nat_source_files) -EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(x_java_source_files) -lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) -lib_gnu_awt_xlib_la_LIBADD = $(x_javao_files) +lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files) +EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(xlib_java_source_files) +lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(xlib_javao_files) +lib_gnu_awt_xlib_la_LIBADD = $(xlib_javao_files) +## The mysterious backslash in the grep pattern is consumed by make. lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ -rpath $(toolexeclibdir) \ -## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` lib_gnu_awt_xlib_la_LINK = $(LIBLINK) @@ -371,7 +372,7 @@ all_java_source_files = \ $(lib_org_xml_sax_la_SOURCES) \ $(lib_org_w3c_dom_la_SOURCES) \ $(gtk_awt_peer_sources) \ - $(x_java_source_files) + $(xlib_java_source_files) all_java_class_files = $(all_java_source_files:.java=.class) @@ -424,7 +425,7 @@ endif # Note: The libtool objects are removed by mostlyclean-local # because of command-line-length issues. -MOSTLYCLEANFILES = $(nat_headers) $(x_nat_headers) +MOSTLYCLEANFILES = $(nat_headers) $(xlib_nat_headers) CLEANFILES = libgcj-@gcc_version@.jar @@ -442,7 +443,7 @@ distclean-local: # Just remove the objects from C++ sources, for testing the C++ compiler. clean-nat: - rm -f $(nat_files) $(x_nat_files) + rm -f $(nat_files) $(xlib_nat_files) SUFFIXES = .class .java .h .properties @@ -455,7 +456,7 @@ SUFFIXES = .class .java .h .properties ## FIXME: For the .o files in subdirs, use a special rule. The ## standard automake rule can't be overridden (this is a bug in ## automake), and it also won't put the .o files into subdirs. -$(nat_files) $(x_nat_files): %.lo: %.cc +$(nat_files) $(xlib_nat_files): %.lo: %.cc @echo '$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<'; \ $(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $< @-mv $(@:.lo=.pp) $(@:.lo=.d) @@ -476,13 +477,13 @@ $(gtk_c_files): %.lo: %.c $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \ $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $< -$(gtk_c_files): $(gtk_c_headers) +$(gtk_c_files): $(gtk_jni_headers) ## FIXME: see above. ## Note: we omit StackTrace here, since it has an explicit rule a bit ## later, and GNU make will warn in this case. -$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java +$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java @@ -536,9 +537,9 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) nat_headers_install = $(ordinary_nat_headers) -x_nat_headers = $(x_java_source_files:.java=.h) +xlib_nat_headers = $(xlib_java_source_files:.java=.h) -$(ordinary_nat_headers) $(x_nat_headers): %.h: %.class +$(ordinary_nat_headers) $(xlib_nat_headers): %.h: %.class java/lang/ClassLoader.h: java/lang/ClassLoader.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ @@ -3001,7 +3002,7 @@ java/util/natTimeZone.cc \ java/util/zip/natDeflater.cc \ java/util/zip/natInflater.cc -x_java_source_files = \ +xlib_java_source_files = \ gnu/gcj/xlib/Clip.java \ gnu/gcj/xlib/Colormap.java \ gnu/gcj/xlib/Display.java \ @@ -3037,7 +3038,7 @@ gnu/awt/xlib/XPanelPeer.java \ gnu/awt/xlib/XFontPeer.java \ gnu/awt/xlib/XToolkit.java -x_nat_source_files = \ +xlib_nat_source_files = \ gnu/gcj/xlib/natClip.cc \ gnu/gcj/xlib/natColormap.cc \ gnu/gcj/xlib/natDisplay.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 0352b791d9f..0164ed1c75d 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -174,15 +174,15 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ -@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@lib-gnu-awt-xlib.la -@XLIB_AWT_FALSE@cond_x_ltlibrary = +@XLIB_AWT_TRUE@cond_xlib_ltlibrary = @XLIB_AWT_TRUE@lib-gnu-awt-xlib.la +@XLIB_AWT_FALSE@cond_xlib_ltlibrary = @XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_noncanonical) -I$(srcdir)/../libstdc++-v3/libsupc++ @XLIB_AWT_FALSE@xlib_includes = @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 libgij.la lib-org-xml-sax.la lib-org-w3c-dom.la \ - $(cond_gtk_ltlibrary) $(cond_x_ltlibrary) + $(cond_gtk_ltlibrary) $(cond_xlib_ltlibrary) toolexecmainlib_DATA = libgcj.spec @@ -240,14 +240,14 @@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ nat_files = $(nat_source_files:.cc=.lo) -x_nat_files = $(x_nat_source_files:.cc=.lo) +xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) c_files = $(c_source_files:.c=.lo) extra_cc_files = $(extra_cc_source_files:.cc=.lo) gtk_c_files = $(gtk_c_source_files:.c=.lo) javao_files = $(java_source_files:.java=.lo) \ $(built_java_source_files:.java=.lo) -x_javao_files = $(x_java_source_files:.java=.lo) +xlib_javao_files = $(xlib_java_source_files:.java=.lo) libgij_la_SOURCES = gij.cc @@ -370,7 +370,7 @@ gnu/java/awt/peer/gtk/GtkToolkit.java \ gnu/java/awt/peer/gtk/GtkWindowPeer.java -gtk_c_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) +gtk_jni_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) lib_gnu_java_awt_peer_gtk_la_SOURCES = \ $(gtk_awt_peer_sources) \ @@ -384,6 +384,7 @@ jni/classpath/primlib.h lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) +lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` @@ -455,10 +456,10 @@ lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lib_gnu_awt_xlib_la_SOURCES = $(x_nat_source_files) -EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(x_java_source_files) -lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) -lib_gnu_awt_xlib_la_LIBADD = $(x_javao_files) +lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files) +EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(xlib_java_source_files) +lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(xlib_javao_files) +lib_gnu_awt_xlib_la_LIBADD = $(xlib_javao_files) lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ -rpath $(toolexeclibdir) \ @@ -472,7 +473,7 @@ all_java_source_files = \ $(lib_org_xml_sax_la_SOURCES) \ $(lib_org_w3c_dom_la_SOURCES) \ $(gtk_awt_peer_sources) \ - $(x_java_source_files) + $(xlib_java_source_files) all_java_class_files = $(all_java_source_files:.java=.class) @@ -486,7 +487,7 @@ propertyo_files = $(property_files:.properties=.properties.lo) # Note: The libtool objects are removed by mostlyclean-local # because of command-line-length issues. -MOSTLYCLEANFILES = $(nat_headers) $(x_nat_headers) +MOSTLYCLEANFILES = $(nat_headers) $(xlib_nat_headers) CLEANFILES = libgcj-@gcc_version@.jar @@ -511,7 +512,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) nat_headers_install = $(ordinary_nat_headers) -x_nat_headers = $(x_java_source_files:.java=.h) +xlib_nat_headers = $(xlib_java_source_files:.java=.h) extra_headers = java/lang/Object.h java/lang/Class.h @@ -2686,7 +2687,7 @@ java/util/zip/natDeflater.cc \ java/util/zip/natInflater.cc -x_java_source_files = \ +xlib_java_source_files = \ gnu/gcj/xlib/Clip.java \ gnu/gcj/xlib/Colormap.java \ gnu/gcj/xlib/Display.java \ @@ -2723,7 +2724,7 @@ gnu/awt/xlib/XFontPeer.java \ gnu/awt/xlib/XToolkit.java -x_nat_source_files = \ +xlib_nat_source_files = \ gnu/gcj/xlib/natClip.cc \ gnu/gcj/xlib/natColormap.cc \ gnu/gcj/xlib/natDisplay.cc \ @@ -2885,7 +2886,6 @@ org/w3c/dom/traversal/DocumentTraversal.lo \ org/w3c/dom/traversal/NodeFilter.lo \ org/w3c/dom/traversal/NodeIterator.lo \ org/w3c/dom/traversal/TreeWalker.lo -lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = @GTK_CAIRO_FALSE@lib_gnu_java_awt_peer_gtk_la_OBJECTS = \ @GTK_CAIRO_FALSE@gnu/java/awt/peer/gtk/GdkClasspathFontPeer.lo \ @GTK_CAIRO_FALSE@gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.lo \ @@ -5458,7 +5458,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -$(gtk_c_headers): $(gtk_awt_peer_sources) +$(gtk_jni_headers): $(gtk_awt_peer_sources) @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input @@ -5506,7 +5506,7 @@ distclean-local: # Just remove the objects from C++ sources, for testing the C++ compiler. clean-nat: - rm -f $(nat_files) $(x_nat_files) + rm -f $(nat_files) $(xlib_nat_files) .class.lo: $(GCJCOMPILE) -o $@ $< @@ -5514,7 +5514,7 @@ clean-nat: .java.lo: $(GCJCOMPILE) -o $@ $< -$(nat_files) $(x_nat_files): %.lo: %.cc +$(nat_files) $(xlib_nat_files): %.lo: %.cc @echo '$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<'; \ $(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $< @-mv $(@:.lo=.pp) $(@:.lo=.d) @@ -5532,9 +5532,9 @@ $(gtk_c_files): %.lo: %.c $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \ $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $< -$(gtk_c_files): $(gtk_c_headers) +$(gtk_c_files): $(gtk_jni_headers) -$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java +$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java @@ -5559,7 +5559,7 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND .class.h: $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<) -$(ordinary_nat_headers) $(x_nat_headers): %.h: %.class +$(ordinary_nat_headers) $(xlib_nat_headers): %.h: %.class java/lang/ClassLoader.h: java/lang/ClassLoader.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ diff --git a/libjava/acconfig.h b/libjava/acconfig.h deleted file mode 100644 index 7055826b29b..00000000000 --- a/libjava/acconfig.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Define to `int' if `ssize_t' is not defined. */ -#undef ssize_t -- 2.30.2