From b16889620450e287765d0d4ac99138d889a22009 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 31 Jan 2003 21:47:16 +0000 Subject: [PATCH] * Makefile.in: Rebuilt. * Makefile.am (cond_x_ltlibrary): Renamed library to lib-gnu-awt-xlib.la. (lib_gnu_awt_xlib_la_SOURCES): Renamed. (EXTRA_lib_gnu_awt_xlib_la_SOURCES): Likewise. (lib_gnu_awt_xlib_la_DEPENDENCIES): Likewise. (lib_gnu_awt_xlib_la_LIBADD): Likewise. (lib_gnu_awt_xlib_la_LDFLAGS): Likewise. (lib_gnu_awt_xlib_la_LINK): Likewise. (install-exec-hook): Removed. (lib-gnu-awt-xlib.la): Renamed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62201 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 14 ++++++++++++++ libjava/Makefile.am | 30 +++++++++++------------------- libjava/Makefile.in | 37 ++++++++++++++----------------------- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d8f87f8bf7e..028f1ae2f80 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,19 @@ 2003-01-31 Tom Tromey + * Makefile.in: Rebuilt. + * Makefile.am (cond_x_ltlibrary): Renamed library to + lib-gnu-awt-xlib.la. + (lib_gnu_awt_xlib_la_SOURCES): Renamed. + (EXTRA_lib_gnu_awt_xlib_la_SOURCES): Likewise. + (lib_gnu_awt_xlib_la_DEPENDENCIES): Likewise. + (lib_gnu_awt_xlib_la_LIBADD): Likewise. + (lib_gnu_awt_xlib_la_LDFLAGS): Likewise. + (lib_gnu_awt_xlib_la_LINK): Likewise. + (install-exec-hook): Removed. + (lib-gnu-awt-xlib.la): Renamed. + +2003-01-31 Tom Tromey + * aclocal.m4, configure, include/config.h.in: Rebuilt. * acinclude.m4 (CHECK_FOR_BROKEN_MINGW_LD): Resurrected; was in aclocal.m4 and lost in some merge. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 65c106455cc..92bfc1e09d5 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -17,7 +17,7 @@ endif ## if XLIB_AWT -cond_x_ltlibrary = libgcjx.la +cond_x_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_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ else @@ -304,23 +304,15 @@ org/xml/sax/SAXParseException.java \ org/xml/sax/XMLFilter.java \ org/xml/sax/XMLReader.java -libgcjx_la_SOURCES = $(x_nat_source_files) -EXTRA_libgcjx_la_SOURCES = $(x_java_source_files) -libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) -libgcjx_la_LIBADD = $(x_javao_files) -libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ +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_LDFLAGS = @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` -libgcjx_la_LINK = $(LIBLINK) - -## Make a symlink for each `libgcjx' file that was installed. -install-exec-hook: - cd $(DESTDIR)$(libdir) && \ - if test -f libgcjx.la; then \ - rm -f gnu-awt-xlib.la; \ - $(LN_S) libgcjx.la gnu-awt-xlib.la; \ - fi +lib_gnu_awt_xlib_la_LINK = $(LIBLINK) all_java_source_files = \ $(java_source_files) \ @@ -398,10 +390,10 @@ libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) @GCLIBS@ @LIBFFI@ @ZLIBS@ \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) -libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES) - @: $(shell echo Creating list of files to link...) $(shell rm -f libgcjx.objectlist || :) $(shell touch libgcjx.objectlist) $(foreach object,$(libgcjx_la_OBJECTS) $(libgcjx_la_LIBADD),$(shell echo $(object) >> libgcjx.objectlist)) - $(libgcjx_la_LINK) -objectlist libgcjx.objectlist \ - -rpath $(toolexeclibdir) $(libgcjx_la_LDFLAGS) $(LIBS) +lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) + @: $(shell echo Creating list of files to link...) $(shell rm -f lib_gnu_awt_xlib.objectlist || :) $(shell touch lib_gnu_awt_xlib.objectlist) $(foreach object,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),$(shell echo $(object) >> lib_gnu_awt_xlib.objectlist)) + $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \ + -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS) ## ################################################################ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index a646689d7b2..d008c471faa 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -146,7 +146,7 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . @TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include @TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include -@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la +@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@lib-gnu-awt-xlib.la @XLIB_AWT_FALSE@cond_x_ltlibrary = @XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ @XLIB_AWT_FALSE@xlib_includes = @@ -386,15 +386,15 @@ org/xml/sax/XMLFilter.java \ org/xml/sax/XMLReader.java -libgcjx_la_SOURCES = $(x_nat_source_files) -EXTRA_libgcjx_la_SOURCES = $(x_java_source_files) -libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) -libgcjx_la_LIBADD = $(x_javao_files) -libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ +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_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` -libgcjx_la_LINK = $(LIBLINK) +lib_gnu_awt_xlib_la_LINK = $(LIBLINK) all_java_source_files = \ $(java_source_files) \ @@ -2486,7 +2486,7 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.lo \ jni/gtk-peer/gthread-jni.lo jni/classpath/jcl.lo \ jni/classpath/jnilink.lo jni/classpath/native_state.lo \ jni/classpath/primlib.lo -libgcjx_la_OBJECTS = gnu/gcj/xlib/natClip.lo \ +lib_gnu_awt_xlib_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 \ gnu/gcj/xlib/natGC.lo gnu/gcj/xlib/natPixmap.lo \ @@ -4008,8 +4008,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) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_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) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) +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) all: all-redirect .SUFFIXES: @@ -4437,8 +4437,6 @@ installcheck-am: installcheck: installcheck-recursive install-exec-am: install-toolexeclibLTLIBRARIES install-binPROGRAMS \ install-binSCRIPTS install-toolexecmainlibDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-exec: install-exec-recursive install-data-am: install-jarDATA install-data-local @@ -4540,13 +4538,6 @@ $(gtk_c_headers): $(gtk_awt_peer_sources) echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input -install-exec-hook: - cd $(DESTDIR)$(libdir) && \ - if test -f libgcjx.la; then \ - rm -f gnu-awt-xlib.la; \ - $(LN_S) libgcjx.la gnu-awt-xlib.la; \ - fi - .java.class: $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) \ -d $(here) $< @@ -4597,10 +4588,10 @@ libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) @GCLIBS@ @LIBFFI@ @ZLIBS@ \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) -libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES) - @: $(shell echo Creating list of files to link...) $(shell rm -f libgcjx.objectlist || :) $(shell touch libgcjx.objectlist) $(foreach object,$(libgcjx_la_OBJECTS) $(libgcjx_la_LIBADD),$(shell echo $(object) >> libgcjx.objectlist)) - $(libgcjx_la_LINK) -objectlist libgcjx.objectlist \ - -rpath $(toolexeclibdir) $(libgcjx_la_LDFLAGS) $(LIBS) +lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) + @: $(shell echo Creating list of files to link...) $(shell rm -f lib_gnu_awt_xlib.objectlist || :) $(shell touch lib_gnu_awt_xlib.objectlist) $(foreach object,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),$(shell echo $(object) >> lib_gnu_awt_xlib.objectlist)) + $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \ + -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS) .class.h: $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<) -- 2.11.0