Regenerate Makefile.in; update ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 020b22d7a1a9f831d6bf8504893926513ac37d66..15adcf131844183287b63e4d896df92137204963 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-05  Ivan Maidanski <ivmai@mail.ru>
+
+       * src/atomic_ops/Makefile.in: Regenerate (by autoreconf -vif).
+
+2013-01-04  Ivan Maidanski <ivmai@mail.ru>
+
+       * src/atomic_ops/Makefile.am (BUILT_SOURCES): Define to force
+       regeneration of generalize-small.h (if the corresponding
+       source template is changed) before compilation of .c files (that use
+       atomic_ops.h).
+
 2013-01-02  Ivan Maidanski <ivmai@mail.ru>
 
        * src/atomic_ops/generalize-small.template (AO_XSIZE_fetch_and_add):

diff --git a/src/atomic_ops/Makefile.in b/src/atomic_ops/Makefile.in
index 88b31edff76725815aad8eb0d9c2815e111d6704..b0705a4f5d244759ab7a84683236cb68be707bb3 100644 (file)
--- a/src/atomic_ops/Makefile.in
+++ b/src/atomic_ops/Makefile.in
@@ -224,11 +224,13 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = sysdeps
 EXTRA_DIST = generalize-small.template
+BUILT_SOURCES = generalize-small.h
 
 #Private Headers
 private_HEADERS = generalize.h generalize-small.h
 privatedir = ${includedir}/atomic_ops/
-all: all-recursive
+all: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -474,14 +476,16 @@ distdir: $(DISTFILES)
          fi; \
        done
 check-am: all-am
-check: check-recursive
+check: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
        for dir in "$(DESTDIR)$(privatedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
-install: install-recursive
+install: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
@@ -511,6 +515,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
@@ -577,8 +582,9 @@ ps-am:
 
 uninstall-am: uninstall-privateHEADERS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-       install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+       ctags-recursive install install-am install-strip \
+       tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am check check-am clean clean-generic ctags \