2012-04-19 Pedro Alves <palves@redhat.com>

	* Makefile.in (GNULIB_BUILDDIR): New.
	(LIBGNU, INCGNU, GNULIB_H): Adjust.
	(SUBDIRS): Add $(GNULIB_BUILDDIR).
	(CLEANDIRS). Remove gnulib/import.
	(REQUIRED_SUBDIRS): Replace gnulib/import with $(GNULIB_BUILDDIR).
	(all-lib): Ditto.
	(distclean): Remove the $(GNULIB_BUILDDIR) directory.
	(gnulib/import/Makefile): Replace gnulib/import with
	$(GNULIB_BUILDDIR).  Set CONFIG_FILES to just Makefile.
	(ACLOCAL_AMFLAGS): Remove '-I gnulib/import/m4'.
	(aclocal_m4_deps): Remove the gnulib dependencies.  Add
	acx_configure_dir.m4.
	* acinclude.m4: Include acx_configure_dir.m4.
	* acx_configure_dir.m4: New file.
	* aclocal.m4: Regenerate.
        * configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE
        calls.  Configure gnulib using ACX_CONFIGURE_DIR.
        (GNULIB): New variable.
        (GNULIB_STDINT_H): Adjust.
        (AC_OUTPUT): Don't output gnulib/Makefile.
        * gdb/defs.h: Include build-gnulib/config.h.
        * acx_configure_dir.m4: New file.
        * aclocal.m4: Regenerate.
        * config.in: Regenerate.
        * configure: Regenerate.

        * gnulib/Makefile.in: New file.
        * gnulib/configure.ac: New file.
        * gnulib/aclocal.m4: New file.
        * gnulib/config.in: New file.
        * gnulib/configure: New file.
	* gnulib/: Re-run gnulib-tool to adjust.

        gdbserver/
        * Makefile.in (GNULIB_BUILDDIR): New.
	(LIBGNU, INCGNU, GNULIB_H): Adjust.
        (SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): New.
        (all, install-only, uninstall, clean-info, all-lib, clean): No
        longer pass GNULIB_FLAGS_TO_PASS.  Use subdir_do.
        (maintainer-clean realclean distclean): Use subdir_do.
        (subdir_do): New.
        (gnulib/import/Makefile): Adjust.  Replace gnulib/import with
	$(GNULIB_BUILDDIR).  Don't pass argument to config.status.
        * acinclude.m4: Include acx_configure_dir.m4.
        * configure.ac: Remove gl_EARLY, gl_INIT, and AM_INIT_AUTOMAKE
        calls.  Call AC_PROG_RANLIB.  Configure gnulib using
        ACX_CONFIGURE_DIR.
        (GNULIB): New.
        (GNULIB_STDINT_H): Adjust.
        (AC_OUTPUT): Don't output gnulib/Makefile anymore.
        * gdbreplay.c: Include build-gnulib/config.h.
        * server.h: Likewise.
        * aclocal.m4: Regenerate.
        * config.in: Regenerate.
        * configure: Regenerate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 90fdca6..1511fd4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,40 @@
 2012-04-19  Pedro Alves  <palves@redhat.com>
 
+       * Makefile.in (GNULIB_BUILDDIR): New.
+       (LIBGNU, INCGNU, GNULIB_H): Adjust.
+       (SUBDIRS): Add $(GNULIB_BUILDDIR).
+       (CLEANDIRS). Remove gnulib/import.
+       (REQUIRED_SUBDIRS): Replace gnulib/import with $(GNULIB_BUILDDIR).
+       (all-lib): Ditto.
+       (distclean): Remove the $(GNULIB_BUILDDIR) directory.
+       (gnulib/import/Makefile): Replace gnulib/import with
+       $(GNULIB_BUILDDIR).  Set CONFIG_FILES to just Makefile.
+       (ACLOCAL_AMFLAGS): Remove '-I gnulib/import/m4'.
+       (aclocal_m4_deps): Remove the gnulib dependencies.  Add
+       acx_configure_dir.m4.
+       * acinclude.m4: Include acx_configure_dir.m4.
+       * acx_configure_dir.m4: New file.
+       * aclocal.m4: Regenerate.
+        * configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE
+        calls.  Configure gnulib using ACX_CONFIGURE_DIR.
+        (GNULIB): New variable.
+        (GNULIB_STDINT_H): Adjust.
+        (AC_OUTPUT): Don't output gnulib/Makefile.
+        * gdb/defs.h: Include build-gnulib/config.h.
+        * acx_configure_dir.m4: New file.
+        * aclocal.m4: Regenerate.
+        * config.in: Regenerate.
+        * configure: Regenerate.
+
+        * gnulib/Makefile.in: New file.
+        * gnulib/configure.ac: New file.
+        * gnulib/aclocal.m4: New file.
+        * gnulib/config.in: New file.
+        * gnulib/configure: New file.
+       * gnulib/: Re-run gnulib-tool to adjust.
+
+2012-04-19  Pedro Alves  <palves@redhat.com>
+
        * Makefile.in (HFILES_NO_SRCDIR): Remove gnulib/wchar.in.h.
        Adjust paths to gnulib imported files.