projects / platform / upstream / gcc48.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove unused files
[platform/upstream/gcc48.git] / libjava / Makefile.in
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index e741f26..5230d24 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
+       $(top_srcdir)/../config/libstdc++-raw-cxx.m4 \
        $(top_srcdir)/../config/lthostflags.m4 \
        $(top_srcdir)/../config/multi.m4 \
        $(top_srcdir)/../config/no-executables.m4 \
@@ -358,7 +359,8 @@ am__objects_5 = $(am__objects_3) gnu/classpath/natConfiguration.lo \
        gnu/java/nio/natVMChannel.lo \
        gnu/java/nio/channels/natFileChannelImpl.lo \
        gnu/java/security/jce/prng/natVMSecureRandom.lo \
-       java/io/natFile.lo java/io/natVMObjectInputStream.lo \
+       java/io/natFile.lo java/io/natVMConsole.lo \
+       java/io/natVMObjectInputStream.lo \
        java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
        java/lang/natClass.lo java/lang/natClassLoader.lo \
        java/lang/natConcreteProcess.lo java/lang/natVMDouble.lo \
@@ -618,6 +620,8 @@ LIBMATHSPEC = @LIBMATHSPEC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTDCXXSPEC = @LIBSTDCXXSPEC@
+LIBSTDCXX_RAW_CXX_CXXFLAGS = @LIBSTDCXX_RAW_CXX_CXXFLAGS@
+LIBSTDCXX_RAW_CXX_LDFLAGS = @LIBSTDCXX_RAW_CXX_LDFLAGS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -1132,11 +1136,9 @@ lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar libgcj.la \
        $(lib_gnu_awt_xlib_la_LIBADD) $(am__append_21)
 lib_gnu_awt_xlib_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -I../libstdc++-v3/include \
-       -I../libstdc++-v3/include/$(target_noncanonical) \
-       -I$(srcdir)/../libstdc++-v3/libsupc++
+       $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 
-lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
+lib_gnu_awt_xlib_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDFLAGS) \
        @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
         -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
@@ -4275,6 +4277,7 @@ classpath/java/io/CharArrayReader.java \
 classpath/java/io/CharArrayWriter.java \
 classpath/java/io/CharConversionException.java \
 classpath/java/io/Closeable.java \
+classpath/java/io/Console.java \
 classpath/java/io/DataInput.java \
 classpath/java/io/DataInputStream.java \
 classpath/java/io/DataOutput.java \
@@ -4297,6 +4300,7 @@ classpath/java/io/FilterOutputStream.java \
 classpath/java/io/FilterReader.java \
 classpath/java/io/FilterWriter.java \
 classpath/java/io/Flushable.java \
+classpath/java/io/IOError.java \
 classpath/java/io/IOException.java \
 classpath/java/io/InputStream.java \
 java/io/InputStreamReader.java \
@@ -4340,6 +4344,7 @@ classpath/java/io/StringWriter.java \
 classpath/java/io/SyncFailedException.java \
 classpath/java/io/UTFDataFormatException.java \
 classpath/java/io/UnsupportedEncodingException.java \
+java/io/VMConsole.java \
 java/io/VMObjectInputStream.java \
 java/io/VMObjectStreamClass.java \
 classpath/java/io/WriteAbortedException.java \
@@ -4354,6 +4359,7 @@ classpath/java/lang/ArithmeticException.java \
 classpath/java/lang/ArrayIndexOutOfBoundsException.java \
 classpath/java/lang/ArrayStoreException.java \
 classpath/java/lang/AssertionError.java \
+classpath/java/lang/AutoCloseable.java \
 classpath/java/lang/Boolean.java \
 classpath/java/lang/Byte.java \
 classpath/java/lang/CharSequence.java \
@@ -4412,6 +4418,7 @@ java/lang/PosixProcess.java \
 classpath/java/lang/Process.java \
 classpath/java/lang/ProcessBuilder.java \
 classpath/java/lang/Readable.java \
+classpath/java/lang/ReflectiveOperationException.java \
 classpath/java/lang/Runnable.java \
 java/lang/Runtime.java \
 classpath/java/lang/RuntimeException.java \
@@ -8352,8 +8359,8 @@ property_files = \
   classpath/resource/gnu/java/util/regex/MessagesBundle.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
-  classpath/resource/gnu/javax/print/PrinterDialog.properties \
-  classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
+  classpath/resource/gnu/javax/print/MessagesBundle.properties \
+  classpath/resource/gnu/javax/print/MessagesBundle_de.properties \
   classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
   classpath/resource/java/text/metazones.properties \
   classpath/resource/java/util/iso4217.properties \
@@ -8605,6 +8612,7 @@ gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
 gnu/java/security/jce/prng/natVMSecureRandom.cc \
 java/io/natFile.cc \
+java/io/natVMConsole.cc \
 java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
 java/lang/natCharacter.cc \
@@ -9128,6 +9136,8 @@ java/io/$(DEPDIR)/$(am__dirstamp):
        @: > java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natFile.lo: java/io/$(am__dirstamp) \
        java/io/$(DEPDIR)/$(am__dirstamp)
+java/io/natVMConsole.lo: java/io/$(am__dirstamp) \
+       java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectInputStream.lo: java/io/$(am__dirstamp) \
        java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectStreamClass.lo: java/io/$(am__dirstamp) \
@@ -9636,6 +9646,8 @@ mostlyclean-compile:
        -rm -f gnu/java/security/jce/prng/natVMSecureRandom.lo
        -rm -f java/io/natFile.$(OBJEXT)
        -rm -f java/io/natFile.lo
+       -rm -f java/io/natVMConsole.$(OBJEXT)
+       -rm -f java/io/natVMConsole.lo
        -rm -f java/io/natVMObjectInputStream.$(OBJEXT)
        -rm -f java/io/natVMObjectInputStream.lo
        -rm -f java/io/natVMObjectStreamClass.$(OBJEXT)
@@ -9810,6 +9822,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/channels/$(DEPDIR)/natFileChannelImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/security/jce/prng/$(DEPDIR)/natVMSecureRandom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natFile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMConsole.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@
@@ -12411,7 +12424,7 @@ install-exec-hook: install-binPROGRAMS install-toolexeclibLTLIBRARIES \
 @BUILD_ECJ1_TRUE@      mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
 install-data-local:
        $(PRE_INSTALL)
-       @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
+       @pc_version=`echo $(GCJVERSION)`; \
        file="libgcj-$${pc_version}.pc"; \
        $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
        echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
Domain: System / Uncategorized;