Move some build files to build-aux/

2 files changed, 22 insertions, 21 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index cc18f404..8dc96594 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl strndup
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl strndup
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -46,17 +46,17 @@ EXTRA_libgnu_a_SOURCES =
 BUILT_SOURCES += arg-nonnull.h
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/arg-nonnull.h, except that it has the copyright header cut off.
-arg-nonnull.h: $(top_srcdir)/./arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/./arg-nonnull.h \
+	  < $(top_srcdir)/build-aux/arg-nonnull.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
 
 ARG_NONNULL_H=arg-nonnull.h
 
-EXTRA_DIST += $(top_srcdir)/./arg-nonnull.h
+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h
 
 ## end   gnulib module arg-nonnull
 
@@ -70,17 +70,17 @@ EXTRA_DIST += $(top_srcdir)/./arg-nonnull.h
 BUILT_SOURCES += c++defs.h
 # The c++defs.h that gets inserted into generated .h files is the same as
 # build-aux/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/./c++defs.h
+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/./c++defs.h \
+	  < $(top_srcdir)/build-aux/c++defs.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += c++defs.h c++defs.h-t
 
 CXXDEFS_H=c++defs.h
 
-EXTRA_DIST += $(top_srcdir)/./c++defs.h
+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h
 
 ## end   gnulib module c++defs
 
@@ -234,17 +234,17 @@ EXTRA_libgnu_a_SOURCES += strnlen.c
 BUILT_SOURCES += warn-on-use.h
 # The warn-on-use.h that gets inserted into generated .h files is the same as
 # build-aux/warn-on-use.h, except that it has the copyright header cut off.
-warn-on-use.h: $(top_srcdir)/./warn-on-use.h
+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/./warn-on-use.h \
+	  < $(top_srcdir)/build-aux/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
 
 WARN_ON_USE_H=warn-on-use.h
 
-EXTRA_DIST += $(top_srcdir)/./warn-on-use.h
+EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h
 
 ## end   gnulib module warn-on-use
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1c6c4e4f..94165ceb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -24,7 +24,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl strndup
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl strndup
 
 
 
@@ -82,7 +82,7 @@ am_libgnu_a_OBJECTS = dummy.$(OBJEXT)
 libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -337,9 +337,10 @@ SUBDIRS =
 noinst_HEADERS = 
 noinst_LIBRARIES = libgnu.a
 noinst_LTLIBRARIES = 
-EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \
-	memchr.c memchr.valgrind stddef.in.h string.in.h strndup.c \
-	strnlen.c $(top_srcdir)/./warn-on-use.h
+EXTRA_DIST = $(top_srcdir)/build-aux/arg-nonnull.h \
+	$(top_srcdir)/build-aux/c++defs.h memchr.c memchr.valgrind \
+	stddef.in.h string.in.h strndup.c strnlen.c \
+	$(top_srcdir)/build-aux/warn-on-use.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
@@ -770,18 +771,18 @@ uninstall-am:
 
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/arg-nonnull.h, except that it has the copyright header cut off.
-arg-nonnull.h: $(top_srcdir)/./arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/./arg-nonnull.h \
+	  < $(top_srcdir)/build-aux/arg-nonnull.h \
 	  > $@-t && \
 	mv $@-t $@
 # The c++defs.h that gets inserted into generated .h files is the same as
 # build-aux/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/./c++defs.h
+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/./c++defs.h \
+	  < $(top_srcdir)/build-aux/c++defs.h \
 	  > $@-t && \
 	mv $@-t $@
 
@@ -886,10 +887,10 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	mv $@-t $@
 # The warn-on-use.h that gets inserted into generated .h files is the same as
 # build-aux/warn-on-use.h, except that it has the copyright header cut off.
-warn-on-use.h: $(top_srcdir)/./warn-on-use.h
+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/./warn-on-use.h \
+	  < $(top_srcdir)/build-aux/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@