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

	gdb/
	* gnulib/: Move whole directory ...
	* gnulib/import/: ... here, and re-rerun gnulib-tool to adjust.
	* Makefile.in (LIBGNU, INCGNU, GNULIB_H, CLEANDIRS)
	(REQUIRED_SUBDIRS, all-lib, gnulib/Makefile, ACLOCAL_AMFLAGS)
	(aclocal_m4_deps): Adjust.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* configure.ac: Adjust AC_OUTPUT output.

	gdbserver/
	* Makefile.in (LIBGNU, INCGNU): Adjust.
	(GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust.
	(all, install-only, uninstall, clean-info, all-lib, clean)
	(maintainer-clean, Makefile, gnulib/Makefile): Adjust.
	* configure.ac: Adjust AC_OUTPUT output.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

5 files changed, 48 insertions, 38 deletions

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a7aa722..90db8e6 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,15 @@
 2012-04-19  Pedro Alves  <palves@redhat.com>
 
+	* Makefile.in (LIBGNU, INCGNU): Adjust.
+	(GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust.
+	(all, install-only, uninstall, clean-info, all-lib, clean)
+	(maintainer-clean, Makefile, gnulib/Makefile): Adjust.
+	* configure.ac: Adjust AC_OUTPUT output.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2012-04-19  Pedro Alves  <palves@redhat.com>
+
 	* Makefile.in (generated_files): New.
 	(server_h): Remove the explicit dependency on config.h, and depend
 	on $generated_files.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 4f0ba19..cbeccef 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -76,20 +76,20 @@ ustlibs = @ustlibs@
 ustinc = @ustinc@
 
 # gnulib
-LIBGNU = gnulib/libgnu.a
-INCGNU = -I$(srcdir)/../gnulib -Ignulib
+LIBGNU = gnulib/import/libgnu.a
+INCGNU = -I$(srcdir)/../gnulib/import -Ignulib/import
 
 # We build gnulib directly under the gdbserver build directory, but
 # its sources don't live directly under gdbserver's source directory.
 # Tweak $srcdir and VPATH to make that work.
 GNULIB_FLAGS_TO_PASS = \
 	"top_srcdir=$(abs_top_srcdir)/.." \
-	"srcdir=$(abs_srcdir)/../gnulib" \
-	"VPATH=$(abs_top_srcdir)/../gnulib:$(abs_top_srcdir)"
+	"srcdir=$(abs_srcdir)/../gnulib/import" \
+	"VPATH=$(abs_top_srcdir)/../gnulib/import:$(abs_top_srcdir)"
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
-GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@
+GNULIB_H = gnulib/import/string.h @GNULIB_STDINT_H@
 
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
@@ -216,7 +216,7 @@ generated_files = config.h $(GNULIB_H)
 	${CC} -c ${INTERNAL_CFLAGS} $<
 
 all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
 
 # Traditionally "install" depends on "all".  But it may be useful
 # not to; for example, if the user has made some trivial change to a
@@ -237,13 +237,13 @@ install-only:
 	$(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT); \
 	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir); \
 	$(INSTALL_DATA) $(srcdir)/gdbserver.1 $(DESTDIR)$(man1dir)/$$n.1
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install
 
 uninstall: force
 	n=`echo gdbserver | sed '$(program_transform_name)'`; \
 	if [ x$$n = x ]; then n=gdbserver; else true; fi; \
 	rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(man1dir)/$$n.1
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall
 
 installcheck:
 check:
@@ -253,7 +253,7 @@ install-pdf:
 html:
 install-html:
 clean-info: force
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
 
 gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
 	rm -f gdbserver$(EXEEXT)
@@ -261,8 +261,8 @@ gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
 	$(LIBGNU) $(GDBSERVER_LIBS) $(XM_CLIBS)
 
 $(LIBGNU) $(GNULIB_H): all-lib
-all-lib: gnulib/Makefile
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
+all-lib: gnulib/import/Makefile
+	@cd gnulib/import/; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
 
 .PHONY: all-lib
 
@@ -320,11 +320,11 @@ clean:
 	rm -f i386-mmx.c i386-mmx-linux.c
 	rm -f x32.c x32-linux.c
 	rm -f x32-avx.c x32-avx-linux.c
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean
 
 maintainer-clean realclean distclean: clean
 	rm -f nm.h tm.h xm.h config.h stamp-h config.log
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
 	rm -f Makefile config.status
 
 config.h: stamp-h ; @true
@@ -334,11 +334,11 @@ stamp-h: config.in config.status
 Makefile: Makefile.in config.status
 	CONFIG_HEADERS="" $(SHELL) ./config.status
 
-gnulib/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
+gnulib/import/Makefile: $(srcdir)/../gnulib/import/Makefile.in config.status
 	  CONFIG_COMMANDS="depfiles" \
 	  CONFIG_HEADERS= \
 	  CONFIG_LINKS= \
-	  $(SHELL) config.status "gnulib/Makefile"
+	  $(SHELL) config.status "gnulib/import/Makefile"
 
 config.status: configure configure.srv
 	$(SHELL) ./config.status --recheck
diff --git a/gdb/gdbserver/aclocal.m4 b/gdb/gdbserver/aclocal.m4
index d23f9db..7ecd5ba 100644
--- a/gdb/gdbserver/aclocal.m4
+++ b/gdb/gdbserver/aclocal.m4
@@ -989,22 +989,22 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../gnulib/m4/00gnulib.m4])
-m4_include([../gnulib/m4/extensions.m4])
-m4_include([../gnulib/m4/gnulib-common.m4])
-m4_include([../gnulib/m4/gnulib-comp.m4])
-m4_include([../gnulib/m4/include_next.m4])
-m4_include([../gnulib/m4/inttypes-pri.m4])
-m4_include([../gnulib/m4/inttypes.m4])
-m4_include([../gnulib/m4/longlong.m4])
-m4_include([../gnulib/m4/memchr.m4])
-m4_include([../gnulib/m4/memmem.m4])
-m4_include([../gnulib/m4/mmap-anon.m4])
-m4_include([../gnulib/m4/multiarch.m4])
-m4_include([../gnulib/m4/onceonly.m4])
-m4_include([../gnulib/m4/stddef_h.m4])
-m4_include([../gnulib/m4/stdint.m4])
-m4_include([../gnulib/m4/string_h.m4])
-m4_include([../gnulib/m4/warn-on-use.m4])
-m4_include([../gnulib/m4/wchar_t.m4])
+m4_include([../gnulib/import/m4/00gnulib.m4])
+m4_include([../gnulib/import/m4/extensions.m4])
+m4_include([../gnulib/import/m4/gnulib-common.m4])
+m4_include([../gnulib/import/m4/gnulib-comp.m4])
+m4_include([../gnulib/import/m4/include_next.m4])
+m4_include([../gnulib/import/m4/inttypes-pri.m4])
+m4_include([../gnulib/import/m4/inttypes.m4])
+m4_include([../gnulib/import/m4/longlong.m4])
+m4_include([../gnulib/import/m4/memchr.m4])
+m4_include([../gnulib/import/m4/memmem.m4])
+m4_include([../gnulib/import/m4/mmap-anon.m4])
+m4_include([../gnulib/import/m4/multiarch.m4])
+m4_include([../gnulib/import/m4/onceonly.m4])
+m4_include([../gnulib/import/m4/stddef_h.m4])
+m4_include([../gnulib/import/m4/stdint.m4])
+m4_include([../gnulib/import/m4/string_h.m4])
+m4_include([../gnulib/import/m4/warn-on-use.m4])
+m4_include([../gnulib/import/m4/wchar_t.m4])
 m4_include([acinclude.m4])
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index cdd54f1..ff43ef9 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -7848,7 +7848,7 @@ fi
   gl_cond_libtool=false
   gl_libdeps=
   gl_ltlibdeps=
-  gl_m4_base='gnulib/m4'
+  gl_m4_base='gnulib/import/m4'
 
 
 
@@ -7858,7 +7858,7 @@ fi
 
 
 
-  gl_source_base='gnulib'
+  gl_source_base='gnulib/import'
 
 
 
@@ -9125,7 +9125,7 @@ if test x"$STDINT_H" != x; then
 fi
 
 
-ac_config_files="$ac_config_files Makefile gnulib/Makefile:${srcdir}/../gnulib/Makefile.in"
+ac_config_files="$ac_config_files Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -9886,7 +9886,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "gnulib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/Makefile:${srcdir}/../gnulib/Makefile.in" ;;
+    "gnulib/import/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 96a5f2d..ebbe571 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -450,7 +450,7 @@ if test x"$STDINT_H" != x; then
 fi
 AC_SUBST(GNULIB_STDINT_H)
 
-AC_OUTPUT(Makefile gnulib/Makefile:${srcdir}/../gnulib/Makefile.in,
+AC_OUTPUT(Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in,
 [case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > stamp-h ;;