|
 |
384b531 |
From 90b8f20a41798ba4a38e7681783a5a14a13ef541 Mon Sep 17 00:00:00 2001
|
|
|
384b531 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
384b531 |
Date: Tue, 5 Nov 2013 17:40:20 +0000
|
|
|
384b531 |
Subject: [PATCH] builder: Add dependencies which automake doesn't generate
|
|
|
384b531 |
correctly.
|
|
|
384b531 |
|
|
|
384b531 |
This is a further attempt, earlier commits:
|
|
|
384b531 |
commit e3ac293e869a4c69225e3d954b812e9bf21588a1
|
|
|
384b531 |
commit dfe97b352d6b398c3cb3ddb1c9984767722e514b
|
|
|
384b531 |
|
|
|
384b531 |
(cherry picked from commit 4339b55d105eab6eba2756bffff42a1c34f9f656)
|
|
|
384b531 |
---
|
|
|
384b531 |
builder/Makefile.am | 11 +++++++----
|
|
|
384b531 |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
384b531 |
|
|
|
384b531 |
diff --git a/builder/Makefile.am b/builder/Makefile.am
|
|
|
384b531 |
index 593e3ef..a828ffd 100644
|
|
|
384b531 |
--- a/builder/Makefile.am
|
|
|
384b531 |
+++ b/builder/Makefile.am
|
|
|
384b531 |
@@ -120,8 +120,6 @@ virt-builder: $(OBJECTS)
|
|
|
384b531 |
.ml.cmx:
|
|
|
384b531 |
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@
|
|
|
384b531 |
|
|
|
384b531 |
-index-parser-c.o: index-parse.h
|
|
|
384b531 |
-
|
|
|
384b531 |
# Manual pages and HTML files for the website.
|
|
|
384b531 |
|
|
|
384b531 |
man_MANS += virt-builder.1
|
|
|
384b531 |
@@ -192,8 +190,6 @@ virt_index_validate_SOURCES = \
|
|
|
384b531 |
index-struct.c \
|
|
|
384b531 |
index-validate.c
|
|
|
384b531 |
|
|
|
384b531 |
-index-validate.o: index-parse.h
|
|
|
384b531 |
-
|
|
|
384b531 |
man_MANS += virt-index-validate.1
|
|
|
384b531 |
noinst_DATA += $(top_builddir)/html/virt-index-validate.1.html
|
|
|
384b531 |
|
|
|
384b531 |
@@ -212,3 +208,10 @@ CLEANFILES += \
|
|
|
384b531 |
index-parse.h \
|
|
|
384b531 |
index-scan.c \
|
|
|
384b531 |
stamp-virt-index-validate.pod
|
|
|
384b531 |
+
|
|
|
384b531 |
+# Fix dependencies which automake doesn't generate correctly.
|
|
|
384b531 |
+if HAVE_OCAML
|
|
|
384b531 |
+index-parser-c.o: index-parse.h
|
|
|
384b531 |
+index-scan.o: index-parse.h
|
|
|
384b531 |
+endif
|
|
|
384b531 |
+index-validate.o: index-parse.h
|
|
|
384b531 |
--
|
|
|
384b531 |
1.8.3.1
|
|
|
384b531 |
|