[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
patch: Makefile.in in subdir not generated
From: |
Ilya N. Golubev |
Subject: |
patch: Makefile.in in subdir not generated |
Date: |
Wed, 20 Aug 2008 22:43:53 +0400 |
Described what is fixing here in <Makefile.in in subdir not
generated> posted to <address@hidden> on
generated> (<address@hidden>).
Patched 1.10.1 as follows.
* lib/am/configure.am (%MAKEFILE-IN%): Fixed `exit'ing before
invoking `$(AUTOMAKE)' if prerequisite other then
`Makefile.am' is newer. Borrowed invocation of recursive
`make' and handling its exit codes from commands generated by
automake for other recursive targets. Added elimination of
duplicate `$(AUTOMAKE)' invocation.
--- lib/am/configure.am 2008-01-22 01:11:41 +0300
+++ lib/am/configure.am 2008-08-20 22:34:58 +0400
@@ -37,20 +37,37 @@
## Makefile.in are to be updated; it is then more efficient to run
## automake on all the Makefiles at once. It also allow Automake to be
## run for newly added directories.
- @for dep in $?; do \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ am_refreshed=; \
+ for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
+ if [ ! "$$am_refreshed" ];then \
?TOPDIR_P? echo ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS%
%USE-DEPS%'; \
+ ( \
?TOPDIR_P? cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% \
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
\
- && exit 0; \
- exit 1;; \
+ ) \
+ || eval $$failcom; \
+ am_refreshed=1; \
+ else :;fi;; \
esac; \
done; \
## Otherwise, rebuild only this file.
echo ' cd $(top_srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%
%MAKEFILE-AM-SOURCES%'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%
+?TOPDIR_P? if [ ! "$$am_refreshed" ];then \
+ { cd $(top_srcdir) && \
+ $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%; \
+ } || exit 1; \
+?TOPDIR_P? am_refreshed=1; \
+?TOPDIR_P? else :;fi; \
+ test -z "$$fail"
## Ensure that GNU make doesn't remove Makefile if ./config.status (below)
## is interrupted. Otherwise, the user would need to know to rerun
- patch: Makefile.in in subdir not generated,
Ilya N. Golubev <=