diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-31 21:47:16 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-31 21:47:16 +0000 |
| commit | b16889620450e287765d0d4ac99138d889a22009 (patch) | |
| tree | 98cbbd53ce3b7e02f3c6fe46f725432446d917d7 /libjava/Makefile.am | |
| parent | 2b73a3b32454d3d2487b8b7518d18b016552585f (diff) | |
| download | gcc-b16889620450e287765d0d4ac99138d889a22009.tar.gz | |
* 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
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 30 |
1 files changed, 11 insertions, 19 deletions
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) ## ################################################################ |