diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-17 18:09:40 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-17 18:09:40 +0000 |
| commit | 2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede (patch) | |
| tree | c976ca91e3ef0bda3b34b37c0195145638d8d08e /libjava/classpath/examples/Makefile.in | |
| parent | a3ef37ddfeddcc5b0f1c5068d8fdeb25a302d5cd (diff) | |
| download | ppe42-gcc-2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede.tar.gz ppe42-gcc-2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede.zip | |
Imported GNU Classpath 0.20
* Makefile.am (AM_CPPFLAGS): Add classpath/include.
* java/nio/charset/spi/CharsetProvider.java: New override file.
* java/security/Security.java: Likewise.
* sources.am: Regenerated.
* Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109831 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/examples/Makefile.in')
| -rw-r--r-- | libjava/classpath/examples/Makefile.in | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/libjava/classpath/examples/Makefile.in b/libjava/classpath/examples/Makefile.in index 5ba479cf5e2..f554fd7c2fc 100644 --- a/libjava/classpath/examples/Makefile.in +++ b/libjava/classpath/examples/Makefile.in @@ -43,10 +43,11 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ - $(top_srcdir)/m4/acinclude.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/acinclude.m4 \ + $(top_srcdir)/m4/ax_create_stdint_h.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,6 +152,7 @@ JAY = @JAY@ JAY_SKELETON = @JAY_SKELETON@ JIKES = @JIKES@ JIKESENCODING = @JIKESENCODING@ +JIKESWARNINGS = @JIKESWARNINGS@ KJC = @KJC@ LDFLAGS = @LDFLAGS@ LIBDEBUG = @LIBDEBUG@ @@ -491,25 +493,25 @@ install-data-local: for file in $(ALL_EXAMPLE_FILES); do \ f=`echo $$file | cut -c$$srcdir_cnt-`; \ fdir=`dirname $$f`; \ - if test ! -d $(DESTDIR)/$(pkgdatadir)/examples/$$fdir; then \ - echo "$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/examples/$$fdir"; \ - $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/examples/$$fdir; \ + if test ! -d $(DESTDIR)$(pkgdatadir)/examples/$$fdir; then \ + echo "$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/examples/$$fdir"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/examples/$$fdir; \ fi; \ - echo "$(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \ - $(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f; \ + echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/examples/$$f"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/examples/$$f; \ done - echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/" - $(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/ + echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/" + $(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/ uninstall-local: srcdir_cnt=`echo $(srcdir) | wc -c`; \ for file in $(ALL_EXAMPLE_FILES); do \ f=`echo $$file | cut -c$$srcdir_cnt-`; \ - echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \ - rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f; \ + echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/$$f"; \ + rm -f $(DESTDIR)$(pkgdatadir)/examples/$$f; \ done - echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt" - rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt + echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt" + rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt dist-hook: srcdir_cnt=`echo $(srcdir) | wc -c`; \ for file in $(ALL_EXAMPLE_FILES); do \ |

