PATCH: Remove duplicated multi-do/multi-clean targets

PATCH: Remove duplicated multi-do/multi-clean targets

[H.J. Lu]

Makefiles in libjava and libobjc have duplicated multi-do/multi-clean
targets due to the old multilib support. The proper way is to
define multilib_arg.  This patch fixes it.

Tested on Linux/x86-64.  OK to install to mainline?

H.J.
---
libjava/

2007-10-14  H.J. Lu  <hongjiu.lu@intel.com>

	* configure.ac: Don't run config-ml.in directly.
	(multilib_arg): New.
	* configure: Regenerated.

libobjc/

2007-10-14  H.J. Lu  <hongjiu.lu@intel.com>

	* configure.ac: Don't run config-ml.in directly.
	(multilib_arg): New.
	* configure: Regenerated.

--- gcc/libjava/configure.ac.multi	2007-10-14 08:49:53.000000000 -0700
+++ gcc/libjava/configure.ac	2007-10-14 08:49:01.000000000 -0700
@@ -1491,33 +1491,11 @@ include/Makefile
 testsuite/Makefile
 ])
 
-AC_CONFIG_FILES([scripts/jar], [chmod +x scripts/jar])
-
-AC_CONFIG_COMMANDS([default],
-[# Only add multilib support code if we just rebuilt top-level Makefile.
-case " $CONFIG_FILES " in
- *" Makefile "*)
-   LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-   ac_file=Makefile . ${multi_basedir}/./libjava/../config-ml.in
-   ;;
-esac
-for ac_multi_file in $CONFIG_FILES; do
-  case $ac_multi_file in
-  */Makefile)
-    grep "^MULTI[[^ ]]* =" Makefile >> "$ac_multi_file" ;;
-  esac
-done
-],
-srcdir=${srcdir}
-host=${host}
-target=${target}
-with_multisubdir=${with_multisubdir}
-ac_configure_args="${multilib_arg} ${ac_configure_args}"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-multi_basedir=${multi_basedir}
-CC="${CC}"
-CXX="${CXX}"
-ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
-)
+if test ${multilib} = yes; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
 
+AC_CONFIG_FILES([scripts/jar], [chmod +x scripts/jar])
 AC_OUTPUT
--- gcc/libobjc/configure.ac.multi	2006-10-21 13:45:59.000000000 -0700
+++ gcc/libobjc/configure.ac	2007-10-14 08:47:37.000000000 -0700
@@ -271,26 +271,11 @@ AC_MSG_RESULT($ac_exception_model_name)
 # Output
 # ------
 
-AC_CONFIG_FILES([Makefile])
-
-AC_CONFIG_COMMANDS([default],
-[[if test -n "$CONFIG_FILES"; then
-  if test -n "${with_target_subdir}"; then
-    # FIXME: We shouldn't need to set ac_file
-    ac_file=Makefile
-    LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-    . ${multi_basedir}/config-ml.in
-  fi
-fi]],
-[[srcdir=${srcdir}
-host=${host}
-target=${target}
-with_target_subdir=${with_target_subdir}
-with_multisubdir=${with_multisubdir}
-ac_configure_args="--enable-multilib ${ac_configure_args}"
-multi_basedir=${multi_basedir}
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
-]])
+if test ${multilib} = yes; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
 
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

Re: PATCH: Remove duplicated multi-do/multi-clean targets

[Andrew Pinski]

On 10/14/07, H.J. Lu <hjl@lucon.org> wrote:
> libobjc/
>
> 2007-10-14  H.J. Lu  <hongjiu.lu@intel.com>
>
>         * configure.ac: Don't run config-ml.in directly.
>         (multilib_arg): New.
>         * configure: Regenerated.

The libobjc parts are ok.

Thanks,
Andrew Pinski

Re: PATCH: Remove duplicated multi-do/multi-clean targets

[Paolo Bonzini]

H.J. Lu wrote:
> Makefiles in libjava and libobjc have duplicated multi-do/multi-clean
> targets due to the old multilib support. The proper way is to
> define multilib_arg.  This patch fixes it.

Ok.

Paolo