mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix inter-directory dependencies

Browse Source 
This change adds an explicit dependency on generator.ml for every file it
generates, except java files. Java is left for another time because it's
considerably trickier.

It also adds a build rule for src/libguestfs.la so it can be rebuilt as required
from other directories.

It does this by creating a top level make file, subdir-rules.mk, which can be
included from sub-directories. sub-directories need to define 'generator_built'
to include local files which are built by generator.ml, and they will be updated
automatically.

This fixes parallel make, and will automatically re-create generated files when
make is run from any directory.

It also fixes the problem which efad4f53 was targetting. Specifically,
src/guestfs_protocol.(c|h) had an erroneous dependency on stamp-generator, and
therefore generator.ml, despite not being directly created by it. This caused
them to be recreated every time generator.ml ran rather than only when
src/guestfs_protocol.x was updated, which cascaded into a daemon and therefore
appliance update.

This patch also changes the contents of the distribution tarball by including
files created by rpcgen.
This commit is contained in:
Matthew Booth
2009-11-19 16:10:00 +00:00
committed by Richard Jones
parent 16c1b31646
commit c477e2fb78
20 changed files with 173 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
@@ -54,9 +56,15 @@ if HAVE_HASKELL
SUBDIRS += haskell
endif
generator_built = \
guestfs-structs.pod \
guestfs-actions.pod \
guestfish-actions.pod
EXTRA_DIST = \
guestfs.pod guestfs-actions.pod guestfs-structs.pod \
guestfish.pod guestfish-actions.pod \
$(generator_built) \
guestfs.pod \
guestfish.pod \
html/pod.css \
HACKING TODO \
libguestfs.pc libguestfs.pc.in \

2
appliance/Makefile.am
View File

@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = \
libguestfs-supermin-helper \
kmod.whitelist.in \

9
capitests/Makefile.am
View File

@@ -15,8 +15,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTRA_DIST = \
tests.c
include $(top_srcdir)/subdir-rules.mk
generator_built = tests.c
BUILT_SOURCES = $(generator_built)
EXTRA_DIST = $(BUILT_SOURCES)
# Tests. These are auto-generated from the test descriptions
# in the generator.

26
daemon/Makefile.am
View File

@@ -19,6 +19,25 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = lib tests .
libsrcdir = $(top_builddir)/../src
generator_built = \
actions.h \
stubs.c \
names.c
.PHONY: force
$(generator_built): force
$(MAKE) -C $(libsrcdir) stamp-generator
BUILT_SOURCES = $(generator_built)
EXTRA_DIST = $(BUILT_SOURCES)
$(libsrcdir)/guestfs_protocol.o: force
$(MAKE) -C $(libsrcdir) guestfs_protocol.o
noinst_PROGRAMS = guestfsd
guestfsd_SOURCES = \
actions.h \
@@ -83,11 +102,8 @@ guestfsd_SOURCES = \
wc.c \
xattr.c \
zero.c \
zerofree.c \
$(top_builddir)/../src/guestfs_protocol.h \
$(top_builddir)/../src/guestfs_protocol.c
zerofree.c
guestfsd_LDADD = $(libsrcdir)/guestfs_protocol.o lib/libgnu.a
AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
LDADD = lib/libgnu.a

2
examples/Makefile.am
View File

@@ -1,5 +1,7 @@
# libguestfs examples
include $(top_srcdir)/subdir-rules.mk
noinst_PROGRAMS = hello to-xml
hello_SOURCES = hello.c

21
fish/Makefile.am
View File

@@ -15,17 +15,26 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
bin_PROGRAMS = guestfish
generator_built = \
cmds.c \
completion.c
BUILT_SOURCES = \
$(generator_built) \
rc_protocol.h \
rc_protocol.c
EXTRA_DIST = \
$(BUILT_SOURCES) \
rc_protocol.x
CLEANFILES = rc_protocol.c rc_protocol.h
guestfish_SOURCES = \
$(generator_built) \
alloc.c \
cmds.c \
completion.c \
destpaths.c \
echo.c \
edit.c \
@@ -44,10 +53,6 @@ guestfish_SOURCES = \
librc_protocol_la_SOURCES = rc_protocol.c
librc_protocol_la_CFLAGS = -Wall -Wno-unused
BUILT_SOURCES = \
rc_protocol.c \
rc_protocol.h
guestfish_CFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-I$(top_srcdir)/fish -I$(top_builddir)/fish \

2
fuse/Makefile.am
View File

@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = guestmount.pod test-fuse.sh
if HAVE_FUSE

12
haskell/Makefile.am
View File

@@ -15,7 +15,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTRA_DIST = *.hs run-bindtests
include $(top_srcdir)/subdir-rules.mk
generator_built = \
Guestfs.hs \
Bindtests.hs
# $(generator_built) isn't redundant below as the wildcard rule won't match, and
# therefore won't generate, the files if they haven't been created yet
EXTRA_DIST = $(generator_built) *.hs run-bindtests
CLEANFILES = *~
@@ -32,6 +40,8 @@ check_DATA = Bindtests
GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs
all: Bindtests Guestfs005Load Guestfs010Launch Guestfs050LVCreate
Bindtests: Bindtests.hs Guestfs.hs
$(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs

2
images/Makefile.am
View File

@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/images

2
inspector/Makefile.am
View File

@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = \
run-inspector-locally \
virt-inspector \

10
java/Makefile.am
View File

@@ -15,9 +15,19 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/java
# XXX: Need to fix generator.ml dependencies
#
# Files generated by generator.ml:
# Makefile.inc
# All files listed in Makefile.inc
# com_redhat_et_libguestfs_GuestFS.c
# Bindtests.java
java_prefix = com/redhat/et/libguestfs
# Pull in automatically generated built sources

13
ocaml/Makefile.am
View File

@@ -15,12 +15,19 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
generator_built = \
guestfs.mli \
guestfs.ml \
guestfs_c_actions.c \
bindtests.ml
EXTRA_DIST = \
guestfs.mli guestfs.ml \
guestfs_c.c guestfs_c.h guestfs_c_actions.c \
$(generator_built) \
guestfs_c.c guestfs_c.h \
guestfs_inspector.mli guestfs_inspector.ml \
.depend META.in \
bindtests.ml \
run-bindtests \
t/*.ml

15
perl/Makefile.am
View File

@@ -15,17 +15,22 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTRA_DIST = \
Makefile.PL.in \
include $(top_srcdir)/subdir-rules.mk
generator_built = \
Guestfs.xs \
lib/Sys/Guestfs.pm \
bindtests.pl
EXTRA_DIST = \
$(generator_built) \
Makefile.PL.in \
examples/README \
examples/LICENSE \
examples/*.pl \
lib/Sys/Guestfs.pm \
lib/Sys/Guestfs/Lib.pm \
run-bindtests \
run-perl-tests \
bindtests.pl \
t/*.t \
typemap
@@ -42,7 +47,7 @@ TESTS_ENVIRONMENT = \
INSTALLDIRS = site
all: Makefile-pl
all: Makefile-pl $(generator_built)
$(MAKE) -f Makefile-pl
Makefile-pl: Makefile.PL

11
python/Makefile.am
View File

@@ -18,10 +18,15 @@
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/python
EXTRA_DIST = \
guestfs.py \
include $(top_srcdir)/subdir-rules.mk
generator_built = \
guestfs-py.c \
bindtests.py \
guestfs.py \
bindtests.py
EXTRA_DIST = \
$(generator_built) \
run-bindtests \
run-python-tests \
t/*.py

2
regressions/Makefile.am
View File

@@ -21,6 +21,8 @@
#
# See also capitests/
include $(top_srcdir)/subdir-rules.mk
TESTS = \
rhbz503169c10.sh \
rhbz503169c13.sh \

13
ruby/Makefile.am
View File

@@ -15,14 +15,19 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTRA_DIST = \
Rakefile.in \
include $(top_srcdir)/subdir-rules.mk
generator_built = \
ext/guestfs/_guestfs.c \
bindtests.rb
EXTRA_DIST = \
$(generator_built) \
Rakefile.in \
ext/guestfs/extconf.rb \
lib/guestfs.rb \
run-bindtests \
run-ruby-tests \
bindtests.rb \
tests/tc_*.rb
CLEANFILES = \
@@ -43,7 +48,7 @@ TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance
all:
all: $(generator_built)
rake build
endif

35
src/Makefile.am
View File

@@ -15,12 +15,28 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTRA_DIST = \
include $(top_srcdir)/subdir-rules.mk
generator_built = \
guestfs_protocol.x \
guestfs-structs.h \
guestfs-actions.h \
guestfs-internal-actions.h \
guestfs-actions.c \
guestfs-bindtests.c
$(generator_built): stamp-generator
BUILT_SOURCES = \
$(generator_built) \
guestfs_protocol.c \
guestfs_protocol.h
EXTRA_DIST = \
$(BUILT_SOURCES) \
MAX_PROC_NR \
stamp-generator \
generator.ml \
guestfs-internal-actions.h
generator.ml
# Rerun the generator if it has changed.
# Git removes empty directories, so in cases where the
@@ -34,21 +50,10 @@ stamp-generator: generator.ml
mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
$(BUILT_SOURCES): stamp-generator
include_HEADERS = guestfs.h guestfs-actions.h guestfs-structs.h
lib_LTLIBRARIES = libguestfs.la
BUILT_SOURCES = \
guestfs_protocol.x \
guestfs_protocol.c \
guestfs_protocol.h \
guestfs-structs.h \
guestfs-actions.h \
guestfs-actions.c \
guestfs-bindtests.c
# This convenience library is solely to avoid compiler warnings
# in its generated sources.
libprotocol_la_SOURCES = \
@@ -57,8 +62,6 @@ libprotocol_la_SOURCES = \
libprotocol_la_CFLAGS =
CLEANFILES = guestfs_protocol.c guestfs_protocol.h
# From the libtool info file, with comments:
#
# | 1. Start with version information of `0:0:0' for each libtool library.

29
subdir-rules.mk Normal file
View File

@@ -0,0 +1,29 @@
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Define a force dependency which will always be rebuilt
.PHONY: force
# Rebuild rules for common dependencies
$(top_builddir)/src/libguestfs.la: force
$(MAKE) -C $(top_builddir)/src libguestfs.la
# Automatically build targets defined in generator_built
# generator_built is defined in individual Makefiles
$(generator_built): $(top_builddir)/src/stamp-generator
$(top_builddir)/src/stamp-generator: force
$(MAKE) -C $(top_builddir)/src stamp-generator

2
test-tool/Makefile.am
View File

@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = libguestfs-test-tool.pod
CLEANFILES =

2
tools/Makefile.am
View File

@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include $(top_srcdir)/subdir-rules.mk
tools = cat df edit ls rescue tar win-reg
EXTRA_DIST = \