External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-06 21:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix build of fresh checkout

Browse Source 
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 ca02b101d7)

Conflicts:

	src/Makefile.am
This commit is contained in:
Eric Blake 2012-06-06 09:45:04 -06:00 committed by Cole Robinson
parent 3c3aaaf95f
commit 04d6469141
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@ -661,8 +661,7 @@ libvirt_driver_remote_la_LDFLAGS += -module -avoid-version
endif endif
libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
REMOTE_DRIVER_PREREQS = $(REMOTE_DRIVER_GENERATED) BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED)
%remote_driver.lo: $(REMOTE_DRIVER_PREREQS)
endif WITH_REMOTE endif WITH_REMOTE
@ -1299,7 +1298,7 @@ libvirt_la_BUILT_LIBADD += probes.o
libvirt_la_DEPENDENCIES += probes.o libvirt_la_DEPENDENCIES += probes.o
nodist_libvirt_la_SOURCES = probes.h nodist_libvirt_la_SOURCES = probes.h
if WITH_REMOTE if WITH_REMOTE
$(REMOTE_DRIVER_GENERATED): probes.h nodist_libvirt_driver_remote_la_SOURCES = probes.h
endif WITH_REMOTE endif WITH_REMOTE
BUILT_SOURCES += probes.h libvirt_probes.stp libvirt_functions.stp BUILT_SOURCES += probes.h libvirt_probes.stp libvirt_functions.stp