From 2cd48372e30de18391912fb632e3699045ea4e56 Mon Sep 17 00:00:00 2001 From: doko Date: Thu, 7 Sep 2006 14:28:04 +0000 Subject: [PATCH] 2006-09-07 Matthias Klose * Makefile.am (AM_CXXFLAGS): Remove duplicate define. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116750 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/Makefile.am | 3 +-- libjava/Makefile.in | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 57603f9ac91..110104150dc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-09-07 Matthias Klose + + * Makefile.am (AM_CXXFLAGS): Remove duplicate define. + * Makefile.in: Regenerate. + 2006-09-06 Keith Seitz * java/lang/Class.h (_Jv_FindInterpreterMethod): Change return type diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 25bfe6515e7..764cb96d894 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -127,8 +127,7 @@ AM_CXXFLAGS = \ -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \ -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ - -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \ - -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" + -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" AM_GCJFLAGS = \ @LIBGCJ_JAVAFLAGS@ \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index f4d37e91b79..cffe7262e44 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -753,8 +753,7 @@ AM_CXXFLAGS = \ -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \ -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ - -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \ - -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" + -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" AM_GCJFLAGS = \ @LIBGCJ_JAVAFLAGS@ \ -- 2.11.0