From: Eric Blake <eblake@redhat.com>
Date: Wed, 6 Jun 2012 15:45:04 +0000 (-0600)
Subject: build: fix build of fresh checkout
X-Git-Tag: v0.9.11.4~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04d646914149bb92f2b12ce9d6da182e948a29e4;p=thirdparty%2Flibvirt.git

build: fix build of fresh checkout

Commit 7bff56a worked in an incremental build, but fails for a
fresh clone; apparently, if make sees both an actual file
spelling and an inference rule, only the exact spelling is used.

  CCLD   libvirt_driver_test.la
  CC     libvirt_driver_remote_la-remote_driver.lo
remote/remote_driver.c:4707:34: fatal error: remote_client_bodies.h: No such file or directory
compilation terminated.

BUILT_SOURCES to the rescue, instead of trying to mess with .lo
dependencies directly.

* src/Makefile.am (REMOTE_DRIVER_PREREQS, %remote_driver.lo): Drop...
(BUILT_SOURCES): ...and add here instead.
(cherry picked from commit ca02b101d74510df424c5ea659d7b7d481874f98)

Conflicts:

	src/Makefile.am
---

diff --git a/src/Makefile.am b/src/Makefile.am
index e0ebc6cccf..db02eb0fe0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -661,8 +661,7 @@ libvirt_driver_remote_la_LDFLAGS += -module -avoid-version
 endif
 libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
 
-REMOTE_DRIVER_PREREQS = $(REMOTE_DRIVER_GENERATED)
-%remote_driver.lo: $(REMOTE_DRIVER_PREREQS)
+BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED)
 
 endif WITH_REMOTE
 
@@ -1299,7 +1298,7 @@ libvirt_la_BUILT_LIBADD += probes.o
 libvirt_la_DEPENDENCIES += probes.o
 nodist_libvirt_la_SOURCES = probes.h
 if WITH_REMOTE
-$(REMOTE_DRIVER_GENERATED): probes.h
+nodist_libvirt_driver_remote_la_SOURCES = probes.h
 endif WITH_REMOTE
 
 BUILT_SOURCES += probes.h libvirt_probes.stp libvirt_functions.stp