On Fri, 2010-05-14 at 18:32 -0600, Eric Blake wrote:
Fix the cygwin regression introduced in commit 48445ccff, but
without repeating the fresh build regression of commit
2d550542e.
* src/Makefile.am (libvirt_test_la_LIBADD): Split out subset of
locally-built libraries...
(libvirt_test_la_BUILT_LIBADD): ...into new variable.
(libvirt_test_la_DEPENDENCIES): Depend only on the subset that
automake would have given us for free if we didn't have to add our
own extra file.
---
Evidence that I'm a compulsive programmer, who can't bear the
thought of waiting an entire weekend to fix a bug.
:-)
But this time, I _won't_ commit without an ACK; even if it fixes
a build regression on cygwin, it no longer falls under the trivial
rule.
I've tested a clean build on both Linux and cygwin.
src/Makefile.am | 59 ++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 15bc8fc..8617feb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -389,7 +389,8 @@ EXTRA_DIST += $(pkgdata_DATA)
# First deal with sources usable in non-daemon context
noinst_LTLIBRARIES = libvirt_util.la
-libvirt_la_LIBADD = libvirt_util.la
+libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD)
+libvirt_la_BUILT_LIBADD = libvirt_util.la
libvirt_util_la_SOURCES = \
$(UTIL_SOURCES)
I tried to apply it but the indentation of above line doesn't make it
fit (on my machine the $ is under the 'S'). Hunks 1,2,22 fail for me and
many others have fuzz 1.
Stefan