diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-08-22 20:37:36 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2006-08-22 20:37:36 +0000 |
| commit | df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8 (patch) | |
| tree | f54905dce8ace4179ad3874a31cb8155be9bb6df /libjava/classpath/include | |
| parent | 9a23b833613b375031e84fc9c7dcb3b5ab875d42 (diff) | |
| download | gcc-df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8.zip gcc-df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8.tar.gz gcc-df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8.tar.bz2 | |
re PR libgcj/27890 (lib/logging.properties pollutes common namespace)
2006-08-22 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/27890
* gnu/classpath/natSystemProperties.cc (insertSystemProperties):
Set gnu.classpath.home.url to TOOLEXECLIBDIR.
* configure.ac: Do not add --with-native-libdir to
ac_configure_args.
* java/security/libgcj.security: Remove file.
* java/util/logging/logging.properties: Likewise.
* classpath/m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro.
* classpath/resource/Makefile.am (loggingdir): Define to
toolexeclibdir.
(securitydir): Likewise.
* classpath/configure.ac: Call CLASSPATH_TOOLEXECLIBDIR.
Set default nativeexeclibdir using toolexeclibdir.
* HACKING: Fix classpath aclocal arguments.
* Makefile.am (secdir): Remove variable.
(propdir): Likewise.
(AM_CXXFLAGS): Replace LIBDIR definition with TOOLEXECLIBDIR
definition.
(all_property_files): Remove variable.
(install-data-local): Do not install libgcj.security or
logging.properties.
* configure, Makefile.in, classpath/configure,
classpath/Makefile.in, classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/target/Linux/Makefile.in,
classpath/native/target/Makefile.in,
classpath/native/target/generic/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in, classpath/aclocal.m4,
classpath/examples/Makefile.in, aclocal.m4: Regenerate.
From-SVN: r116332
Diffstat (limited to 'libjava/classpath/include')
| -rw-r--r-- | libjava/classpath/include/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libjava/classpath/include/Makefile.in b/libjava/classpath/include/Makefile.in index 47889b7..b87dc5b 100644 --- a/libjava/classpath/include/Makefile.in +++ b/libjava/classpath/include/Makefile.in @@ -40,9 +40,10 @@ subdir = include DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.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 \ +am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ + $(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \ + $(top_srcdir)/m4/accross.m4 $(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 \ @@ -278,6 +279,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +toolexeclibdir = @toolexeclibdir@ vm_classes = @vm_classes@ DISTCLEANFILES = jni_md.h config-int.h ARG_JNI_JAVAH = -jni |