[Libguestfs] [PATCH 1/2] gobject: Use generator_built macro to ensure generated files are rebuilt properly.
From: "Richard W.M. Jones" <rjones(a)redhat.com>
---
generator/generator_gobject.ml | 4 ++--
gobject/Makefile.am | 14 +++++++++-----
gobject/Makefile.inc | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/generator/generator_gobject.ml b/generator/generator_gobject.ml
index 17c6c36..3096501 100644
--- a/generator/generator_gobject.ml
+++ b/generator/generator_gobject.ml
@@ -193,9 +193,9 @@ let generate_gobject_makefile () =
let sources =
List.map (function n -> sprintf "src/%s.c" n) output_filenames
in
- pr "guestfs_gobject_headers=\\\n include/guestfs-gobject.h \\\n %s\n\n"
+ pr "guestfs_gobject_headers= \\\n include/guestfs-gobject.h \\\n %s\n\n"
(String.concat " \\\n " headers);
- pr "guestfs_gobject_sources=\\\n %s\n" (String.concat " \\\n "
sources)
+ pr "guestfs_gobject_sources= \\\n %s\n" (String.concat " \\\n "
sources)
let generate_gobject_header () =
generate_header CStyle GPLv2plus;
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index e28a8b1..1aa2e0f 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -17,15 +17,19 @@
SUBDIRS = . docs
+include $(top_srcdir)/subdir-rules.mk
+
include $(srcdir)/Makefile.inc
-BUILT_SOURCES = \
- $(guestfs_gobject_headers) \
- $(guestfs_gobject_sources) \
- bindtests.js
+generator_built = \
+ $(guestfs_gobject_headers) \
+ $(guestfs_gobject_sources) \
+ bindtests.js
+
+BUILT_SOURCES = $(generator_built)
EXTRA_DIST = \
- $(BUILT_SOURCES) \
+ $(generator_built) \
TODO.txt \
bindtests-manual.js \
tests-misc.js \
diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc
index 22ea052..c912fef 100644
--- a/gobject/Makefile.inc
+++ b/gobject/Makefile.inc
@@ -19,7 +19,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-guestfs_gobject_headers=\
+guestfs_gobject_headers= \
include/guestfs-gobject.h \
include/guestfs-gobject/session.h \
include/guestfs-gobject/tristate.h \
@@ -62,7 +62,7 @@ guestfs_gobject_headers=\
include/guestfs-gobject/optargs-mkfs_btrfs.h \
include/guestfs-gobject/optargs-set_e2attrs.h
-guestfs_gobject_sources=\
+guestfs_gobject_sources= \
src/session.c \
src/tristate.c \
src/struct-int_bool.c \
--
1.7.10